SVN: PLDSetupAssistant: PLDSetupAssistant.cpp PLDSetupAssistant.h

Tue May 11 00:01:32 CEST 2010

Author: cactus
Date: Tue May 11 00:01:31 2010
New Revision: 11432

Modified:
   PLDSetupAssistant/PLDSetupAssistant.cpp
   PLDSetupAssistant/PLDSetupAssistant.h
Log:
- some debug and apply to pages

Modified: PLDSetupAssistant/PLDSetupAssistant.cpp
==============================================================================

--- PLDSetupAssistant/PLDSetupAssistant.cpp	(original)
+++ PLDSetupAssistant/PLDSetupAssistant.cpp	Tue May 11 00:01:31 2010
@@ -5,6 +5,7 @@
 
 #include <KActionMenu>
 #include <KCMultiDialog>
+#include <KDebug>
 #include <KLocale>
 #include <KPushButton>
 #include <KServiceTypeTrader>
@@ -83,7 +84,7 @@
     //titleWidget->setText(i18n("<html><font size=\"5\">Keyboard Layout</font></html>"));
     //titleWidget->setPixmap(KIcon("pld_czarny").pixmap(48), KTitleWidget::ImageLeft);
     
-    keyboardDialog = kcmDialog("keyboard_layout");
+    keyboardDialog = kcmDialog("kcm_keyboard_layout", "keyboard_layout");
    
     QVBoxLayout *keyboardLayout = new QVBoxLayout;
     keyboardLayout->addWidget(keyboardDialog);
@@ -93,13 +94,13 @@
     keyboardWidget->setLayout(keyboardLayout);
     keyboardWidget->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed);
     
-    KPageWidgetItem *page1 = addPage(keyboardWidget, i18n("Step One: Choose your keyboard layout"));
+    page1 = addPage(keyboardWidget, i18n("Step One: Choose your keyboard layout"));
     //setValid(page1, false);
     setAppropriate(page1, true);
     
     //keyboardDialog->button(KDialog::Apply)->click();
 
-    clockDialog = kcmDialog("keyboard_layout");
+    clockDialog = kcmDialog("kcm_keyboard_layout", "keyboard_layout");
 
     QVBoxLayout *clockLayout = new QVBoxLayout;
     clockLayout->addWidget(clockDialog);
@@ -109,7 +110,7 @@
     clockWidget->setLayout(clockLayout);
     clockWidget->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed);
     
-    KPageWidgetItem *page2 = addPage(clockWidget, i18n("Step Two: Choose your timezone and setup the clock"));
+    page2 = addPage(clockWidget, i18n("Step Two: Choose your timezone and setup the clock"));
     //addPage(page2,i18n("Step Two: Account Information"));
 
     //dlg->buttonClicked(KDialog::Apply);
@@ -119,11 +120,12 @@
 {
 }
 
-KCMultiDialog* StartAssistant::kcmDialog(const QString name)
+KCMultiDialog* StartAssistant::kcmDialog(const QString lib, const QString name)
 {
   foreach (const KService::Ptr service, KServiceTypeTrader::self()->query("KCModule")) {
-    if (service->pluginKeyword() == name)
+    if (service->library() == lib && ( name.isEmpty() || service->desktopEntryName() == name))
     {
+      kDebug() <<service->library() << service->desktopEntryName() << service->untranslatedGenericName() << service->name();
       KCMultiDialog *dlg = new KCMultiDialog(this);
       dlg->addModule(KCModuleInfo(service));
       //dlg->setButtons(None);
@@ -134,7 +136,7 @@
       dlg->showButton(KDialog::Default, false);
       dlg->showButtonSeparator(false);
       return dlg;
-    }
+    } else kDebug() <<service->library() << service->desktopEntryName() << service->untranslatedGenericName() << service->name();
 }
   return 0;
 }
@@ -146,7 +148,12 @@
 
 void StartAssistant::next()
 {
-      keyboardDialog->button(KDialog::Apply)->click();
+      if (currentPage() == page1)
+	keyboardDialog->button(KDialog::Apply)->click();
+
+      if (currentPage() == page2)
+	clockDialog->button(KDialog::Apply)->click();
+
       KAssistantDialog::next();
 }
 

Modified: PLDSetupAssistant/PLDSetupAssistant.h
==============================================================================
--- PLDSetupAssistant/PLDSetupAssistant.h	(original)
+++ PLDSetupAssistant/PLDSetupAssistant.h	Tue May 11 00:01:31 2010
@@ -30,8 +30,10 @@
 
     KCMultiDialog *clockDialog;
     KCMultiDialog *keyboardDialog;
-    
-    KCMultiDialog* kcmDialog(const QString);
+    KPageWidgetItem *page1;
+    KPageWidgetItem *page2;
+
+    KCMultiDialog* kcmDialog(const QString lib, const QString name = "");
 
 public:
     StartAssistant( QWidget * parent = 0 );
