Extract the system tray functionality to its own class

LibraryWindow is already a monster, so we'll try to not make it bigger.
2025-07-18 13:04:28 -04:00 · 2019-09-21 10:47:01 +02:00
parent 3c07e7269a
commit 8e99d9e59f
5 changed files with 167 additions and 41 deletions
--- a/YACReaderLibrary/trayicon_controller.cpp
+++ b/YACReaderLibrary/trayicon_controller.cpp
@ -0,0 +1,100 @@
+#include "trayicon_controller.h"
+
+#include "yacreader_global_gui.h"
+
+#include <QtWidgets>
+#include <QMessageBox>
+
+#ifdef Q_OS_MACOS
+#include "trayhandler.h"
+#endif
+
+using namespace YACReader;
+
+TrayIconController::TrayIconController(QSettings *settings, QMainWindow *window)
+    : QObject(nullptr), settings(settings), window(window)
+{
+
+    // If a window icon was set in main() we reuse it for the tray too.
+    // This allows support for third party icon themes on Freedesktop(Linux/Unix)
+    // systems.
+    if (!QApplication::windowIcon().isNull()) {
+        trayIcon.setIcon(QApplication::windowIcon());
+    } else {
+#ifdef Q_OS_WIN
+        trayIcon.setIcon(QIcon(":/icon.ico"));
+#else
+#ifdef Q_OS_MACOS
+        auto icon = QIcon(":/macostrayicon.svg");
+        icon.setIsMask(true);
+        trayIcon.setIcon(icon);
+#else
+        trayIcon.setIcon(QIcon(":/images/iconLibrary.png"));
+#endif
+#endif
+    }
+
+    connect(&trayIcon, &QSystemTrayIcon::activated,
+            [=](QSystemTrayIcon::ActivationReason reason) {
+                if (reason == QSystemTrayIcon::DoubleClick) {
+                    showWindow();
+                }
+            });
+
+    updateIconVisibility();
+
+    auto restoreAction = new QAction(tr("&Restore"), this);
+    connect(restoreAction, &QAction::triggered, this, &TrayIconController::showWindow);
+
+    auto quitAction = new QAction(tr("&Quit"), this);
+    connect(quitAction, &QAction::triggered, window, &QMainWindow::close);
+
+    trayIconMenu = new QMenu(this->window);
+    trayIconMenu->addAction(restoreAction);
+    trayIconMenu->addSeparator();
+    trayIconMenu->addAction(quitAction);
+
+    trayIcon.setContextMenu(trayIconMenu);
+}
+
+void TrayIconController::updateIconVisibility()
+{
+    trayIcon.setVisible(settings->value(CLOSE_TO_TRAY, false).toBool());
+}
+
+bool TrayIconController::handleCloseToTrayIcon(QCloseEvent *event)
+{
+#ifdef Q_OS_OSX
+    if (!event->spontaneous() || !window->isVisible()) {
+        return false;
+    }
+#endif
+    if (trayIcon.isVisible()) {
+        if (!settings->value(CLOSE_TO_TRAY_NOTIFIED, false).toBool()) {
+            QMessageBox::information(window, tr("Systray"),
+                                     tr("YACReaderLibrary will keep running in the "
+                                        "system tray. To terminate the program, "
+                                        "choose <b>Quit</b> in the context menu "
+                                        "of the system tray icon."));
+            settings->setValue(CLOSE_TO_TRAY_NOTIFIED, true);
+        }
+#ifdef Q_OS_OSX
+        OSXHideDockIcon();
+#endif
+        window->hide();
+        event->ignore();
+        return true;
+    } else {
+        return false;
+    }
+}
+
+void TrayIconController::showWindow()
+{
+#ifdef Q_OS_MACOS
+    OSXShowDockIcon();
+#endif
+    window->showNormal();
+    window->raise(); // for MacOS
+    window->activateWindow(); // for Windows
+}