diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-01-13 14:34:08 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-01-13 14:34:08 -0300 |
| commit | cb4d2d020c34d5fae1fe09ea9f29cdc8f475b702 (patch) | |
| tree | 47cd1b8009ac345b2dde4ef2cc8e84c62f477449 /src/leap/bitmask/gui/ui | |
| parent | f2e12a56740cdf6a32695fc1a04674e6175945f7 (diff) | |
| parent | 24e7c4f505d92164187c8afe038b24c67e2bdedc (diff) | |
Merge remote-tracking branch 'refs/remotes/ivan/bug/4942_fix-logout-error-message' into develop
Diffstat (limited to 'src/leap/bitmask/gui/ui')
| -rw-r--r-- | src/leap/bitmask/gui/ui/login.ui | 43 |
1 files changed, 16 insertions, 27 deletions
diff --git a/src/leap/bitmask/gui/ui/login.ui b/src/leap/bitmask/gui/ui/login.ui index 7e8f9daf..f5725d5a 100644 --- a/src/leap/bitmask/gui/ui/login.ui +++ b/src/leap/bitmask/gui/ui/login.ui @@ -217,26 +217,6 @@ <property name="bottomMargin"> <number>0</number> </property> - <item row="1" column="1"> - <spacer name="horizontalSpacer"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="0"> - <widget class="QPushButton" name="btnLogout"> - <property name="text"> - <string>Logout</string> - </property> - </widget> - </item> <item row="0" column="0" colspan="2"> <widget class="QLabel" name="lblUser"> <property name="font"> @@ -251,17 +231,26 @@ </property> </widget> </item> - <item row="2" column="0" colspan="2"> - <widget class="QLabel" name="lblLoginStatus"> - <property name="styleSheet"> - <string notr="true">color: rgb(132, 132, 132); -font: 75 12pt;</string> - </property> + <item row="1" column="0"> + <widget class="QPushButton" name="btnLogout"> <property name="text"> - <string/> + <string>Logout</string> </property> </widget> </item> + <item row="1" column="1"> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> </layout> </widget> </item> |