SVN: PLDSetupAssistant: PLDSetupAssistant.cpp PLDSetupAssistant.h main.cpp

Tue May 11 11:30:50 CEST 2010

Author: shadzik
Date: Tue May 11 11:30:49 2010
New Revision: 11448

Modified:
   PLDSetupAssistant/PLDSetupAssistant.cpp
   PLDSetupAssistant/PLDSetupAssistant.h
   PLDSetupAssistant/main.cpp
Log:
- add last page (not finished, should be some nice wizard graphics and something about the authors, find a way do include abaoutData in this)
- minor changes


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

--- PLDSetupAssistant/PLDSetupAssistant.cpp	(original)
+++ PLDSetupAssistant/PLDSetupAssistant.cpp	Tue May 11 11:30:49 2010
@@ -78,10 +78,6 @@
     setPlainCaption(i18n("PLD Setup Assistant"));
     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);
-   
     // Keyboard
     keyboardDialog = kcmDialog("kcm_keyboard_layout", "keyboard_layout");
     keyboardPage = addPage(kcmLayout(keyboardDialog), i18n("Step One: Choose your keyboard layout"));
@@ -93,6 +89,10 @@
     // Network
     netDialog = kcmDialog("kcm_knetworkconfmodule", "kcm_knetworkconfmodule");
     netPage = addPage(kcmLayout(netDialog), i18n("Step Three: Setup your network"));
+    
+    // Finish
+    finishDialog = finish();
+    finishPage = addPage(finishDialog, i18n(""));
 
 }
 
@@ -100,6 +100,22 @@
 {
 }
 
+QWidget * StartAssistant::finish()
+{
+    KTitleWidget *titleWidget = new KTitleWidget(this);
+    titleWidget->setText(i18n("<html><font size=\"5\">Hurray, the setup is now complete!</font></html>"));
+    titleWidget->setPixmap(KIcon("pld_czarny").pixmap(48), KTitleWidget::ImageLeft);
+    
+    QVBoxLayout *layout = new QVBoxLayout(this);
+    layout->addWidget(titleWidget);
+    layout->setMargin(0);
+    
+    QWidget *widget = new QWidget(this);
+    widget->setLayout(layout);
+    widget->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed);
+    return widget;
+}
+
 QWidget * StartAssistant::kcmLayout(KCMultiDialog* dialog)
 {
     QVBoxLayout *layout = new QVBoxLayout(this);

Modified: PLDSetupAssistant/PLDSetupAssistant.h
==============================================================================
--- PLDSetupAssistant/PLDSetupAssistant.h	(original)
+++ PLDSetupAssistant/PLDSetupAssistant.h	Tue May 11 11:30:49 2010
@@ -3,6 +3,7 @@
 
 #include <KAssistantDialog>
 #include <KDialog>
+#include <KAboutData>
 
 class KCMultiDialog;
 
@@ -31,11 +32,14 @@
     KCMultiDialog *keyboardDialog;
     KCMultiDialog *clockDialog;
     KCMultiDialog *netDialog;
+    QWidget *finishDialog;
     KPageWidgetItem *keyboardPage;
     KPageWidgetItem *clockPage;
     KPageWidgetItem *netPage;
+    KPageWidgetItem *finishPage;
 
     QWidget * kcmLayout(KCMultiDialog* dialog);
+    QWidget * finish();
     KCMultiDialog* kcmDialog(const QString lib, const QString name = "", bool debug = false);
 
 public:

Modified: PLDSetupAssistant/main.cpp
==============================================================================
--- PLDSetupAssistant/main.cpp	(original)
+++ PLDSetupAssistant/main.cpp	Tue May 11 11:30:49 2010
@@ -10,8 +10,7 @@
 {
   
     KAboutData aboutData( "PLDSetupAssistant", "PLD Setup Assistant", ki18n("PLD Setup Assistant"),
-			  "0.1", ki18n("Setup Assistant"), KAboutData::License_GPL, 
-			  ki18n("(c) Bartosz Swiatek <shadzik at pld-linux.org>"));
+			  "0.1", ki18n("Setup Assistant"), KAboutData::License_GPL);
 			  
     fillAboutData(aboutData);
   
@@ -26,5 +25,6 @@
 void fillAboutData(KAboutData& aboutData)
 {
   aboutData.setProgramIconName("tools-wizard");
-  aboutData.addAuthor(ki18n("Bartlomiej Zimon"), ki18n("Author"), "cactus at pld-linux.org");
+  aboutData.addAuthor(ki18n("Bartosz Świątek"), ki18n("Author"), "shadzik at pld-linux.org");
+  aboutData.addAuthor(ki18n("Bartłomiej Zimoń"), ki18n("Author"), "cactus at pld-linux.org");
 }
\ No newline at end of file
