AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extend multimedia keys

Browse Source 
Extends the Qt keycodes with four missing keys, common on remote controls:
Guide, Info, Settings and Exit.

Change-Id: I6789f13dbb662da4261a3c947757644e12306dd9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
This commit is contained in:
Allan Sandfeld Jensen 2013-07-22 19:24:49 +02:00 committed by The Qt Project
parent 6c4c2b752c
commit 68974f31ff
4 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/corelib/global/qnamespace.h
View File

@ -998,6 +998,10 @@ public:
Key_ChannelUp = 0x01000118,
Key_ChannelDown = 0x01000119,
Key_Guide = 0x0100011a,
Key_Info = 0x0100011b,
Key_Settings = 0x0100011c,
Key_MediaLast = 0x0100ffff,
// Keypad navigation keys
@ -1015,6 +1019,7 @@ public:
//Key_Jisho = 0x01020007, // IME: Dictionary key
//Key_Oyayubi_Left = 0x01020008, // IME: Left Oyayubi key
//Key_Oyayubi_Right = 0x01020009, // IME: Right Oyayubi key
Key_Exit = 0x0102000a,
// Device keys
Key_Context1 = 0x01100000,

4
src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h
View File

@ -641,6 +641,7 @@ const QEvdevKeyboardMap::Mapping QEvdevKeyboardHandler::s_keymap_default[] = {
{ KEY_VOLUMEUP, 0xffff, Qt::Key_VolumeUp, 0x00, 0x00, 0x0000 },
{ KEY_PAUSE, 0xffff, Qt::Key_Pause, 0x00, 0x00, 0x0000 },
{ KEY_STOP, 0xffff, Qt::Key_Stop, 0x00, 0x00, 0x0000 },
{ KEY_SETUP, 0xffff, Qt::Key_Settings, 0x00, 0x00, 0x0000 },
{ KEY_RECORD, 0xffff, Qt::Key_MediaRecord, 0x00, 0x00, 0x0000 },
{ KEY_REWIND, 0xffff, Qt::Key_AudioRewind, 0x00, 0x00, 0x0000 },
{ KEY_PLAYPAUSE, 0xffff, Qt::Key_MediaTogglePlayPause, 0x00, 0x00, 0x0000 },
@ -651,6 +652,9 @@ const QEvdevKeyboardMap::Mapping QEvdevKeyboardHandler::s_keymap_default[] = {
// 0x160 ->
{ KEY_SELECT, 0xffff, Qt::Key_Select, 0x00, 0x00, 0x0000 },
{ KEY_CLEAR, 0xffff, Qt::Key_Clear, 0x00, 0x00, 0x0000 },
{ KEY_EXIT, 0xffff, Qt::Key_Exit, 0x00, 0x00, 0x0000 },
{ KEY_INFO, 0xffff, Qt::Key_Info, 0x00, 0x00, 0x0000 },
{ KEY_PROGRAM, 0xffff, Qt::Key_Guide, 0x00, 0x00, 0x0000 },
{ KEY_CALENDAR, 0xffff, Qt::Key_Calendar, 0x00, 0x00, 0x0000 },
{ KEY_RED, 0xffff, Qt::Key_Red, 0x00, 0x00, 0x0000 },
{ KEY_GREEN, 0xffff, Qt::Key_Green, 0x00, 0x00, 0x0000 },

9
src/plugins/platforms/android/src/androidjniinput.cpp
View File

@ -471,6 +471,9 @@ namespace QtAndroidInput
case 0x000000ba: // KEYCODE_PROG_BLUE
return Qt::Key_Blue;
case 0x000000a5: // KEYCODE_INFO
return Qt::Key_Info;
case 0x000000a6: // KEYCODE_CHANNEL_UP
return Qt::Key_ChannelUp;
@ -483,9 +486,15 @@ namespace QtAndroidInput
case 0x000000a9: // KEYCODE_ZOOM_OUT
return Qt::Key_ZoomOut;
case 0x000000ac: // KEYCODE_GUIDE
return Qt::Key_Guide;
case 0x000000af: // KEYCODE_CAPTIONS
return Qt::Key_Subtitle;
case 0x000000b0: // KEYCODE_SETTINGS
return Qt::Key_Settings;
case 0x000000d0: // KEYCODE_CALENDAR
return Qt::Key_Calendar;

4
src/plugins/platforms/directfb/qdirectfbconvenience.cpp
View File

@ -281,12 +281,16 @@ QDirectFbKeyMap::QDirectFbKeyMap()
insert(DIKS_CLEAR , Qt::Key_Clear);
insert(DIKS_MENU , Qt::Key_Menu);
insert(DIKS_HELP , Qt::Key_Help);
insert(DIKS_INFO , Qt::Key_Info);
insert(DIKS_EXIT , Qt::Key_Exit);
insert(DIKS_SETUP , Qt::Key_Settings);
insert(DIKS_CD , Qt::Key_CD);
insert(DIKS_INTERNET , Qt::Key_HomePage);
insert(DIKS_MAIL , Qt::Key_LaunchMail);
insert(DIKS_FAVORITES , Qt::Key_Favorites);
insert(DIKS_PHONE , Qt::Key_Phone);
insert(DIKS_PROGRAM , Qt::Key_Guide);
insert(DIKS_TIME , Qt::Key_Time);
insert(DIKS_RED , Qt::Key_Red);