summaryrefslogtreecommitdiffstats
path: root/kcontrol
diff options
context:
space:
mode:
authorMavridis Philippe <mavridisf@gmail.com>2023-06-01 12:53:38 +0300
committerMavridis Philippe <mavridisf@gmail.com>2023-06-14 14:19:31 +0300
commit4e428e11c5858b5a2485af135cbb2fabd8a3522f (patch)
treeea5edb36e57eb9cbe0621c6b030d66b602c3c1d2 /kcontrol
parente4e948060df1bb40207cc62b0d231f3b147c7b16 (diff)
downloadtdebase-4e428e11c5858b5a2485af135cbb2fabd8a3522f.tar.gz
tdebase-4e428e11c5858b5a2485af135cbb2fabd8a3522f.zip
kxkb: re-add custom TDE switching shortcut
This commit fixes issue #342. Signed-off-by: Mavridis Philippe <mavridisf@gmail.com> (cherry picked from commit 22bb398b3ba83142bf49f6abf47081e5e9e11bef)
Diffstat (limited to 'kcontrol')
-rw-r--r--kcontrol/keys/keyconfig.cpp2
-rw-r--r--kcontrol/keys/main.cpp1
-rw-r--r--kcontrol/keys/shortcuts.cpp1
3 files changed, 4 insertions, 0 deletions
diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp
index 4ba5951dd..ee39447a1 100644
--- a/kcontrol/keys/keyconfig.cpp
+++ b/kcontrol/keys/keyconfig.cpp
@@ -66,6 +66,7 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone )
#include "../../kicker/taskbar/taskbarbindings.cpp"
#include "../../kdesktop/kdesktopbindings.cpp"
#include "../../klipper/klipperbindings.cpp"
+#include "../../kxkb/kxkbbindings.cpp"
#undef TDEShortcuts
KeyScheme = "Global Key Scheme";
KeySet = "Global Keys";
@@ -488,6 +489,7 @@ void KKeyModule::init()
#include "../../kicker/kicker/core/kickerbindings.cpp"
#include "../../kicker/taskbar/taskbarbindings.cpp"
#include "../../kdesktop/kdesktopbindings.cpp"
+#include "../../kxkb/kxkbbindings.cpp"
#undef TDEShortcuts
kdDebug(125) << "KKeyModule::init() - Read Config Bindings\n";
diff --git a/kcontrol/keys/main.cpp b/kcontrol/keys/main.cpp
index 53daa462e..d002b667f 100644
--- a/kcontrol/keys/main.cpp
+++ b/kcontrol/keys/main.cpp
@@ -190,6 +190,7 @@ extern "C"
#include "../../kicker/kicker/core/kickerbindings.cpp"
#include "../../kicker/taskbar/taskbarbindings.cpp"
#include "../../kdesktop/kdesktopbindings.cpp"
+#include "../../kxkb/kxkbbindings.cpp"
// Write all the global keys to kdeglobals.
// This is needed to be able to check for conflicts with global keys in app's keyconfig
diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp
index e350b1e22..e7f599dda 100644
--- a/kcontrol/keys/shortcuts.cpp
+++ b/kcontrol/keys/shortcuts.cpp
@@ -116,6 +116,7 @@ void ShortcutsModule::initGUI()
#include "../../kicker/taskbar/taskbarbindings.cpp"
#include "../../kdesktop/kdesktopbindings.cpp"
#include "../../klipper/klipperbindings.cpp"
+#include "../../kxkb/kxkbbindings.cpp"
kdDebug(125) << "B-----------" << endl;
m_actionsSequence.init( m_actionsGeneral );