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

[svn at pcbsd.org]

Author: kris
Date: 2010-04-08 07:28:57 -0700 (Thu, 08 Apr 2010)
New Revision: 6534

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

Some additional SysInstaller cfg file generation cleanup, don't need lots of thing when doing
a restore



Modified: pcbsd/trunk/SysInstaller/sysinstaller.cpp
===================================================================
--- pcbsd/trunk/SysInstaller/sysinstaller.cpp	2010-04-08 14:16:07 UTC (rev 6533)
+++ pcbsd/trunk/SysInstaller/sysinstaller.cpp	2010-04-08 14:28:57 UTC (rev 6534)
@@ -601,7 +601,7 @@
     summaryList << tr("Installing From:") + " " + tr("DVD/USB");
   }
 
-  if ( comboLanguage->currentIndex() != 0 ) {
+  if ( comboLanguage->currentIndex() != 0 && ! radioRestore->isChecked() ) {
     QString lang = languages.at(comboLanguage->currentIndex());
     lang.truncate(lang.indexOf(")"));
     lang.remove(0, lang.indexOf("(") + 1);
@@ -610,7 +610,7 @@
   }
 
   // Seeif we need to prune other l10n files
-  if (checkPruneLangs->isChecked() )
+  if (checkPruneLangs->isChecked() && ! radioRestore->isChecked() )
     tmpList << "localizePrune=yes";
 
   // If we are doing an upgrade, put disk info for selected drive
@@ -622,7 +622,7 @@
     tmpList << "partition=" + upSlice;
     tmpList << "bootManager=none";
     tmpList << "commitDiskPart";
-  } else {
+  } else if ( ! radioRestore->isChecked()) {
     // Save the timezone
     tmp = comboBoxTimezone->currentText();
     tmp.truncate(tmp.indexOf(":"));
@@ -636,26 +636,27 @@
   }
 
   // Now figure out of we need to set custom keyboard layouts
-  tmpList << "";
-  tmpList << "# Keyboard Layout Options";
-  tmp = comboBoxKeyboardModel->currentText();
-  tmp.truncate(tmp.indexOf(")"));
-  tmp = tmp.remove(0, tmp.indexOf(" (") + 2 );
-  tmpList << "localizeKeyModel=" + tmp;
+  if ( ! radioRestore->isChecked() ) {
+    tmpList << "";
+    tmpList << "# Keyboard Layout Options";
+    tmp = comboBoxKeyboardModel->currentText();
+    tmp.truncate(tmp.indexOf(")"));
+    tmp = tmp.remove(0, tmp.indexOf(" (") + 2 );
+    tmpList << "localizeKeyModel=" + tmp;
 
-  tmp = listKbLayouts->currentItem()->text();
-  tmp.truncate(tmp.indexOf(")"));
-  tmp = tmp.remove(0, tmp.indexOf(" (") + 2 );
-  tmpList << "localizeKeyLayout=" + tmp;
-
-  tmp = listKbVariants->currentItem()->text();
-  if ( tmp != "<none>" )
-  {
+    tmp = listKbLayouts->currentItem()->text();
     tmp.truncate(tmp.indexOf(")"));
     tmp = tmp.remove(0, tmp.indexOf(" (") + 2 );
-    tmpList << "localizeKeyVariant=" + tmp;
-  } 
+    tmpList << "localizeKeyLayout=" + tmp;
 
+    tmp = listKbVariants->currentItem()->text();
+    if ( tmp != "<none>" ) {
+      tmp.truncate(tmp.indexOf(")"));
+      tmp = tmp.remove(0, tmp.indexOf(" (") + 2 );
+      tmpList << "localizeKeyVariant=" + tmp;
+    } 
+  }
+
   tmpList << " ";
 
   return tmpList;
@@ -672,9 +673,10 @@
   if ( ! radioUpgrade->isChecked() )
     cfgList+=getDiskCfgSettings(summaryList);
 
-  cfgList+=getComponentCfgSettings(summaryList);
+  if ( ! radioRestore->isChecked() )
+    cfgList+=getComponentCfgSettings(summaryList);
 
-  if ( ! radioUpgrade->isChecked() )
+  if ( ! radioUpgrade->isChecked() && ! radioRestore->isChecked() )
     cfgList+=getUsersCfgSettings(summaryList);
 
   textEditSummary->clear();