From ed83831f3bd46d542bd8d5d69d539515cfde7bc9 Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Sun, 21 Jun 2009 14:32:20 +0000 Subject: Change the X5/M5 remote keymapping to match the M3 way, improving consistency with the button labels. The most important change is that VOL+/VOL- are moving up/down in lists, NEXT enters submenus or selects, PREV exists or cancels. There are a few more slight differences. * Fix M3 remote button mapping in the vkeyboard: moving up/down was switched and select/accept didn't work. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21454 a1c6a512-1295-4272-9138-f99709370657 --- apps/keymaps/keymap-m3.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'apps/keymaps/keymap-m3.c') diff --git a/apps/keymaps/keymap-m3.c b/apps/keymaps/keymap-m3.c index 6b68f1f881..c5c0796644 100644 --- a/apps/keymaps/keymap-m3.c +++ b/apps/keymaps/keymap-m3.c @@ -137,13 +137,13 @@ static const struct button_mapping remote_button_context_keyboard[] = { { ACTION_KBD_LEFT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_KBD_RIGHT, BUTTON_RC_FF, BUTTON_NONE }, { ACTION_KBD_RIGHT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_KBD_UP, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, - { ACTION_KBD_UP, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_KBD_DOWN, BUTTON_RC_VOL_UP, BUTTON_NONE }, - { ACTION_KBD_DOWN, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_KBD_UP, BUTTON_RC_VOL_UP, BUTTON_NONE }, + { ACTION_KBD_UP, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_KBD_DOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, + { ACTION_KBD_DOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_KBD_PAGE_FLIP, BUTTON_RC_MODE, BUTTON_NONE }, - { ACTION_KBD_SELECT, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_PLAY }, - { ACTION_KBD_DONE, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, + { ACTION_KBD_SELECT, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY }, + { ACTION_KBD_DONE, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_RC_PLAY }, { ACTION_KBD_ABORT, BUTTON_RC_REC, BUTTON_NONE }, LAST_ITEM_IN_LIST @@ -423,6 +423,7 @@ static const struct button_mapping* get_context_mapping_remote( int context ) return remote_button_context_settings; case CONTEXT_SETTINGS_EQ: + case CONTEXT_SETTINGS_TIME: return remote_button_context_settings_r_is_inc; case CONTEXT_TREE: -- cgit v1.2.3