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

[shadzik]

Author: shadzik
Date: Mon Dec  6 12:13:52 2010
New Revision: 11958

Modified:
   PLDLiveInstaller/branches/0.2/PLDLiveInstaller.cpp
   PLDLiveInstaller/branches/0.2/PLDLiveInstaller.h
Log:
- merged


Modified: PLDLiveInstaller/branches/0.2/PLDLiveInstaller.cpp
==============================================================================
--- PLDLiveInstaller/branches/0.2/PLDLiveInstaller.cpp	(original)
+++ PLDLiveInstaller/branches/0.2/PLDLiveInstaller.cpp	Mon Dec  6 12:13:52 2010
@@ -109,20 +109,11 @@
     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(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);
@@ -303,6 +294,12 @@
     refresh->setFixedHeight(33);
     connect(refresh, SIGNAL(clicked()), diskListWidget, SLOT(refresh()));
     
+    KPushButton *startPartitionManager= new KPushButton(KIcon("partitionmanager"), i18n("Start Partition Manager"), buttonBox);
+    startPartitionManager->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed);
+    startPartitionManager->setToolTip("Start Partition Manager");
+    startPartitionManager->setIconSize(QSize(22,22));
+    connect(startPartitionManager, SIGNAL(clicked()), this, SLOT(startPM()));
+    
     defimage = new QLabel;
     defimage->setPixmap(KIcon("media-optical").pixmap(128));
     defimage->setAlignment(Qt::AlignLeft);

Modified: PLDLiveInstaller/branches/0.2/PLDLiveInstaller.h
==============================================================================
--- PLDLiveInstaller/branches/0.2/PLDLiveInstaller.h	(original)
+++ PLDLiveInstaller/branches/0.2/PLDLiveInstaller.h	Mon Dec  6 12:13:52 2010
@@ -42,7 +42,6 @@
     QWidget * failedWidget();
     QProgressBar *pbar, *pwStrengthMeter;
     QPushButton *install;
-    KPushButton *startPartitionManager;
     QLineEdit *username, *password, *password2, *hostname, *usercredentials;
     DiskListWidget *diskListWidget;
     QListWidgetItem * selectedDisk;