SVN: PLDSetupAssistant: PLDSetupAssistant.cpp PLDSetupAssistant.h

[cactus]

Author: cactus
Date: Tue May 11 01:34:43 2010
New Revision: 11445

Modified:
   PLDSetupAssistant/PLDSetupAssistant.cpp
   PLDSetupAssistant/PLDSetupAssistant.h
Log:
- simple setting of dialog layouts, clean code

Modified: PLDSetupAssistant/PLDSetupAssistant.cpp
==============================================================================
--- PLDSetupAssistant/PLDSetupAssistant.cpp	(original)
+++ PLDSetupAssistant/PLDSetupAssistant.cpp	Tue May 11 01:34:43 2010
@@ -84,42 +84,15 @@
    
     // Keyboard
     keyboardDialog = kcmDialog("kcm_keyboard_layout", "keyboard_layout");
-   
-    QVBoxLayout *keyboardLayout = new QVBoxLayout;
-    keyboardLayout->addWidget(keyboardDialog);
-    keyboardLayout->setMargin(0);
-    
-    QWidget *keyboardWidget = new QWidget;
-    keyboardWidget->setLayout(keyboardLayout);
-    keyboardWidget->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed);
-    
-    keyboardPage = addPage(keyboardWidget, i18n("Step One: Choose your keyboard layout"));
+    keyboardPage = addPage(kcmLayout(keyboardDialog), i18n("Step One: Choose your keyboard layout"));
 
     // Date and Time
     clockDialog = kcmDialog("kcm_clock", "clock");
-
-    QVBoxLayout *clockLayout = new QVBoxLayout;
-    clockLayout->addWidget(clockDialog);
-    clockLayout->setMargin(0);
-    
-    QWidget *clockWidget = new QWidget;
-    clockWidget->setLayout(clockLayout);
-    clockWidget->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed);
-    
-    clockPage = addPage(clockWidget, i18n("Step Two: Choose your timezone and setup the clock"));
+    clockPage = addPage(kcmLayout(clockDialog), i18n("Step Two: Choose your timezone and setup the clock"));
     
     // Network
     netDialog = kcmDialog("kcm_knetworkconfmodule", "kcm_knetworkconfmodule");
-    
-    QVBoxLayout *netLayout = new QVBoxLayout;
-    netLayout->addWidget(netDialog);
-    netLayout->setMargin(0);
-    
-    QWidget *netWidget = new QWidget;
-    netWidget->setLayout(netLayout);
-    netWidget->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed);
-    
-    netPage = addPage(netWidget, i18n("Step Three: Setup your network"));
+    netPage = addPage(kcmLayout(netDialog), i18n("Step Three: Setup your network"));
 
 }
 
@@ -127,6 +100,18 @@
 {
 }
 
+QWidget * StartAssistant::kcmLayout(KCMultiDialog* dialog)
+{
+    QVBoxLayout *layout = new QVBoxLayout;
+    layout->addWidget(dialog);
+    layout->setMargin(0);
+
+    QWidget *widget = new QWidget;
+    widget->setLayout(layout);
+    widget->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed);
+    return widget;
+}
+
 KCMultiDialog* StartAssistant::kcmDialog(const QString lib, const QString name)
 {
   KService::List serviceList = KServiceTypeTrader::self()->query("KCModule");

Modified: PLDSetupAssistant/PLDSetupAssistant.h
==============================================================================
--- PLDSetupAssistant/PLDSetupAssistant.h	(original)
+++ PLDSetupAssistant/PLDSetupAssistant.h	Tue May 11 01:34:43 2010
@@ -35,6 +35,7 @@
     KPageWidgetItem *clockPage;
     KPageWidgetItem *netPage;
 
+    QWidget * kcmLayout(KCMultiDialog* dialog);
     KCMultiDialog* kcmDialog(const QString lib, const QString name = "");
 
 public: