From 36d665d87d27c744defdafac2b6dd58073466502 Mon Sep 17 00:00:00 2001 From: mlaurent Date: Tue, 26 Feb 2008 12:17:55 +0000 Subject: [PATCH] Port to uic4 git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/KDE/kdeadmin@779527 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- knetworkconf/knetworkconf/CMakeLists.txt | 2 +- knetworkconf/knetworkconf/knetworkconfigparser.cpp | 7 +- knetworkconf/knetworkconf/knetworkconfigparser.h | 10 +- knetworkconf/knetworkconf/kselectdistrodlg.ui | 278 ++++++++++----------- 4 files changed, 153 insertions(+), 144 deletions(-) rewrite knetworkconf/knetworkconf/kselectdistrodlg.ui (94%) diff --git a/knetworkconf/knetworkconf/CMakeLists.txt b/knetworkconf/knetworkconf/CMakeLists.txt index 2ad8dc3..c685dd8 100644 --- a/knetworkconf/knetworkconf/CMakeLists.txt +++ b/knetworkconf/knetworkconf/CMakeLists.txt @@ -19,7 +19,6 @@ set(kcm_knetworkconfmodule_PART_SRCS kadddevicecontainer.cpp ) kde4_add_ui3_files(kcm_knetworkconfmodule_PART_SRCS - kselectdistrodlg.ui kaddknownhostdlg.ui kadddevicedlg.ui kadddnsserverdlg.ui @@ -32,6 +31,7 @@ kde4_add_ui_files(kcm_knetworkconfmodule_PART_SRCS kdetectdistrodlg.ui kreloadnetworkdlg.ui kinterfaceupdowndlg.ui + kselectdistrodlg.ui ) kde4_add_plugin(kcm_knetworkconfmodule ${kcm_knetworkconfmodule_PART_SRCS}) diff --git a/knetworkconf/knetworkconf/knetworkconfigparser.cpp b/knetworkconf/knetworkconf/knetworkconfigparser.cpp index dda3201..02c4ea7 100644 --- a/knetworkconf/knetworkconf/knetworkconfigparser.cpp +++ b/knetworkconf/knetworkconf/knetworkconfigparser.cpp @@ -1032,7 +1032,12 @@ QString KNetworkConfigParser::getPlatformInfo(QDomElement platform){ /** Shows the dialog with all the supported platforms by GST. */ void KNetworkConfigParser::showSupportedPlatformsDialogSlot(){ KDialog *dialog= new KDialog( 0 ); - KSelectDistroDlg* widget = new KSelectDistroDlg(dialog, 0); + KSelectDistroDlg* widget = new KSelectDistroDlg(dialog); + connect(widget->kpbOk,SIGNAL(clicked()),dialog,SLOT(accept())); + connect(widget->kpbCancel,SIGNAL(clicked()),dialog,SLOT(reject())); + connect(widget->klbDistroList,SIGNAL(doubleClicked(Q3ListBoxItem*)),dialog,SLOT(accept())); + dialog->setSizeGripEnabled(true); + for ( QStringList::Iterator it = supportedPlatformsList.begin(); it != supportedPlatformsList.end(); ++it ) { diff --git a/knetworkconf/knetworkconf/knetworkconfigparser.h b/knetworkconf/knetworkconf/knetworkconfigparser.h index 40a8cd5..6936218 100644 --- a/knetworkconf/knetworkconf/knetworkconfigparser.h +++ b/knetworkconf/knetworkconf/knetworkconfigparser.h @@ -46,7 +46,7 @@ #include "ui_kdetectdistrodlg.h" #include "kreloadnetworkdlg.h" #include "ui_kinterfaceupdowndlg.h" -#include "kselectdistrodlg.h" +#include "ui_kselectdistrodlg.h" class KDetectDistroDlg : public QDialog, public Ui::KDetectDistroDlg @@ -65,6 +65,14 @@ public: } }; +class KSelectDistroDlg : public QWidget, public Ui::KSelectDistroDlg +{ +public: + KSelectDistroDlg( QWidget *parent ) : QWidget( parent ) { + setupUi( this ); + } +}; + /** *@author Juan Luis Baptiste */ diff --git a/knetworkconf/knetworkconf/kselectdistrodlg.ui b/knetworkconf/knetworkconf/kselectdistrodlg.ui dissimilarity index 94% index a14964a..967eaa2 100644 --- a/knetworkconf/knetworkconf/kselectdistrodlg.ui +++ b/knetworkconf/knetworkconf/kselectdistrodlg.ui @@ -1,141 +1,137 @@ - -KSelectDistroDlg - - - KSelectDistroDlg - - - - 0 - 0 - 372 - 499 - - - - Unsupported Platform - - - image0 - - - true - - - - unnamed - - - - klbDistroList - - - - - kpbOk - - - &OK - - - - - - true - - - true - - - - - kpbCancel - - - &Cancel - - - - - - true - - - - - cbAskAgain - - - Do not ask again - - - - - Horizontal Spacing2 - - - Horizontal - - - Expanding - - - - 130 - 20 - - - - - - textLabel1 - - - <font size="+1"><p align="center"><b>Your Platform is Not Supported</b></p></font> - - - - - textLabel2 - - - You may choose one of the following supported platforms if you are <b>sure</b> your platform behaves the same as the chosen one. Please be sure, because your current network configuration could be damaged. - - - - - - - 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000039e4944415418959595cd6b1d5518c67f934e9a776452cf40948e74915b2af6aa2897a6602a2e6e6a5d74e3dafe03d28f8d0b71292eba312808052964e34297154442119b2e44234aaca8ed151332c586ccd85cef1cc9e8bcd6938e8b9b7b136b6e4b5e18e683f33ef39ce77738c7abaa8a9dcaf33c2ebc7761e2e48993171179aaf75d7c50b7fd2e80822f557a3399bff4f1a557cf4f9f5ff47754dd2c33660e8931b50fafa6233a1c1019417c41a42baa4e290b8bae433caa4c3d1d3f89cf38707f6141867078577fb6941210858a31029b5d5a802d20cf721ae3c2e4213c600ff4870ca8615094b2005be44084aaed3bc6416e736ca1d876371175ca8385bbaeb13627d5a0eb3214284000ab8a1690decaa99b685be60f10ee0d1209d0a224b742a08a88609d82425e28b89e5301d7edf507d15ffd7515750c810ecfbc5627d8a42fbe30f753c247f342aa10f942eec088e9c6b369d587ddd39f3c1c33fb6302614ceee75da7b209747bc6bba53f7518ce4e8219035cb4a1ae048767dbd99f38fedaca7897f44b85bcc89150aa74256d6769f6a53a4d739bb7922469010cfd8f7e66b1ed9cbc2849db25a52d49db39d676e9ab2aea203631511879c7268e3ddc6834464a5b7e3077756ee6ec99b3edad28764bdf29eaba20adda3daa1a59b57beb8fd7ef1c7fe978b515850ff88288101b4142c184d29f8b55bd977e952c267fb4165bd7b4d0ebc952f2496bb1f5c3ece5d9fec6d35bc71e289111ac0fb18990b03b13754aa0c1bdf437d276ba9265f67d33666e34269aa5d95f9366f364f1fa1be7b61cdb759b0baccf9caeed5347d5fd1143aadd455faa828baa3e7d9beda9d7eb4fc4fbf55d09644dc2e0ae647c7eedfbefde02cabe70b2947c3b373cf7b6f85257a7e3b503b51722138d0294ae449d56c9cde4efec56f67be94ac17157550b2d744d9d2e4b68ee264baddfec9afdef1ebcf0d58277ea9553233317679acb3796bfe8dceedce9ac76aaceed4ed559ed54cbbf2c579dd54eb9f0cdc2a7d3e7a78f365f6c8e5cf9ec8a075055d58ed710c0916347aac644e31f09855cf31155f5d429aa8a557b5ffa83cadbfe72e6f499d1da78edb9c8442f9bd03c1bc5d133a52d35cbb3ebdbe87f3d7b7976bdd733f004ea3d4cbf333314c0a366bf79c86676b474fafcd489e6b9f9f9f9b56429b960c6cc8dda817a99acdc5c179f768ffe20e1feb669db69101c88df8c1f898f9ad16838f0794cc04c361a074d680e0ea23fa8fac2c94ab291173649b3741fb0577c10118b036b6de7bef477a87f018b9f681dd4db618a0000000049454e44ae426082 - - - - - kpbOk - clicked() - KSelectDistroDlg - accept() - - - kpbCancel - clicked() - KSelectDistroDlg - reject() - - - klbDistroList - doubleClicked(QListBoxItem*) - KSelectDistroDlg - accept() - - - - exitSlot() - - - - kdialog.h - k3listbox.h - kpushbutton.h - - + + + + + KSelectDistroDlg + + + + 0 + 0 + 372 + 499 + + + + Unsupported Platform + + + image0 + + + + + + + + + &OK + + + + + + true + + + true + + + + + + + &Cancel + + + + + + true + + + + + + + Do not ask again + + + + + + + + 130 + 20 + + + + QSizePolicy::Expanding + + + Qt::Horizontal + + + + + + + <font size="+1"><p align="center"><b>Your Platform is Not Supported</b></p></font> + + + false + + + + + + + You may choose one of the following supported platforms if you are <b>sure</b> your platform behaves the same as the chosen one. Please be sure, because your current network configuration could be damaged. + + + false + + + + + + + + + K3ListBox + Q3ListBox +
k3listbox.h
+
+
+ + + 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000039e4944415418959595cd6b1d5518c67f934e9a776452cf40948e74915b2af6aa2897a6602a2e6e6a5d74e3dafe03d28f8d0b71292eba312808052964e34297154442119b2e44234aaca8ed151332c586ccd85cef1cc9e8bcd6938e8b9b7b136b6e4b5e18e683f33ef39ce77738c7abaa8a9dcaf33c2ebc7761e2e48993171179aaf75d7c50b7fd2e80822f557a3399bff4f1a557cf4f9f5ff47754dd2c33660e8931b50fafa6233a1c1019417c41a42baa4e290b8bae433caa4c3d1d3f89cf38707f6141867078577fb6941210858a31029b5d5a802d20cf721ae3c2e4213c600ff4870ca8615094b2005be44084aaed3bc6416e736ca1d876371175ca8385bbaeb13627d5a0eb3214284000ab8a1690decaa99b685be60f10ee0d1209d0a224b742a08a88609d82425e28b89e5301d7edf507d15ffd7515750c810ecfbc5627d8a42fbe30f753c247f342aa10f942eec088e9c6b369d587ddd39f3c1c33fb6302614ceee75da7b209747bc6bba53f7518ce4e8219035cb4a1ae048767dbd99f38fedaca7897f44b85bcc89150aa74256d6769f6a53a4d739bb7922469010cfd8f7e66b1ed9cbc2849db25a52d49db39d676e9ab2aea203631511879c7268e3ddc6834464a5b7e3077756ee6ec99b3edad28764bdf29eaba20adda3daa1a59b57beb8fd7ef1c7fe978b515850ff88288101b4142c184d29f8b55bd977e952c267fb4165bd7b4d0ebc952f2496bb1f5c3ece5d9fec6d35bc71e289111ac0fb18990b03b13754aa0c1bdf437d276ba9265f67d33666e34269aa5d95f9366f364f1fa1be7b61cdb759b0baccf9caeed5347d5fd1143aadd455faa828baa3e7d9beda9d7eb4fc4fbf55d09644dc2e0ae647c7eedfbefde02cabe70b2947c3b373cf7b6f85257a7e3b503b51722138d0294ae449d56c9cde4efec56f67be94ac17157550b2d744d9d2e4b68ee264baddfec9afdef1ebcf0d58277ea9553233317679acb3796bfe8dceedce9ac76aaceed4ed559ed54cbbf2c579dd54eb9f0cdc2a7d3e7a78f365f6c8e5cf9ec8a075055d58ed710c0916347aac644e31f09855cf31155f5d429aa8a557b5ffa83cadbfe72e6f499d1da78edb9c8442f9bd03c1bc5d133a52d35cbb3ebdbe87f3d7b7976bdd733f004ea3d4cbf333314c0a366bf79c86676b474fafcd489e6b9f9f9f9b56429b960c6cc8dda817a99acdc5c179f768ffe20e1feb669db69101c88df8c1f898f9ad16838f0794cc04c361a074d680e0ea23fa8fac2c94ab291173649b3741fb0577c10118b036b6de7bef477a87f018b9f681dd4db618a0000000049454e44ae426082 + + + + kdialog.h + k3listbox.h + kpushbutton.h + + + + kpbOk + clicked() + KSelectDistroDlg + accept() + + + kpbCancel + clicked() + KSelectDistroDlg + reject() + + + klbDistroList + doubleClicked(Q3ListBoxItem*) + KSelectDistroDlg + accept() + + +
-- 2.11.4.GIT