[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdepim/kleopatra/conf
From: Laurent Montel <montel () kde ! org>
Date: 2007-06-12 8:57:29
Message-ID: 1181638649.734949.5728.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 674377 by mlaurent:
Port to uic4
M +1 -1 CMakeLists.txt
M +2 -6 appearanceconfigwidget.cpp
M +12 -2 appearanceconfigwidget.h
M +167 -194 appearanceconfigwidgetbase.ui
--- trunk/KDE/kdepim/kleopatra/conf/CMakeLists.txt #674376:674377
@@ -15,7 +15,7 @@
kde4_automoc(${kcm_kleopatra_PART_SRCS})
-kde4_add_ui3_files(kcm_kleopatra_PART_SRCS appearanceconfigwidgetbase.ui )
+kde4_add_ui_files(kcm_kleopatra_PART_SRCS appearanceconfigwidgetbase.ui )
kde4_add_plugin(kcm_kleopatra ${kcm_kleopatra_PART_SRCS})
--- trunk/KDE/kdepim/kleopatra/conf/appearanceconfigwidget.cpp #674376:674377
@@ -31,10 +31,6 @@
your version.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "appearanceconfigwidget.h"
#include <kleo/cryptobackendfactory.h>
@@ -179,8 +175,8 @@
////
Kleo::AppearanceConfigWidget::AppearanceConfigWidget (
- QWidget* parent, const char* name, Qt::WFlags fl )
- : AppearanceConfigWidgetBase( parent, name, fl )
+ QWidget* parent )
+ : AppearanceConfigWidgetBase( parent)
{
categoriesLV->setSorting( -1 );
load();
--- trunk/KDE/kdepim/kleopatra/conf/appearanceconfigwidget.h #674376:674377
@@ -34,9 +34,19 @@
#ifndef APPEARANCECONFIGWIDGET_H
#define APPEARANCECONFIGWIDGET_H
-#include "appearanceconfigwidgetbase.h"
+#include "ui_appearanceconfigwidgetbase.h"
#include <QStringList>
+
+class AppearanceConfigWidgetBase : public QWidget, public Ui::AppearanceConfigWidgetBase
+{
+public:
+ AppearanceConfigWidgetBase( QWidget *parent ) : QWidget( parent ) {
+ setupUi( this );
+ }
+};
+
+
namespace Kleo {
class AppearanceConfigWidget : public AppearanceConfigWidgetBase {
@@ -44,7 +54,7 @@
public:
AppearanceConfigWidget(
- QWidget * parent=0, const char * name=0, Qt::WFlags f=0 );
+ QWidget * parent=0);
~AppearanceConfigWidget();
void load();
--- trunk/KDE/kdepim/kleopatra/conf/appearanceconfigwidgetbase.ui #674376:674377
@@ -1,215 +1,188 @@
-<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
-<class>AppearanceConfigWidgetBase</class>
-<widget class="QWidget">
- <property name="name">
- <cstring>AppearanceConfigWidgetBase</cstring>
+<ui version="4.0" stdsetdef="1" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>AppearanceConfigWidgetBase</class>
+ <widget class="QWidget" name="AppearanceConfigWidgetBase" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>616</width>
+ <height>352</height>
+ </rect>
</property>
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>616</width>
- <height>352</height>
- </rect>
+ <property name="windowTitle" >
+ <string>Color & Font Configuration</string>
</property>
- <property name="windowTitle">
- <string>Color & Font Configuration</string>
- </property>
- <hbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="QListView">
- <column>
- <property name="text">
- <string>Key Categories</string>
- </property>
- <property name="clickable">
- <bool>true</bool>
- </property>
- <property name="resizable">
- <bool>true</bool>
- </property>
- </column>
- <property name="name">
- <cstring>categoriesLV</cstring>
+ <layout class="QHBoxLayout" >
+ <item>
+ <widget class="Q3ListView" name="categoriesLV" >
+ <column>
+ <property name="text" >
+ <string>Key Categories</string>
</property>
- </widget>
- <widget class="QLayoutWidget">
- <property name="name">
- <cstring>layout2</cstring>
+ <property name="clickable" >
+ <bool>true</bool>
</property>
- <vbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="QPushButton">
- <property name="name">
- <cstring>foregroundButton</cstring>
- </property>
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Set &Text Color...</string>
- </property>
- </widget>
- <widget class="QPushButton">
- <property name="name">
- <cstring>backgroundButton</cstring>
- </property>
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Set &Background Color...</string>
- </property>
- </widget>
- <widget class="QPushButton">
- <property name="name">
- <cstring>fontButton</cstring>
- </property>
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Set F&ont...</string>
- </property>
- </widget>
- <widget class="QCheckBox">
- <property name="name">
- <cstring>italicCB</cstring>
- </property>
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Italic</string>
- </property>
- </widget>
- <widget class="QCheckBox">
- <property name="name">
- <cstring>boldCB</cstring>
- </property>
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Bold</string>
- </property>
- </widget>
- <widget class="QCheckBox">
- <property name="name">
- <cstring>strikeoutCB</cstring>
- </property>
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Strikeout</string>
- </property>
- </widget>
- <spacer>
- <property name="name">
- <cstring>spacer6</cstring>
- </property>
- <property name="orientation">
- <enum>Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>20</width>
- <height>100</height>
- </size>
- </property>
- </spacer>
- <widget class="QPushButton">
- <property name="name">
- <cstring>defaultLookPB</cstring>
- </property>
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Default Appearance</string>
- </property>
- </widget>
- </vbox>
+ <property name="resizable" >
+ <bool>true</bool>
+ </property>
+ </column>
</widget>
- </hbox>
-</widget>
-<connections>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" >
+ <item>
+ <widget class="QPushButton" name="foregroundButton" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ <property name="text" >
+ <string>Set &Text Color...</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="backgroundButton" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ <property name="text" >
+ <string>Set &Background Color...</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="fontButton" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ <property name="text" >
+ <string>Set F&ont...</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="italicCB" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ <property name="text" >
+ <string>Italic</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="boldCB" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ <property name="text" >
+ <string>Bold</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="strikeoutCB" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ <property name="text" >
+ <string>Strikeout</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="spacer6" >
+ <property name="sizeHint" >
+ <size>
+ <width>20</width>
+ <height>100</height>
+ </size>
+ </property>
+ <property name="sizeType" >
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="defaultLookPB" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ <property name="text" >
+ <string>Default Appearance</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <tabstops>
+ <tabstop>categoriesLV</tabstop>
+ <tabstop>foregroundButton</tabstop>
+ <tabstop>backgroundButton</tabstop>
+ <tabstop>fontButton</tabstop>
+ <tabstop>italicCB</tabstop>
+ <tabstop>boldCB</tabstop>
+ <tabstop>strikeoutCB</tabstop>
+ <tabstop>defaultLookPB</tabstop>
+ </tabstops>
+ <connections>
<connection>
- <sender>foregroundButton</sender>
- <signal>clicked()</signal>
- <receiver>AppearanceConfigWidgetBase</receiver>
- <slot>slotForegroundClicked()</slot>
+ <sender>foregroundButton</sender>
+ <signal>clicked()</signal>
+ <receiver>AppearanceConfigWidgetBase</receiver>
+ <slot>slotForegroundClicked()</slot>
</connection>
<connection>
- <sender>backgroundButton</sender>
- <signal>clicked()</signal>
- <receiver>AppearanceConfigWidgetBase</receiver>
- <slot>slotBackgroundClicked()</slot>
+ <sender>backgroundButton</sender>
+ <signal>clicked()</signal>
+ <receiver>AppearanceConfigWidgetBase</receiver>
+ <slot>slotBackgroundClicked()</slot>
</connection>
<connection>
- <sender>fontButton</sender>
- <signal>clicked()</signal>
- <receiver>AppearanceConfigWidgetBase</receiver>
- <slot>slotFontClicked()</slot>
+ <sender>fontButton</sender>
+ <signal>clicked()</signal>
+ <receiver>AppearanceConfigWidgetBase</receiver>
+ <slot>slotFontClicked()</slot>
</connection>
<connection>
- <sender>categoriesLV</sender>
- <signal>selectionChanged(QListViewItem*)</signal>
- <receiver>AppearanceConfigWidgetBase</receiver>
- <slot>slotSelectionChanged(QListViewItem*)</slot>
+ <sender>categoriesLV</sender>
+ <signal>selectionChanged(Q3ListViewItem*)</signal>
+ <receiver>AppearanceConfigWidgetBase</receiver>
+ <slot>slotSelectionChanged(Q3ListViewItem*)</slot>
</connection>
<connection>
- <sender>defaultLookPB</sender>
- <signal>clicked()</signal>
- <receiver>AppearanceConfigWidgetBase</receiver>
- <slot>slotDefaultClicked()</slot>
+ <sender>defaultLookPB</sender>
+ <signal>clicked()</signal>
+ <receiver>AppearanceConfigWidgetBase</receiver>
+ <slot>slotDefaultClicked()</slot>
</connection>
<connection>
- <sender>italicCB</sender>
- <signal>clicked()</signal>
- <receiver>AppearanceConfigWidgetBase</receiver>
- <slot>slotItalicClicked()</slot>
+ <sender>italicCB</sender>
+ <signal>clicked()</signal>
+ <receiver>AppearanceConfigWidgetBase</receiver>
+ <slot>slotItalicClicked()</slot>
</connection>
<connection>
- <sender>boldCB</sender>
- <signal>clicked()</signal>
- <receiver>AppearanceConfigWidgetBase</receiver>
- <slot>slotBoldClicked()</slot>
+ <sender>boldCB</sender>
+ <signal>clicked()</signal>
+ <receiver>AppearanceConfigWidgetBase</receiver>
+ <slot>slotBoldClicked()</slot>
</connection>
<connection>
- <sender>strikeoutCB</sender>
- <signal>clicked()</signal>
- <receiver>AppearanceConfigWidgetBase</receiver>
- <slot>slotStrikeoutClicked()</slot>
+ <sender>strikeoutCB</sender>
+ <signal>clicked()</signal>
+ <receiver>AppearanceConfigWidgetBase</receiver>
+ <slot>slotStrikeoutClicked()</slot>
</connection>
-</connections>
-<tabstops>
- <tabstop>categoriesLV</tabstop>
- <tabstop>foregroundButton</tabstop>
- <tabstop>backgroundButton</tabstop>
- <tabstop>fontButton</tabstop>
- <tabstop>italicCB</tabstop>
- <tabstop>boldCB</tabstop>
- <tabstop>strikeoutCB</tabstop>
- <tabstop>defaultLookPB</tabstop>
-</tabstops>
-<slots>
- <slot access="protected">slotForegroundClicked()</slot>
- <slot access="protected">slotBackgroundClicked()</slot>
- <slot access="protected">slotFontClicked()</slot>
- <slot access="protected">slotSelectionChanged( QListViewItem * )</slot>
- <slot access="protected">slotDefaultClicked()</slot>
- <slot access="protected">slotItalicClicked()</slot>
- <slot access="protected">slotBoldClicked()</slot>
- <slot access="protected">slotStrikeoutClicked()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
+ </connections>
+</ui>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic