From 68974f31ff12b04580a1d18a56994212d9af56a9 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 22 Jul 2013 19:24:49 +0200 Subject: Extend multimedia keys Extends the Qt keycodes with four missing keys, common on remote controls: Guide, Info, Settings and Exit. Change-Id: I6789f13dbb662da4261a3c947757644e12306dd9 Reviewed-by: Thiago Macieira Reviewed-by: BogDan Vatra --- src/plugins/platforms/android/src/androidjniinput.cpp | 9 +++++++++ src/plugins/platforms/directfb/qdirectfbconvenience.cpp | 4 ++++ 2 files changed, 13 insertions(+) (limited to 'src/plugins') diff --git a/src/plugins/platforms/android/src/androidjniinput.cpp b/src/plugins/platforms/android/src/androidjniinput.cpp index 8ce95532d3..55d44b7377 100644 --- a/src/plugins/platforms/android/src/androidjniinput.cpp +++ b/src/plugins/platforms/android/src/androidjniinput.cpp @@ -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; diff --git a/src/plugins/platforms/directfb/qdirectfbconvenience.cpp b/src/plugins/platforms/directfb/qdirectfbconvenience.cpp index b56d75a16e..16510095db 100644 --- a/src/plugins/platforms/directfb/qdirectfbconvenience.cpp +++ b/src/plugins/platforms/directfb/qdirectfbconvenience.cpp @@ -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); -- cgit v1.2.3