From 7f252785df20f395cb740a8cca79e70943431748 Mon Sep 17 00:00:00 2001
From: Ivan Alejandro <ivanalejandro0@gmail.com>
Date: Wed, 7 Aug 2013 13:02:47 -0300
Subject: Bugfix ui, login-cancel consistency. Closes #3401.

---
 src/leap/gui/login.py      | 6 +++---
 src/leap/gui/mainwindow.py | 3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/leap')

diff --git a/src/leap/gui/login.py b/src/leap/gui/login.py
index 3c994597..de0b2d50 100644
--- a/src/leap/gui/login.py
+++ b/src/leap/gui/login.py
@@ -197,18 +197,18 @@ class LoginWidget(QtGui.QWidget):
         """
         self.ui.lnUser.setEnabled(enabled)
         self.ui.lnPassword.setEnabled(enabled)
-        self.ui.btnLogin.setEnabled(enabled)
         self.ui.chkRemember.setEnabled(enabled)
         self.ui.cmbProviders.setEnabled(enabled)
 
-    def set_cancel(self, enabled=False):
+        self._set_cancel(not enabled)
+
+    def _set_cancel(self, enabled=False):
         """
         Enables or disables the cancel action in the "log in" process.
 
         :param enabled: wether it should be enabled or not
         :type enabled: bool
         """
-        self.ui.btnLogin.setEnabled(enabled)
         text = self.tr("Cancel")
         login_or_cancel = self.cancel_login
 
diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py
index a1ba4df4..6b31fb6c 100644
--- a/src/leap/gui/mainwindow.py
+++ b/src/leap/gui/mainwindow.py
@@ -804,7 +804,6 @@ class MainWindow(QtGui.QMainWindow):
 
         self._login_widget.set_status(self.tr("Logging in..."), error=False)
         self._login_widget.set_enabled(False)
-        self._login_widget.set_cancel(True)
 
         if self._login_widget.get_remember() and has_keyring():
             # in the keyring and in the settings
@@ -832,7 +831,6 @@ class MainWindow(QtGui.QMainWindow):
         Stops the login sequence.
         """
         logger.debug("Cancelling log in.")
-        self._login_widget.set_cancel(False)
 
         if self._download_provider_defer:
             logger.debug("Cancelling download provider defer.")
@@ -1301,7 +1299,6 @@ class MainWindow(QtGui.QMainWindow):
         """
         passed = data[self._provider_bootstrapper.PASSED_KEY]
         if not passed:
-            self._login_widget.set_cancel(False)
             self._login_widget.set_enabled(True)
             self._login_widget.set_status(
                 self.tr("Unable to connect: Problem with provider"))
-- 
cgit v1.2.3