From 6f932294e7bf58e66ca117fe46ebe346e10aef0f Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Thu, 3 Oct 2013 14:00:14 -0300 Subject: Reorder providers combo, disable if no providers. - Move radio buttons to get more space for the labels. - If there are no configured providers then disable the combo. --- src/leap/bitmask/gui/ui/wizard.ui | 53 +++++++++++++++++++++------------------ src/leap/bitmask/gui/wizard.py | 6 +++++ 2 files changed, 34 insertions(+), 25 deletions(-) (limited to 'src/leap/bitmask') diff --git a/src/leap/bitmask/gui/ui/wizard.ui b/src/leap/bitmask/gui/ui/wizard.ui index b796b795..0f6eef6e 100644 --- a/src/leap/bitmask/gui/ui/wizard.ui +++ b/src/leap/bitmask/gui/ui/wizard.ui @@ -269,7 +269,24 @@ Configure or select a provider - + + + + Configure new provider: + + + true + + + + + + + Use existing one: + + + + https:// @@ -279,44 +296,30 @@ - + - - - false - - - - Check - - + + - Configure new provider - - - true + https:// - - - - - - Use existing one + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - https:// + + + + false diff --git a/src/leap/bitmask/gui/wizard.py b/src/leap/bitmask/gui/wizard.py index 219270c7..e3f5904e 100644 --- a/src/leap/bitmask/gui/wizard.py +++ b/src/leap/bitmask/gui/wizard.py @@ -155,6 +155,12 @@ class Wizard(QtGui.QWizard): """ ls = LeapSettings() providers = ls.get_configured_providers() + if not providers: + self.ui.rbExistingProvider.setEnabled(False) + self.ui.label_8.setEnabled(False) # 'https://' label + self.ui.cbProviders.setEnabled(False) + return + pinned = [] user_added = [] -- cgit v1.2.3