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

svn at pcbsd.org svn at pcbsd.org
Wed May 21 11:38:09 PDT 2008


Author: kris
Date: 2008-05-21 11:38:09 -0700 (Wed, 21 May 2008)
New Revision: 1942

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

Added combobox for FS type  with options for UFS, UFS+Softupdates, UFS+Journaling and ZFS



Modified: pcbsd/trunk/PCInstall/pcinstall.ui
===================================================================
--- pcbsd/trunk/PCInstall/pcinstall.ui	2008-05-21 17:49:08 UTC (rev 1941)
+++ pcbsd/trunk/PCInstall/pcinstall.ui	2008-05-21 18:38:09 UTC (rev 1942)
@@ -3283,6 +3283,50 @@
         </widget>
         <widget class="QGroupBox">
             <property name="name">
+                <cstring>groupBox1_2_2_2_2</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>10</x>
+                    <y>510</y>
+                    <width>970</width>
+                    <height>140</height>
+                </rect>
+            </property>
+            <property name="font">
+                <font>
+                </font>
+            </property>
+            <property name="title">
+                <string>Quick Tips</string>
+            </property>
+            <widget class="QLabel">
+                <property name="name">
+                    <cstring>textLabel9</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>10</x>
+                        <y>20</y>
+                        <width>950</width>
+                        <height>110</height>
+                    </rect>
+                </property>
+                <property name="font">
+                    <font>
+                    </font>
+                </property>
+                <property name="text">
+                    <string>You will now need to select the drive or partition that you wish to install PC-BSD onto. (Warning: Choosing an extended partition will erase any logical partitions!)
+If you wish to load PC-BSD as the only operating system on this system, you will want to select "Use entire disk" for the partition. If you want to dual-boot with another operating system, you will need to select one of the primary partitions to continue. A boot loader is not needed if entire disk is used by PC-BSD.</string>
+                </property>
+                <property name="alignment">
+                    <set>WordBreak|AlignTop</set>
+                </property>
+            </widget>
+        </widget>
+        <widget class="QGroupBox">
+            <property name="name">
                 <cstring>groupBox13</cstring>
             </property>
             <property name="geometry">
@@ -3319,13 +3363,13 @@
             </widget>
             <widget class="QCheckBox">
                 <property name="name">
-                    <cstring>checkBootloader</cstring>
+                    <cstring>checkBoxEntireDisk</cstring>
                 </property>
                 <property name="geometry">
                     <rect>
                         <x>10</x>
-                        <y>140</y>
-                        <width>650</width>
+                        <y>20</y>
+                        <width>640</width>
                         <height>20</height>
                     </rect>
                 </property>
@@ -3334,21 +3378,18 @@
                     </font>
                 </property>
                 <property name="text">
-                    <string>Install the PC-BSD bootloader</string>
+                    <string>Use entire disk</string>
                 </property>
-                <property name="checked">
-                    <bool>true</bool>
-                </property>
             </widget>
             <widget class="QCheckBox">
                 <property name="name">
-                    <cstring>checkBoxEntireDisk</cstring>
+                    <cstring>checkBootloader</cstring>
                 </property>
                 <property name="geometry">
                     <rect>
                         <x>10</x>
-                        <y>20</y>
-                        <width>640</width>
+                        <y>140</y>
+                        <width>650</width>
                         <height>20</height>
                     </rect>
                 </property>
@@ -3357,10 +3398,36 @@
                     </font>
                 </property>
                 <property name="text">
-                    <string>Use entire disk</string>
+                    <string>Install the PC-BSD bootloader</string>
                 </property>
+                <property name="checked">
+                    <bool>true</bool>
+                </property>
             </widget>
         </widget>
+        <widget class="QCheckBox">
+            <property name="name">
+                <cstring>checkCustomPartition</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>320</x>
+                    <y>420</y>
+                    <width>650</width>
+                    <height>20</height>
+                </rect>
+            </property>
+            <property name="font">
+                <font>
+                </font>
+            </property>
+            <property name="text">
+                <string>Customize the partition layout. (Advanced)</string>
+            </property>
+            <property name="checked">
+                <bool>false</bool>
+            </property>
+        </widget>
         <widget class="QLabel">
             <property name="name">
                 <cstring>textPartInfo</cstring>
@@ -3368,7 +3435,7 @@
             <property name="geometry">
                 <rect>
                     <x>320</x>
-                    <y>390</y>
+                    <y>460</y>
                     <width>650</width>
                     <height>31</height>
                 </rect>
@@ -3383,71 +3450,49 @@
         </widget>
         <widget class="QGroupBox">
             <property name="name">
-                <cstring>groupBox1_2_2_2_2</cstring>
+                <cstring>groupBox42</cstring>
             </property>
             <property name="geometry">
                 <rect>
