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

[svn at pcbsd.org]

Author: kris
Date: 2010-03-31 12:06:46 -0700 (Wed, 31 Mar 2010)
New Revision: 6482

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

Started adding buttons / framework to SysInstaller for removing / adding MBR partitions from a disk at
install time



Modified: pcbsd/trunk/SysInstaller/sys-diskwidget.cpp
===================================================================
--- pcbsd/trunk/SysInstaller/sys-diskwidget.cpp	2010-03-31 18:45:45 UTC (rev 6481)
+++ pcbsd/trunk/SysInstaller/sys-diskwidget.cpp	2010-03-31 19:06:46 UTC (rev 6482)
@@ -12,11 +12,23 @@
   connect(pushAddMount,SIGNAL(clicked()), this, SLOT(slotAddNewFileSystem()));
   connect(pushEditMount,SIGNAL(clicked()), this, SLOT(slotEditFileSystem()));
   connect(pushRemoveMount,SIGNAL(clicked()), this, SLOT(slotRemoveFileSystem()));
+  connect(pushAddPartition,SIGNAL(clicked()), this, SLOT(slotAddMBRPartition()));
+  connect(pushDeletePartition,SIGNAL(clicked()), this, SLOT(slotDeleteMBRPartition()));
 
   // Hide the ID part of our custom treeWidget
   treeWidgetCustomPartition->setColumnHidden(0, true);
 }
 
+void SysInstaller::slotAddMBRPartition()
+{
+
+}
+
+void SysInstaller::slotDeleteMBRPartition()
+{
+
+}
+
 // Slot which switches between basic / advanced disk setup
 void SysInstaller::slotChangeRadioCustomDisk()
 {

Modified: pcbsd/trunk/SysInstaller/sysinstaller.h
===================================================================
--- pcbsd/trunk/SysInstaller/sysinstaller.h	2010-03-31 18:45:45 UTC (rev 6481)
+++ pcbsd/trunk/SysInstaller/sysinstaller.h	2010-03-31 19:06:46 UTC (rev 6482)
@@ -96,6 +96,8 @@
     void slotEditFileSystem();
     void slotRemoveFileSystem();
     void slotUpdateFileSystemLayout(QList<QStringList> newFileSystemLayout);
+    void slotAddMBRPartition();
+    void slotDeleteMBRPartition();
 
     // User Management Slots
     void slotPasswordTextChanged();

Modified: pcbsd/trunk/SysInstaller/sysinstaller.ui
===================================================================
--- pcbsd/trunk/SysInstaller/sysinstaller.ui	2010-03-31 18:45:45 UTC (rev 6481)
+++ pcbsd/trunk/SysInstaller/sysinstaller.ui	2010-03-31 19:06:46 UTC (rev 6482)
@@ -996,7 +996,7 @@
                 </palette>
                </property>
                <property name="currentIndex">
-                <number>0</number>
+                <number>3</number>
                </property>
                <widget class="QWidget" name="aiStep0">
                 <property name="palette">
@@ -7943,6 +7943,13 @@
                         </property>
                         <widget class="QWidget" name="page">
                          <layout class="QGridLayout" name="gridLayout_2">
+                          <item row="0" column="0">
+                           <widget class="QLabel" name="label_23">
+                            <property name="text">
+                             <string>Select the slice you wish to install to, or check &quot;Use Entire Disk&quot;</string>
+                            </property>
+                           </widget>
+                          </item>
                           <item row="1" column="0">
                            <widget class="QCheckBox" name="checkUseEntireDisk">
                             <property name="styleSheet">
@@ -7962,6 +7969,45 @@
                            </widget>
                           </item>
                           <item row="3" column="0">
+                           <layout class="QHBoxLayout" name="horizontalLayout_10">
+                            <item>
+                             <spacer name="horizontalSpacer_40">
+                              <property name="orientation">
+                               <enum>Qt::Horizontal</enum>
+                              </property>
+                              <property name="sizeHint" stdset="0">
+                               <size>
+                                <width>418</width>
+                                <height>20</height>
+                               </size>
+                              </property>
+                             </spacer>
+                            </item>
+                            <item>
+                             <widget class="QPushButton" name="pushAddPartition">
+                              <property name="text">
+                               <string>Add</string>
+                              </property>
+                              <property name="icon">
+                               <iconset resource="sysinstaller.qrc">
+                                <normaloff>:/PCBSD/images/edit_add.png</normaloff>:/PCBSD/images/edit_add.png</iconset>
+                              </property>
+                             </widget>
+                            </item>
+                            <item>
+                             <widget class="QPushButton" name="pushDeletePartition">
+                              <property name="text">
+                               <string>Delete</string>
+                              </property>
+                              <property name="icon">
+                               <iconset resource="sysinstaller.qrc">
+                                <normaloff>:/PCBSD/images/edit_remove.png</normaloff>:/PCBSD/images/edit_remove.png</iconset>
+                              </property>
+                             </widget>
+                            </item>
+                           </layout>
+                          </item>
+                          <item row="4" column="0">
                            <spacer name="verticalSpacer_2">
                             <property name="orientation">
                              <enum>Qt::Vertical</enum>
@@ -7974,13 +8020,6 @@
                             </property>
                            </spacer>
                           </item>
-                          <item row="0" column="0">
-                           <widget class="QLabel" name="label_23">
-                            <property name="text">
-                             <string>Select the slice you wish to install to, or check &quot;Use Entire Disk&quot;</string>
-                            </property>
-                           </widget>
-                          </item>
                          </layout>
                         </widget>
                         <widget class="QWidget" name="page_2">