Merging from old trunk:

r601570 | mlaurent | 2006-11-03 17:58:18 +0100 (Fri, 03 Nov 2006) | 2 lines

Port to uic4


svn path=/trunk/KDE/kdebase/workspace/; revision=659299
icc-effect-5.14.5
Luboš Luňák 2007-04-29 22:31:09 +00:00
parent 9faad7bc5e
commit bcf8544a27
7 changed files with 178 additions and 177 deletions

View File

@ -7,7 +7,7 @@ set(kwin_keramik_config_PART_SRCS config.cpp )
kde4_automoc(${kwin_keramik_config_PART_SRCS})
kde4_add_ui3_files(kwin_keramik_config_PART_SRCS keramikconfig.ui )
kde4_add_ui_files(kwin_keramik_config_PART_SRCS keramikconfig.ui )
kde4_add_plugin(kwin_keramik_config ${kwin_keramik_config_PART_SRCS})

View File

@ -27,7 +27,17 @@
#include <kconfig.h>
#include "keramikconfig.h"
#include "ui_keramikconfig.h"
class KeramikConfigUI : public QWidget, public Ui::KeramikConfigUI
{
public:
KeramikConfigUI( QWidget *parent ) : QWidget( parent ) {
setupUi( this );
}
};
class KeramikConfig: public QObject
{

View File

@ -1,72 +1,66 @@
<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
<class>KeramikConfigUI</class>
<widget class="QWidget">
<property name="name">
<cstring>KeramikConfigUI</cstring>
<ui version="4.0" stdsetdef="1" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>KeramikConfigUI</class>
<widget class="QWidget" name="KeramikConfigUI" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>287</width>
<height>102</height>
</rect>
</property>
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>287</width>
<height>102</height>
</rect>
<property name="windowTitle" >
<string>Keramik</string>
</property>
<property name="windowTitle">
<string>Keramik</string>
</property>
<vbox>
<property name="margin">
<cstring>0</cstring>
</property>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QCheckBox">
<property name="name">
<cstring>showAppIcons</cstring>
</property>
<property name="text">
<string>Display the window &amp;icon in the caption bubble</string>
</property>
<property name="whatsThis" stdset="0">
<string>Check this option if you want the window icon to be displayed in the caption bubble next to the titlebar text.</string>
</property>
<layout class="QVBoxLayout" >
<property name="margin" >
<cstring>0</cstring>
</property>
<item>
<widget class="QCheckBox" name="showAppIcons" >
<property name="text" >
<string>Display the window &amp;icon in the caption bubble</string>
</property>
<property name="whatsThis" stdset="0" >
<string>Check this option if you want the window icon to be displayed in the caption bubble next to the titlebar text.</string>
</property>
</widget>
<widget class="QCheckBox">
<property name="name">
<cstring>smallCaptions</cstring>
</property>
<property name="text">
<string>Draw &amp;small caption bubbles on active windows</string>
</property>
<property name="whatsThis" stdset="0">
<string>Check this option if you want the caption bubble to have the same size on active windows that it has on inactive ones. This option is useful for laptops or low resolution displays where you want maximize the amount of space available to the window contents.</string>
</property>
</item>
<item>
<widget class="QCheckBox" name="smallCaptions" >
<property name="text" >
<string>Draw &amp;small caption bubbles on active windows</string>
</property>
<property name="whatsThis" stdset="0" >
<string>Check this option if you want the caption bubble to have the same size on active windows that it has on inactive ones. This option is useful for laptops or low resolution displays where you want maximize the amount of space available to the window contents.</string>
</property>
</widget>
<widget class="QCheckBox">
<property name="name">
<cstring>largeGrabBars</cstring>
</property>
<property name="text">
<string>Draw g&amp;rab bars below windows</string>
</property>
<property name="whatsThis" stdset="0">
<string>Check this option if you want a grab bar to be drawn below windows. When this option is not selected only a thin border will be drawn in its place.</string>
</property>
</item>
<item>
<widget class="QCheckBox" name="largeGrabBars" >
<property name="text" >
<string>Draw g&amp;rab bars below windows</string>
</property>
<property name="whatsThis" stdset="0" >
<string>Check this option if you want a grab bar to be drawn below windows. When this option is not selected only a thin border will be drawn in its place.</string>
</property>
</widget>
<widget class="QCheckBox">
<property name="name">
<cstring>useShadowedText</cstring>
</property>
<property name="text">
<string>Use shadowed &amp;text</string>
</property>
<property name="whatsThis" stdset="0">
<string>Check this option if you want the titlebar text to have a 3D look with a shadow behind it.</string>
</property>
</item>
<item>
<widget class="QCheckBox" name="useShadowedText" >
<property name="text" >
<string>Use shadowed &amp;text</string>
</property>
<property name="whatsThis" stdset="0" >
<string>Check this option if you want the titlebar text to have a 3D look with a shadow behind it.</string>
</property>
</widget>
</vbox>
</widget>
<layoutdefaults spacing="6" margin="11"/>
</UI>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
</ui>

View File

@ -7,7 +7,7 @@ set(kwin_plastik_config_PART_SRCS config.cpp )
kde4_automoc(${kwin_plastik_config_PART_SRCS})
kde4_add_ui3_files(kwin_plastik_config_PART_SRCS configdialog.ui )
kde4_add_ui_files(kwin_plastik_config_PART_SRCS configdialog.ui )
kde4_add_plugin(kwin_plastik_config ${kwin_plastik_config_PART_SRCS})

View File

@ -32,7 +32,6 @@
#include <kglobal.h>
#include "config.h"
#include "configdialog.h"
PlastikConfig::PlastikConfig(KConfig* config, QWidget* parent)
: QObject(parent), m_config(0), m_dialog(0)

View File

@ -24,11 +24,19 @@
#define KNIFTYCONFIG_H
#include <QObject>
#include "ui_configdialog.h"
class QButtonGroup;
class QGroupBox;
class KConfig;
class ConfigDialog;
class ConfigDialog : public QWidget, public Ui::ConfigDialog
{
public:
ConfigDialog( QWidget *parent ) : QWidget( parent ) {
setupUi( this );
}
};
class PlastikConfig : public QObject
{

View File

@ -1,119 +1,109 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>ConfigDialog</class>
<widget class="QWidget">
<property name="name">
<cstring>ConfigDialog</cstring>
<ui version="4.0" stdsetdef="1" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>ConfigDialog</class>
<widget class="QWidget" name="ConfigDialog" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>541</width>
<height>170</height>
</rect>
</property>
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>541</width>
<height>170</height>
</rect>
<property name="windowTitle" >
<string>Config Dialog</string>
</property>
<property name="windowTitle">
<string>Config Dialog</string>
</property>
<vbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
<property name="margin">
<number>0</number>
</property>
<widget class="QButtonGroup">
<property name="name">
<cstring>titleAlign</cstring>
<layout class="QVBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<item>
<widget class="Q3ButtonGroup" name="titleAlign" >
<property name="title" >
<string>Title &amp;Alignment</string>
</property>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="title">
<string>Title &amp;Alignment</string>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
<item>
<widget class="QRadioButton" name="AlignLeft" >
<property name="text" >
<string>Left</string>
</property>
<widget class="QRadioButton">
<property name="name">
<cstring>AlignLeft</cstring>
</property>
<property name="text">
<string>Left</string>
</property>
</widget>
<widget class="QRadioButton">
<property name="name">
<cstring>AlignHCenter</cstring>
</property>
<property name="text">
<string>Center</string>
</property>
</widget>
<widget class="QRadioButton">
<property name="name">
<cstring>AlignRight</cstring>
</property>
<property name="text">
<string>Right</string>
</property>
</widget>
</hbox>
</widget>
</item>
<item>
<widget class="QRadioButton" name="AlignHCenter" >
<property name="text" >
<string>Center</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="AlignRight" >
<property name="text" >
<string>Right</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QCheckBox">
<property name="name">
<cstring>coloredBorder</cstring>
</property>
<property name="text">
<string>Colored Window Border</string>
</property>
<property name="accel">
<string></string>
</property>
<property name="whatsThis" stdset="0">
<string>Check this option if the window border should be painted in the titlebar color. Otherwise it will be painted in the background color.</string>
</property>
</item>
<item>
<widget class="QCheckBox" name="coloredBorder" >
<property name="text" >
<string>Colored Window Border</string>
</property>
<property name="shortcut" >
<string/>
</property>
<property name="whatsThis" stdset="0" >
<string>Check this option if the window border should be painted in the titlebar color. Otherwise it will be painted in the background color.</string>
</property>
</widget>
<widget class="QCheckBox">
<property name="name">
<cstring>titleShadow</cstring>
</property>
<property name="text">
<string>Use shadowed &amp;text</string>
</property>
<property name="whatsThis" stdset="0">
<string>Check this option if you want the titlebar text to have a 3D look with a shadow behind it.</string>
</property>
</item>
<item>
<widget class="QCheckBox" name="titleShadow" >
<property name="text" >
<string>Use shadowed &amp;text</string>
</property>
<property name="whatsThis" stdset="0" >
<string>Check this option if you want the titlebar text to have a 3D look with a shadow behind it.</string>
</property>
</widget>
<widget class="QCheckBox">
<property name="name">
<cstring>animateButtons</cstring>
</property>
<property name="text">
<string>Animate buttons</string>
</property>
<property name="whatsThis" stdset="0">
<string>Check this option if you want the buttons to fade in when the mouse pointer hovers over them and fade out again when it moves away.</string>
</property>
</item>
<item>
<widget class="QCheckBox" name="animateButtons" >
<property name="text" >
<string>Animate buttons</string>
</property>
<property name="whatsThis" stdset="0" >
<string>Check this option if you want the buttons to fade in when the mouse pointer hovers over them and fade out again when it moves away.</string>
</property>
</widget>
<widget class="QCheckBox">
<property name="name">
<cstring>menuClose</cstring>
</property>
<property name="text">
<string>Close windows by double clicking the menu button</string>
</property>
<property name="whatsThis" stdset="0">
<string>Check this option if you want windows to be closed when you double click the menu button, similar to Microsoft Windows.</string>
</property>
</item>
<item>
<widget class="QCheckBox" name="menuClose" >
<property name="text" >
<string>Close windows by double clicking the menu button</string>
</property>
<property name="whatsThis" stdset="0" >
<string>Check this option if you want windows to be closed when you double click the menu button, similar to Microsoft Windows.</string>
</property>
</widget>
</vbox>
</widget>
<tabstops>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
<tabstops>
<tabstop>AlignLeft</tabstop>
<tabstop>AlignHCenter</tabstop>
<tabstop>AlignRight</tabstop>
<tabstop>animateButtons</tabstop>
<tabstop>titleShadow</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
</UI>
</tabstops>
</ui>