-                    <x>10</x>
-                    <y>510</y>
-                    <width>970</width>
-                    <height>140</height>
+                    <x>310</x>
+                    <y>340</y>
+                    <width>670</width>
+                    <height>71</height>
                 </rect>
             </property>
-            <property name="font">
-                <font>
-                </font>
-            </property>
             <property name="title">
-                <string>Quick Tips</string>
+                <string>File System (Advanced)</string>
             </property>
+            <widget class="QComboBox">
+                <property name="name">
+                    <cstring>comboFileSystem</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>20</x>
+                        <y>30</y>
+                        <width>260</width>
+                        <height>24</height>
+                    </rect>
+                </property>
+            </widget>
             <widget class="QLabel">
                 <property name="name">
-                    <cstring>textLabel9</cstring>
+                    <cstring>textLabel1_5</cstring>
                 </property>
                 <property name="geometry">
                     <rect>
-                        <x>10</x>
-                        <y>20</y>
-                        <width>950</width>
-                        <height>110</height>
+                        <x>290</x>
+                        <y>30</y>
+                        <width>370</width>
+                        <height>24</height>
                     </rect>
                 </property>
-                <property name="font">
-                    <font>
-                    </font>
-                </property>
                 <property name="text">
-                    <string>You will now need to select the drive or partition that you wish to install PC-BSD onto. (Warning: Choosing an extended partition will erase any logical partitions!)
-If you wish to load PC-BSD as the only operating system on this system, you will want to select "Use entire disk" for the partition. If you want to dual-boot with another operating system, you will need to select one of the primary partitions to continue. A boot loader is not needed if entire disk is used by PC-BSD.</string>
+                    <string>Leave as default if unsure!</string>
                 </property>
-                <property name="alignment">
-                    <set>WordBreak|AlignTop</set>
-                </property>
             </widget>
         </widget>
-        <widget class="QCheckBox">
-            <property name="name">
-                <cstring>checkCustomPartition</cstring>
-            </property>
-            <property name="geometry">
-                <rect>
-                    <x>320</x>
-                    <y>350</y>
-                    <width>650</width>
-                    <height>20</height>
-                </rect>
-            </property>
-            <property name="font">
-                <font>
-                </font>
-            </property>
-            <property name="text">
-                <string>Customize the partition layout. (Advanced)</string>
-            </property>
-            <property name="checked">
-                <bool>false</bool>
-            </property>
-        </widget>
     </widget>
     <widget class="QWidget">
         <property name="name">

Modified: pcbsd/trunk/PCInstall/pcinstall.ui.h
===================================================================
--- pcbsd/trunk/PCInstall/pcinstall.ui.h	2008-05-21 17:49:08 UTC (rev 1941)
+++ pcbsd/trunk/PCInstall/pcinstall.ui.h	2008-05-21 18:38:09 UTC (rev 1942)
@@ -91,6 +91,12 @@
     // Load the TimeZone Info
     loadTZone();
     
+    // List our filesystem types
+    comboFileSystem->insertItem("UFS2");
+    comboFileSystem->insertItem("UFS2 + Soft Updates");
+    comboFileSystem->insertItem("UFS2 + Journaling");
+    comboFileSystem->insertItem("ZFS (Experimental)");
+    comboFileSystem->setCurrentItem(2);
 
     
     // Load the HD info
@@ -1178,6 +1184,7 @@
 
 void PCInstall::RunNewfsSlot()
 {
+    QString tmp;
  //     QMessageBox::warning( this, "PCBSD Installer",  "running newfs", "Retry", "Quit", 0, 0, 1 );
     
        textFileProgress->setText(tr("Running newfs on ") + RootPartition);
@@ -1185,7 +1192,8 @@
        NewFSProc = new QProcess( this );
        NewFSProc->addArgument( "/usr/local/pcbsd/scripts/PCBSD.NewFS.sh" );
        NewFSProc->addArgument( RootPartition );
-
+       NewFSProc->addArgument( tmp.setNum(comboFileSystem->currentItem()) );
+       
     connect( NewFSProc, SIGNAL(processExited()), this, SLOT(MountPartSlot() ) );
 
     if ( !NewFSProc->start() ) {
@@ -1198,6 +1206,8 @@
 
 void PCInstall::MountPartSlot()
 {
+    QString tmp;
+    
     // If we are using pre-configured RAID
     if (usingRAIDMirror == 1)
     {       
@@ -1227,10 +1237,10 @@
     MountDisk = new QProcess( this );
     MountDisk->addArgument( "/usr/local/pcbsd/scripts/PCBSD.MountDisk.sh" );
     MountDisk->addArgument( RootPartition );
+    MountDisk->addArgument( tmp.setNum(comboFileSystem->currentItem()) );
 
 
 
-
     while ( ! SliceMnt[i].isEmpty() )
     {
 	MountDisk->addArgument( SliceMnt[i] );



More information about the Commits mailing list