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

svn at pcbsd.org svn at pcbsd.org
Mon Dec 14 10:08:19 PST 2009


Author: kris
Date: 2009-12-14 10:08:19 -0800 (Mon, 14 Dec 2009)
New Revision: 5596

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

Cleanup add/users UI, lineEdits aren't shrunk now, you can see what you're typing



Modified: pcbsd/trunk/SysInstaller/sysinstaller.ui
===================================================================
--- pcbsd/trunk/SysInstaller/sysinstaller.ui	2009-12-14 17:51:19 UTC (rev 5595)
+++ pcbsd/trunk/SysInstaller/sysinstaller.ui	2009-12-14 18:08:19 UTC (rev 5596)
@@ -307,7 +307,7 @@
              <item>
               <widget class="QStackedWidget" name="anteInstallStack">
                <property name="currentIndex">
-                <number>0</number>
+                <number>4</number>
                </property>
                <widget class="QWidget" name="aiStep0">
                 <layout class="QGridLayout" name="gridLayout_10">
@@ -1940,7 +1940,7 @@
                </widget>
                <widget class="QWidget" name="aiStep4">
                 <layout class="QGridLayout" name="gridLayout_14">
-                 <item row="0" column="0" rowspan="7">
+                 <item row="0" column="0" rowspan="4">
                   <spacer name="horizontalSpacer_24">
                    <property name="orientation">
                     <enum>Qt::Horizontal</enum>
@@ -1953,75 +1953,7 @@
                    </property>
                   </spacer>
                  </item>
-                 <item row="0" column="2" rowspan="9">
-                  <spacer name="horizontalSpacer_22">
-                   <property name="orientation">
-                    <enum>Qt::Horizontal</enum>
-                   </property>
-                   <property name="sizeHint" stdset="0">
-                    <size>
-                     <width>112</width>
-                     <height>497</height>
-                    </size>
-                   </property>
-                  </spacer>
-                 </item>
-                 <item row="2" column="1">
-                  <spacer name="verticalSpacer_9">
-                   <property name="orientation">
-                    <enum>Qt::Vertical</enum>
-                   </property>
-                   <property name="sizeType">
-                    <enum>QSizePolicy::Fixed</enum>
-                   </property>
-                   <property name="sizeHint" stdset="0">
-                    <size>
-                     <width>518</width>
-                     <height>17</height>
-                    </size>
-                   </property>
-                  </spacer>
-                 </item>
-                 <item row="4" column="1">
-                  <spacer name="verticalSpacer_8">
-                   <property name="orientation">
-                    <enum>Qt::Vertical</enum>
-                   </property>
-                   <property name="sizeType">
-                    <enum>QSizePolicy::Fixed</enum>
-                   </property>
-                   <property name="sizeHint" stdset="0">
-                    <size>
-                     <width>518</width>
-                     <height>17</height>
-                    </size>
-                   </property>
-                  </spacer>
-                 </item>
-                 <item row="6" column="1">
-                  <widget class="QCheckBox" name="checkAutoLogon">
-                   <property name="text">
-                    <string>Auto-login User (The first user listed will be logged on automatically)</string>
-                   </property>
-                   <property name="checked">
-                    <bool>true</bool>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="8" column="1">
-                  <spacer name="verticalSpacer_6">
-                   <property name="orientation">
-                    <enum>Qt::Vertical</enum>
-                   </property>
-                   <property name="sizeHint" stdset="0">
-                    <size>
-                     <width>518</width>
-                     <height>18</height>
-                    </size>
-                   </property>
-                  </spacer>
-                 </item>
-                 <item row="1" column="1">
+                 <item row="0" column="1">
                   <widget class="QGroupBox" name="groupBox">
                    <property name="title">
                     <string>Administrator Password (root)</string>
@@ -2070,8 +2002,27 @@
                    </layout>
                   </widget>
                  </item>
-                 <item row="3" column="1">
+                 <item row="0" column="2" rowspan="6">
+                  <spacer name="horizontalSpacer_22">
+                   <property name="orientation">
+                    <enum>Qt::Horizontal</enum>
+                   </property>
+                   <property name="sizeHint" stdset="0">
+                    <size>
+                     <width>112</width>
+                     <height>497</height>
+                    </size>
+                   </property>
+                  </spacer>
+                 </item>
+                 <item row="1" column="1">
                   <widget class="QGroupBox" name="groupBox_2">
+                   <property name="sizePolicy">
+                    <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+                     <horstretch>0</horstretch>
+                     <verstretch>0</verstretch>
+                    </sizepolicy>
+                   </property>
                    <property name="title">
                     <string>Add User</string>
                    </property>
