[PC-BSD Commits] r6520 - in pcbsd/trunk/SysInstaller: . images

svn at pcbsd.org svn at pcbsd.org
Wed Apr 7 08:09:16 PDT 2010


Author: kris
Date: 2010-04-07 08:09:16 -0700 (Wed, 07 Apr 2010)
New Revision: 6520

Added:
   pcbsd/trunk/SysInstaller/images/view-refresh.png
Modified:
   pcbsd/trunk/SysInstaller/sys-diskwidget.cpp
   pcbsd/trunk/SysInstaller/sysinstaller.cpp
   pcbsd/trunk/SysInstaller/sysinstaller.h
   pcbsd/trunk/SysInstaller/sysinstaller.qrc
   pcbsd/trunk/SysInstaller/sysinstaller.ui
Log:

Added button to SysInstaller, so that the user can trigger a reload of disk information, which will
be very useful when doing some advanced setup manually, and still want to use the GUI to perform
the installation




Property changes on: pcbsd/trunk/SysInstaller/images/view-refresh.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: pcbsd/trunk/SysInstaller/sys-diskwidget.cpp
===================================================================
--- pcbsd/trunk/SysInstaller/sys-diskwidget.cpp	2010-04-07 09:02:17 UTC (rev 6519)
+++ pcbsd/trunk/SysInstaller/sys-diskwidget.cpp	2010-04-07 15:09:16 UTC (rev 6520)
@@ -14,6 +14,7 @@
   connect(pushRemoveMount,SIGNAL(clicked()), this, SLOT(slotRemoveFileSystem()));
   connect(pushAddPartition,SIGNAL(clicked()), this, SLOT(slotAddMBRPartition()));
   connect(pushDeletePartition,SIGNAL(clicked()), this, SLOT(slotDeleteMBRPartition()));
+  connect(pushDiskRescan,SIGNAL(clicked()), this, SLOT(slotLoadDiskInfo()));
 
   // Hide the ID part of our custom treeWidget
   treeWidgetCustomPartition->setColumnHidden(0, true);
@@ -49,7 +50,7 @@
 	   QMessageBox::critical(this, tr("Add Failed"),
 				       tr("The slice creation failed with the following message:") + "\n" \
 				       + Output);
-      loadDiskInfo(); 
+      slotLoadDiskInfo(); 
       if ( comboDiskList->count() >= curDiskItem)
         comboDiskList->setCurrentIndex(curDiskItem);
     }
@@ -79,7 +80,7 @@
 	   QMessageBox::critical(this, tr("Delete Failed"),
 				       tr("The slice deletion failed with the following message:") + "\n" \
 				       + Output);
-	 loadDiskInfo(); 
+	 slotLoadDiskInfo(); 
          if ( comboDiskList->count() >= curDiskItem)
 	   comboDiskList->setCurrentIndex(curDiskItem);
          break;
@@ -261,11 +262,12 @@
 }
 
 // Load the Disk string list
