[PC-BSD Commits] r603 - pcbsd/trunk/PCInstall

[svn at pcbsd.org]

Author: kris
Date: 2007-08-16 10:15:57 -0700 (Thu, 16 Aug 2007)
New Revision: 603

Modified:
   pcbsd/trunk/PCInstall/pcinstall.ui
   pcbsd/trunk/PCInstall/pcinstall.ui.h
Log:

Fixed bug with custom partitions, so that they will not be regenerated 
unless the user has changed the disk selection first. 



Modified: pcbsd/trunk/PCInstall/pcinstall.ui
===================================================================
--- pcbsd/trunk/PCInstall/pcinstall.ui	2007-08-16 16:40:43 UTC (rev 602)
+++ pcbsd/trunk/PCInstall/pcinstall.ui	2007-08-16 17:15:57 UTC (rev 603)
@@ -7756,6 +7756,7 @@
     <variable access="private">int ComponentSelected[100];</variable>
     <variable access="private">QProcess *InstallComponentsProc;</variable>
     <variable access="private">int installComponents;</variable>
+    <variable access="private">int regenCustomSlices;</variable>
 </variables>
 <slots>
     <slot>ProgramInit()</slot>

Modified: pcbsd/trunk/PCInstall/pcinstall.ui.h
===================================================================
--- pcbsd/trunk/PCInstall/pcinstall.ui.h	2007-08-16 16:40:43 UTC (rev 602)
+++ pcbsd/trunk/PCInstall/pcinstall.ui.h	2007-08-16 17:15:57 UTC (rev 603)
@@ -16,13 +16,10 @@
 
 void PCInstall::ProgramInit()
 {
-    // Go to FULLSCREEN Mode
-    //showFullScreen();
-    
-    // Disable the "next" button until user clicks "I Agree"
-    //setNextEnabled(page(4), FALSE);
-    
 
+    // Set the variable to regenerate the custom slices
+    regenCustomSlices = 1;
+
     // Setup Translations
     nextButton()->setText(tr("Next"));
     backButton()->setText(tr("Back"));
@@ -233,8 +230,11 @@
         if ( Page == tr("Advanced Disk Setup") )
     {
 	
-	// Setup the initial slice layout
-	setupInitialSlices();
+	if ( regenCustomSlices == 1) {
+	   // Setup the initial slice layout
+	   setupInitialSlices();
+	   regenCustomSlices = 0;
+                }
 		
 	// Display slices on GUI
 	populateSlices();
@@ -704,6 +704,8 @@
     // Reset the list box
     listPartitionBox->clear();
     
+    // Make sure to set flag to regenerate slice layout for custom partitions
+    regenCustomSlices = 1;
     
     
     if ( listDriveBox->currentItem() == -1)
@@ -870,6 +872,9 @@
 
 void PCInstall::useEntireDiskSlot()
 {
+     // Make sure to set flag to regenerate slice layout for custom partitions
+    regenCustomSlices = 1;
+    
     if ( checkBoxEntireDisk->isChecked() )
     {
 	listPartitionBox->setEnabled(FALSE);
@@ -885,6 +890,9 @@
 
 void PCInstall::checkPartitionSelectionSlot()
 {
+     // Make sure to set flag to regenerate slice layout for custom partitions
+    regenCustomSlices = 1;
+    
     textPartInfo->setText("");
     int SelPartition;
     QString tmp;