diff --git a/clients/keramik/config/CMakeLists.txt b/clients/keramik/config/CMakeLists.txt index 25a7448bfd..995f1b0af3 100644 --- a/clients/keramik/config/CMakeLists.txt +++ b/clients/keramik/config/CMakeLists.txt @@ -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}) diff --git a/clients/keramik/config/config.h b/clients/keramik/config/config.h index 9348599fa0..80dbbbc528 100644 --- a/clients/keramik/config/config.h +++ b/clients/keramik/config/config.h @@ -27,7 +27,17 @@ #include -#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 { diff --git a/clients/keramik/config/keramikconfig.ui b/clients/keramik/config/keramikconfig.ui index 9da2c9a6f5..2d402f6609 100644 --- a/clients/keramik/config/keramikconfig.ui +++ b/clients/keramik/config/keramikconfig.ui @@ -1,72 +1,66 @@ - -KeramikConfigUI - - - KeramikConfigUI + + + + + KeramikConfigUI + + + + 0 + 0 + 287 + 102 + - - - 0 - 0 - 287 - 102 - + + Keramik - - Keramik - - - - 0 - - - unnamed - - - - showAppIcons - - - Display the window &icon in the caption bubble - - - Check this option if you want the window icon to be displayed in the caption bubble next to the titlebar text. - + + + 0 + + + + + Display the window &icon in the caption bubble + + + Check this option if you want the window icon to be displayed in the caption bubble next to the titlebar text. + - - - smallCaptions - - - Draw &small caption bubbles on active windows - - - 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. - + + + + + Draw &small caption bubbles on active windows + + + 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. + - - - largeGrabBars - - - Draw g&rab bars below windows - - - 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. - + + + + + Draw g&rab bars below windows + + + 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. + - - - useShadowedText - - - Use shadowed &text - - - Check this option if you want the titlebar text to have a 3D look with a shadow behind it. - + + + + + Use shadowed &text + + + Check this option if you want the titlebar text to have a 3D look with a shadow behind it. + - - - - + + + + + qPixmapFromMimeSource + diff --git a/clients/plastik/config/CMakeLists.txt b/clients/plastik/config/CMakeLists.txt index d5161f32eb..4479a4a5b9 100644 --- a/clients/plastik/config/CMakeLists.txt +++ b/clients/plastik/config/CMakeLists.txt @@ -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}) diff --git a/clients/plastik/config/config.cpp b/clients/plastik/config/config.cpp index 5efad7bc4b..c4b1ee0d51 100644 --- a/clients/plastik/config/config.cpp +++ b/clients/plastik/config/config.cpp @@ -32,7 +32,6 @@ #include #include "config.h" -#include "configdialog.h" PlastikConfig::PlastikConfig(KConfig* config, QWidget* parent) : QObject(parent), m_config(0), m_dialog(0) diff --git a/clients/plastik/config/config.h b/clients/plastik/config/config.h index b75198aaeb..8adaad9609 100644 --- a/clients/plastik/config/config.h +++ b/clients/plastik/config/config.h @@ -24,11 +24,19 @@ #define KNIFTYCONFIG_H #include - +#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 { diff --git a/clients/plastik/config/configdialog.ui b/clients/plastik/config/configdialog.ui index 3b8f981819..3b8418e5fb 100644 --- a/clients/plastik/config/configdialog.ui +++ b/clients/plastik/config/configdialog.ui @@ -1,119 +1,109 @@ - -ConfigDialog - - - ConfigDialog + + + + + ConfigDialog + + + + 0 + 0 + 541 + 170 + - - - 0 - 0 - 541 - 170 - + + Config Dialog - - Config Dialog - - - - unnamed - - - 0 - - - - titleAlign + + + 0 + + + + + Title &Alignment + + + + 0 - - Title &Alignment - - - - unnamed + + + + Left - - - AlignLeft - - - Left - - - - - AlignHCenter - - - Center - - - - - AlignRight - - - Right - - - + + + + + + Center + + + + + + + Right + + + + - - - coloredBorder - - - Colored Window Border - - - - - - Check this option if the window border should be painted in the titlebar color. Otherwise it will be painted in the background color. - + + + + + Colored Window Border + + + + + + Check this option if the window border should be painted in the titlebar color. Otherwise it will be painted in the background color. + - - - titleShadow - - - Use shadowed &text - - - Check this option if you want the titlebar text to have a 3D look with a shadow behind it. - + + + + + Use shadowed &text + + + Check this option if you want the titlebar text to have a 3D look with a shadow behind it. + - - - animateButtons - - - Animate buttons - - - 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. - + + + + + Animate buttons + + + 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. + - - - menuClose - - - Close windows by double clicking the menu button - - - Check this option if you want windows to be closed when you double click the menu button, similar to Microsoft Windows. - + + + + + Close windows by double clicking the menu button + + + Check this option if you want windows to be closed when you double click the menu button, similar to Microsoft Windows. + - - - + + + + + qPixmapFromMimeSource + AlignLeft AlignHCenter AlignRight animateButtons titleShadow - - - + +