[PC-BSD Commits] r15145 - in users/kris/pc-installgui: . images

[svn at pcbsd.org]

Author: kris
Date: 2012-02-02 21:44:34 +0000 (Thu, 02 Feb 2012)
New Revision: 15145

Added:
   users/kris/pc-installgui/images/advanced.png
   users/kris/pc-installgui/images/basic.png
   users/kris/pc-installgui/images/expert.png
   users/kris/pc-installgui/wizardDisk.cpp
   users/kris/pc-installgui/wizardDisk.h
   users/kris/pc-installgui/wizardDisk.ui
Modified:
   users/kris/pc-installgui/installer.cpp
   users/kris/pc-installgui/installer.h
   users/kris/pc-installgui/pc-sysinstaller.pro
   users/kris/pc-installgui/sysinstaller.qrc
Log:

Add new disk wizard UI to installer, still needs code to make it functional



Index: users/kris/pc-installgui/images/advanced.png
===================================================================
--- users/kris/pc-installgui/images/advanced.png	2012-02-02 20:35:49 UTC (rev 15144)
+++ users/kris/pc-installgui/images/advanced.png	2012-02-02 21:44:34 UTC (rev 15145)

Property changes on: users/kris/pc-installgui/images/advanced.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
Index: users/kris/pc-installgui/images/basic.png
===================================================================
--- users/kris/pc-installgui/images/basic.png	2012-02-02 20:35:49 UTC (rev 15144)
+++ users/kris/pc-installgui/images/basic.png	2012-02-02 21:44:34 UTC (rev 15145)

Property changes on: users/kris/pc-installgui/images/basic.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
Index: users/kris/pc-installgui/images/expert.png
===================================================================
--- users/kris/pc-installgui/images/expert.png	2012-02-02 20:35:49 UTC (rev 15144)
+++ users/kris/pc-installgui/images/expert.png	2012-02-02 21:44:34 UTC (rev 15145)

Property changes on: users/kris/pc-installgui/images/expert.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
Modified: users/kris/pc-installgui/installer.cpp
===================================================================
--- users/kris/pc-installgui/installer.cpp	2012-02-02 20:35:49 UTC (rev 15144)
+++ users/kris/pc-installgui/installer.cpp	2012-02-02 21:44:34 UTC (rev 15145)
@@ -397,7 +397,12 @@
 
 void Installer::slotDiskCustomizeClicked()
 {
-
+  wDisk = new wizardDisk();
+  wDisk->programInit();
+  wDisk->setWindowModality(Qt::ApplicationModal);
+  //connect(wDisk, SIGNAL(saved(QStringList)), this, SLOT(slotSaveMetaChanges(QStringList)));
+  wDisk->show();
+  wDisk->raise();
 }
 
 void Installer::slotDesktopCustomizeClicked()

Modified: users/kris/pc-installgui/installer.h
===================================================================
--- users/kris/pc-installgui/installer.h	2012-02-02 20:35:49 UTC (rev 15144)
+++ users/kris/pc-installgui/installer.h	2012-02-02 21:44:34 UTC (rev 15145)
@@ -14,6 +14,7 @@
 #include "dialogKeyboard.h"
 #include "dialogDesktopSelection.h"
 #include "wizardFreeBSD.h"
+#include "wizardDisk.h"
 
 #include "backend.h"
 
@@ -128,6 +129,9 @@
     QStringList keyModels;
     QStringList keyLayouts;
 
+    // Disk setup wizard
+    wizardDisk *wDisk;
+
 };
 
 #endif // INSTALLER_H

Modified: users/kris/pc-installgui/pc-sysinstaller.pro
===================================================================
--- users/kris/pc-installgui/pc-sysinstaller.pro	2012-02-02 20:35:49 UTC (rev 15144)
+++ users/kris/pc-installgui/pc-sysinstaller.pro	2012-02-02 21:44:34 UTC (rev 15145)
@@ -12,6 +12,7 @@
     dialogHelp.cpp \
     dialogSelectNet.cpp \
     dialogZFSMount.cpp \
+    wizardDisk.cpp \
     wizardFreeBSD.cpp \
     installer.cpp \
     backend.cpp
@@ -23,6 +24,7 @@
     dialogHelp.h \
     dialogSelectNet.h \
     dialogZFSMount.h \
+    wizardDisk.h \
     wizardFreeBSD.h \
     helpText.h \
     backend.h
@@ -96,5 +98,5 @@
 
 INSTALLS += dotrans
 
-FORMS += installer.ui dialogDesktopSelection.ui dialogFileSystem.ui dialogHelp.ui dialogSelectNet.ui dialogZFSMount.ui dialogInfoBox.ui wizardFreeBSD.ui dialogKeyboard.ui
+FORMS += installer.ui dialogDesktopSelection.ui dialogFileSystem.ui dialogHelp.ui dialogSelectNet.ui dialogZFSMount.ui dialogInfoBox.ui wizardFreeBSD.ui dialogKeyboard.ui wizardDisk.ui
 RESOURCES += sysinstaller.qrc

Modified: users/kris/pc-installgui/sysinstaller.qrc
===================================================================
--- users/kris/pc-installgui/sysinstaller.qrc	2012-02-02 20:35:49 UTC (rev 15144)
+++ users/kris/pc-installgui/sysinstaller.qrc	2012-02-02 21:44:34 UTC (rev 15145)
@@ -1,5 +1,8 @@
 <RCC>
   <qresource prefix="/modules">
+    <file>images/basic.png</file>
+    <file>images/advanced.png</file>
+    <file>images/expert.png</file>
     <file>images/encrypted.png</file>
     <file>images/help-hint.png</file>
     <file>images/view-refresh.png</file>

Index: users/kris/pc-installgui/wizardDisk.ui
===================================================================
--- users/kris/pc-installgui/wizardDisk.ui	2012-02-02 20:35:49 UTC (rev 15144)
+++ users/kris/pc-installgui/wizardDisk.ui	2012-02-02 21:44:34 UTC (rev 15145)

Property changes on: users/kris/pc-installgui/wizardDisk.ui
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/xml