From 6e8639a480d63acd5c8bc044a8b1ca907c325233 Mon Sep 17 00:00:00 2001
From: Ivan Alejandro <ivanalejandro0@gmail.com>
Date: Fri, 13 Mar 2015 15:59:35 -0300
Subject: [bug] enable providers combo box on check fail

After a provider fails to pass the checks, the providers combo box is
not enabled when it should, we just took care of the provider line edit.

- Resolves: #6418
---
 src/leap/bitmask/gui/wizard.py | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

(limited to 'src/leap/bitmask')

diff --git a/src/leap/bitmask/gui/wizard.py b/src/leap/bitmask/gui/wizard.py
index 527df9b7..c66c6269 100644
--- a/src/leap/bitmask/gui/wizard.py
+++ b/src/leap/bitmask/gui/wizard.py
@@ -264,6 +264,20 @@ class Wizard(QtGui.QWizard, SignalTracker):
         if reset:
             self._reset_provider_check()
 
+    def _provider_widget_set_enabled(self, enabled):
+        """
+        Enable/Disable the provider widget.
+        The widget to use depends on whether the used decided to use an
+        existing provider or a new one.
+
+        :param enabled: the new state for the widget
+        :type enabled: bool
+        """
+        if self.ui.rbNewProvider.isChecked():
+            self.ui.lnProvider.setEnabled(enabled)
+        else:
+            self.ui.cbProviders.setEnabled(enabled)
+
     def _focus_username(self):
         """
         Focus at the username lineedit for the registration page
@@ -439,11 +453,7 @@ class Wizard(QtGui.QWizard, SignalTracker):
         self.ui.grpCheckProvider.setVisible(True)
         self.ui.btnCheck.setEnabled(False)
 
-        # Disable provider widget
-        if self.ui.rbNewProvider.isChecked():
-            self.ui.lnProvider.setEnabled(False)
-        else:
-            self.ui.cbProviders.setEnabled(False)
+        self._provider_widget_set_enabled(False)
 
         self.button(QtGui.QWizard.BackButton).clearFocus()
 
@@ -510,7 +520,7 @@ class Wizard(QtGui.QWizard, SignalTracker):
             self.ui.lblHTTPS.setPixmap(self.QUESTION_ICON)
         self.ui.lblProviderSelectStatus.setText(status)
         self.ui.btnCheck.setEnabled(not passed)
-        self.ui.lnProvider.setEnabled(not passed)
+        self._provider_widget_set_enabled(not passed)
 
     def _https_connection(self, data):
         """
@@ -529,7 +539,8 @@ class Wizard(QtGui.QWizard, SignalTracker):
         else:
             self.ui.lblProviderInfo.setPixmap(self.QUESTION_ICON)
         self.ui.btnCheck.setEnabled(not passed)
-        self.ui.lnProvider.setEnabled(not passed)
+
+        self._provider_widget_set_enabled(not passed)
 
     def _download_provider_info(self, data):
         """
@@ -558,13 +569,9 @@ class Wizard(QtGui.QWizard, SignalTracker):
             status = self.tr("<font color='red'><b>Not a valid provider"
                              "</b></font>")
             self.ui.lblProviderSelectStatus.setText(status)
-        self.ui.btnCheck.setEnabled(True)
 
-        # Enable provider widget
-        if self.ui.rbNewProvider.isChecked():
-            self.ui.lnProvider.setEnabled(True)
-        else:
-            self.ui.cbProviders.setEnabled(True)
+        self.ui.btnCheck.setEnabled(True)
+        self._provider_widget_set_enabled(True)
 
     def _provider_get_details(self, details):
         """
-- 
cgit v1.2.3