SVN: PLDLiveInstaller/branches/0.2: PLDLiveInstaller.cpp PLDLiveInstaller.h

[shadzik]

Author: shadzik
Date: Tue Nov 30 16:37:14 2010
New Revision: 11916

Modified:
   PLDLiveInstaller/branches/0.2/PLDLiveInstaller.cpp
   PLDLiveInstaller/branches/0.2/PLDLiveInstaller.h
Log:
- merge with trunk


Modified: PLDLiveInstaller/branches/0.2/PLDLiveInstaller.cpp
==============================================================================
--- PLDLiveInstaller/branches/0.2/PLDLiveInstaller.cpp	(original)
+++ PLDLiveInstaller/branches/0.2/PLDLiveInstaller.cpp	Tue Nov 30 16:37:14 2010
@@ -20,6 +20,7 @@
 #include <KDebug>
 #include <KLocale>
 #include <KPushButton>
+#include <KRun>
 #include <KService>
 #include <KServiceTypeTrader>
 #include <KStandardDirs>
@@ -81,6 +82,11 @@
 {
 }
 
+void PLDLiveInstaller::startPM()
+{
+  KRun::runCommand("partitionmanager", this);
+}
+
 QWidget * PLDLiveInstaller::startWidget()
 {
     KTitleWidget *titleWidget = new KTitleWidget(this);
@@ -103,12 +109,25 @@
     text->setAlignment(Qt::AlignCenter);
     text->setWordWrap(true);
     
+    KVBox *buttonBox = new KVBox;
+    
+    startPartitionManager= new KPushButton(KIcon("partitionmanager"), i18n("Start Partition Manager"), buttonBox);
+    startPartitionManager->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed);
+    startPartitionManager->setToolTip("Start Partition Manager");
+    startPartitionManager->setIconSize(QSize::QSize(22,22));
+    connect(startPartitionManager, SIGNAL(clicked()), this, SLOT(startPM()));
+    
     QVBoxLayout *textLayout = new QVBoxLayout;
     textLayout->addWidget(text);
+    
+    QVBoxLayout *buttonBoxLayout = new QVBoxLayout;
+    buttonBoxLayout->setAlignment(Qt::AlignCenter);
+    buttonBoxLayout->addWidget(buttonBox);
    
     QVBoxLayout *layout = new QVBoxLayout;
     layout->addWidget(titleWidget);
     layout->addLayout(textLayout);
+    layout->addLayout(buttonBoxLayout);
     layout->setMargin(30);
     
     QWidget *widget = new QWidget;
@@ -1741,7 +1760,11 @@
 void PLDLiveInstaller::back()
 {
     if(currentPage() == selectPartitionsPage)
+    {
       partDescr->clear();
+      selRoot.clear();
+      selSwap.clear();
+    }
     
     KAssistantDialog::back();
 }

Modified: PLDLiveInstaller/branches/0.2/PLDLiveInstaller.h
==============================================================================
--- PLDLiveInstaller/branches/0.2/PLDLiveInstaller.h	(original)
+++ PLDLiveInstaller/branches/0.2/PLDLiveInstaller.h	Tue Nov 30 16:37:14 2010
@@ -15,17 +15,15 @@
 #include <Solid/StorageVolume>
 #include <QLabel>
 #include <QPushButton>
+#include <KPushButton>
 
 #include "DiskListWidget.h"
 
-class KCMultiDialog;
-
 class PLDLiveInstaller : public KAssistantDialog
 {
 
     Q_OBJECT
 
-    KCMultiDialog *partitionDialog;
     KPageWidgetItem *startPage;
     KPageWidgetItem *partitionPage;
     KPageWidgetItem *selectDiskPage;
@@ -35,8 +33,6 @@
     KPageWidgetItem *finishPage;
     KPageWidgetItem *failedPage;
 
-    QWidget * kcmLayout(KCMultiDialog* dialog);
-    QWidget * kcmLayout(QWidget* widget);
     QWidget * startWidget();
     QWidget * selectDiskWidget();
     QWidget * selectPartitionsWidget();
@@ -46,6 +42,7 @@
     QWidget * failedWidget();
     QProgressBar *pbar, *pwStrengthMeter;
     QPushButton *install;
+    KPushButton *startPartitionManager;
     QLineEdit *username, *password, *password2, *hostname, *usercredentials;
     DiskListWidget *diskListWidget;
     QListWidgetItem * selectedDisk;
@@ -89,6 +86,7 @@
     void instBootLoaderIsChecked(int state);
     void checkPwStrength();
     void checkPwMatch();
+    void startPM();
     
 };