From 1d97935a442e66e276336fb36eed1a6e399f77aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Wed, 2 Aug 2006 09:20:29 +0000 Subject: [PATCH] Hardcode only 3-modifiers shortcuts in the code, the rest should be in kcontrol/keys schemes. (http://lists.kde.org/?l=kde-core-devel&m=115445034006353&w=2) svn path=/trunk/KDE/kdebase/workspace/; revision=568780 --- kwinbindings.cpp | 62 ++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/kwinbindings.cpp b/kwinbindings.cpp index cf728d10bd..cb971e80ea 100644 --- a/kwinbindings.cpp +++ b/kwinbindings.cpp @@ -24,25 +24,25 @@ new KAction( i18n("Navigation"), actionCollection, "Group:Navigation" ); DEF( I18N_NOOP("Walk Through Windows"), Qt::ALT+Qt::Key_Tab, slotWalkThroughWindows() ); DEF( I18N_NOOP("Walk Through Windows (Reverse)"), Qt::ALT+Qt::SHIFT+Qt::Key_Tab, slotWalkBackThroughWindows() ); - DEF( I18N_NOOP("Walk Through Desktops"), Qt::META+Qt::Key_Tab, slotWalkThroughDesktops() ); - DEF( I18N_NOOP("Walk Through Desktops (Reverse)"), Qt::META+Qt::SHIFT+Qt::Key_Tab, slotWalkBackThroughDesktops() ); + DEF( I18N_NOOP("Walk Through Desktops"), 0, slotWalkThroughDesktops() ); + DEF( I18N_NOOP("Walk Through Desktops (Reverse)"), 0, slotWalkBackThroughDesktops() ); DEF( I18N_NOOP("Walk Through Desktop List"), 0, slotWalkThroughDesktopList() ); DEF( I18N_NOOP("Walk Through Desktop List (Reverse)"), 0, slotWalkBackThroughDesktopList() ); new KAction( i18n("Windows"), actionCollection, "Group:Windows" ); - DEF( I18N_NOOP("Window Operations Menu"), Qt::ALT+Qt::Key_Menu, slotWindowOperations() ); + DEF( I18N_NOOP("Window Operations Menu"), Qt::ALT+Qt::Key_F3, slotWindowOperations() ); DEF2( "Window Close", I18N_NOOP("Close Window"), - "Alt+Escape;Alt+F4", slotWindowClose() ); + Qt::ALT+Qt::Key_F4, slotWindowClose() ); DEF2( "Window Maximize", I18N_NOOP("Maximize Window"), - Qt::META+Qt::Key_Plus, slotWindowMaximize() ); + 0, slotWindowMaximize() ); DEF2( "Window Maximize Vertical", I18N_NOOP("Maximize Window Vertically"), - Qt::META+Qt::Key_Bar, slotWindowMaximizeVertical() ); + 0, slotWindowMaximizeVertical() ); DEF2( "Window Maximize Horizontal", I18N_NOOP("Maximize Window Horizontally"), - Qt::META+Qt::Key_Equal, slotWindowMaximizeHorizontal() ); + 0, slotWindowMaximizeHorizontal() ); DEF2( "Window Minimize", I18N_NOOP("Minimize Window"), - Qt::META+Qt::Key_Minus, slotWindowMinimize() ); + 0, slotWindowMinimize() ); DEF2( "Window Shade", I18N_NOOP("Shade Window"), - Qt::META+Qt::Key_Underscore, slotWindowShade() ); + 0, slotWindowShade() ); DEF2( "Window Move", I18N_NOOP("Move Window"), 0, slotWindowMove() ); DEF2( "Window Resize", I18N_NOOP("Resize Window"), @@ -84,16 +84,16 @@ new KAction( i18n("Window & Desktop"), actionCollection, "Group:Window Desktop" ); DEF2( "Window On All Desktops", I18N_NOOP("Keep Window on All Desktops"), 0, slotWindowOnAllDesktops() ); - DEF( I18N_NOOP("Window to Desktop 1"), Qt::META+Qt::ALT+Qt::Key_F1, slotWindowToDesktop1() ); - DEF( I18N_NOOP("Window to Desktop 2"), Qt::META+Qt::ALT+Qt::Key_F2, slotWindowToDesktop2() ); - DEF( I18N_NOOP("Window to Desktop 3"), Qt::META+Qt::ALT+Qt::Key_F3, slotWindowToDesktop3() ); - DEF( I18N_NOOP("Window to Desktop 4"), Qt::META+Qt::ALT+Qt::Key_F4, slotWindowToDesktop4() ); - DEF( I18N_NOOP("Window to Desktop 5"), Qt::META+Qt::ALT+Qt::Key_F5, slotWindowToDesktop5() ); - DEF( I18N_NOOP("Window to Desktop 6"), Qt::META+Qt::ALT+Qt::Key_F6, slotWindowToDesktop6() ); - DEF( I18N_NOOP("Window to Desktop 7"), Qt::META+Qt::ALT+Qt::Key_F7, slotWindowToDesktop7() ); - DEF( I18N_NOOP("Window to Desktop 8"), Qt::META+Qt::ALT+Qt::Key_F8, slotWindowToDesktop8() ); - DEF( I18N_NOOP("Window to Desktop 9"), Qt::META+Qt::ALT+Qt::Key_F9, slotWindowToDesktop9() ); - DEF( I18N_NOOP("Window to Desktop 10"), Qt::META+Qt::ALT+Qt::Key_F10, slotWindowToDesktop10() ); + DEF( I18N_NOOP("Window to Desktop 1"), 0, slotWindowToDesktop1() ); + DEF( I18N_NOOP("Window to Desktop 2"), 0, slotWindowToDesktop2() ); + DEF( I18N_NOOP("Window to Desktop 3"), 0, slotWindowToDesktop3() ); + DEF( I18N_NOOP("Window to Desktop 4"), 0, slotWindowToDesktop4() ); + DEF( I18N_NOOP("Window to Desktop 5"), 0, slotWindowToDesktop5() ); + DEF( I18N_NOOP("Window to Desktop 6"), 0, slotWindowToDesktop6() ); + DEF( I18N_NOOP("Window to Desktop 7"), 0, slotWindowToDesktop7() ); + DEF( I18N_NOOP("Window to Desktop 8"), 0, slotWindowToDesktop8() ); + DEF( I18N_NOOP("Window to Desktop 9"), 0, slotWindowToDesktop9() ); + DEF( I18N_NOOP("Window to Desktop 10"), 0, slotWindowToDesktop10() ); DEF( I18N_NOOP("Window to Desktop 11"), 0, slotWindowToDesktop11() ); DEF( I18N_NOOP("Window to Desktop 12"), 0, slotWindowToDesktop12() ); DEF( I18N_NOOP("Window to Desktop 13"), 0, slotWindowToDesktop13() ); @@ -112,16 +112,16 @@ DEF( I18N_NOOP("Window One Desktop Down"), 0, slotWindowToDesktopDown() ); new KAction( i18n("Desktop Switching"), actionCollection, "Group:Desktop Switching" ); - DEF( I18N_NOOP("Switch to Desktop 1"), Qt::META+Qt::Key_F1, slotSwitchToDesktop1() ); - DEF( I18N_NOOP("Switch to Desktop 2"), Qt::META+Qt::Key_F2, slotSwitchToDesktop2() ); - DEF( I18N_NOOP("Switch to Desktop 3"), Qt::META+Qt::Key_F3, slotSwitchToDesktop3() ); - DEF( I18N_NOOP("Switch to Desktop 4"), Qt::META+Qt::Key_F4, slotSwitchToDesktop4() ); - DEF( I18N_NOOP("Switch to Desktop 5"), Qt::META+Qt::Key_F5, slotSwitchToDesktop5() ); - DEF( I18N_NOOP("Switch to Desktop 6"), Qt::META+Qt::Key_F6, slotSwitchToDesktop6() ); - DEF( I18N_NOOP("Switch to Desktop 7"), Qt::META+Qt::Key_F7, slotSwitchToDesktop7() ); - DEF( I18N_NOOP("Switch to Desktop 8"), Qt::META+Qt::Key_F8, slotSwitchToDesktop8() ); - DEF( I18N_NOOP("Switch to Desktop 9"), Qt::META+Qt::Key_F9, slotSwitchToDesktop9() ); - DEF( I18N_NOOP("Switch to Desktop 10"), Qt::META+Qt::Key_F10, slotSwitchToDesktop10() ); + DEF( I18N_NOOP("Switch to Desktop 1"), Qt::CTRL+Qt::Key_F1, slotSwitchToDesktop1() ); + DEF( I18N_NOOP("Switch to Desktop 2"), Qt::CTRL+Qt::Key_F2, slotSwitchToDesktop2() ); + DEF( I18N_NOOP("Switch to Desktop 3"), Qt::CTRL+Qt::Key_F3, slotSwitchToDesktop3() ); + DEF( I18N_NOOP("Switch to Desktop 4"), Qt::CTRL+Qt::Key_F4, slotSwitchToDesktop4() ); + DEF( I18N_NOOP("Switch to Desktop 5"), Qt::CTRL+Qt::Key_F5, slotSwitchToDesktop5() ); + DEF( I18N_NOOP("Switch to Desktop 6"), Qt::CTRL+Qt::Key_F6, slotSwitchToDesktop6() ); + DEF( I18N_NOOP("Switch to Desktop 7"), Qt::CTRL+Qt::Key_F7, slotSwitchToDesktop7() ); + DEF( I18N_NOOP("Switch to Desktop 8"), Qt::CTRL+Qt::Key_F8, slotSwitchToDesktop8() ); + DEF( I18N_NOOP("Switch to Desktop 9"), Qt::CTRL+Qt::Key_F9, slotSwitchToDesktop9() ); + DEF( I18N_NOOP("Switch to Desktop 10"), Qt::CTRL+Qt::Key_F10, slotSwitchToDesktop10() ); DEF( I18N_NOOP("Switch to Desktop 11"), Qt::CTRL+Qt::Key_F11, slotSwitchToDesktop11() ); DEF( I18N_NOOP("Switch to Desktop 12"), Qt::CTRL+Qt::Key_F12, slotSwitchToDesktop12() ); DEF( I18N_NOOP("Switch to Desktop 13"), Qt::CTRL+Qt::SHIFT+Qt::Key_F1, slotSwitchToDesktop13() ); @@ -141,9 +141,9 @@ new KAction( i18n("Miscellaneous"), actionCollection, "Group:Miscellaneous" ); DEF( I18N_NOOP("Mouse Emulation"), Qt::ALT+Qt::Key_F12, slotMouseEmulation() ); - DEF( I18N_NOOP("Kill Window"), Qt::META+Qt::CTRL+Qt::Key_Delete, slotKillWindow() ); + DEF( I18N_NOOP("Kill Window"), Qt::CTRL+Qt::Key_Delete, slotKillWindow() ); DEF( I18N_NOOP("Window Screenshot"), Qt::ALT+Qt::Key_Print, slotGrabWindow() ); - DEF( I18N_NOOP("Desktop Screenshot"), Qt::META+Qt::Key_Print, slotGrabDesktop() ); + DEF( I18N_NOOP("Desktop Screenshot"), Qt::CTRL+Qt::Key_Print, slotGrabDesktop() ); DEF( I18N_NOOP("Block Global Shortcuts"), 0, slotDisableGlobalShortcuts()); /*This belongs in taskbar rather than here, so it'll have to wait until after 2.2 is done.