[PC-BSD Commits] r6523 - pcbsd/trunk/SysInstaller

svn at pcbsd.org svn at pcbsd.org
Wed Apr 7 09:29:38 PDT 2010


Author: kris
Date: 2010-04-07 09:29:38 -0700 (Wed, 07 Apr 2010)
New Revision: 6523

Modified:
   pcbsd/trunk/SysInstaller/sysinstaller.cpp
Log:

Fixed some GUI logic for restores, don't need to go through user / component pages



Modified: pcbsd/trunk/SysInstaller/sysinstaller.cpp
===================================================================
--- pcbsd/trunk/SysInstaller/sysinstaller.cpp	2010-04-07 16:18:13 UTC (rev 6522)
+++ pcbsd/trunk/SysInstaller/sysinstaller.cpp	2010-04-07 16:29:38 UTC (rev 6523)
@@ -268,6 +268,7 @@
    if ( stackWidget->currentIndex() == 3 && ! checkDiskRequirements())
       return;
 
+
    // Check if we are on the disk page, and using auto-partitioning, and set it up if so
    if ( stackWidget->currentIndex() == 3 && radioAutoPartition->isChecked() )
    {
@@ -282,6 +283,7 @@
       }
    }
 
+
    // If the chosen disk is too small or partition is invalid, don't continue
    if ( stackWidget->currentIndex() == 4 && ! checkUserAccountInfo() )
       return;
@@ -298,6 +300,15 @@
    if ( stackWidget->currentIndex() == 6 )
      startConfigGen();
 
+   // If we are doing a rsync restore need to skip some pages
+   if ( radioRestore->isChecked() ) {
+     if ( stackWidget->currentIndex() == 3 ) {
+       startConfigGen();
+       setCurrentIndex(6);
+       return;
+     }
+   }
+
    if ( stackWidget->currentIndex() == 7 )
    {
       int ret = QMessageBox::question(this, tr("PC-BSD Installer"),
@@ -319,6 +330,14 @@
 
 void SysInstaller::slotBack()
 {
+   // If we are doing a rsync restore need to skip some pages
+   if ( radioRestore->isChecked() ) {
+     if ( stackWidget->currentIndex() == 6 ) {
+       setCurrentIndex(3);
+       return;
+     }
+   }
+
    // Check if we are trying to go back when doing an upgrade, and skip other steps
    if ( stackWidget->currentIndex() == 6 && radioUpgrade->isChecked() ) {
       QString ss = labels.at(6)->styleSheet();



More information about the Commits mailing list