Better macOS support in indicator

- Prolong waiting time on macOS
- Add a splash screen for macOS
- Separate platform-specified actions

indicator/CMakeLists.txt

@@ -14,6 +14,14 @@ ecm_add_app_icon(indicator_SRCS ICONS
     ../icon/256-apps-kdeconnect.png
 )
 
+if (WIN32)
+    list(APPEND indicator_SRCS indicatorhelper_win.cpp)
+elseif (APPLE)
+    list(APPEND indicator_SRCS indicatorhelper_mac.cpp)
+else ()
+    list(APPEND indicator_SRCS indicatorhelper.cpp)
+endif()
+
 add_executable(kdeconnect-indicator ${indicator_SRCS})
 target_include_directories(kdeconnect-indicator PUBLIC ${CMAKE_BINARY_DIR})
 target_link_libraries(kdeconnect-indicator Qt5::Widgets KF5::CoreAddons KF5::I18n KF5::Notifications KF5::DBusAddons KF5::KCMUtils kdeconnectinterfaces kdeconnectcore)

indicator/indicatorhelper.cpp

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2019 Weixuan XIAO <veyx.shaw@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <QApplication>
+#include <QIcon>
+
+#include "indicatorhelper.h"
+
+IndicatorHelper::IndicatorHelper() {}
+IndicatorHelper::~IndicatorHelper() {}
+
+void IndicatorHelper::preInit() {}
+
+void IndicatorHelper::postInit() {}
+
+void IndicatorHelper::iconPathHook() {}
+
+int IndicatorHelper::daemonHook(QProcess &kdeconnectd)
+{
+    Q_UNUSED(kdeconnectd);
+
+    return 0;
+}
+
+#ifdef QSYSTRAY
+void IndicatorHelper::systrayIconHook(QSystemTrayIcon &systray)
+{
+    systray.setIcon(QIcon::fromTheme(QStringLiteral("kdeconnectindicatordark")));
+}
+#else
+void IndicatorHelper::systrayIconHook(KStatusNotifierItem &systray)
+{
+    systray.setIconByName(QStringLiteral("kdeconnectindicatordark"));
+}
+#endif

indicator/indicatorhelper.h

