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

[svn at pcbsd.org]

Author: kris
Date: 2010-04-01 12:40:23 -0700 (Thu, 01 Apr 2010)
New Revision: 6491

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

Added checkbox to SysInstaller for trying to import KDE4 profile data during an upgrade



Modified: pcbsd/trunk/SysInstaller/sysinstaller.cpp
===================================================================
--- pcbsd/trunk/SysInstaller/sysinstaller.cpp	2010-04-01 19:33:36 UTC (rev 6490)
+++ pcbsd/trunk/SysInstaller/sysinstaller.cpp	2010-04-01 19:40:23 UTC (rev 6491)
@@ -507,6 +507,11 @@
     // Save the mode as an upgrade
     tmpList << "installMode=upgrade";
 
+    // Do we want to try and import desktop data?
+    if ( checkUpgradeKeepDesktopData->isChecked() )
+      tmpList << "upgradeKeepDesktopProfile=yes";
+
+
     // Set if we are doing an upgrade of PC-BSD or FreeBSD
     if ( radioInstallPCBSD->isChecked() ) {
       tmpList << "installType=PCBSD";

Modified: pcbsd/trunk/SysInstaller/sysinstaller.ui
===================================================================
--- pcbsd/trunk/SysInstaller/sysinstaller.ui	2010-04-01 19:33:36 UTC (rev 6490)
+++ pcbsd/trunk/SysInstaller/sysinstaller.ui	2010-04-01 19:40:23 UTC (rev 6491)
@@ -996,7 +996,7 @@
                 </palette>
                </property>
                <property name="currentIndex">
-                <number>3</number>
+                <number>2</number>
                </property>
                <widget class="QWidget" name="aiStep0">
                 <property name="palette">
@@ -6025,6 +6025,16 @@
                        </property>
                       </widget>
                      </item>
+                     <item row="3" column="0">
+                      <widget class="QCheckBox" name="checkUpgradeKeepDesktopData">
+                       <property name="toolTip">
+                        <string>This option will try to import your exiting desktop profile settings</string>
+                       </property>
+                       <property name="text">
+                        <string>Import current desktop configuration</string>
+                       </property>
+                      </widget>
+                     </item>
                     </layout>
                    </widget>
                    <widget class="QWidget" name="page_6">