summaryrefslogtreecommitdiff
path: root/src/leap/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/leap/gui')
-rw-r--r--src/leap/gui/mainwindow.py15
-rw-r--r--src/leap/gui/wizard.py5
2 files changed, 14 insertions, 6 deletions
diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py
index 51b96463..cf20c6eb 100644
--- a/src/leap/gui/mainwindow.py
+++ b/src/leap/gui/mainwindow.py
@@ -299,9 +299,12 @@ class MainWindow(QtGui.QMainWindow):
"""
if self._wizard is None:
self._wizard = Wizard(bypass_checks=self._bypass_checks)
- self._wizard.accepted.connect(self._finish_init)
+ self._wizard.accepted.connect(self._finish_init)
+
self.setVisible(False)
self._wizard.exec_()
+ # We need this to process any wizard related event
+ QtCore.QCoreApplication.processEvents()
self._wizard = None
self.setVisible(True)
@@ -474,8 +477,8 @@ class MainWindow(QtGui.QMainWindow):
default_provider = self._settings.get_defaultprovider()
if default_provider is None:
- logger.info("Cannot autostart EIP because there's no default "
- "provider configured")
+ logger.info("Cannot autostart Encrypted Internet because there is "
+ "no default provider configured")
return
self._action_eip_provider.setText(default_provider)
@@ -983,7 +986,7 @@ class MainWindow(QtGui.QMainWindow):
error=True)
except OpenVPNNotFoundException:
self._status_panel.set_eip_status(
- self.tr("We couldn't find openvpn"),
+ self.tr("We couldn't find openvpn binary"),
error=True)
except VPNLauncherException as e:
self._status_panel.set_eip_status("%s" % (e,), error=True)
@@ -1087,7 +1090,7 @@ class MainWindow(QtGui.QMainWindow):
else:
if data[self._eip_bootstrapper.PASSED_KEY]:
self._status_panel.set_eip_status(
- self.tr("Could not load EIP Configuration"),
+ self.tr("Could not load Encrypted Internet Configuration"),
error=True)
else:
self._status_panel.set_eip_status(
@@ -1209,7 +1212,7 @@ class MainWindow(QtGui.QMainWindow):
self._cleanup_pidfiles()
logger.debug('Terminating vpn')
- self._vpn.terminate()
+ self._vpn.terminate(shutdown=True)
def quit(self):
"""
diff --git a/src/leap/gui/wizard.py b/src/leap/gui/wizard.py
index d03427db..897bf94f 100644
--- a/src/leap/gui/wizard.py
+++ b/src/leap/gui/wizard.py
@@ -154,6 +154,11 @@ class Wizard(QtGui.QWizard):
self.page(self.FINISH_PAGE).setButtonText(
QtGui.QWizard.FinishButton, self.tr("Connect"))
+ # XXX: Temporary removal for enrollment policy
+ # https://leap.se/code/issues/2922
+ self.ui.label_12.setVisible(False)
+ self.ui.lblProviderPolicy.setVisible(False)
+
def get_domain(self):
return self._domain