From c4bdce612fefd1ccdadc2ab287c5309f2fff189f Mon Sep 17 00:00:00 2001 From: mlaurent Date: Sat, 27 Jan 2007 15:47:24 +0000 Subject: [PATCH] uic4 port git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/KDE/kdeartwork@627658 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kscreensaver/kdesavers/CMakeLists.txt | 4 +- kscreensaver/kdesavers/fountain.cpp | 6 +- kscreensaver/kdesavers/fountain.h | 6 +- kscreensaver/kdesavers/fountaincfg.ui | 359 ++++++++++++++++----------------- kscreensaver/kdesavers/wave.cpp | 6 +- kscreensaver/kdesavers/wave.h | 6 +- kscreensaver/kdesavers/wavecfg.ui | 363 ++++++++++++++++------------------ 7 files changed, 355 insertions(+), 395 deletions(-) rewrite kscreensaver/kdesavers/fountaincfg.ui (94%) rewrite kscreensaver/kdesavers/wavecfg.ui (93%) diff --git a/kscreensaver/kdesavers/CMakeLists.txt b/kscreensaver/kdesavers/CMakeLists.txt index 54fa84ae..486d2658 100644 --- a/kscreensaver/kdesavers/CMakeLists.txt +++ b/kscreensaver/kdesavers/CMakeLists.txt @@ -175,14 +175,14 @@ target_link_libraries( keuphoria.kss ${KDE4_KDEUI_LIBS} ${QT_QTOPENGL_LIBRARY} k install(TARGETS keuphoria.kss DESTINATION ${BIN_INSTALL_DIR} ) set(kfountain.kss_SRCS fountain.cpp ) -kde4_add_ui3_files(kfountain.kss_SRCS fountaincfg.ui) +kde4_add_ui_files(kfountain.kss_SRCS fountaincfg.ui) kde4_automoc(${kfountain.kss_SRCS}) kde4_add_executable(kfountain.kss ${kfountain.kss_SRCS}) target_link_libraries( kfountain.kss ${KDE4_KDEUI_LIBS} ${QT_QTOPENGL_LIBRARY} kscreensaver) install(TARGETS kfountain.kss DESTINATION ${BIN_INSTALL_DIR} ) set(kwave.kss_SRCS wave.cpp ) -kde4_add_ui3_files(kwave.kss_SRCS wavecfg.ui) +kde4_add_ui_files(kwave.kss_SRCS wavecfg.ui) kde4_automoc(${kwave.kss_SRCS}) kde4_add_executable(kwave.kss ${kwave.kss_SRCS}) target_link_libraries( kwave.kss ${KDE4_KDEUI_LIBS} ${QT_QTOPENGL_LIBRARY} kscreensaver) diff --git a/kscreensaver/kdesavers/fountain.cpp b/kscreensaver/kdesavers/fountain.cpp index b1de6011..679c20c8 100644 --- a/kscreensaver/kdesavers/fountain.cpp +++ b/kscreensaver/kdesavers/fountain.cpp @@ -66,9 +66,11 @@ int main( int argc, char *argv[] ) //----------------------------------------------------------------------------- // dialog to setup screen saver parameters // -KFountainSetup::KFountainSetup( QWidget *parent, const char *name ) - : SetupUi( parent, name, TRUE ) +KFountainSetup::KFountainSetup( QWidget *parent ) + : QDialog( parent) { + setupUi(this); + setModal(true); readSettings(); //QLabel *label; diff --git a/kscreensaver/kdesavers/fountain.h b/kscreensaver/kdesavers/fountain.h index fa89e6f8..f2051b29 100644 --- a/kscreensaver/kdesavers/fountain.h +++ b/kscreensaver/kdesavers/fountain.h @@ -26,7 +26,7 @@ #include #include #include -#include "fountaincfg.h" +#include "ui_fountaincfg.h" #include #include #include @@ -117,11 +117,11 @@ private: QTimer *timer; }; -class KFountainSetup : public SetupUi +class KFountainSetup : public QDialog, public Ui::SetupUi { Q_OBJECT public: - KFountainSetup( QWidget *parent = NULL, const char *name = NULL ); + KFountainSetup( QWidget *parent =0L); protected: void readSettings(); diff --git a/kscreensaver/kdesavers/fountaincfg.ui b/kscreensaver/kdesavers/fountaincfg.ui dissimilarity index 94% index b43e8936..2752bef3 100644 --- a/kscreensaver/kdesavers/fountaincfg.ui +++ b/kscreensaver/kdesavers/fountaincfg.ui @@ -1,192 +1,167 @@ - -SetupUi - - - SetupUi - - - - 0 - 0 - 400 - 209 - - - - - 400 - 209 - - - - - 400 - 250 - - - - Particle Fountain Setup - - - - unnamed - - - 11 - - - 6 - - - - Layout4 - - - - unnamed - - - 0 - - - 6 - - - - CheckBox1 - - - Use textures - - - - - PushButton3 - - - &About - - - - - SpinBox1 - - - 500 - - - 25 - - - 10 - - - 75 - - - - - PushButton2 - - - &Cancel - - - - - PushButton1 - - - &OK - - - true - - - - - GroupBox1 - - - Shapes - - - - unnamed - - - 11 - - - 6 - - - - Layout3 - - - - unnamed - - - 0 - - - 6 - - - - RadioButton1 - - - Stars - - - true - - - - - RadioButton1_2 - - - Flares - - - - - - - - - preview - - - - - TextLabel1 - - - Particle size: - - - - - - - - - RadioButton1_2 - pressed() - RadioButton1 - toggle() - - - RadioButton1 - pressed() - RadioButton1_2 - toggle() - - - - + + + + + SetupUi + + + + 0 + 0 + 400 + 209 + + + + + 400 + 209 + + + + + 400 + 250 + + + + Particle Fountain Setup + + + + 11 + + + 6 + + + + + 0 + + + 6 + + + + + Use textures + + + + + + + &About + + + + + + + 500 + + + 25 + + + 10 + + + 75 + + + + + + + &Cancel + + + + + + + &OK + + + true + + + + + + + Shapes + + + + 11 + + + 6 + + + + + 0 + + + 6 + + + + + Stars + + + true + + + + + + + Flares + + + + + + + + + + + + + + + Particle size: + + + false + + + + + + + + + qPixmapFromMimeSource + + + RadioButton1_2 + pressed() + RadioButton1 + toggle() + + + RadioButton1 + pressed() + RadioButton1_2 + toggle() + + + diff --git a/kscreensaver/kdesavers/wave.cpp b/kscreensaver/kdesavers/wave.cpp index 68a63496..7e0f2aa3 100644 --- a/kscreensaver/kdesavers/wave.cpp +++ b/kscreensaver/kdesavers/wave.cpp @@ -66,9 +66,11 @@ int main( int argc, char *argv[] ) //----------------------------------------------------------------------------- // dialog to setup screen saver parameters // -KWaveSetup::KWaveSetup( QWidget *parent, const char *name ) - : SetupUi( parent, name, TRUE ) +KWaveSetup::KWaveSetup( QWidget *parent) + : QDialog( parent ) { + setupUi(this); + setModal(true); readSettings(); preview->setFixedSize( 220, 170 ); diff --git a/kscreensaver/kdesavers/wave.h b/kscreensaver/kdesavers/wave.h index ea2f64f3..8b0118c5 100644 --- a/kscreensaver/kdesavers/wave.h +++ b/kscreensaver/kdesavers/wave.h @@ -26,7 +26,7 @@ #include #include #include -#include "wavecfg.h" +#include "ui_wavecfg.h" class Wave : public QGLWidget @@ -74,11 +74,11 @@ private: QTimer *timer; }; -class KWaveSetup : public SetupUi +class KWaveSetup : public QDialog, public Ui::SetupUi { Q_OBJECT public: - KWaveSetup( QWidget *parent = NULL, const char *name = NULL ); + KWaveSetup( QWidget *parent = 0L ); ~KWaveSetup( ); protected: void readSettings(); diff --git a/kscreensaver/kdesavers/wavecfg.ui b/kscreensaver/kdesavers/wavecfg.ui dissimilarity index 93% index 02e569b4..fd31b458 100644 --- a/kscreensaver/kdesavers/wavecfg.ui +++ b/kscreensaver/kdesavers/wavecfg.ui @@ -1,191 +1,172 @@ - -SetupUi - - - SetupUi - - - - 0 - 0 - 400 - 209 - - - - - 0 - 0 - 0 - 0 - - - - - 400 - 209 - - - - - 400 - 250 - - - - Bitmap Flag Setup - - - - Layout4 - - - - 1 - 1 - 398 - 206 - - - - - unnamed - - - 0 - - - 6 - - - - CheckBox1 - - - Use textures - - - - - PushButton3 - - - &About - - - - - SpinBox1 - - - 500 - - - 10 - - - 10 - - - - - PushButton2 - - - &Cancel - - - - - PushButton1 - - - &OK - - - true - - - - - GroupBox1 - - - Shapes - - - - Layout3 - - - - 10 - 20 - 130 - 50 - - - - - unnamed - - - 0 - - - 6 - - - - RadioButton1 - - - Stars - - - true - - - - - RadioButton1_2 - - - Flares - - - - - - - - preview - - - - - TextLabel1 - - - Particle size: - - - - - - - - RadioButton1_2 - pressed() - RadioButton1 - toggle() - - - RadioButton1 - pressed() - RadioButton1_2 - toggle() - - - - + + + + + SetupUi + + + + 0 + 0 + 400 + 209 + + + + + 0 + 0 + 0 + 0 + + + + + 400 + 209 + + + + + 400 + 250 + + + + Bitmap Flag Setup + + + + + 1 + 1 + 398 + 206 + + + + + 0 + + + 6 + + + + + Use textures + + + + + + + &About + + + + + + + 500 + + + 10 + + + 10 + + + + + + + &Cancel + + + + + + + &OK + + + true + + + + + + + Shapes + + + + + 10 + 20 + 130 + 50 + + + + + 0 + + + 6 + + + + + Stars + + + true + + + + + + + Flares + + + + + + + + + + + + + + Particle size: + + + false + + + + + + + + qPixmapFromMimeSource + + + RadioButton1_2 + pressed() + RadioButton1 + toggle() + + + RadioButton1 + pressed() + RadioButton1_2 + toggle() + + + -- 2.11.4.GIT