File Enabled-the-global-shortcuts-plugin-by-default.... of Package kactivitymanagerd

Overview Repositories Revisions Requests Users Attributes Meta

File Enabled-the-global-shortcuts-plugin-by-default.patch of Package kactivitymanagerd

From 23d2d2f5191c5f1253a9540ca5f991fc46068217 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20=C4=8Cuki=C4=87?= <ivan.cukic@kde.org>
Date: Tue, 7 Aug 2018 09:53:26 +0200
Subject: [PATCH] Enabled the global shortcuts plugin by default

---
 src/service/Application.cpp                              | 5 +++++
 src/service/Application.h                                | 1 +
 .../plugins/globalshortcuts/GlobalShortcutsPlugin.cpp    | 9 +++++----
 .../plugins/globalshortcuts/GlobalShortcutsPlugin.h      | 2 +-
 .../kactivitymanagerd-plugin-globalshortcuts.json        | 2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/service/Application.cpp b/src/service/Application.cpp
index 84ccee5..80d2753 100644
--- a/src/service/Application.cpp
+++ b/src/service/Application.cpp
@@ -423,3 +423,8 @@ int main(int argc, char **argv)
     }
 }
 
+QStringList Application::loadedPlugins() const
+{
+    return d->pluginIds;
+}
+
diff --git a/src/service/Application.h b/src/service/Application.h
index bf55810..e240bb9 100644
--- a/src/service/Application.h
+++ b/src/service/Application.h
@@ -58,6 +58,7 @@ public Q_SLOTS:
     void quit();
     QString serviceVersion() const;
     bool loadPlugin(const QString &plugin);
+    QStringList loadedPlugins() const;
 
 private Q_SLOTS:
     void init();
diff --git a/src/service/plugins/globalshortcuts/GlobalShortcutsPlugin.cpp b/src/service/plugins/globalshortcuts/GlobalShortcutsPlugin.cpp
index 3915cad..21ffe31 100644
--- a/src/service/plugins/globalshortcuts/GlobalShortcutsPlugin.cpp
+++ b/src/service/plugins/globalshortcuts/GlobalShortcutsPlugin.cpp
@@ -39,6 +39,9 @@ GlobalShortcutsPlugin::GlobalShortcutsPlugin(QObject *parent, const QVariantList
     , m_actionCollection(new KActionCollection(this))
 {
     Q_UNUSED(args);
+
+    m_actionCollection->setComponentName("ActivityManager");
+    m_actionCollection->setComponentDisplayName(i18n("Activity Manager"));
 }
 
 GlobalShortcutsPlugin::~GlobalShortcutsPlugin()
@@ -69,8 +72,6 @@ bool GlobalShortcutsPlugin::init(QHash<QString, QObject *> &modules)
 
     m_actionCollection->readSettings();
 
-    activityRemoved();
-
     return true;
 }
 
@@ -88,12 +89,12 @@ void GlobalShortcutsPlugin::activityAdded(const QString &activity)
         objectNamePattern.arg(activity));
 
     action->setText(i18nc("@action", "Switch to activity \"%1\"", activityName(activity)));
-    KGlobalAccel::self()->setGlobalShortcut(action, QList<QKeySequence>{});
+    KGlobalAccel::self()->setDefaultShortcut(action, QList<QKeySequence>{});
 
     connect(action, SIGNAL(triggered()), m_signalMapper, SLOT(map()));
     m_signalMapper->setMapping(action, activity);
 
-    m_actionCollection->writeSettings();
+    // m_actionCollection->writeSettings();
 }
 
 QString GlobalShortcutsPlugin::activityForAction(QAction *action) const
diff --git a/src/service/plugins/globalshortcuts/GlobalShortcutsPlugin.h b/src/service/plugins/globalshortcuts/GlobalShortcutsPlugin.h
index d4285c2..b1d3bbc 100644
--- a/src/service/plugins/globalshortcuts/GlobalShortcutsPlugin.h
+++ b/src/service/plugins/globalshortcuts/GlobalShortcutsPlugin.h
@@ -37,7 +37,7 @@ public:
 
 private Q_SLOTS:
     void activityAdded(const QString &activity);
-    void activityRemoved(const QString &activity = QString());
+    void activityRemoved(const QString &activity);
     void activityChanged(const QString &activity);
 
 private:
diff --git a/src/service/plugins/globalshortcuts/kactivitymanagerd-plugin-globalshortcuts.json b/src/service/plugins/globalshortcuts/kactivitymanagerd-plugin-globalshortcuts.json
index 6713ac8..bd0f3b5 100644
--- a/src/service/plugins/globalshortcuts/kactivitymanagerd-plugin-globalshortcuts.json
+++ b/src/service/plugins/globalshortcuts/kactivitymanagerd-plugin-globalshortcuts.json
@@ -46,7 +46,7 @@
         "Description[x-test]": "xxAdds global keyboard shortcuts for activity switchingxx",
         "Description[zh_CN]": "添加活动切换的全局键盘快捷方式",
         "Description[zh_TW]": "新增活動切換的全域快速鍵",
-        "EnabledByDefault": false,
+        "EnabledByDefault": true,
         "Icon": "configure-shortcuts",
         "Id": "org.kde.ActivityManager.GlobalShortcuts",
         "License": "GPL",
-- 
GitLab

Places

File Enabled-the-global-shortcuts-plugin-by-default.patch of Package kactivitymanagerd

Places