summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@yahoo.com.ar>2013-07-01 13:48:13 -0300
committerIvan Alejandro <ivanalejandro0@yahoo.com.ar>2013-07-01 15:38:01 -0300
commit215c703d2d1d4502aea2ac91f501bbe5c8637970 (patch)
tree6978a5a759cc848c8ddd3b18bf99a4a966420ddd
parentbe3f8ebd2e5b2d45f7426624d069bc795e5825ec (diff)
Reorder systray. Closes #2919.
-rw-r--r--changes/feature_2919-reorder-tray-icons1
-rw-r--r--src/leap/gui/mainwindow.py17
2 files changed, 15 insertions, 3 deletions
diff --git a/changes/feature_2919-reorder-tray-icons b/changes/feature_2919-reorder-tray-icons
new file mode 100644
index 00000000..d81c7f24
--- /dev/null
+++ b/changes/feature_2919-reorder-tray-icons
@@ -0,0 +1 @@
+ o Reorder tray icons according new design. Closes #2919.
diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py
index 94343292..5c85a4ce 100644
--- a/src/leap/gui/mainwindow.py
+++ b/src/leap/gui/mainwindow.py
@@ -514,15 +514,26 @@ class MainWindow(QtGui.QMainWindow):
if self._systray is not None:
self._systray.setVisible(True)
return
+
+ # Placeholder actions
+ # They are temporary to display the tray as designed
+ preferences_action = QtGui.QAction(self.tr("Preferences"), self)
+ preferences_action.setEnabled(False)
+ help_action = QtGui.QAction(self.tr("Help"), self)
+ help_action.setEnabled(False)
+
systrayMenu = QtGui.QMenu(self)
systrayMenu.addAction(self._action_visible)
- systrayMenu.addAction(self.ui.action_sign_out)
- 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)
+ systrayMenu.addSeparator()
+ systrayMenu.addAction(preferences_action)
+ systrayMenu.addAction(help_action)
+ systrayMenu.addSeparator()
+ systrayMenu.addAction(self.ui.action_sign_out)
+ systrayMenu.addAction(self.ui.action_quit)
self._systray = QtGui.QSystemTrayIcon(self)
self._systray.setContextMenu(systrayMenu)
self._systray.setIcon(self._status_panel.ERROR_ICON)