Commit da571cf1 authored by Ronan Abhamon's avatar Ronan Abhamon

fix(app): many fixes

parent 07465fac
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#include <QMenu> #include <QMenu>
#include <QQmlApplicationEngine> #include <QQmlApplicationEngine>
#include <QQmlContext>
#include <QQuickView> #include <QQuickView>
#include <QSystemTrayIcon> #include <QSystemTrayIcon>
#include <QtDebug> #include <QtDebug>
...@@ -11,35 +12,39 @@ ...@@ -11,35 +12,39 @@
// =================================================================== // ===================================================================
int exec (App &app, QQmlApplicationEngine &engine) { int exec (App &app, QQmlApplicationEngine &engine) {
if (!QSystemTrayIcon::isSystemTrayAvailable()) if (QSystemTrayIcon::isSystemTrayAvailable())
qWarning() << "System tray not found on this system."; qWarning() << "System tray not found on this system.";
else {
QQuickWindow *root = qobject_cast<QQuickWindow *>(engine.rootObjects().at(0));
QMenu *menu = new QMenu();
QSystemTrayIcon *tray_icon = new QSystemTrayIcon(root);
// Right click actions. QQuickWindow *root = qobject_cast<QQuickWindow *>(engine.rootObjects().at(0));
QAction *quitAction = new QAction(QObject::tr("Quit"), root); QMenu *menu = new QMenu();
root->connect(quitAction, &QAction::triggered, qApp, &QCoreApplication::quit); QSystemTrayIcon *tray_icon = new QSystemTrayIcon(root);
QAction *restoreAction = new QAction(QObject::tr("Restore"), root); // Warning: Add global context trayIcon for all views!
root->connect(restoreAction, &QAction::triggered, root, &QQuickWindow::showNormal); engine.rootContext()->setContextProperty("trayIcon", tray_icon);
// Left click action. // trayIcon: Right click actions.
root->connect(tray_icon, &QSystemTrayIcon::activated, [&root](QSystemTrayIcon::ActivationReason reason) { QAction *quitAction = new QAction(QObject::tr("Quit"), root);
if (reason == QSystemTrayIcon::DoubleClick) root->connect(quitAction, &QAction::triggered, qApp, &QCoreApplication::quit);
root->showNormal();
});
menu->addAction(restoreAction); QAction *restoreAction = new QAction(QObject::tr("Restore"), root);
menu->addSeparator(); root->connect(restoreAction, &QAction::triggered, root, &QQuickWindow::showNormal);
menu->addAction(quitAction);
tray_icon->setContextMenu(menu); // trayIcon: Left click action.
tray_icon->setIcon(QIcon(":/imgs/linphone.png")); root->connect(tray_icon, &QSystemTrayIcon::activated, [&root](QSystemTrayIcon::ActivationReason reason) {
tray_icon->show(); if (reason == QSystemTrayIcon::DoubleClick)
} root->showNormal();
});
// Build trayIcon menu.
menu->addAction(restoreAction);
menu->addSeparator();
menu->addAction(quitAction);
tray_icon->setContextMenu(menu);
tray_icon->setIcon(QIcon(":/imgs/linphone.png"));
tray_icon->show();
// RUN.
return app.exec(); return app.exec();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment