diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-07-02 10:40:08 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-07-02 10:40:08 -0300 |
| commit | 7a86fe5719984ba0656628d4ab74734009065f3c (patch) | |
| tree | 4f6b14129e9c5fe04ab383daf9bb6e93103d9644 | |
| parent | 81842d06dbaf9d3749176e018d40d109d68bf736 (diff) | |
| parent | 215c703d2d1d4502aea2ac91f501bbe5c8637970 (diff) | |
Merge remote-tracking branch 'ivan/feature/2919_reorder-systray' into develop
| -rw-r--r-- | changes/feature_2919-reorder-tray-icons | 1 | ||||
| -rw-r--r-- | src/leap/gui/mainwindow.py | 17 |
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 85c66bc0..0382f334 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) |