Fix #2085 new tray menu.

- left click on the systray icon brings up the new QtQuick based dialogs on all platforms - right click on the systray icon brings up the new QtQuick based dialog on Mac OS only - right click on the systray icon brings up a context menu on all other platforms than Mac OS Signed-off-by: Camila <[email protected]>
nextcloud · Jun 29, 2020 · 67355ce · 67355ce
1 parent 372f678
commit 67355ce
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp
@@ -164,7 +164,13 @@ void ownCloudGui::slotOpenMainDialog()
 
 void ownCloudGui::slotTrayClicked(QSystemTrayIcon::ActivationReason reason)
 {
-    if (reason == QSystemTrayIcon::Trigger || reason == QSystemTrayIcon::Context) {
+    bool macos = false;
+#ifdef Q_OS_MAC
+    macos = true;
+#endif
+
+    if(reason == QSystemTrayIcon::Trigger ||
+            (macos && reason == QSystemTrayIcon::Context)){
         if (OwncloudSetupWizard::bringWizardToFrontIfVisible()) {
             // brought wizard to front
         } else if (_shareDialogs.size() > 0) {

diff --git a/src/gui/systray.cpp b/src/gui/systray.cpp
@@ -25,6 +25,7 @@
 #include <QQmlContext>
 #include <QQuickWindow>
 #include <QScreen>
+#include <QMenu>
 
 #ifdef USE_FDO_NOTIFICATIONS
 #include <QDBusConnection>
@@ -79,6 +80,14 @@ Systray::Systray()
         }
     );
 
+#ifndef Q_OS_MAC
+      auto contextMenu = new QMenu();
+        contextMenu->addAction(tr("Open Settings"), this, &Systray::openSettings);
+        contextMenu->addAction(tr("Help"), this, &Systray::openHelp);
+        contextMenu->addAction(tr("Quit Nextcloud"), this, &Systray::shutdown);
+        setContextMenu(contextMenu);
+#endif
+
     connect(UserModel::instance(), &UserModel::newUserSelected,
         this, &Systray::slotNewUserSelected);
 
@@ -259,7 +268,7 @@ QRect Systray::taskbarGeometry() const
 #else
     if (taskbarOrientation() == TaskBarPosition::Bottom || taskbarOrientation() == TaskBarPosition::Top) {
         auto screenWidth = currentScreenRect().width();
-        return QRect(0, 0, screenWidth, 32);
+        return {0, 0, screenWidth, 32};
     } else {
         auto screenHeight = currentScreenRect().height();
         return QRect(0, 0, 32, screenHeight);