summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug-5495_wizard-provider-edit-disable1
-rw-r--r--changes/bug-5497_hide-bandwidth-on-openvpn-killed1
-rw-r--r--src/leap/bitmask/gui/mainwindow.py2
-rw-r--r--src/leap/bitmask/gui/wizard.py15
4 files changed, 17 insertions, 2 deletions
diff --git a/changes/bug-5495_wizard-provider-edit-disable b/changes/bug-5495_wizard-provider-edit-disable
new file mode 100644
index 00000000..879f95e0
--- /dev/null
+++ b/changes/bug-5495_wizard-provider-edit-disable
@@ -0,0 +1 @@
+- Disable providers combo box during check and enable combo or line edit depending on radio button. Closes #5495.
diff --git a/changes/bug-5497_hide-bandwidth-on-openvpn-killed b/changes/bug-5497_hide-bandwidth-on-openvpn-killed
new file mode 100644
index 00000000..28484605
--- /dev/null
+++ b/changes/bug-5497_hide-bandwidth-on-openvpn-killed
@@ -0,0 +1 @@
+- Hide the bandwidth widget and update status icon if the openvpn process is killed. Closes #5497.
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 9d0f9145..56ac1545 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -1783,6 +1783,8 @@ class MainWindow(QtGui.QMainWindow):
elif exitCode != 0 or not self.user_stopped_eip:
eip_status_label = self.tr("{0} finished in an unexpected manner!")
eip_status_label = eip_status_label.format(self._eip_name)
+ self._eip_status.eip_stopped()
+ self._eip_status.set_eip_status_icon("error")
self._eip_status.set_eip_status(eip_status_label, error=True)
signal = qtsigs.connection_died_signal
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):
"""