diff options
| author | Kali Kaneko <kali@leap.se> | 2017-11-01 01:44:38 +0100 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2017-11-01 01:44:42 +0100 |
| commit | 1339894fb448c3a6fc5c03650718f4963d0f7977 (patch) | |
| tree | 08577ed919257a4427a2b5e761c19f3ed4b70f5a | |
| parent | f54676330174c311e2decc21dca92ec3f0a69686 (diff) | |
[docs] document systray in changelog
- Resolves: #9094
| -rw-r--r-- | docs/changelog.rst | 2 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/app.py | 9 | ||||
| -rw-r--r-- | src/leap/bitmask/vpn/tunnel.py | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/docs/changelog.rst b/docs/changelog.rst index 99821b44..a9d492f1 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -3,11 +3,11 @@ Changelog 0.10.2 - `master`_ ------------------------------- - .. note:: This version is not yet released and is under active development. Features ~~~~~~~~ +- `#9094 <https://0xacab.org/leap/bitmask-dev/issues/9094>`_: Implement a simple systray icon. - Ship gpg1 binary with osx builds. Bugfixes diff --git a/src/leap/bitmask/gui/app.py b/src/leap/bitmask/gui/app.py index 283e5a09..ffb533b4 100644 --- a/src/leap/bitmask/gui/app.py +++ b/src/leap/bitmask/gui/app.py @@ -94,22 +94,21 @@ class WithTrayIcon(QDialog): settip = self.trayIcon.setToolTip if status == 'off': seticon(self.ICON_OFF) - settip('Off') + settip('VPN: Off') elif status == 'on': seticon(self.ICON_ON) - settip('On') + settip('VPN: On') elif status == 'starting': seticon(self.ICON_WAIT) - settip('Starting') + settip('VPN: Starting') elif status == 'stopping': seticon(self.ICON_WAIT) - settip('Stopping') + settip('VPN: Stopping') def setUpEventListener(self): leap_events.register(catalog.VPN_STATUS_CHANGED, self._handle_vpn_event) def _handle_vpn_event(self, *args): - print ">>>>>> GOT EVENT", str(args) status = None if len(args) > 1: status = args[1] diff --git a/src/leap/bitmask/vpn/tunnel.py b/src/leap/bitmask/vpn/tunnel.py index b003a33c..f2bd20a1 100644 --- a/src/leap/bitmask/vpn/tunnel.py +++ b/src/leap/bitmask/vpn/tunnel.py @@ -92,7 +92,7 @@ class ConfiguredTunnel(object): else: status = self._vpnproc.status # Currently, there's some UI flickering that needs to be debugged #9049 - print ">>>> STATUS", status + # print ">>>> STATUS", status return status @property |