[PC-BSD Commits] r18479 - pcbsd/current/src-qt4/pc-installgui

[svn at pcbsd.org]

Author: kris
Date: 2012-08-17 19:27:37 +0000 (Fri, 17 Aug 2012)
New Revision: 18479

Modified:
   pcbsd/current/src-qt4/pc-installgui/wizardDisk.cpp
   pcbsd/current/src-qt4/pc-installgui/wizardDisk.h
   pcbsd/current/src-qt4/pc-installgui/wizardDisk.ui
Log:

Change disk wizard layout, don't show encryption settings when using ZFS raidz / mirror



Modified: pcbsd/current/src-qt4/pc-installgui/wizardDisk.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-installgui/wizardDisk.cpp	2012-08-17 18:28:05 UTC (rev 18478)
+++ pcbsd/current/src-qt4/pc-installgui/wizardDisk.cpp	2012-08-17 19:27:37 UTC (rev 18479)
@@ -143,9 +143,10 @@
        if (radioAdvanced->isChecked())
 	 checkGPT->setVisible(true);
 	break;
-     case Page_BasicEnc:
+     case Page_BasicDisk:
        if (radioBasic->isChecked())
-         return Page_Confirmation;
+         return Page_BasicEnc;
+       return Page_FS;
        break;
      case Page_FS:
        if (radioZFS->isChecked() ) {
@@ -158,6 +159,17 @@
        }
        return Page_Mounts;
        break;
+     case Page_ZFS:
+       // If we are using ZFS raidz / mirror, skip encryption
+       if ( groupZFSOpts->isChecked() )
+          return Page_Mounts;
+       return Page_BasicEnc;
+       break;
+     case Page_BasicEnc:
+       if (radioBasic->isChecked())
+         return Page_Confirmation;
+       return Page_Mounts;
+       break;
      case Page_Mounts:
        return Page_Confirmation;
        break;
@@ -179,7 +191,7 @@
     populateDiskTree();
   }
   // Generate suggested disk layout and show disk tree
-  if ( prevID == Page_ZFS && currentId() == Page_Mounts) {
+  if ( prevID == Page_BasicEnc && currentId() == Page_Mounts) {
     generateDiskLayout();
     populateDiskTree();
   }

Modified: pcbsd/current/src-qt4/pc-installgui/wizardDisk.h
===================================================================
--- pcbsd/current/src-qt4/pc-installgui/wizardDisk.h	2012-08-17 18:28:05 UTC (rev 18478)
+++ pcbsd/current/src-qt4/pc-installgui/wizardDisk.h	2012-08-17 19:27:37 UTC (rev 18479)
@@ -83,7 +83,7 @@
     QMenu *popupCH;
     QMenu *popupNE;
     dialogFSSize *rFS;
-    enum { Page_Intro, Page_BasicDisk, Page_BasicEnc, Page_FS, Page_ZFS, Page_Mounts, Page_Expert, Page_Confirmation };
+    enum { Page_Intro, Page_BasicDisk, Page_FS, Page_ZFS, Page_BasicEnc, Page_Mounts, Page_Expert, Page_Confirmation };
 
 signals:
     void saved(QList<QStringList>, bool, bool);

Modified: pcbsd/current/src-qt4/pc-installgui/wizardDisk.ui
===================================================================
(Binary files differ)