summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-04-14 12:15:23 -0300
committerTomás Touceda <chiiph@leap.se>2014-04-14 12:15:23 -0300
commit0483d150499b6e23ea21906b1a235d29ebbd4d87 (patch)
tree834dce89d461ffc7d7fb79463765246deef78d0e /src/leap
parente29dba903d5ebce051adbe8b28ba745082072650 (diff)
parenta6e96bc487ffb9c4b4d34957ca4b2b48a88b0ccb (diff)
Merge remote-tracking branch 'refs/remotes/ivan/bug/5495_wizard-provider-edit-disable' into develop
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/bitmask/gui/wizard.py15
1 files changed, 13 insertions, 2 deletions
diff --git a/src/leap/bitmask/gui/wizard.py b/src/leap/bitmask/gui/wizard.py
index e2c1a16e..ebcee400 100644
--- a/src/leap/bitmask/gui/wizard.py
+++ b/src/leap/bitmask/gui/wizard.py
@@ -390,7 +390,13 @@ class Wizard(QtGui.QWizard):
self.ui.grpCheckProvider.setVisible(True)
self.ui.btnCheck.setEnabled(False)
- self.ui.lnProvider.setEnabled(False)
+
+ # Disable provider widget
+ if self.ui.rbNewProvider.isChecked():
+ self.ui.lnProvider.setEnabled(False)
+ else:
+ self.ui.cbProviders.setEnabled(False)
+
self.button(QtGui.QWizard.BackButton).clearFocus()
self.ui.lblNameResolution.setPixmap(self.QUESTION_ICON)
@@ -506,7 +512,12 @@ class Wizard(QtGui.QWizard):
"</b></font>")
self.ui.lblProviderSelectStatus.setText(status)
self.ui.btnCheck.setEnabled(True)
- self.ui.lnProvider.setEnabled(True)
+
+ # Enable provider widget
+ if self.ui.rbNewProvider.isChecked():
+ self.ui.lnProvider.setEnabled(True)
+ else:
+ self.ui.cbProviders.setEnabled(True)
def _download_ca_cert(self, data):
"""