diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-06-05 12:25:43 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-06-05 12:25:43 -0300 |
| commit | 269f6535fb468ab6789d3efef27c272178e31395 (patch) | |
| tree | 37596dfab149a133e81dc6f664ae625bdbcbb90d | |
| parent | 1addf4b9f098f73443861ee39a4b87455dce5dcf (diff) | |
| parent | 5b5eef87e8eb41916f2f5657287ac1ad8f0bbfeb (diff) | |
Merge remote-tracking branch 'ivan/bug/issue-2693_select-configured-provider' into develop
| -rw-r--r-- | changes/bug-2693_select-configured-provider | 1 | ||||
| -rw-r--r-- | src/leap/gui/mainwindow.py | 6 | ||||
| -rw-r--r-- | src/leap/gui/wizard.py | 3 |
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 3cf1765b..8c5ea2a0 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 |