diff options
| author | Sky <git@bunnies.cc> | 2013-10-21 18:00:30 +0100 |
|---|---|---|
| committer | Sky <git@bunnies.cc> | 2013-10-21 18:00:30 +0100 |
| commit | 11813a0621dd7b500c2d7966a2671c0ab93be692 (patch) | |
| tree | a7ac3a60534322f70cbdc34111228885e0606691 /gui/logindialog.ui | |
| parent | 33725e30fb3b2242315a19481865be13b49e1e4a (diff) | |
| parent | ce512e1cf228584336353acbcacbdc30e21f5c4a (diff) | |
| download | MultiMC-11813a0621dd7b500c2d7966a2671c0ab93be692.tar MultiMC-11813a0621dd7b500c2d7966a2671c0ab93be692.tar.gz MultiMC-11813a0621dd7b500c2d7966a2671c0ab93be692.tar.lz MultiMC-11813a0621dd7b500c2d7966a2671c0ab93be692.tar.xz MultiMC-11813a0621dd7b500c2d7966a2671c0ab93be692.zip | |
Merge branch 'feature_skins' into develop
Diffstat (limited to 'gui/logindialog.ui')
| -rw-r--r-- | gui/logindialog.ui | 43 |
1 files changed, 38 insertions, 5 deletions
diff --git a/gui/logindialog.ui b/gui/logindialog.ui index 0aaad52b..46965425 100644 --- a/gui/logindialog.ui +++ b/gui/logindialog.ui @@ -23,10 +23,34 @@ </item> <item> <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QLabel" name="usernameLabel"> + <item row="0" column="4" rowspan="2"> + <widget class="QLabel" name="lblFace"> + <property name="minimumSize"> + <size> + <width>48</width> + <height>48</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>48</width> + <height>48</height> + </size> + </property> + <property name="sizeIncrement"> + <size> + <width>1</width> + <height>1</height> + </size> + </property> <property name="text"> - <string>Username:</string> + <string/> + </property> + <property name="pixmap"> + <pixmap resource="../multimc.qrc">:/icons/instances/steve</pixmap> + </property> + <property name="scaledContents"> + <bool>true</bool> </property> </widget> </item> @@ -37,6 +61,13 @@ </property> </widget> </item> + <item row="0" column="0"> + <widget class="QLabel" name="usernameLabel"> + <property name="text"> + <string>Username:</string> + </property> + </widget> + </item> <item row="1" column="0"> <widget class="QLabel" name="passwordLabel"> <property name="text"> @@ -54,7 +85,7 @@ </property> </widget> </item> - <item row="0" column="2" rowspan="2"> + <item row="0" column="5" rowspan="2"> <widget class="QPushButton" name="forgetButton"> <property name="sizePolicy"> <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> @@ -111,7 +142,9 @@ </item> </layout> </widget> - <resources/> + <resources> + <include location="../multimc.qrc"/> + </resources> <connections> <connection> <sender>loginButtonBox</sender> |