Changeset View
Changeset View
Standalone View
Standalone View
useractions.cpp
Show All 28 Lines | |||||
29 | 29 | | |||
30 | /////////////////////////////////////////////////////////////////////////////// | 30 | /////////////////////////////////////////////////////////////////////////////// | ||
31 | // NOTE: if you change the menu, keep kde-workspace/libs/taskmanager/taskactions.cpp in sync | 31 | // NOTE: if you change the menu, keep kde-workspace/libs/taskmanager/taskactions.cpp in sync | ||
32 | ////////////////////////////////////////////////////////////////////////////// | 32 | ////////////////////////////////////////////////////////////////////////////// | ||
33 | 33 | | |||
34 | #include "useractions.h" | 34 | #include "useractions.h" | ||
35 | #include "cursor.h" | 35 | #include "cursor.h" | ||
36 | #include "client.h" | 36 | #include "client.h" | ||
37 | #include "colorcorrection/manager.h" | ||||
37 | #include "composite.h" | 38 | #include "composite.h" | ||
38 | #include "input.h" | 39 | #include "input.h" | ||
39 | #include "workspace.h" | 40 | #include "workspace.h" | ||
40 | #include "effects.h" | 41 | #include "effects.h" | ||
41 | #include "platform.h" | 42 | #include "platform.h" | ||
42 | #include "screens.h" | 43 | #include "screens.h" | ||
43 | #include "shell_client.h" | 44 | #include "shell_client.h" | ||
44 | #include "virtualdesktops.h" | 45 | #include "virtualdesktops.h" | ||
▲ Show 20 Lines • Show All 1066 Lines • ▼ Show 20 Line(s) | |||||
1111 | void Workspace::initShortcuts() | 1112 | void Workspace::initShortcuts() | ||
1112 | { | 1113 | { | ||
1113 | #define IN_KWIN | 1114 | #define IN_KWIN | ||
1114 | #include "kwinbindings.cpp" | 1115 | #include "kwinbindings.cpp" | ||
1115 | #ifdef KWIN_BUILD_TABBOX | 1116 | #ifdef KWIN_BUILD_TABBOX | ||
1116 | TabBox::TabBox::self()->initShortcuts(); | 1117 | TabBox::TabBox::self()->initShortcuts(); | ||
1117 | #endif | 1118 | #endif | ||
1118 | VirtualDesktopManager::self()->initShortcuts(); | 1119 | VirtualDesktopManager::self()->initShortcuts(); | ||
1120 | kwinApp()->platform()->colorCorrectManager()->initShortcuts(); | ||||
1119 | m_userActionsMenu->discard(); // so that it's recreated next time | 1121 | m_userActionsMenu->discard(); // so that it's recreated next time | ||
1120 | } | 1122 | } | ||
1121 | 1123 | | |||
1122 | void Workspace::setupWindowShortcut(AbstractClient* c) | 1124 | void Workspace::setupWindowShortcut(AbstractClient* c) | ||
1123 | { | 1125 | { | ||
1124 | assert(client_keys_dialog == NULL); | 1126 | assert(client_keys_dialog == NULL); | ||
1125 | // TODO: PORT ME (KGlobalAccel related) | 1127 | // TODO: PORT ME (KGlobalAccel related) | ||
1126 | //keys->setEnabled( false ); | 1128 | //keys->setEnabled( false ); | ||
▲ Show 20 Lines • Show All 798 Lines • Show Last 20 Lines |