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

svn at pcbsd.org svn at pcbsd.org
Wed Nov 18 13:58:07 PST 2009


Author: kris
Date: 2009-11-18 13:58:07 -0800 (Wed, 18 Nov 2009)
New Revision: 5073

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

Update UI, add boxes for disk partition selection, update radio descriptions, and rename buttons
for partitioning



Modified: pcbsd/trunk/SysInstaller/sysinstaller.ui
===================================================================
--- pcbsd/trunk/SysInstaller/sysinstaller.ui	2009-11-18 21:31:33 UTC (rev 5072)
+++ pcbsd/trunk/SysInstaller/sysinstaller.ui	2009-11-18 21:58:07 UTC (rev 5073)
@@ -300,7 +300,7 @@
              <item>
               <widget class="QStackedWidget" name="anteInstallStack">
                <property name="currentIndex">
-                <number>2</number>
+                <number>3</number>
                </property>
                <widget class="QWidget" name="aiStep0">
                 <layout class="QVBoxLayout" name="verticalLayout_6">
@@ -1176,7 +1176,7 @@
                        <property name="currentIndex">
                         <number>0</number>
                        </property>
-                       <widget class="QWidget" name="stackedWidgetNetOptionsPage1" native="true">
+                       <widget class="QWidget" name="stackedWidgetNetOptionsPage1">
                         <layout class="QGridLayout" name="gridLayout_8">
                          <item row="1" column="1">
                           <widget class="QWidget" name="widget_2" native="true">
@@ -1356,7 +1356,7 @@
                       </size>
                      </property>
                      <property name="styleSheet">
-                      <string>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</string>
+                      <string notr="true"/>
                      </property>
                      <layout class="QHBoxLayout" name="horizontalLayout">
                       <property name="spacing">
@@ -1385,7 +1385,7 @@
                        </spacer>
                       </item>
                       <item>
-                       <widget class="QRadioButton" name="radioEntireDisk">
+                       <widget class="QRadioButton" name="radioAutoPartition">
                         <property name="sizePolicy">
                          <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
                           <horstretch>0</horstretch>
@@ -1393,7 +1393,7 @@
                          </sizepolicy>
                         </property>
                         <property name="text">
-                         <string>Use Entire Disk</string>
+                         <string>Auto Partition</string>
                         </property>
                         <property name="checked">
                          <bool>true</bool>
@@ -1409,10 +1409,10 @@
                          </sizepolicy>
                         </property>
                         <property name="layoutDirection">
-                         <enum>Qt::RightToLeft</enum>
+                         <enum>Qt::LeftToRight</enum>
                         </property>
                         <property name="text">
-                         <string>Customize Disk Layout</string>
+                         <string>Customize Disk Setup (Advanced)</string>
                         </property>
                        </widget>
                       </item>
@@ -1441,38 +1441,15 @@
                       <enum>QFrame::Sunken</enum>
                      </property>
                      <property name="currentIndex">
-                      <number>1</number>
+                      <number>0</number>
                      </property>
                      <widget class="QWidget" name="page">
-                      <layout class="QVBoxLayout" name="verticalLayout_20">
+                      <layout class="QGridLayout" name="gridLayout_10">
                        <property name="topMargin">
                         <number>40</number>
                        </property>
-                       <item>
-                        <widget class="QLabel" name="label_8">
-                         <property name="font">
-                          <font>
-                           <pointsize>12</pointsize>
-                           <weight>75</weight>
-                           <bold>true</bold>
-                          </font>
-                         </property>
-                         <property name="styleSheet">
-                          <string>color: rgb(116, 160, 180);</string>
-                         </property>
-                         <property name="text">
-                          <string>Disk Setup Preview</string>
-                         </property>
-                         <property name="alignment">
-                          <set>Qt::AlignCenter</set>
-                         </property>
-                        </widget>
-                       </item>
-                       <item>
+                       <item row="0" column="0">
                         <widget class="QScrollArea" name="scrollArea">
-                         <property name="styleSheet">
-                          <string>color: rgb(116, 160, 180);</string>
-                         </property>
                          <property name="frameShape">
                           <enum>QFrame::NoFrame</enum>
                          </property>
@@ -1487,35 +1464,15 @@
                            <rect>
                             <x>0</x>
                             <y>0</y>
-                            <width>152</width>
-                            <height>30</height>
+                            <width>672</width>
+                            <height>190</height>
                            </rect>
                           </property>
                           <layout class="QGridLayout" name="gridLayout_2">
                            <property name="horizontalSpacing">
                             <number>20</number>
                            </property>
-                           <item row="0" column="0">
-                            <widget class="QLabel" name="label_10">
-                             <property name="layoutDirection">
-                              <enum>Qt::LeftToRight</enum>
-                             </property>
-                             <property name="text">
-                              <string>TextLabel</string>
-                             </property>
-                             <property name="alignment">
-                              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                             </property>
-                            </widget>
-                           </item>
-                           <item row="0" column="1">
-                            <widget class="QLabel" name="label_11">
-                             <property name="text">
-                              <string>TextLabel</string>
-                             </property>
-                            </widget>
-                           </item>
-                           <item row="1" column="0">
+                           <item row="2" column="0">
                             <spacer name="verticalSpacer_2">
                              <property name="orientation">
                               <enum>Qt::Vertical</enum>
@@ -1528,6 +1485,19 @@
                              </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>
@@ -1552,7 +1522,7 @@
                            <number>5</number>
                           </property>
                           <item>
-                           <widget class="QPushButton" name="pushButton">
+                           <widget class="QPushButton" name="pushAddMount">
                             <property name="styleSheet">
                              <string>background-color: rgb(250, 250, 250);</string>
                             </property>
@@ -1569,7 +1539,7 @@
                            </widget>
                           </item>
                           <item>
-                           <widget class="QPushButton" name="pushButton_2">
+                           <widget class="QPushButton" name="pushEditMount">
                             <property name="styleSheet">
                              <string>background-color: rgb(250, 250, 250);</string>
                             </property>
@@ -1586,7 +1556,7 @@
                            </widget>
                           </item>
                           <item>
-                           <widget class="QPushButton" name="pushButton_3">
+                           <widget class="QPushButton" name="pushRemoveMount">
                             <property name="styleSheet">
                              <string>background-color: rgb(250, 250, 250);</string>
                             </property>
@@ -1610,7 +1580,7 @@
                            </widget>
                           </item>
                           <item>
-                           <widget class="QPushButton" name="pushButton_4">
+                           <widget class="QPushButton" name="pushAutoMount">
                             <property name="styleSheet">
                              <string>background-color: rgb(250, 250, 250);</string>
                             </property>



More information about the Commits mailing list