SVN: PLDSetupAssistant: PLDSetupAssistant.cpp PLDSetupAssistant.h

Mon May 10 22:06:56 CEST 2010

Author: cactus
Date: Mon May 10 22:06:56 2010
New Revision: 11428

Modified:
   PLDSetupAssistant/PLDSetupAssistant.cpp
   PLDSetupAssistant/PLDSetupAssistant.h
Log:
- add 2nd page and reimplement empty back and next

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

--- PLDSetupAssistant/PLDSetupAssistant.cpp	(original)
+++ PLDSetupAssistant/PLDSetupAssistant.cpp	Mon May 10 22:06:56 2010
@@ -77,28 +77,44 @@
     setCaption("Keyboard Layout");
     //setButtons(None);
     //setButtons(KDialog::Close);
+    showButton(KDialog::Help, false);
     
-    KTitleWidget *titleWidget = new KTitleWidget(this);
-    titleWidget->setText(i18n("<html><font size=\"5\">Keyboard Layout</font></html>"));
-    titleWidget->setPixmap(KIcon("pld_czarny").pixmap(48), KTitleWidget::ImageLeft);
+    //KTitleWidget *titleWidget = new KTitleWidget(this);
+    //titleWidget->setText(i18n("<html><font size=\"5\">Keyboard Layout</font></html>"));
+    //titleWidget->setPixmap(KIcon("pld_czarny").pixmap(48), KTitleWidget::ImageLeft);
     
-    KAssistantDialog *assistDialog = new KAssistantDialog;
-    //assistDialog->next();
-    showButton(KDialog::Help, false);
-    showButton(KDialog::Cancel, false);
+    KCMultiDialog *keyboardDialog = kcmDialog("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);
+    
+    KPageWidgetItem *page1 = addPage(keyboardWidget, i18n("Step One: Choose your keyboard layout"));
+    //setValid(page1, false);
+    setAppropriate(page1, true);
+
+    KCMultiDialog *clockDialog = kcmDialog("timezone");
+
+    QVBoxLayout *clockLayout = new QVBoxLayout;
+    clockLayout->addWidget(clockDialog);
+    clockLayout->setMargin(0);
     
-    QVBoxLayout *mainLayout = new QVBoxLayout;
-    mainLayout->addWidget(titleWidget);
-    mainLayout->setMargin(0);
-    
-    KCMultiDialog *dlg = kcmDialog("keyboard_layout");
-    mainLayout->addWidget(dlg);
-    
-    QWidget *mainWidget = new QWidget;
-    mainWidget->setLayout(mainLayout);
-    mainWidget->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed);
- 
-    setMainWidget(mainWidget);
+    QWidget *clockWidget = new QWidget;
+    clockWidget->setLayout(clockLayout);
+    clockWidget->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed);
+    
+    KPageWidgetItem *page2 = addPage(clockWidget, i18n("Step Two: Choose your timezone and setup the clock"));
+    //addPage(page2,i18n("Step Two: Account Information"));
+
+    //dlg->buttonClicked(KDialog::Apply);
+}
+
+StartAssistant::~StartAssistant()
+{
 }
 
 KCMultiDialog* StartAssistant::kcmDialog(const QString name)
@@ -115,8 +131,11 @@
   return 0;
 }
 
+void StartAssistant::back()
+{
+}
 
-StartAssistant::~StartAssistant()
+void StartAssistant::next()
 {
 }
 

Modified: PLDSetupAssistant/PLDSetupAssistant.h
==============================================================================
--- PLDSetupAssistant/PLDSetupAssistant.h	(original)
+++ PLDSetupAssistant/PLDSetupAssistant.h	Mon May 10 22:06:56 2010
@@ -33,6 +33,10 @@
 public:
     StartAssistant( QWidget * parent = 0 );
     virtual ~StartAssistant();
+
+public Q_SLOTS:
+    virtual void back();
+    virtual void next();
 };
 
 #endif // PLDSetupAssistant_H
