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]
---
 bug-4942_fix-logout-error-message  |  1 +
 src/leap/bitmask/gui/login.py      | 17 ---------------
 src/leap/bitmask/gui/mainwindow.py |  5 ++---
 src/leap/bitmask/gui/ui/login.ui   | 43 ++++++++++++++------------------------
 4 files changed, 19 insertions(+), 47 deletions(-)
 create mode 100644 bug-4942_fix-logout-error-message

diff --git a/bug-4942_fix-logout-error-message b/bug-4942_fix-logout-error-message
new file mode 100644
index 00000000..f8c8a3b2
--- /dev/null
+++ b/bug-4942_fix-logout-error-message
@@ -0,0 +1 @@
+- Fix logout error message, display it similarly to other errors in the app. Closes #4942.
diff --git a/src/leap/bitmask/gui/login.py b/src/leap/bitmask/gui/login.py
index d0cb20b1..8a7c6996 100644
--- a/src/leap/bitmask/gui/login.py
+++ b/src/leap/bitmask/gui/login.py
@@ -327,7 +327,6 @@ class LoginWidget(QtGui.QWidget):
         self.ui.logged_widget.show()
         self.ui.lblUser.setText(make_address(
             self.get_user(), self.get_selected_provider()))
-        self.set_login_status("")
 
         if flags.OFFLINE is False:
             self.logged_in_signal.emit()
@@ -346,22 +345,6 @@ class LoginWidget(QtGui.QWidget):
         self.set_enabled(True)
         self.set_status("", error=False)
 
-    def set_login_status(self, msg, error=False):
-        """
-        Sets the status label for the logged in state.
-
-        :param msg: status message
-        :type msg: str or unicode
-        :param error: if the status is an erroneous one, then set this
-                      to True
-        :type error: bool
-        """
-        leap_assert_type(error, bool)
-        if error:
-            msg = "<font color='red'><b>%s</b></font>" % (msg,)
-        self.ui.lblLoginStatus.setText(msg)
-        self.ui.lblLoginStatus.show()
-
     def start_logout(self):
         """
         Sets the widgets to the logging out state
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 83aa47a9..ddaa085c 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -1754,9 +1754,8 @@ class MainWindow(QtGui.QMainWindow):
             self._mail_status.mail_state_disabled()
 
         else:
-            self._login_widget.set_login_status(
-                self.tr("Something went wrong with the logout."),
-                error=True)
+            self._login_widget.set_status(
+                self.tr("Something went wrong with the logout."))
 
     def _intermediate_stage(self, data):
         # TODO this method name is confusing as hell.
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