aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Edmundson <[email protected]>2018-10-26 12:14:37 +0100
committerDavid Edmundson <[email protected]>2018-10-30 21:16:20 +0000
commitce32b031f5a09cb0530a72e7602490cb05637ac0 (patch)
tree9c1de094f3a3f9a00aee4eca53cab05b8afb73c4
parentbdcd42d85823de590c0eec3407e8afefc52affb4 (diff)
[kcmkwin/kwindesktop] Fix global shortcut's display name for kwin changing
Summary: KGlobalAcceld stores actions grouped by ID and a single display name. When an action with a given id changes, the display names change for all actions in that group. The KCM sets the ID to "kwin" but does not explicitly set a display name. This means it is automatically deduced which will be kcmshell or systemsettings. The end result is all kwin shortcuts get renamed in system setting's global shortcuts UI until kwin is restarted. This patch explicitly sets the dispay name. BUG: 400248 Fixed-in: 5.15.0 Test Plan: Changed virtual desktops Checked global shortcut settings still listed kwin as kwin Reviewers: #kwin, graesslin Reviewed By: #kwin, graesslin Subscribers: graesslin, kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D16418
-rw-r--r--kcmkwin/kwindesktop/main.cpp2
-rw-r--r--kcmkwin/kwintabbox/main.cpp1
2 files changed, 3 insertions, 0 deletions
diff --git a/kcmkwin/kwindesktop/main.cpp b/kcmkwin/kwindesktop/main.cpp
index 31b8e2e..9338794 100644
--- a/kcmkwin/kwindesktop/main.cpp
+++ b/kcmkwin/kwindesktop/main.cpp
@@ -90,10 +90,12 @@ void KWinDesktopConfig::init()
// Shortcut config. The shortcut belongs to the component "kwin"!
m_actionCollection = new KActionCollection(this, QStringLiteral("kwin"));
+ m_actionCollection->setComponentDisplayName(i18n("KWin"));
m_actionCollection->setConfigGroup("Desktop Switching");
m_actionCollection->setConfigGlobal(true);
m_switchDesktopCollection = new KActionCollection(this, QStringLiteral("kwin"));
+ m_switchDesktopCollection->setComponentDisplayName(i18n("KWin"));
m_switchDesktopCollection->setConfigGroup("Desktop Switching");
m_switchDesktopCollection->setConfigGlobal(true);
diff --git a/kcmkwin/kwintabbox/main.cpp b/kcmkwin/kwintabbox/main.cpp
index 82e72fe..0017911 100644
--- a/kcmkwin/kwintabbox/main.cpp
+++ b/kcmkwin/kwintabbox/main.cpp
@@ -91,6 +91,7 @@ KWinTabBoxConfig::KWinTabBoxConfig(QWidget* parent, const QVariantList& args)
// Shortcut config. The shortcut belongs to the component "kwin"!
m_actionCollection = new KActionCollection(this, QStringLiteral("kwin"));
+ m_actionCollection->setComponentDisplayName(i18n("KWin"));
m_actionCollection->setConfigGroup("Navigation");
m_actionCollection->setConfigGlobal(true);
QAction* a;