summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@yahoo.com.ar>2013-06-05 11:52:37 -0300
committerIvan Alejandro <ivanalejandro0@yahoo.com.ar>2013-06-05 12:02:01 -0300
commit5b5eef87e8eb41916f2f5657287ac1ad8f0bbfeb (patch)
tree264d3147c6c31bf73f321cc72d06455129295cc0
parente6b055fc2b054c1ab12e2554e9dbe73f47c647c0 (diff)
Select the configured domain in the providers box
-rw-r--r--changes/bug-2693_select-configured-provider1
-rw-r--r--src/leap/gui/mainwindow.py6
-rw-r--r--src/leap/gui/wizard.py3
3 files changed, 10 insertions, 0 deletions
diff --git a/changes/bug-2693_select-configured-provider b/changes/bug-2693_select-configured-provider
new file mode 100644
index 00000000..8cb49aa1
--- /dev/null
+++ b/changes/bug-2693_select-configured-provider
@@ -0,0 +1 @@
+ o Select the configured domain in the providers combo box. Closes #2693.
diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py
index 89f06a1c..f9e088a7 100644
--- a/src/leap/gui/mainwindow.py
+++ b/src/leap/gui/mainwindow.py
@@ -377,6 +377,12 @@ class MainWindow(QtGui.QMainWindow):
if self._wizard:
possible_username = self._wizard.get_username()
possible_password = self._wizard.get_password()
+
+ # select the configured provider in the combo box
+ domain = self._wizard.get_domain()
+ provider_index = self.ui.cmbProviders.findText(domain)
+ self.ui.cmbProviders.setCurrentIndex(provider_index)
+
self.ui.chkRemember.setChecked(self._wizard.get_remember())
self._enabled_services = list(self._wizard.get_services())
self._settings.set_enabled_services(
diff --git a/src/leap/gui/wizard.py b/src/leap/gui/wizard.py
index 405752ef..ea4474ae 100644
--- a/src/leap/gui/wizard.py
+++ b/src/leap/gui/wizard.py
@@ -154,6 +154,9 @@ class Wizard(QtGui.QWizard):
self.page(self.FINISH_PAGE).setButtonText(
QtGui.QWizard.FinishButton, self.tr("Connect"))
+ def get_domain(self):
+ return self._domain
+
def get_username(self):
return self._username