diff options
| author | Andrew <forkk@forkk.net> | 2013-03-28 11:37:12 -0500 |
|---|---|---|
| committer | Andrew <forkk@forkk.net> | 2013-03-28 11:37:12 -0500 |
| commit | ebb2c54975e3f0b7b891532e8e72d2ef760f96c4 (patch) | |
| tree | 973de7066457a1faddffd3834eb0c260d5191ec2 /gui/logindialog.ui | |
| parent | 168ed3e8e58a8e5065ffa720f8d45f4cee0f2069 (diff) | |
| parent | 1f13f0c665001a1a79f00cdad1e63e6c9802e55f (diff) | |
| download | MultiMC-ebb2c54975e3f0b7b891532e8e72d2ef760f96c4.tar MultiMC-ebb2c54975e3f0b7b891532e8e72d2ef760f96c4.tar.gz MultiMC-ebb2c54975e3f0b7b891532e8e72d2ef760f96c4.tar.lz MultiMC-ebb2c54975e3f0b7b891532e8e72d2ef760f96c4.tar.xz MultiMC-ebb2c54975e3f0b7b891532e8e72d2ef760f96c4.zip | |
Merge branch 'master' of git://github.com/peterix/MultiMC5
Conflicts:
CMakeLists.txt
gui/mainwindow.cpp
Diffstat (limited to 'gui/logindialog.ui')
| -rw-r--r-- | gui/logindialog.ui | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/gui/logindialog.ui b/gui/logindialog.ui index ce41d2f5..0aaad52b 100644 --- a/gui/logindialog.ui +++ b/gui/logindialog.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>365</width> - <height>145</height> + <width>476</width> + <height>168</height> </rect> </property> <property name="windowTitle"> @@ -31,9 +31,9 @@ </widget> </item> <item row="0" column="1"> - <widget class="QLineEdit" name="usernameTextBox"> - <property name="placeholderText"> - <string>Username</string> + <widget class="QComboBox" name="usernameTextBox"> + <property name="editable"> + <bool>true</bool> </property> </widget> </item> @@ -54,20 +54,23 @@ </property> </widget> </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="checkboxLayout"> - <item> - <widget class="QPushButton" name="forceUpdateButton"> - <property name="text"> - <string>&Force Update</string> + <item row="0" column="2" rowspan="2"> + <widget class="QPushButton" name="forgetButton"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> - <property name="checkable"> - <bool>true</bool> + <property name="text"> + <string>Forget</string> </property> </widget> </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="checkboxLayout"> <item> <widget class="QCheckBox" name="rememberUsernameCheckbox"> <property name="sizePolicy"> |