@@ -2105,7 +2056,7 @@
                       </property>
                      </widget>
                     </item>
-                    <item row="0" column="3" colspan="3">
+                    <item row="0" column="3" colspan="2">
                      <widget class="QLineEdit" name="lineFullName"/>
                     </item>
                     <item row="1" column="0">
@@ -2128,7 +2079,7 @@
                       </property>
                      </widget>
                     </item>
-                    <item row="1" column="2" colspan="2">
+                    <item row="1" column="2">
                      <widget class="QLabel" name="textLabel5_4">
                       <property name="text">
                        <string>Verify password:</string>
@@ -2141,7 +2092,7 @@
                       </property>
                      </widget>
                     </item>
-                    <item row="1" column="4" colspan="2">
+                    <item row="1" column="3" colspan="2">
                      <widget class="QLineEdit" name="lineUserPassword2">
                       <property name="echoMode">
                        <enum>QLineEdit::Password</enum>
@@ -2164,7 +2115,23 @@
                     <item row="2" column="1">
                      <widget class="QComboBox" name="comboShell"/>
                     </item>
-                    <item row="2" column="3" colspan="2">
+                    <item row="2" column="2">
+                     <spacer name="horizontalSpacer_39">
+                      <property name="orientation">
+                       <enum>Qt::Horizontal</enum>
+                      </property>
+                      <property name="sizeType">
+                       <enum>QSizePolicy::Minimum</enum>
+                      </property>
+                      <property name="sizeHint" stdset="0">
+                       <size>
+                        <width>99</width>
+                        <height>17</height>
+                       </size>
+                      </property>
+                     </spacer>
+                    </item>
+                    <item row="2" column="3">
                      <widget class="QPushButton" name="pushApplyUser">
                       <property name="enabled">
                        <bool>true</bool>
@@ -2187,7 +2154,7 @@
                       </property>
                      </widget>
                     </item>
-                    <item row="2" column="5">
+                    <item row="2" column="4">
                      <widget class="QPushButton" name="pushAddUser">
                       <property name="enabled">
                        <bool>true</bool>
@@ -2204,8 +2171,14 @@
                    </layout>
                   </widget>
                  </item>
-                 <item row="5" column="1">
+                 <item row="2" column="1">
                   <widget class="QGroupBox" name="groupBox_3">
+                   <property name="sizePolicy">
+                    <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+                     <horstretch>0</horstretch>
+                     <verstretch>0</verstretch>
+                    </sizepolicy>
+                   </property>
                    <property name="title">
                     <string>User Accounts</string>
                    </property>
@@ -2228,12 +2201,42 @@
                      </widget>
                     </item>
                     <item row="0" column="0">
-                     <widget class="QListWidget" name="listWidgetUsers"/>
+                     <widget class="QListWidget" name="listWidgetUsers">
+                      <property name="sizePolicy">
+                       <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+                        <horstretch>0</horstretch>
+                        <verstretch>0</verstretch>
+                       </sizepolicy>
+                      </property>
+                     </widget>
                     </item>
                    </layout>
                   </widget>
                  </item>
-                 <item row="7" column="1">
+                 <item row="3" column="1">
+                  <widget class="QCheckBox" name="checkAutoLogon">
+                   <property name="text">
+                    <string>Auto-login User (The first user listed will be logged on automatically)</string>
+                   </property>
+                   <property name="checked">
+                    <bool>true</bool>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="4" column="1">
+                  <spacer name="verticalSpacer_6">
+                   <property name="orientation">
+                    <enum>Qt::Vertical</enum>
+                   </property>
+                   <property name="sizeHint" stdset="0">
+                    <size>
+                     <width>518</width>
+                     <height>18</height>
+                    </size>
+                   </property>
+                  </spacer>
+                 </item>
+                 <item row="5" column="1">
                   <widget class="QLabel" name="textAcctNotify">
                    <property name="styleSheet">
                     <string>color: rgb(167, 0, 0);</string>
@@ -2247,6 +2250,12 @@
                   </widget>
                  </item>
                 </layout>
+                <zorder>checkAutoLogon</zorder>
+                <zorder>groupBox</zorder>
+                <zorder>groupBox_2</zorder>
+                <zorder>groupBox_3</zorder>
+                <zorder>textAcctNotify</zorder>
+                <zorder>footerWidget</zorder>
                </widget>
                <widget class="QWidget" name="aiStep5">
                 <layout class="QGridLayout" name="gridLayout_16">



More information about the Commits mailing list