allow one instance per skill

MycroftAI · Dec 13, 2019 · e1e2a82 · e1e2a82
1 parent eebe0be
commit e1e2a82
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -61,6 +61,7 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS I18n)
 if(NOT CMAKE_SYSTEM_NAME STREQUAL "Android")
     find_package(Qt5Widgets ${QT_MIN_VERSION} REQUIRED)
     find_package(KF5Plasma ${KF5_MIN_VERSION} REQUIRED)
+    find_package(KF5DBusAddons ${KF5_MIN_VERSION} REQUIRED)
     find_package(KF5KIO ${KF5_MIN_VERSION} REQUIRED) # FIXME look for "KIOWidgets" (KRun) explicitly
 endif()
 

diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt
@@ -20,6 +20,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Android")
 else()
 set(mycroft_gui_app_EXTRA_LIBS
         Qt5::Widgets
+        KF5::DBusAddons
     )
 endif()
 

diff --git a/application/main.cpp b/application/main.cpp
@@ -29,6 +29,7 @@
 #include <QGuiApplication>
 #else
 #include <QApplication>
+#include <KDBusService>
 #endif
 
 #include "speechintent.h"
@@ -67,6 +68,8 @@ int main(int argc, char *argv[])
     QApplication app(argc, argv);
 #endif
 
+    app.setApplicationName(QStringLiteral("mycroft.gui"));
+    app.setOrganizationDomain(QStringLiteral("kde.org"));
     app.setWindowIcon(QIcon::fromTheme(QStringLiteral("mycroft")));
 
     // NOTE: Have to manually implement a --help option because the parser.addHelpOption() would
@@ -85,6 +88,13 @@ int main(int argc, char *argv[])
     int height = parser.value(heightOption).toInt();
     bool maximize = parser.isSet(maximizeOption);
 
+#ifndef Q_OS_ANDROID
+    if (parser.isSet(skillOption)) {
+        app.setApplicationName(QStringLiteral("mycroft.gui.") + parser.value(skillOption));
+    }
+    KDBusService service(KDBusService::Unique);
+#endif
+
     QQmlApplicationEngine engine;
     engine.rootContext()->setContextProperty(QStringLiteral("deviceWidth"), width);
     engine.rootContext()->setContextProperty(QStringLiteral("deviceHeight"), height);
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Android") @@
     else()
     set(mycroft_gui_app_EXTRA_LIBS
             Qt5::Widgets
+            KF5::DBusAddons
         )
     endif()
@@ Expand Down @@