summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2013-08-01 16:10:29 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2013-08-01 18:08:14 -0300
commit571fdf3908bc34d063e6a316abed448efbe1bfdb (patch)
tree28d28a16b9d010e4d914970798fdf93581153328
parentd1d9005201ea772c7599aa279650e49e1d91c27a (diff)
Add cancel button to login. Closes #3318.
-rw-r--r--changes/feature-3318_add-cancel-button-to-login1
-rw-r--r--src/leap/gui/login.py22
-rw-r--r--src/leap/gui/mainwindow.py29
3 files changed, 49 insertions, 3 deletions
diff --git a/changes/feature-3318_add-cancel-button-to-login b/changes/feature-3318_add-cancel-button-to-login
new file mode 100644
index 00000000..2086e42d
--- /dev/null
+++ b/changes/feature-3318_add-cancel-button-to-login
@@ -0,0 +1 @@
+ o Add cancel button to login. Closes #3318.
diff --git a/src/leap/gui/login.py b/src/leap/gui/login.py
index 36934ace..3eb1fe39 100644
--- a/src/leap/gui/login.py
+++ b/src/leap/gui/login.py
@@ -36,6 +36,8 @@ class LoginWidget(QtGui.QWidget):
# Emitted when the login button is clicked
login = QtCore.Signal()
+ cancel_login = QtCore.Signal()
+
# Emitted when the user selects "Other..." in the provider
# combobox or click "Create Account"
show_wizard = QtCore.Signal()
@@ -193,6 +195,26 @@ class LoginWidget(QtGui.QWidget):
self.ui.chkRemember.setEnabled(enabled)
self.ui.cmbProviders.setEnabled(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
+
+ if not enabled:
+ text = self.tr("Log In")
+ login_or_cancel = self.login
+
+ self.ui.btnLogin.setText(text)
+
+ self.ui.btnLogin.clicked.disconnect()
+ self.ui.btnLogin.clicked.connect(login_or_cancel)
+
def _focus_password(self):
"""
Focuses in the password lineedit
diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py
index ed4ad864..9dd44f4c 100644
--- a/src/leap/gui/mainwindow.py
+++ b/src/leap/gui/mainwindow.py
@@ -141,6 +141,7 @@ class MainWindow(QtGui.QMainWindow):
self.ui.loginLayout.addWidget(self._login_widget)
self._login_widget.login.connect(self._login)
+ self._login_widget.cancel_login.connect(self._cancel_login)
self._login_widget.show_wizard.connect(
self._launch_wizard)
@@ -274,6 +275,7 @@ class MainWindow(QtGui.QMainWindow):
self._keymanager = None
self._login_defer = None
+ self._download_provider_defer = None
self._smtp_config = SMTPConfig()
@@ -709,9 +711,9 @@ class MainWindow(QtGui.QMainWindow):
"""
provider = self._login_widget.get_selected_provider()
- self._provider_bootstrapper.run_provider_select_checks(
- provider,
- download_if_needed=True)
+ pb = self._provider_bootstrapper
+ d = pb.run_provider_select_checks(provider, download_if_needed=True)
+ self._download_provider_defer = d
def _load_provider_config(self, data):
"""
@@ -787,6 +789,7 @@ 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
@@ -805,6 +808,25 @@ class MainWindow(QtGui.QMainWindow):
self._download_provider_config()
+ def _cancel_login(self):
+ """
+ SLOT
+ TRIGGERS:
+ self._login_widget.cancel_login
+
+ 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.")
+ self._download_provider_defer.cancel()
+
+ if self._login_defer:
+ logger.debug("Cancelling login defer.")
+ self._login_defer.cancel()
+
def _provider_config_loaded(self, data):
"""
SLOT
@@ -1249,6 +1271,7 @@ 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(
data[self._provider_bootstrapper.ERROR_KEY])