diff options
| author | Kali Kaneko <kali@leap.se> | 2013-09-05 22:38:57 +0200 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-09-05 22:38:57 +0200 |
| commit | 9a82c662bbc334a66f3aa021f1bbbc1f32cddcc8 (patch) | |
| tree | 82e2ead16de0535c3f4e5db7f1e5381339eb5cd6 /src/leap/bitmask/gui/mainwindow.py | |
| parent | c1203f645af746f1eb2ea9d8140035586b123ff4 (diff) | |
| parent | 58420cb3d10cd5eceacbd88a6bc7fdfdc4a85f88 (diff) | |
Merge remote-tracking branch 'ivan-github/feature/3659_display-mx-status-in-tray' into develop
Diffstat (limited to 'src/leap/bitmask/gui/mainwindow.py')
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index 706b9c2a..0950462b 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -254,14 +254,20 @@ class MainWindow(QtGui.QMainWindow): 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) self._action_eip_status.setEnabled(False) - self._status_panel.set_action_eip_status( self._action_eip_status) + self._action_mail_status = QtGui.QAction( + self.tr("Encrypted Mail is OFF"), self) + self._action_mail_status.setEnabled(False) + self._status_panel.set_action_mail_status( + self._action_mail_status) + self._action_eip_startstop = QtGui.QAction( self.tr("Turn OFF"), self) self._action_eip_startstop.triggered.connect( @@ -623,6 +629,7 @@ class MainWindow(QtGui.QMainWindow): systrayMenu.addAction(self._action_eip_provider) systrayMenu.addAction(self._action_eip_status) systrayMenu.addAction(self._action_eip_startstop) + systrayMenu.addAction(self._action_mail_status) systrayMenu.addSeparator() systrayMenu.addAction(self._action_preferences) systrayMenu.addAction(help_action) |