summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@yahoo.com.ar>2013-06-05 12:19:18 -0300
committerIvan Alejandro <ivanalejandro0@yahoo.com.ar>2013-06-05 12:19:18 -0300
commit1addf4b9f098f73443861ee39a4b87455dce5dcf (patch)
tree7b436fcd7cde286a8530fdcfc44eca1fb857973f
parente6b055fc2b054c1ab12e2554e9dbe73f47c647c0 (diff)
parent2456b456ae72c7c56c03aaf131aef7a2e7ad011b (diff)
Merge remote-tracking branch 'chiiph/bug/2569_show_question_mark_rev1' into develop
-rw-r--r--changes/bug_2569_question_mark2
-rw-r--r--src/leap/gui/wizard.py14
2 files changed, 12 insertions, 4 deletions
diff --git a/changes/bug_2569_question_mark b/changes/bug_2569_question_mark
new file mode 100644
index 00000000..de49e17b
--- /dev/null
+++ b/changes/bug_2569_question_mark
@@ -0,0 +1,2 @@
+ o Only show the question mark for a check being done if the previous
+ one passed. Fixes #2569. \ No newline at end of file
diff --git a/src/leap/gui/wizard.py b/src/leap/gui/wizard.py
index 405752ef..3cf1765b 100644
--- a/src/leap/gui/wizard.py
+++ b/src/leap/gui/wizard.py
@@ -389,10 +389,11 @@ class Wizard(QtGui.QWizard):
if not passed:
status = self.tr("<font color='red'><b>Non-existent "
"provider</b></font>")
+ else:
+ 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.ui.lblHTTPS.setPixmap(self.QUESTION_ICON)
def _https_connection(self, data):
"""
@@ -408,9 +409,10 @@ class Wizard(QtGui.QWizard):
status = self.tr("<font color='red'><b>%s</b></font>") \
% (data[self._provider_bootstrapper.ERROR_KEY])
self.ui.lblProviderSelectStatus.setText(status)
+ else:
+ self.ui.lblProviderInfo.setPixmap(self.QUESTION_ICON)
self.ui.btnCheck.setEnabled(not passed)
self.ui.lnProvider.setEnabled(not passed)
- self.ui.lblProviderInfo.setPixmap(self.QUESTION_ICON)
def _download_provider_info(self, data):
"""
@@ -451,7 +453,9 @@ class Wizard(QtGui.QWizard):
Sets the status for the download of the CA certificate check
"""
self._complete_task(data, self.ui.lblDownloadCaCert)
- self.ui.lblCheckCaFpr.setPixmap(self.QUESTION_ICON)
+ passed = data[self._provider_bootstrapper.PASSED_KEY]
+ if passed:
+ self.ui.lblCheckCaFpr.setPixmap(self.QUESTION_ICON)
def _check_ca_fingerprint(self, data):
"""
@@ -461,7 +465,9 @@ class Wizard(QtGui.QWizard):
Sets the status for the CA fingerprint check
"""
self._complete_task(data, self.ui.lblCheckCaFpr)
- self.ui.lblCheckApiCert.setPixmap(self.QUESTION_ICON)
+ passed = data[self._provider_bootstrapper.PASSED_KEY]
+ if passed:
+ self.ui.lblCheckApiCert.setPixmap(self.QUESTION_ICON)
def _check_api_certificate(self, data):
"""