diff options
| author | Kali Kaneko <kali@leap.se> | 2013-09-04 17:26:56 +0200 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-09-04 17:26:56 +0200 |
| commit | f688bae3beb8b011c643e2d17c62618cfdc89f6c (patch) | |
| tree | 7fa56b7a9e6c50bb2a4fa0aba2e26c0c06781b58 | |
| parent | d0afef400e3259b9b1d8acb7f53ee1eda380e9c0 (diff) | |
| parent | 1d9199849f889f244da113dd8e73fca02aa1d40e (diff) | |
Merge remote-tracking branch 'ivan-github/bug/3717_enable-preferences-option-in-systray' into develop
| -rw-r--r-- | changes/bug-3717_enable-preferences-option-in-systray | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 11 |
2 files changed, 7 insertions, 5 deletions
diff --git a/changes/bug-3717_enable-preferences-option-in-systray b/changes/bug-3717_enable-preferences-option-in-systray new file mode 100644 index 00000000..8f9f30d1 --- /dev/null +++ b/changes/bug-3717_enable-preferences-option-in-systray @@ -0,0 +1 @@ + o Enable preferences option in systray. Closes #3717. diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index 759a591b..1fdd0792 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -270,6 +270,9 @@ class MainWindow(QtGui.QMainWindow): self._status_panel.set_action_eip_startstop( self._action_eip_startstop) + self._action_preferences = QtGui.QAction(self.tr("Preferences"), self) + self._action_preferences.triggered.connect(self._show_preferences) + self._action_visible = QtGui.QAction(self.tr("Hide Main Window"), self) self._action_visible.triggered.connect(self._toggle_visible) @@ -609,10 +612,8 @@ class MainWindow(QtGui.QMainWindow): 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) + # Placeholder action + # It is temporary to display the tray as designed help_action = QtGui.QAction(self.tr("Help"), self) help_action.setEnabled(False) @@ -623,7 +624,7 @@ class MainWindow(QtGui.QMainWindow): systrayMenu.addAction(self._action_eip_status) systrayMenu.addAction(self._action_eip_startstop) systrayMenu.addSeparator() - systrayMenu.addAction(preferences_action) + systrayMenu.addAction(self._action_preferences) systrayMenu.addAction(help_action) systrayMenu.addSeparator() systrayMenu.addAction(self.ui.action_log_out) |