-void SysInstaller::loadDiskInfo()
+void SysInstaller::slotLoadDiskInfo()
 {
   // load drives
   comboDiskList->clear();
   sysFinalDiskLayout.clear();
+  treeWidgetCustomPartition->clear();
   sysDisks = Scripts::Backend::hardDrives();
   for (int i=0; i < sysDisks.count(); ++i) {
     // Make sure to only add the drives to the comboDiskList

Modified: pcbsd/trunk/SysInstaller/sysinstaller.cpp
===================================================================
--- pcbsd/trunk/SysInstaller/sysinstaller.cpp	2010-04-07 09:02:17 UTC (rev 6519)
+++ pcbsd/trunk/SysInstaller/sysinstaller.cpp	2010-04-07 15:09:16 UTC (rev 6520)
@@ -139,7 +139,7 @@
     connectComponentSlots();
 
     // Load the disks
-    loadDiskInfo();
+    slotLoadDiskInfo();
 
     // Load any nics
     loadNics();

Modified: pcbsd/trunk/SysInstaller/sysinstaller.h
===================================================================
--- pcbsd/trunk/SysInstaller/sysinstaller.h	2010-04-07 09:02:17 UTC (rev 6519)
+++ pcbsd/trunk/SysInstaller/sysinstaller.h	2010-04-07 15:09:16 UTC (rev 6520)
@@ -98,6 +98,7 @@
     void slotUpdateFileSystemLayout(QList<QStringList> newFileSystemLayout);
     void slotAddMBRPartition();
     void slotDeleteMBRPartition();
+    void slotLoadDiskInfo();
 
     // User Management Slots
     void slotPasswordTextChanged();
@@ -119,7 +120,6 @@
     void initPostInstall();
     void loadStepsInfo(bool installed);
     void loadNics();
-    void loadDiskInfo();
 
     void setCurrentIndex(int);
     void setKbVariants(const QString &);

Modified: pcbsd/trunk/SysInstaller/sysinstaller.qrc
===================================================================
--- pcbsd/trunk/SysInstaller/sysinstaller.qrc	2010-04-07 09:02:17 UTC (rev 6519)
+++ pcbsd/trunk/SysInstaller/sysinstaller.qrc	2010-04-07 15:09:16 UTC (rev 6520)
@@ -1,30 +1,31 @@
 <RCC>
-    <qresource prefix="/modules" >
-        <file>images/language.png</file>
-        <file>images/keyboard.png</file>
-        <file>images/components.png</file>
-        <file>images/disk.png</file>
-        <file>images/display.png</file>
-        <file>images/date.png</file>
-        <file>images/slices.png</file>
-        <file>images/install.png</file>
-        <file>images/cdrom_mount.png</file>
-        <file>images/network.png</file>
-        <file>images/freebsd.png</file>
-        <file>images/timezone.png</file>
-        <file>images/add_user.png</file>
-        <file>images/systemsettings.png</file>
-    </qresource>
-    <qresource prefix="/PCBSD" >
-        <file>images/edit_add.png</file>
-        <file>images/edit.png</file>
-        <file>images/edit_remove.png</file>
-        <file>images/previous.png</file>
-        <file>images/next.png</file>
-        <file>images/info.png</file>
-        <file>images/pcbsd-banner.png</file>
-        <file>images/pcbsd-banner2.png</file>
-        <file>images/pbidiricon.png</file>
-        <file>images/pcbsdheader.png</file>
-    </qresource>
+  <qresource prefix="/modules">
+    <file>images/view-refresh.png</file>
+    <file>images/language.png</file>
+    <file>images/keyboard.png</file>
+    <file>images/components.png</file>
+    <file>images/disk.png</file>
+    <file>images/display.png</file>
+    <file>images/date.png</file>
+    <file>images/slices.png</file>
+    <file>images/install.png</file>
+    <file>images/cdrom_mount.png</file>
+    <file>images/network.png</file>
+    <file>images/freebsd.png</file>
+    <file>images/timezone.png</file>
+    <file>images/add_user.png</file>
+    <file>images/systemsettings.png</file>
+  </qresource>
+  <qresource prefix="/PCBSD">
+    <file>images/edit_add.png</file>
+    <file>images/edit.png</file>
+    <file>images/edit_remove.png</file>
+    <file>images/previous.png</file>
+    <file>images/next.png</file>
+    <file>images/info.png</file>
+    <file>images/pcbsd-banner.png</file>
+    <file>images/pcbsd-banner2.png</file>
+    <file>images/pbidiricon.png</file>
+    <file>images/pcbsdheader.png</file>
+  </qresource>
 </RCC>

Modified: pcbsd/trunk/SysInstaller/sysinstaller.ui
===================================================================
--- pcbsd/trunk/SysInstaller/sysinstaller.ui	2010-04-07 09:02:17 UTC (rev 6519)
+++ pcbsd/trunk/SysInstaller/sysinstaller.ui	2010-04-07 15:09:16 UTC (rev 6520)
@@ -996,7 +996,7 @@
                 </palette>
                </property>
                <property name="currentIndex">
-                <number>2</number>
+                <number>3</number>
                </property>
                <widget class="QWidget" name="aiStep0">
                 <property name="palette">
@@ -7714,7 +7714,7 @@
                </widget>
                <widget class="QWidget" name="aiStep3">
                 <layout class="QGridLayout" name="gridLayout_28">
-                 <item row="0" column="0" rowspan="5">
+                 <item row="0" column="0" rowspan="6">
                   <spacer name="horizontalSpacer_15">
                    <property name="orientation">
                     <enum>Qt::Horizontal</enum>
@@ -7727,54 +7727,67 @@
                    </property>
                   </spacer>
                  </item>
-                 <item row="0" column="1">
-                  <layout class="QVBoxLayout" name="verticalLayout_2">
-                   <item>
-                    <spacer name="verticalSpacer_29">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
+                 <item row="0" column="2">
+                  <spacer name="verticalSpacer_29">
+                   <property name="orientation">
+                    <enum>Qt::Vertical</enum>
+                   </property>
+                   <property name="sizeHint" stdset="0">
+                    <size>
+                     <width>528</width>
+                     <height>4</height>
+                    </size>
+                   </property>
+                  </spacer>
+                 </item>
+                 <item row="0" column="4" rowspan="4">
+                  <spacer name="horizontalSpacer_37">
+                   <property name="orientation">
+                    <enum>Qt::Horizontal</enum>
+                   </property>
+                   <property name="sizeHint" stdset="0">
+                    <size>
+                     <width>43</width>
+                     <height>435</height>
+                    </size>
+                   </property>
+                  </spacer>
+                 </item>
+                 <item row="1" column="1">
+                  <spacer name="horizontalSpacer_6">
+                   <property name="orientation">
+                    <enum>Qt::Horizontal</enum>
+                   </property>
+                   <property name="sizeHint" stdset="0">
+                    <size>
+                     <width>56</width>
+                     <height>28</height>
+                    </size>
+                   </property>
+                  </spacer>
+                 </item>
+                 <item row="1" column="2">
+                  <layout class="QGridLayout" name="gridLayout_26">
+                   <item row="0" column="0">
+                    <widget class="QLabel" name="label_22">
+                     <property name="font">
+                      <font>
+                       <pointsize>11</pointsize>
+                       <weight>75</weight>
+                       <bold>true</bold>
+                      </font>
                      </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>528</width>
-                       <height>17</height>
-                      </size>
+                     <property name="text">
+                      <string>Please select the disk drive you wish to use:</string>
                      </property>
-                    </spacer>
+                     <property name="alignment">
+                      <set>Qt::AlignCenter</set>
+                     </property>
+                    </widget>
                    </item>
-                   <item>
-                    <layout class="QGridLayout" name="gridLayout_26">
-                     <item row="0" column="0" rowspan="2">
-                      <spacer name="horizontalSpacer_6">
-                       <property name="orientation">
-                        <enum>Qt::Horizontal</enum>
-                       </property>
-                       <property name="sizeHint" stdset="0">
-                        <size>
-                         <width>40</width>
-                         <height>28</height>
-                        </size>
-                       </property>
-                      </spacer>
-                     </item>
-                     <item row="0" column="1">
-                      <widget class="QLabel" name="label_22">
-                       <property name="font">
-                        <font>
-                         <pointsize>11</pointsize>
-                         <weight>75</weight>
-                         <bold>true</bold>
-                        </font>
-                       </property>
-                       <property name="text">
-                        <string>Please select the disk drive you wish to use:</string>
-                       </property>
-                       <property name="alignment">
-                        <set>Qt::AlignCenter</set>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="1" column="1">
+                   <item row="1" column="0">
+                    <layout class="QHBoxLayout" name="horizontalLayout_11">
+                     <item>
                       <widget class="QComboBox" name="comboDiskList">
                        <property name="font">
                         <font>
@@ -7792,50 +7805,51 @@
                        </item>
                       </widget>
                      </item>
-                     <item row="1" column="2">
-                      <spacer name="horizontalSpacer_13">
-                       <property name="orientation">
-                        <enum>Qt::Horizontal</enum>
+                     <item>
+                      <widget class="QPushButton" name="pushDiskRescan">
+                       <property name="toolTip">
+                        <string>Reload Disk Data</string>
                        </property>
-                       <property name="sizeHint" stdset="0">
-                        <size>
-                         <width>40</width>
-                         <height>20</height>
-                        </size>
+                       <property name="text">
+                        <string/>
                        </property>
-                      </spacer>
+                       <property name="icon">
+                        <iconset resource="sysinstaller.qrc">
+                         <normaloff>:/modules/images/view-refresh.png</normaloff>:/modules/images/view-refresh.png</iconset>
+                       </property>
+                      </widget>
                      </item>
                     </layout>
                    </item>
-                   <item>
-                    <spacer name="verticalSpacer_28">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>658</width>
-                       <height>13</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
                   </layout>
                  </item>
-                 <item row="0" column="2" rowspan="5">
-                  <spacer name="horizontalSpacer_37">
+                 <item row="1" column="3">
+                  <spacer name="horizontalSpacer_13">
                    <property name="orientation">
                     <enum>Qt::Horizontal</enum>
                    </property>
                    <property name="sizeHint" stdset="0">
                     <size>
-                     <width>43</width>
-                     <height>435</height>
+                     <width>56</width>
+                     <height>20</height>
                     </size>
                    </property>
                   </spacer>
                  </item>
-                 <item row="2" column="1">
+                 <item row="2" column="1" colspan="3">
+                  <spacer name="verticalSpacer_28">
+                   <property name="orientation">
+                    <enum>Qt::Vertical</enum>
+                   </property>
+                   <property name="sizeHint" stdset="0">
+                    <size>
+                     <width>658</width>
+                     <height>4</height>
+                    </size>
+                   </property>
+                  </spacer>
+                 </item>
+                 <item row="3" column="1" colspan="3">
                   <widget class="QGroupBox" name="groupBox_6">
                    <property name="title">
                     <string>Disk Layout Settings</string>
@@ -8199,10 +8213,22 @@
                      </layout>
                     </item>
                    </layout>
-                   <zorder></zorder>
                   </widget>
                  </item>
-                 <item row="4" column="1">
+                 <item row="4" column="1" colspan="4">
+                  <spacer name="verticalSpacer_30">
+                   <property name="orientation">
+                    <enum>Qt::Vertical</enum>
+                   </property>
+                   <property name="sizeHint" stdset="0">
+                    <size>
+                     <width>20</width>
+                     <height>40</height>
+                    </size>
+                   </property>
+                  </spacer>
+                 </item>
+                 <item row="6" column="2">
                   <layout class="QHBoxLayout" name="horizontalLayout_8">
                    <item>
                     <spacer name="horizontalSpacer_12">
@@ -8252,7 +8278,7 @@
                    </item>
                   </layout>
                  </item>
-                 <item row="5" column="1">
+                 <item row="7" column="1" colspan="3">
                   <spacer name="verticalSpacer_26">
                    <property name="orientation">
                     <enum>Qt::Vertical</enum>
@@ -8265,32 +8291,6 @@
                    </property>
                   </spacer>
                  </item>
-                 <item row="1" column="1">
-                  <spacer name="verticalSpacer_27">
-                   <property name="orientation">
-                    <enum>Qt::Vertical</enum>
-                   </property>
-                   <property name="sizeHint" stdset="0">
-                    <size>
-                     <width>20</width>
-                     <height>40</height>
-                    </size>
-                   </property>
-                  </spacer>
-                 </item>
-                 <item row="3" column="1">
-                  <spacer name="verticalSpacer_30">
-                   <property name="orientation">
-                    <enum>Qt::Vertical</enum>
-                   </property>
-                   <property name="sizeHint" stdset="0">
-                    <size>
-                     <width>20</width>
-                     <height>40</height>
-                    </size>
-                   </property>
-                  </spacer>
-                 </item>
                 </layout>
                </widget>
                <widget class="QWidget" name="aiStep4">



More information about the Commits mailing list