diff --git a/kdeui/shortcuts/kstandardshortcut.cpp b/kdeui/shortcuts/kstandardshortcut.cpp index f1249f95..cd013987 100644 --- a/kdeui/shortcuts/kstandardshortcut.cpp +++ b/kdeui/shortcuts/kstandardshortcut.cpp @@ -109,16 +109,16 @@ static KStandardShortcutInfo g_infoStandardShortcut[] = { Replace , "Replace" , I18N_NOOP2("@action", "Replace") , CTRL(R) , 0 , KShortcut(), false }, //Group Navigation - { Home , "Home" , I18N_NOOP2("@action Go to main page" , "Home") , ALT(Home) , Qt::Key_HomePage , KShortcut(), false }, + { Home , "Home" , I18N_NOOP2("@action Go to main page" , "Home") , ALT(Home) , 0 , KShortcut(), false }, { Begin , "Begin" , I18N_NOOP2("@action Beginning of document", "Begin") , CTRL(Home) , 0 , KShortcut(), false }, { End , "End" , I18N_NOOP2("@action End of document" , "End") , CTRL(End) , 0 , KShortcut(), false }, { Prior , "Prior" , I18N_NOOP2("@action" , "Prior") , Qt::Key_PageUp , 0 , KShortcut(), false }, { Next , "Next" , I18N_NOOP2("@action Opposite to Prior" , "Next") , Qt::Key_PageDown, 0 , KShortcut(), false }, { Up , "Up" , I18N_NOOP2("@action" , "Up") , ALT(Up) , 0 , KShortcut(), false }, - { Back , "Back" , I18N_NOOP2("@action" , "Back") , ALT(Left) , Qt::Key_Back , KShortcut(), false }, - { Forward , "Forward" , I18N_NOOP2("@action" , "Forward") , ALT(Right) , Qt::Key_Forward , KShortcut(), false }, - { Reload , "Reload" , I18N_NOOP2("@action" , "Reload") , Qt::Key_F5 , Qt::Key_Refresh , KShortcut(), false }, + { Back , "Back" , I18N_NOOP2("@action" , "Back") , ALT(Left) , 0 , KShortcut(), false }, + { Forward , "Forward" , I18N_NOOP2("@action" , "Forward") , ALT(Right) , 0 , KShortcut(), false }, + { Reload , "Reload" , I18N_NOOP2("@action" , "Reload") , Qt::Key_F5 , 0 , KShortcut(), false }, { BeginningOfLine, "BeginningOfLine" , I18N_NOOP2("@action" , "Beginning of Line") , Qt::Key_Home , 0 , KShortcut(), false }, { EndOfLine , "EndOfLine" , I18N_NOOP2("@action" , "End of Line") , Qt::Key_End , 0 , KShortcut(), false }, diff --git a/kdeui/util/kkeyserver.cpp b/kdeui/util/kkeyserver.cpp index 0a45cd5c..9b276d50 100644 --- a/kdeui/util/kkeyserver.cpp +++ b/kdeui/util/kkeyserver.cpp @@ -149,137 +149,8 @@ bool isShiftAsModifierAllowed( int keyQt ) case Qt::Key_CapsLock: case Qt::Key_NumLock: case Qt::Key_Help: - case Qt::Key_Back: - case Qt::Key_Forward: - case Qt::Key_Stop: - case Qt::Key_Refresh: - case Qt::Key_Favorites: - case Qt::Key_LaunchMedia: - case Qt::Key_OpenUrl: - case Qt::Key_HomePage: - case Qt::Key_Search: - case Qt::Key_VolumeDown: - case Qt::Key_VolumeMute: - case Qt::Key_VolumeUp: - case Qt::Key_MediaPlay: - case Qt::Key_MediaStop: - case Qt::Key_MediaPrevious: - case Qt::Key_MediaNext: - case Qt::Key_MediaRecord: - case Qt::Key_MediaPause: - case Qt::Key_LaunchMail: - case Qt::Key_Calculator: - case Qt::Key_Memo: - case Qt::Key_ToDoList: - case Qt::Key_Calendar: - case Qt::Key_PowerDown: - case Qt::Key_ContrastAdjust: - case Qt::Key_Standby: - case Qt::Key_MonBrightnessUp: - case Qt::Key_MonBrightnessDown: - case Qt::Key_KeyboardLightOnOff: - case Qt::Key_KeyboardBrightnessUp: - case Qt::Key_KeyboardBrightnessDown: - case Qt::Key_PowerOff: - case Qt::Key_WakeUp: - case Qt::Key_Eject: - case Qt::Key_ScreenSaver: - case Qt::Key_WWW: - case Qt::Key_Sleep: - case Qt::Key_LightBulb: - case Qt::Key_Shop: - case Qt::Key_History: - case Qt::Key_AddFavorite: - case Qt::Key_HotLinks: - case Qt::Key_BrightnessAdjust: - case Qt::Key_Finance: - case Qt::Key_Community: - case Qt::Key_AudioRewind: - case Qt::Key_BackForward: - case Qt::Key_ApplicationLeft: - case Qt::Key_ApplicationRight: - case Qt::Key_Book: - case Qt::Key_CD: case Qt::Key_Clear: - case Qt::Key_ClearGrab: - case Qt::Key_Close: - case Qt::Key_Copy: - case Qt::Key_Cut: - case Qt::Key_Display: - case Qt::Key_DOS: - case Qt::Key_Documents: - case Qt::Key_Excel: - case Qt::Key_Explorer: - case Qt::Key_Game: - case Qt::Key_Go: - case Qt::Key_iTouch: - case Qt::Key_LogOff: - case Qt::Key_Market: - case Qt::Key_Meeting: - case Qt::Key_MenuKB: - case Qt::Key_MenuPB: - case Qt::Key_MySites: - case Qt::Key_News: - case Qt::Key_OfficeHome: - case Qt::Key_Option: - case Qt::Key_Paste: - case Qt::Key_Phone: - case Qt::Key_Reply: - case Qt::Key_Reload: - case Qt::Key_RotateWindows: - case Qt::Key_RotationPB: - case Qt::Key_RotationKB: - case Qt::Key_Save: - case Qt::Key_Send: - case Qt::Key_Spell: - case Qt::Key_SplitScreen: - case Qt::Key_Support: - case Qt::Key_TaskPane: - case Qt::Key_Terminal: - case Qt::Key_Tools: - case Qt::Key_Travel: - case Qt::Key_Video: - case Qt::Key_Word: - case Qt::Key_Xfer: - case Qt::Key_ZoomIn: - case Qt::Key_ZoomOut: - case Qt::Key_Away: - case Qt::Key_Messenger: - case Qt::Key_WebCam: - case Qt::Key_MailForward: - case Qt::Key_Pictures: - case Qt::Key_Music: - case Qt::Key_Battery: - case Qt::Key_Bluetooth: - case Qt::Key_WLAN: - case Qt::Key_UWB: - case Qt::Key_AudioForward: - case Qt::Key_AudioRepeat: - case Qt::Key_AudioRandomPlay: - case Qt::Key_Subtitle: - case Qt::Key_AudioCycleTrack: - case Qt::Key_Time: case Qt::Key_Select: - case Qt::Key_View: - case Qt::Key_TopMenu: - case Qt::Key_Suspend: - case Qt::Key_Hibernate: - case Qt::Key_Launch0: - case Qt::Key_Launch1: - case Qt::Key_Launch2: - case Qt::Key_Launch3: - case Qt::Key_Launch4: - case Qt::Key_Launch5: - case Qt::Key_Launch6: - case Qt::Key_Launch7: - case Qt::Key_Launch8: - case Qt::Key_Launch9: - case Qt::Key_LaunchA: - case Qt::Key_LaunchB: - case Qt::Key_LaunchC: - case Qt::Key_LaunchD: - case Qt::Key_LaunchE: - case Qt::Key_LaunchF: return true; default: diff --git a/kdeui/util/kkeyserver_x11.cpp b/kdeui/util/kkeyserver_x11.cpp index f05c6de7..f417552c 100644 --- a/kdeui/util/kkeyserver_x11.cpp +++ b/kdeui/util/kkeyserver_x11.cpp @@ -175,137 +175,9 @@ static const TransKey g_rgQtToSymX[] = { '+', XK_KP_Add }, { Qt::Key_Return, XK_KP_Enter }, - // All of the stuff below really has to match qkeymapper_x11.cpp in Qt! - { Qt::Key_Back, XF86XK_Back }, - { Qt::Key_Forward, XF86XK_Forward }, - { Qt::Key_Stop, XF86XK_Stop }, - { Qt::Key_Refresh, XF86XK_Refresh }, - { Qt::Key_Favorites, XF86XK_Favorites }, - { Qt::Key_LaunchMedia, XF86XK_AudioMedia }, - { Qt::Key_OpenUrl, XF86XK_OpenURL }, - { Qt::Key_HomePage, XF86XK_HomePage }, - { Qt::Key_Search, XF86XK_Search }, - { Qt::Key_VolumeDown, XF86XK_AudioLowerVolume }, - { Qt::Key_VolumeMute, XF86XK_AudioMute }, - { Qt::Key_VolumeUp, XF86XK_AudioRaiseVolume }, - { Qt::Key_MediaPlay, XF86XK_AudioPlay }, - { Qt::Key_MediaStop, XF86XK_AudioStop }, - { Qt::Key_MediaPrevious, XF86XK_AudioPrev }, - { Qt::Key_MediaNext, XF86XK_AudioNext }, - { Qt::Key_MediaRecord, XF86XK_AudioRecord }, - { Qt::Key_LaunchMail, XF86XK_Mail }, - { Qt::Key_Memo, XF86XK_Memo }, - { Qt::Key_ToDoList, XF86XK_ToDoList }, - { Qt::Key_Calendar, XF86XK_Calendar }, - { Qt::Key_PowerDown, XF86XK_PowerDown }, - { Qt::Key_ContrastAdjust, XF86XK_ContrastAdjust }, - { Qt::Key_Standby, XF86XK_Standby }, - { Qt::Key_MonBrightnessUp, XF86XK_MonBrightnessUp }, - { Qt::Key_MonBrightnessDown, XF86XK_MonBrightnessDown }, - { Qt::Key_KeyboardLightOnOff, XF86XK_KbdLightOnOff }, - { Qt::Key_KeyboardBrightnessUp, XF86XK_KbdBrightnessUp }, - { Qt::Key_KeyboardBrightnessDown, XF86XK_KbdBrightnessDown }, - { Qt::Key_PowerOff, XF86XK_PowerOff }, - { Qt::Key_WakeUp, XF86XK_WakeUp }, - { Qt::Key_Eject, XF86XK_Eject }, - { Qt::Key_ScreenSaver, XF86XK_ScreenSaver }, - { Qt::Key_WWW, XF86XK_WWW }, - { Qt::Key_Sleep, XF86XK_Sleep }, - { Qt::Key_LightBulb, XF86XK_LightBulb }, - { Qt::Key_Shop, XF86XK_Shop }, - { Qt::Key_History, XF86XK_History }, - { Qt::Key_AddFavorite, XF86XK_AddFavorite }, - { Qt::Key_HotLinks, XF86XK_HotLinks }, - { Qt::Key_BrightnessAdjust, XF86XK_BrightnessAdjust }, - { Qt::Key_Finance, XF86XK_Finance }, - { Qt::Key_Community, XF86XK_Community }, - { Qt::Key_AudioRewind, XF86XK_AudioRewind }, - { Qt::Key_BackForward, XF86XK_BackForward }, - { Qt::Key_ApplicationLeft, XF86XK_ApplicationLeft }, - { Qt::Key_ApplicationRight, XF86XK_ApplicationRight }, - { Qt::Key_Book, XF86XK_Book }, - { Qt::Key_CD, XF86XK_CD }, - { Qt::Key_Calculator, XF86XK_Calculater }, + // All of the stuff below really has to match qkeymapper_x11.cpp in Katie!s { Qt::Key_Clear, XF86XK_Clear }, - { Qt::Key_ClearGrab, XF86XK_ClearGrab }, - { Qt::Key_Close, XF86XK_Close }, - { Qt::Key_Copy, XF86XK_Copy }, - { Qt::Key_Cut, XF86XK_Cut }, - { Qt::Key_Display, XF86XK_Display }, - { Qt::Key_DOS, XF86XK_DOS }, - { Qt::Key_Documents, XF86XK_Documents }, - { Qt::Key_Excel, XF86XK_Excel }, - { Qt::Key_Explorer, XF86XK_Explorer }, - { Qt::Key_Game, XF86XK_Game }, - { Qt::Key_Go, XF86XK_Go }, - { Qt::Key_iTouch, XF86XK_iTouch }, - { Qt::Key_LogOff, XF86XK_LogOff }, - { Qt::Key_Market, XF86XK_Market }, - { Qt::Key_Meeting, XF86XK_Meeting }, - { Qt::Key_MenuKB, XF86XK_MenuKB }, - { Qt::Key_MenuPB, XF86XK_MenuPB }, - { Qt::Key_MySites, XF86XK_MySites }, - { Qt::Key_News, XF86XK_News }, - { Qt::Key_OfficeHome, XF86XK_OfficeHome }, - { Qt::Key_Option, XF86XK_Option }, - { Qt::Key_Paste, XF86XK_Paste }, - { Qt::Key_Phone, XF86XK_Phone }, - { Qt::Key_Reply, XF86XK_Reply }, - { Qt::Key_Reload, XF86XK_Reload }, - { Qt::Key_RotateWindows, XF86XK_RotateWindows }, - { Qt::Key_RotationPB, XF86XK_RotationPB }, - { Qt::Key_RotationKB, XF86XK_RotationKB }, - { Qt::Key_Save, XF86XK_Save }, - { Qt::Key_Send, XF86XK_Send }, - { Qt::Key_Spell, XF86XK_Spell }, - { Qt::Key_SplitScreen, XF86XK_SplitScreen }, - { Qt::Key_Support, XF86XK_Support }, - { Qt::Key_TaskPane, XF86XK_TaskPane }, - { Qt::Key_Terminal, XF86XK_Terminal }, - { Qt::Key_Tools, XF86XK_Tools }, - { Qt::Key_Travel, XF86XK_Travel }, - { Qt::Key_Video, XF86XK_Video }, - { Qt::Key_Word, XF86XK_Word }, - { Qt::Key_Xfer, XF86XK_Xfer }, - { Qt::Key_ZoomIn, XF86XK_ZoomIn }, - { Qt::Key_ZoomOut, XF86XK_ZoomOut }, - { Qt::Key_Away, XF86XK_Away }, - { Qt::Key_Messenger, XF86XK_Messenger }, - { Qt::Key_WebCam, XF86XK_WebCam }, - { Qt::Key_MailForward, XF86XK_MailForward }, - { Qt::Key_Pictures, XF86XK_Pictures }, - { Qt::Key_Music, XF86XK_Music }, - { Qt::Key_Battery, XF86XK_Battery }, - { Qt::Key_Bluetooth, XF86XK_Bluetooth }, - { Qt::Key_WLAN, XF86XK_WLAN }, - { Qt::Key_UWB, XF86XK_UWB }, - { Qt::Key_AudioForward, XF86XK_AudioForward }, - { Qt::Key_AudioRepeat, XF86XK_AudioRepeat }, - { Qt::Key_AudioRandomPlay, XF86XK_AudioRandomPlay }, - { Qt::Key_Subtitle, XF86XK_Subtitle }, - { Qt::Key_AudioCycleTrack, XF86XK_AudioCycleTrack }, - { Qt::Key_Time, XF86XK_Time }, { Qt::Key_Select, XF86XK_Select }, - { Qt::Key_View, XF86XK_View }, - { Qt::Key_TopMenu, XF86XK_TopMenu }, - { Qt::Key_Suspend, XF86XK_Suspend }, - { Qt::Key_Hibernate, XF86XK_Hibernate }, - { Qt::Key_Launch0, XF86XK_Launch0 }, - { Qt::Key_Launch1, XF86XK_Launch1 }, - { Qt::Key_Launch2, XF86XK_Launch2 }, - { Qt::Key_Launch3, XF86XK_Launch3 }, - { Qt::Key_Launch4, XF86XK_Launch4 }, - { Qt::Key_Launch5, XF86XK_Launch5 }, - { Qt::Key_Launch6, XF86XK_Launch6 }, - { Qt::Key_Launch7, XF86XK_Launch7 }, - { Qt::Key_Launch8, XF86XK_Launch8 }, - { Qt::Key_Launch9, XF86XK_Launch9 }, - { Qt::Key_LaunchA, XF86XK_LaunchA }, - { Qt::Key_LaunchB, XF86XK_LaunchB }, - { Qt::Key_LaunchC, XF86XK_LaunchC }, - { Qt::Key_LaunchD, XF86XK_LaunchD }, - { Qt::Key_LaunchE, XF86XK_LaunchE }, - { Qt::Key_LaunchF, XF86XK_LaunchF }, }; //--------------------------------------------------------------------- diff --git a/kdeui/widgets/kmenu.cpp b/kdeui/widgets/kmenu.cpp index 0b700746..9aa4b36c 100644 --- a/kdeui/widgets/kmenu.cpp +++ b/kdeui/widgets/kmenu.cpp @@ -236,7 +236,7 @@ void KMenu::keyPressEvent(QKeyEvent* e) if (key == Qt::Key_Escape || key == Qt::Key_Return || key == Qt::Key_Enter || key == Qt::Key_Up || key == Qt::Key_Down || key == Qt::Key_Left || key == Qt::Key_Right || key == Qt::Key_F1 || key == Qt::Key_PageUp - || key == Qt::Key_PageDown || key == Qt::Key_Back || key == Qt::Key_Select) { + || key == Qt::Key_PageDown || key == Qt::Key_Select) { d->resetKeyboardVars(); // continue event processing by QMenu