summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2015-08-24 15:24:16 -0400
committerKali Kaneko <kali@leap.se>2015-08-24 17:16:35 -0400
commit28d176a2376d3ab41812ca31601d5b5195086d34 (patch)
tree6c704bd89749ea82db41eee0cd084e7bc6903849 /src/leap
parenteb5184845818d9440423251450c6bdcc44e5156d (diff)
[pkg] add icon for mail-only builds
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/bitmask/gui/mainwindow.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 44a048e0..312048ba 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -73,11 +73,13 @@ if HAS_MAIL:
from leap.bitmask.services.mail import conductor as mail_conductor
from leap.bitmask.services import MX_SERVICE
-
QtDelayedCall = QtCore.QTimer.singleShot
logger = get_logger()
+if not HAS_EIP:
+ BITMASK_MAIL_ONLY_ICON = ":/images/menubar-mask-icon.png"
+
class MainWindow(QtGui.QMainWindow, SignalTracker):
"""
@@ -874,11 +876,16 @@ class MainWindow(QtGui.QMainWindow, SignalTracker):
systrayMenu.addAction(self._action_mail_status)
systrayMenu.addSeparator()
systrayMenu.addAction(self.ui.action_quit)
+
self._systray = SysTray(self)
self._systray.setContextMenu(systrayMenu)
if HAS_EIP:
self._systray.setIcon(self._eip_status.ERROR_ICON_TRAY)
+ else:
+ mail_status_icon = QtGui.QPixmap(BITMASK_MAIL_ONLY_ICON)
+ self._systray.setIcon(mail_status_icon)
+
self._systray.setVisible(True)
self._systray.activated.connect(self._tray_activated)