Browse files

Update ordering of Full Name / Username boxes

  • Loading branch information...
1 parent 8b8fb3b commit db55da5637b37fcd5298f992f8361b06e1b3a488 @kmoore134 kmoore134 committed Aug 13, 2013
Showing with 205 additions and 194 deletions.
  1. +135 −125 src-qt4/pc-usermanager/adduser.ui
  2. +70 −69 src-qt4/pc-usermanager/simpleadddlg.ui
View
260 src-qt4/pc-usermanager/adduser.ui
@@ -30,8 +30,41 @@
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout">
- <item row="2" column="0">
- <widget class="QLabel" name="homeLabel">
+ <item row="2" column="1" colspan="2">
+ <widget class="QLineEdit" name="usernameBox">
+ <property name="toolTip">
+ <string>The field is empty</string>
+ </property>
+ <property name="maxLength">
+ <number>16</number>
+ </property>
+ </widget>
+ </item>
+ <item row="9" column="0">
+ <widget class="QLabel" name="confirmPassLabel">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="text">
+ <string>Confirm Password:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="wordWrap">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="9" column="1" colspan="2">
+ <widget class="QLineEdit" name="confirmPassBox">
+ <property name="echoMode">
+ <enum>QLineEdit::Password</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="8" column="0">
+ <widget class="QLabel" name="passLabel">
<property name="enabled">
<bool>true</bool>
</property>
@@ -42,7 +75,7 @@
<enum>QFrame::Plain</enum>
</property>
<property name="text">
- <string>Home Directory:</string>
+ <string>Password:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -52,83 +85,37 @@
</property>
</widget>
</item>
- <item row="4" column="1">
- <widget class="QGroupBox" name="groupGroup">
- <property name="title">
- <string/>
+ <item row="8" column="1" colspan="2">
+ <widget class="QLineEdit" name="passBox">
+ <property name="echoMode">
+ <enum>QLineEdit::Password</enum>
</property>
- <layout class="QFormLayout" name="formLayout">
- <item row="1" column="1">
- <widget class="QComboBox" name="groupBox">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QRadioButton" name="groupRadioOld">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="0" column="0" colspan="2">
- <widget class="QRadioButton" name="groupRadioNew">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>New &amp;Group</string>
- </property>
- <property name="shortcut">
- <string>Alt+G</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
</widget>
</item>
- <item row="4" column="0">
- <widget class="QLabel" name="groupLabel">
- <property name="enabled">
- <bool>true</bool>
- </property>
+ <item row="10" column="0">
+ <widget class="QLabel" name="label">
<property name="text">
- <string>Primary Group:</string>
+ <string>Encrypt Files:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
- <property name="wordWrap">
- <bool>false</bool>
+ </widget>
+ </item>
+ <item row="10" column="1">
+ <widget class="QCheckBox" name="checkEnc">
+ <property name="text">
+ <string/>
</property>
</widget>
</item>
- <item row="7" column="0">
- <widget class="QLabel" name="confirmPassLabel">
+ <item row="6" column="0">
+ <widget class="QLabel" name="groupLabel">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
- <string>Confirm Password:</string>
+ <string>Primary Group:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -138,15 +125,8 @@
</property>
</widget>
</item>
- <item row="6" column="1" colspan="2">
- <widget class="QLineEdit" name="passBox">
- <property name="echoMode">
- <enum>QLineEdit::Password</enum>
- </property>
- </widget>
- </item>
- <item row="6" column="0">
- <widget class="QLabel" name="passLabel">
+ <item row="4" column="0">
+ <widget class="QLabel" name="homeLabel">
<property name="enabled">
<bool>true</bool>
</property>
@@ -157,7 +137,7 @@
<enum>QFrame::Plain</enum>
</property>
<property name="text">
- <string>Password:</string>
+ <string>Home Directory:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -167,34 +147,17 @@
</property>
</widget>
</item>
- <item row="7" column="1" colspan="2">
- <widget class="QLineEdit" name="confirmPassBox">
- <property name="echoMode">
- <enum>QLineEdit::Password</enum>
- </property>
- </widget>
- </item>
- <item row="3" column="1" colspan="2">
- <widget class="QComboBox" name="shellBox">
- <property name="editable">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="2" column="1" colspan="2">
+ <item row="4" column="1" colspan="2">
<widget class="QLineEdit" name="homeBox">
<property name="mode" stdset="0">
<number>18</number>
</property>
</widget>
</item>
- <item row="3" column="0">
- <widget class="QLabel" name="shellLabel">
- <property name="enabled">
- <bool>true</bool>
- </property>
+ <item row="2" column="0">
+ <widget class="QLabel" name="usernameLabel">
<property name="text">
- <string>Shell:</string>
+ <string>Username:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -204,10 +167,20 @@
</property>
</widget>
</item>
- <item row="0" column="0">
- <widget class="QLabel" name="usernameLabel">
+ <item row="5" column="1" colspan="2">
+ <widget class="QComboBox" name="shellBox">
+ <property name="editable">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0">
+ <widget class="QLabel" name="shellLabel">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
<property name="text">
- <string>Username:</string>
+ <string>Shell:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -217,17 +190,61 @@
</property>
</widget>
</item>
- <item row="0" column="1" colspan="2">
- <widget class="QLineEdit" name="usernameBox">
- <property name="toolTip">
- <string>The field is empty</string>
- </property>
- <property name="maxLength">
- <number>16</number>
+ <item row="6" column="1">
+ <widget class="QGroupBox" name="groupGroup">
+ <property name="title">
+ <string/>
</property>
+ <layout class="QFormLayout" name="formLayout">
+ <item row="1" column="1">
+ <widget class="QComboBox" name="groupBox">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QRadioButton" name="groupRadioOld">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0" colspan="2">
+ <widget class="QRadioButton" name="groupRadioNew">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>New &amp;Group</string>
+ </property>
+ <property name="shortcut">
+ <string>Alt+G</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
- <item row="1" column="0">
+ <item row="0" column="0">
<widget class="QLabel" name="fullnameLabel">
<property name="enabled">
<bool>true</bool>
@@ -249,26 +266,9 @@
</property>
</widget>
</item>
- <item row="1" column="1" colspan="2">
+ <item row="0" column="1" colspan="2">
<widget class="QLineEdit" name="fullnameBox"/>
</item>
- <item row="8" column="0">
- <widget class="QLabel" name="label">
- <property name="text">
- <string>Encrypt Files:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- <item row="8" column="1">
- <widget class="QCheckBox" name="checkEnc">
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
</layout>
</widget>
</item>
@@ -360,6 +360,16 @@
</widget>
<layoutdefault spacing="6" margin="11"/>
<tabstops>
+ <tabstop>fullnameBox</tabstop>
+ <tabstop>usernameBox</tabstop>
+ <tabstop>homeBox</tabstop>
+ <tabstop>shellBox</tabstop>
+ <tabstop>groupRadioNew</tabstop>
+ <tabstop>groupRadioOld</tabstop>
+ <tabstop>groupBox</tabstop>
+ <tabstop>passBox</tabstop>
+ <tabstop>confirmPassBox</tabstop>
+ <tabstop>checkEnc</tabstop>
<tabstop>okButton</tabstop>
<tabstop>cancelButton</tabstop>
</tabstops>
View
139 src-qt4/pc-usermanager/simpleadddlg.ui
@@ -21,49 +21,10 @@
<bool>true</bool>
</property>
<layout class="QGridLayout">
- <item row="4" column="1">
- <spacer name="spacer14">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>30</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="2" column="1">
- <widget class="QLineEdit" name="passBox">
- <property name="echoMode">
- <enum>QLineEdit::Password</enum>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="QLineEdit" name="confirmPassBox">
- <property name="echoMode">
- <enum>QLineEdit::Password</enum>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="fullnameLabel">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Plain</enum>
- </property>
+ <item row="2" column="0">
+ <widget class="QLabel" name="usernameLabel">
<property name="text">
- <string>Full Name:</string>
+ <string>Username:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -73,7 +34,17 @@
</property>
</widget>
</item>
- <item row="6" column="0" colspan="2">
+ <item row="2" column="1">
+ <widget class="QLineEdit" name="usernameBox">
+ <property name="toolTip">
+ <string>The field is empty</string>
+ </property>
+ <property name="maxLength">
+ <number>16</number>
+ </property>
+ </widget>
+ </item>
+ <item row="8" column="0" colspan="2">
<layout class="QHBoxLayout">
<item>
<spacer name="spacer13">
@@ -127,8 +98,8 @@
</item>
</layout>
</item>
- <item row="3" column="0">
- <widget class="QLabel" name="confirmPassLabel">
+ <item row="4" column="0">
+ <widget class="QLabel" name="passLabel">
<property name="enabled">
<bool>true</bool>
</property>
@@ -138,8 +109,14 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
+ </property>
<property name="text">
- <string>Confirm Password:</string>
+ <string>Password:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -149,8 +126,8 @@
</property>
</widget>
</item>
- <item row="2" column="0">
- <widget class="QLabel" name="passLabel">
+ <item row="5" column="0">
+ <widget class="QLabel" name="confirmPassLabel">
<property name="enabled">
<bool>true</bool>
</property>
@@ -160,14 +137,8 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Plain</enum>
- </property>
<property name="text">
- <string>Password:</string>
+ <string>Confirm Password:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -177,13 +148,19 @@
</property>
</widget>
</item>
- <item row="1" column="1">
- <widget class="QLineEdit" name="fullnameBox"/>
- </item>
- <item row="0" column="0">
- <widget class="QLabel" name="usernameLabel">
+ <item row="1" column="0">
+ <widget class="QLabel" name="fullnameLabel">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
+ </property>
<property name="text">
- <string>Username:</string>
+ <string>Full Name:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -193,24 +170,44 @@
</property>
</widget>
</item>
- <item row="0" column="1">
- <widget class="QLineEdit" name="usernameBox">
- <property name="toolTip">
- <string>The field is empty</string>
+ <item row="6" column="1">
+ <spacer name="spacer14">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
</property>
- <property name="maxLength">
- <number>16</number>
+ <property name="sizeType">
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>30</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="4" column="1">
+ <widget class="QLineEdit" name="passBox">
+ <property name="echoMode">
+ <enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
<item row="5" column="1">
+ <widget class="QLineEdit" name="confirmPassBox">
+ <property name="echoMode">
+ <enum>QLineEdit::Password</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="7" column="1">
<widget class="QCheckBox" name="checkEnc">
<property name="text">
<string/>
</property>
</widget>
</item>
- <item row="5" column="0">
+ <item row="7" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Encrypt Files:</string>
@@ -220,14 +217,18 @@
</property>
</widget>
</item>
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="fullnameBox"/>
+ </item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
<tabstops>
- <tabstop>usernameBox</tabstop>
<tabstop>fullnameBox</tabstop>
+ <tabstop>usernameBox</tabstop>
<tabstop>passBox</tabstop>
<tabstop>confirmPassBox</tabstop>
+ <tabstop>checkEnc</tabstop>
<tabstop>okButton</tabstop>
<tabstop>cancelButton</tabstop>
</tabstops>

0 comments on commit db55da5

Please sign in to comment.