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

[svn at pcbsd.org]

Author: kris
Date: 2009-11-19 10:45:46 -0800 (Thu, 19 Nov 2009)
New Revision: 5091

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

Update the disk page, use entire disk works now, and cleaned up the UI a bit, don't need scroll area in there



Modified: pcbsd/trunk/SysInstaller/sysinstaller.cpp
===================================================================
--- pcbsd/trunk/SysInstaller/sysinstaller.cpp	2009-11-19 18:38:03 UTC (rev 5090)
+++ pcbsd/trunk/SysInstaller/sysinstaller.cpp	2009-11-19 18:45:46 UTC (rev 5091)
@@ -110,6 +110,7 @@
     connect(radioNetworkInstall,SIGNAL(toggled(bool)), this, SLOT(slotChangedInstallSource()));
     connect(comboSelectNic,SIGNAL(currentIndexChanged(int)), this, SLOT(slotChangedNic()));
     connect(comboDiskList,SIGNAL(currentIndexChanged(int)), this, SLOT(slotChangedDisk()));
+    connect(checkUseEntireDisk,SIGNAL(clicked()), this, SLOT(slotUseEntireDiskClicked()));
 
     setKbDefaults();
 
@@ -125,6 +126,15 @@
 
 }
 
+// Check if use entire disk is checked
+void SysInstaller::slotUseEntireDiskClicked()
+{
+  if ( checkUseEntireDisk->isChecked() )
+    listDiskSlices->setEnabled(false);
+  else
+    listDiskSlices->setEnabled(true);
+}
+
 // Load the Disk string list
 void SysInstaller::loadDiskInfo()
 {

Modified: pcbsd/trunk/SysInstaller/sysinstaller.h
===================================================================
--- pcbsd/trunk/SysInstaller/sysinstaller.h	2009-11-19 18:38:03 UTC (rev 5090)
+++ pcbsd/trunk/SysInstaller/sysinstaller.h	2009-11-19 18:45:46 UTC (rev 5091)
@@ -71,6 +71,7 @@
     void slotChangedInstallSource();
     void slotChangedNic();
     void slotChangedDisk();
+    void slotUseEntireDiskClicked();
 
 private:
     void initSteps();

Modified: pcbsd/trunk/SysInstaller/sysinstaller.ui
===================================================================
--- pcbsd/trunk/SysInstaller/sysinstaller.ui	2009-11-19 18:38:03 UTC (rev 5090)
+++ pcbsd/trunk/SysInstaller/sysinstaller.ui	2009-11-19 18:45:46 UTC (rev 5091)
@@ -1444,64 +1444,33 @@
                       <number>0</number>
                      </property>
                      <widget class="QWidget" name="page">
-                      <layout class="QGridLayout" name="gridLayout_10">
-                       <property name="topMargin">
-                        <number>40</number>
-                       </property>
+                      <layout class="QGridLayout" name="gridLayout_2">
                        <item row="0" column="0">
-                        <widget class="QScrollArea" name="scrollArea">
-                         <property name="frameShape">
-                          <enum>QFrame::NoFrame</enum>
+                        <widget class="QCheckBox" name="checkUseEntireDisk">
+                         <property name="styleSheet">
+                          <string notr="true"/>
                          </property>
-                         <property name="horizontalScrollBarPolicy">
-                          <enum>Qt::ScrollBarAlwaysOff</enum>
+                         <property name="text">
+                          <string>Use Entire Disk</string>
                          </property>
-                         <property name="widgetResizable">
-                          <bool>true</bool>
-                         </property>
-                         <widget class="QWidget" name="scrollAreaWidgetContents">
-                          <property name="geometry">
-                           <rect>
-                            <x>0</x>
-                            <y>0</y>
-                            <width>672</width>
-                            <height>190</height>
-                           </rect>
-                          </property>
-                          <layout class="QGridLayout" name="gridLayout_2">
-                           <property name="horizontalSpacing">
-                            <number>20</number>
-                           </property>
-                           <item row="2" column="0">
-                            <spacer name="verticalSpacer_2">
-                             <property name="orientation">
-                              <enum>Qt::Vertical</enum>
-                             </property>
-                             <property name="sizeHint" stdset="0">
-                              <size>
-                               <width>20</width>
-                               <height>70</height>
-                              </size>
-                             </property>
-                            </spacer>
-                           </item>
-                           <item row="1" column="0">
-                            <widget class="QListWidget" name="listDiskSlices"/>
-                           </item>
-                           <item row="0" column="0">
-                            <widget class="QCheckBox" name="checkUseEntireDisk">
-                             <property name="styleSheet">
-                              <string notr="true"/>
-                             </property>
-                             <property name="text">
-                              <string>Use Entire Disk</string>
-                             </property>
-                            </widget>
-                           </item>
-                          </layout>
-                         </widget>
                         </widget>
                        </item>
+                       <item row="1" column="0">
+                        <widget class="QListWidget" name="listDiskSlices"/>
+                       </item>
+                       <item row="2" column="0">
+                        <spacer name="verticalSpacer_2">
+                         <property name="orientation">
+                          <enum>Qt::Vertical</enum>
+                         </property>
+                         <property name="sizeHint" stdset="0">
+                          <size>
+                           <width>528</width>
+                           <height>20</height>
+                          </size>
+                         </property>
+                        </spacer>
+                       </item>
                       </layout>
                      </widget>
                      <widget class="QWidget" name="page_2">