From 714c9afedfaee3c0288536cb1c3b138b20bab03c Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Wed, 11 Dec 2013 23:02:18 -0800
Subject: login widget: tighten spacing, get rid of non-standard font family.

---
 src/leap/bitmask/gui/ui/login.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/leap/bitmask/gui/ui/login.ui')

diff --git a/src/leap/bitmask/gui/ui/login.ui b/src/leap/bitmask/gui/ui/login.ui
index e7ca1652..7e8f9daf 100644
--- a/src/leap/bitmask/gui/ui/login.ui
+++ b/src/leap/bitmask/gui/ui/login.ui
@@ -215,7 +215,7 @@
        <number>0</number>
       </property>
       <property name="bottomMargin">
-       <number>24</number>
+       <number>0</number>
       </property>
       <item row="1" column="1">
        <spacer name="horizontalSpacer">
@@ -255,7 +255,7 @@
        <widget class="QLabel" name="lblLoginStatus">
         <property name="styleSheet">
          <string notr="true">color: rgb(132, 132, 132);
-font: 75 12pt &quot;Lucida Grande&quot;;</string>
+font: 75 12pt;</string>
         </property>
         <property name="text">
          <string/>
-- 
cgit v1.2.3


From 24e7c4f505d92164187c8afe038b24c67e2bdedc Mon Sep 17 00:00:00 2001
From: Ivan Alejandro <ivanalejandro0@gmail.com>
Date: Mon, 13 Jan 2014 14:20:33 -0300
Subject: Use set_status for all messages.

Remove set_login_status since it's a remaining code after split the
login in a separated widget.

[Closes #4942]
---
 src/leap/bitmask/gui/ui/login.ui | 43 +++++++++++++++-------------------------
 1 file changed, 16 insertions(+), 27 deletions(-)

(limited to 'src/leap/bitmask/gui/ui/login.ui')

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>
-- 
cgit v1.2.3