From e7c3c4fb7b6ff0bbea1258686f76b06a5ffb8d8d Mon Sep 17 00:00:00 2001
From: Piyush Aggarwal <piyushaggarwal002@gmail.com>
Date: Sat, 14 Nov 2020 13:54:21 +0530
Subject: [PATCH] indicator: open Configure menu on double click

---
 indicator/main.cpp | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/indicator/main.cpp b/indicator/main.cpp
index a30453eda..2d47e3bae 100644
--- a/indicator/main.cpp
+++ b/indicator/main.cpp
@@ -7,6 +7,7 @@
 #include <QApplication>
 #include <QProcess>
 #include <QThread>
+#include <QPointer>
 
 #ifdef QSYSTRAY
 #include <QSystemTrayIcon>
@@ -56,15 +57,22 @@ int main(int argc, char** argv)
     model.setDisplayFilter(DevicesModel::Reachable | DevicesModel::Paired);
     QMenu* menu = new QMenu;
 
+    QPointer<KCMultiDialog> dialog;
+
     DaemonDbusInterface iface;
-    auto refreshMenu = [&iface, &model, &menu, &helper]() {
+
+    auto refreshMenu = [&iface, &model, &menu, &helper, &dialog]() {
         menu->clear();
         auto configure = menu->addAction(QIcon::fromTheme(QStringLiteral("configure")), i18n("Configure..."));
-        QObject::connect(configure, &QAction::triggered, configure, [](){
-            KCMultiDialog* dialog = new KCMultiDialog;
-            dialog->addModule(QStringLiteral("kcm_kdeconnect"));
-            dialog->setAttribute(Qt::WA_DeleteOnClose);
-            dialog->show();
+        QObject::connect(configure, &QAction::triggered, configure, [&dialog]() {
+            if (dialog == nullptr) {
+                dialog = new KCMultiDialog;
+                dialog->addModule(QStringLiteral("kcm_kdeconnect"));
+                dialog->setAttribute(Qt::WA_DeleteOnClose);
+                dialog->show();
+            } else {
+                dialog->activateWindow();
+            }
         });
         for (int i=0, count = model.rowCount(); i<count; ++i) {
             DeviceDbusInterface* device = model.getDevice(i);
@@ -125,6 +133,11 @@ int main(int argc, char** argv)
     QObject::connect(&model, &DevicesModel::rowsChanged, &model, [&systray, &model]() {
         systray.setToolTip(i18np("%1 device connected", "%1 devices connected", model.rowCount()));
     });
+    QObject::connect(&systray, &QSystemTrayIcon::activated, [&iface](QSystemTrayIcon::ActivationReason reason) {
+        if (reason == QSystemTrayIcon::DoubleClick) {
+            iface.openConfiguration();
+        }
+    });
 
     systray.setContextMenu(menu);
 #else