summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkali <kali@leap.se>2013-06-14 00:03:25 +0900
committerkali <kali@leap.se>2013-06-14 00:03:25 +0900
commita318aea8f74e7b0e7cf0fb5333c89eff3e091f4a (patch)
tree28f8274ef575ced14605c61c35072c6462aba9e0
parenteba5521bcac69680471ecec0b3ce336f952343ed (diff)
parent521c4b41515fa9491f744274548e1714eb8695f3 (diff)
Merge remote-tracking branch 'chiiph/feature/display_provider_in_tray' into develop
-rw-r--r--changes/feature_display_provider_in_tray2
-rw-r--r--src/leap/gui/mainwindow.py7
2 files changed, 9 insertions, 0 deletions
diff --git a/changes/feature_display_provider_in_tray b/changes/feature_display_provider_in_tray
new file mode 100644
index 00000000..b37e90a2
--- /dev/null
+++ b/changes/feature_display_provider_in_tray
@@ -0,0 +1,2 @@
+ o Display the default provider configured in the systray menu. Close
+ #2813 \ No newline at end of file
diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py
index 3c6c579c..d603809e 100644
--- a/src/leap/gui/mainwindow.py
+++ b/src/leap/gui/mainwindow.py
@@ -227,6 +227,9 @@ class MainWindow(QtGui.QMainWindow):
self._systray = None
+ self._action_eip_provider = QtGui.QAction(
+ self.tr("No default provider"), self)
+ self._action_eip_provider.setEnabled(False)
self._action_eip_status = QtGui.QAction(
self.tr("Encrypted internet is OFF"),
self)
@@ -490,6 +493,8 @@ class MainWindow(QtGui.QMainWindow):
"provider configured")
return
+ self._action_eip_provider.setText(default_provider)
+
self._enabled_services = self._settings.get_enabled_services(
default_provider)
@@ -517,6 +522,7 @@ class MainWindow(QtGui.QMainWindow):
systrayMenu.addSeparator()
systrayMenu.addAction(self.ui.action_quit)
systrayMenu.addSeparator()
+ systrayMenu.addAction(self._action_eip_provider)
systrayMenu.addAction(self._action_eip_status)
systrayMenu.addAction(self._action_eip_startstop)
self._systray = QtGui.QSystemTrayIcon(self)
@@ -963,6 +969,7 @@ class MainWindow(QtGui.QMainWindow):
self._settings.set_defaultprovider(
provider_config.get_domain())
+ self._action_eip_provider.setText(provider_config.get_domain())
self.ui.btnEipStartStop.setText(self.tr("Turn Encryption OFF"))
self.ui.btnEipStartStop.disconnect(self)
self.ui.btnEipStartStop.clicked.connect(