@@ -0,0 +1,53 @@
+/*
+ * Copyright 2019 Weixuan XIAO <veyx.shaw@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <QProcess>
+#include <QSplashScreen>
+
+#ifdef QSYSTRAY
+#include <QSystemTrayIcon>
+#else
+#include <KStatusNotifierItem>
+#endif
+
+class IndicatorHelper
+{
+public:
+    IndicatorHelper();
+    ~IndicatorHelper();
+
+    void preInit();
+    void postInit();
+
+    void iconPathHook();
+
+    int daemonHook(QProcess &kdeconnectd);
+
+#ifdef QSYSTRAY
+    void systrayIconHook(QSystemTrayIcon &systray);
+#else
+    void systrayIconHook(KStatusNotifierItem &systray);
+#endif
+
+private:
+#ifdef Q_OS_MAC
+    QSplashScreen *m_splashScreen;
+#endif
+};

indicator/indicatorhelper_mac.cpp

@@ -0,0 +1,145 @@
+/*
+ * Copyright 2019 Weixuan XIAO <veyx.shaw@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <QApplication>
+#include <QFile>
+#include <QIcon>
+#include <QMessageBox>
+#include <QStandardPaths>
+#include <QThread>
+#include <QDebug>
+
+#include <KLocalizedString>
+
+#include <dbushelper.h>
+
+#include "indicatorhelper.h"
+
+
+IndicatorHelper::IndicatorHelper()
+{
+    QIcon kdeconnectIcon = QIcon::fromTheme(QStringLiteral("kdeconnect"));
+    QPixmap splashPixmap(kdeconnectIcon.pixmap(256, 256));
+
+    m_splashScreen = new QSplashScreen(splashPixmap);
+
+    m_splashScreen->showMessage(i18n("Launching") + QStringLiteral("\n"), Qt::AlignHCenter | Qt::AlignBottom, Qt::white);
+    m_splashScreen->show();
+}
+
+IndicatorHelper::~IndicatorHelper()
+{
+    if (m_splashScreen != nullptr) {
+        delete m_splashScreen;
+        m_splashScreen = nullptr;
+    }
+}
+
+void IndicatorHelper::preInit() {}
+
+void IndicatorHelper::postInit()
+{
+    m_splashScreen->finish(nullptr);
+}
+
+void IndicatorHelper::iconPathHook()
+{
+    const QString iconPath = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("icons"), QStandardPaths::LocateDirectory);
+    if (!iconPath.isNull()) {
+        QStringList themeSearchPaths = QIcon::themeSearchPaths();
+        themeSearchPaths << iconPath;
+        QIcon::setThemeSearchPaths(themeSearchPaths);
+    }
+}
+
+int IndicatorHelper::daemonHook(QProcess &kdeconnectd)
+{
+    // Unset launchctl env, avoid block
+    DBusHelper::macosUnsetLaunchctlEnv();
+
+    // Start kdeconnectd
+    m_splashScreen->showMessage(i18n("Launching daemon") + QStringLiteral("\n"), Qt::AlignHCenter | Qt::AlignBottom, Qt::white);
+    if (QFile::exists(QCoreApplication::applicationDirPath() + QStringLiteral("/kdeconnectd"))) {
+        kdeconnectd.startDetached(QCoreApplication::applicationDirPath() + QStringLiteral("/kdeconnectd"));
+    } else if (QFile::exists(QString::fromLatin1(qgetenv("craftRoot")) + QStringLiteral("/../lib/libexec/kdeconnectd"))) {
+        kdeconnectd.startDetached(QString::fromLatin1(qgetenv("craftRoot")) + QStringLiteral("/../lib/libexec/kdeconnectd"));
+    } else {
+        QMessageBox::critical(nullptr, i18n("KDE Connect"),
+                              i18n("Cannot find kdeconnectd"),
+                              QMessageBox::Abort,
+                              QMessageBox::Abort);
+        return -1;
+    }
+
+    // Wait for dbus daemon env
+    QProcess getLaunchdDBusEnv;
+    m_splashScreen->showMessage(i18n("Waiting D-Bus") + QStringLiteral("\n"), Qt::AlignHCenter | Qt::AlignBottom, Qt::white);
+    int retry = 0;
+    do {
+        getLaunchdDBusEnv.setProgram(QStringLiteral("launchctl"));
+        getLaunchdDBusEnv.setArguments({
+            QStringLiteral("getenv"),
+            QStringLiteral(KDECONNECT_SESSION_DBUS_LAUNCHD_ENV)
+        });
+        getLaunchdDBusEnv.start();
+        getLaunchdDBusEnv.waitForFinished();
+
+        QString launchdDBusEnv = QString::fromLocal8Bit(getLaunchdDBusEnv.readAllStandardOutput());
+
+        if (launchdDBusEnv.length() > 0) {
+            break;
+        } else if (retry >= 10) {
+            // Show a warning and exit
+            qCritical() << "Fail to get launchctl" << KDECONNECT_SESSION_DBUS_LAUNCHD_ENV << "env";
+
+            QMessageBox::critical(nullptr, i18n("KDE Connect"),
+                                  i18n("Cannot connect to DBus\n"
+                                  "KDE Connect will quit"),
+                                  QMessageBox::Abort,
+                                  QMessageBox::Abort);
+            return -2;
+        } else {
+            QThread::sleep(3);  // Retry after 3s
+            retry++;
+        }
+    } while(true);
+
+    m_splashScreen->showMessage(i18n("Loading modules") + QStringLiteral("\n"), Qt::AlignHCenter | Qt::AlignBottom, Qt::white);
+
+    return 0;
+}
+
+#ifdef QSYSTRAY
+void IndicatorHelper::systrayIconHook(QSystemTrayIcon &systray)
+{
+    Q_UNUSED(systray);
+}
+#else
+void IndicatorHelper::systrayIconHook(KStatusNotifierItem &systray)
+{
+    const QString iconPath = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("icons"), QStandardPaths::LocateDirectory);
+    if (!iconPath.isNull()) {
+        systray.setIconByName(QStringLiteral("kdeconnectindicatordark"));
+    } else {
+        // We are in macOS dev env, just continue
+        qWarning() << "Fail to find indicator icon, continue anyway";
+    }
+}
+#endif

indicator/indicatorhelper_win.cpp

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2019 Weixuan XIAO <veyx.shaw@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <QFile>
+#include <QIcon>
+#include <QStandardPaths>
+
+#include "indicatorhelper.h"
+
+IndicatorHelper::IndicatorHelper() {}
+IndicatorHelper::~IndicatorHelper() {}
+
+void IndicatorHelper::preInit() {}
+
+void IndicatorHelper::postInit() {}
+
+void IndicatorHelper::iconPathHook() {}
+
+int IndicatorHelper::daemonHook(QProcess &kdeconnectd)
+{
+    kdeconnectd.start(QStringLiteral("kdeconnectd.exe"));
+    return 0;
+}
+
+#ifdef QSYSTRAY
+void IndicatorHelper::systrayIconHook(QSystemTrayIcon &systray)
+{
+    systray.setIcon(QIcon(QStandardPaths::locate(QStandardPaths::AppLocalDataLocation, QStringLiteral("icons/hicolor/scalable/apps/kdeconnectindicatorwin.svg"))));
+}
+#else
+void IndicatorHelper::systrayIconHook(KStatusNotifierItem &systray)
+{
+    Q_UNUSED(systray);
+}
+#endif

indicator/main.cpp

@@ -21,7 +21,6 @@
 #include <QApplication>
 #include <QProcess>
 #include <QThread>
-#include <QMessageBox>
 
 #ifdef QSYSTRAY
 #include <QSystemTrayIcon>
@@ -41,6 +40,8 @@
 
 #include <dbushelper.h>
 
+#include "indicatorhelper.h"
+
 int main(int argc, char** argv)
 {
     QApplication app(argc, argv);
@@ -52,63 +53,16 @@ int main(int argc, char** argv)
                      i18n("(C) 2016 Aleix Pol Gonzalez"));
     KAboutData::setApplicationData(about);
 
-#ifdef Q_OS_WIN
+    IndicatorHelper helper;
+
+    helper.preInit();
+
+    // Run Daemon initilization step
     QProcess kdeconnectd;
-    kdeconnectd.start(QStringLiteral("kdeconnectd.exe"));
-#endif
-
-#ifdef Q_OS_MAC
-    // Unset launchctl env, avoid block
-    DBusHelper::macosUnsetLaunchctlEnv();
-
-    // Start kdeconnectd
-    QProcess kdeconnectdProcess;
-    if (QFile::exists(QCoreApplication::applicationDirPath() + QStringLiteral("/kdeconnectd"))) {
-        kdeconnectdProcess.startDetached(QCoreApplication::applicationDirPath() + QStringLiteral("/kdeconnectd"));
-    } else if (QFile::exists(QString::fromLatin1(qgetenv("craftRoot")) + QStringLiteral("/../lib/libexec/kdeconnectd"))) {
-        kdeconnectdProcess.startDetached(QString::fromLatin1(qgetenv("craftRoot")) + QStringLiteral("/../lib/libexec/kdeconnectd"));
-    } else {
-        QMessageBox::critical(nullptr, i18n("KDE Connect"),
-                              i18n("Cannot find kdeconnectd"),
-                              QMessageBox::Abort,
-                              QMessageBox::Abort);
+    if (helper.daemonHook(kdeconnectd)) {
         return -1;
     }
 
-    // Wait for dbus daemon env
-    QProcess getLaunchdDBusEnv;
-    int retry = 0;
-    do {
-        getLaunchdDBusEnv.setProgram(QStringLiteral("launchctl"));
-        getLaunchdDBusEnv.setArguments({
-            QStringLiteral("getenv"),
-            QStringLiteral(KDECONNECT_SESSION_DBUS_LAUNCHD_ENV)
-        });
-        getLaunchdDBusEnv.start();
-        getLaunchdDBusEnv.waitForFinished();
-
-        QString launchdDBusEnv = QString::fromLocal8Bit(getLaunchdDBusEnv.readAllStandardOutput());
-
-        if (launchdDBusEnv.length() > 0) {
-            break;
-        } else if (retry >= 10) {
-            // Show a warning and exit
-            qCritical() << "Fail to get launchctl" << KDECONNECT_SESSION_DBUS_LAUNCHD_ENV << "env";
-
-            QMessageBox::critical(nullptr, i18n("KDE Connect"),
-                                  i18n("Cannot connect to DBus\n"
-                                  "KDE Connect will quit"),
-                                  QMessageBox::Abort,
-                                  QMessageBox::Abort);
-
-            return -1;
-        } else {
-            QThread::sleep(1);  // Retry after 1s
-            retry++;
-        }
-    } while(true);
-#endif
-
     KDBusService dbusService(KDBusService::Unique);
 
     DevicesModel model;
@@ -165,22 +119,12 @@ int main(int argc, char** argv)
     QObject::connect(&model, &DevicesModel::rowsInserted, &model, refreshMenu);
     QObject::connect(&model, &DevicesModel::rowsRemoved, &model, refreshMenu);
 
-#ifdef Q_OS_MAC
-    const QString iconPath = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("icons"), QStandardPaths::LocateDirectory);
-    if (!iconPath.isNull()) {
-        QStringList themeSearchPaths = QIcon::themeSearchPaths();
-        themeSearchPaths << iconPath;
-        QIcon::setThemeSearchPaths(themeSearchPaths);
-    }
-#endif
+    // Run icon to add icon path (if necessary)
+    helper.iconPathHook();
 
 #ifdef QSYSTRAY
     QSystemTrayIcon systray;
-#ifdef Q_OS_WIN
-    systray.setIcon(QIcon(QStandardPaths::locate(QStandardPaths::AppLocalDataLocation, QStringLiteral("icons/hicolor/scalable/apps/kdeconnectindicatorwin.svg"))));
-#else
-    systray.setIcon(QIcon::fromTheme(QStringLiteral("kdeconnectindicatordark")));
-#endif
+    helper.systrayIconHook(systray);
     systray.setVisible(true);
     systray.setToolTip(QStringLiteral("KDE Connect"));
     QObject::connect(&model, &DevicesModel::rowsChanged, &model, [&systray, &model]() {
@@ -190,16 +134,7 @@ int main(int argc, char** argv)
     systray.setContextMenu(menu);
 #else
     KStatusNotifierItem systray;
-#ifdef Q_OS_MAC
-    if (!iconPath.isNull()) {
-        systray.setIconByName(QStringLiteral("kdeconnectindicatordark"));
-    } else {
-        // We are in macOS dev env, just continue
-        qWarning() << "Fail to find indicator icon, continue anyway";
-    }
-#else
-    systray.setIconByName(QStringLiteral("kdeconnectindicatordark"));
-#endif
+    helper.systrayIconHook(systray);
     systray.setToolTip(QStringLiteral("kdeconnect"), QStringLiteral("KDE Connect"), QStringLiteral("KDE Connect"));
     systray.setCategory(KStatusNotifierItem::Communications);
     systray.setStatus(KStatusNotifierItem::Passive);
@@ -217,5 +152,8 @@ int main(int argc, char** argv)
 
     app.setQuitOnLastWindowClosed(false);
 
+    // Finish init
+    helper.postInit();
+
     return app.exec();
 }