Merge pull request #19 from yakimka/actions_in_tray

Add Settings and About actions in tray icon context menu
yakimka · Sep 30, 2020 · f63ec6e · f63ec6e
2 parents ec7cd1d + ea358d1
commit f63ec6e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/CherryTomato/main.py b/CherryTomato/main.py
@@ -27,6 +27,15 @@ def setTrayIcon(app, mainWindow):
     trayIcon = QSystemTrayIcon(parent=app, icon=icon)
 
     menu = QMenu(parent=mainWindow)
+
+    settingsAction = QAction(text='Settings', parent=menu)
+    settingsAction.triggered.connect(mainWindow.showSettingsWindow)
+    menu.addAction(settingsAction)
+
+    aboutAction = QAction(text='About', parent=menu)
+    aboutAction.triggered.connect(mainWindow.showAboutWindow)
+    menu.addAction(aboutAction)
+
     quitAction = QAction(text='Quit', parent=menu)
     quitAction.triggered.connect(app.quit)
     menu.addAction(quitAction)

diff --git a/CherryTomato/main_window.py b/CherryTomato/main_window.py
@@ -119,7 +119,7 @@ def setColor(self, base: tuple, highlight: tuple):
         self.progress.setPalette(palette)
         self.button.setColor(highlight)
 
-    @Qt.pyqtSlot(name='setFocusOnWindowAndPlayNotification')
+    @Qt.pyqtSlot(name='setFocusOnWindow')
     def setFocusOnWindow(self):
         self.show()
         self.activateWindow()