summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Guay <marcguay@rockbox.org>2008-07-28 23:09:37 +0000
committerMarc Guay <marcguay@rockbox.org>2008-07-28 23:09:37 +0000
commit7460e49acbe373af29d6be0f9cd47e2c195769d6 (patch)
tree0d546364e86d8f5e3ae2656a59d1537502e49e84
parent52bdcbae856b07d3a793615b98dff338d26302ec (diff)
downloadrockbox-7460e49acbe373af29d6be0f9cd47e2c195769d6.tar.gz
rockbox-7460e49acbe373af29d6be0f9cd47e2c195769d6.zip
Make the recording screen keymap consistent with the rest of the interface on the e200. Menu is now long-select instead of down.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18143 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/keymaps/keymap-e200.c50
1 files changed, 25 insertions, 25 deletions
diff --git a/apps/keymaps/keymap-e200.c b/apps/keymaps/keymap-e200.c
index b90870a158..95c51ea374 100644
--- a/apps/keymaps/keymap-e200.c
+++ b/apps/keymaps/keymap-e200.c
@@ -34,21 +34,21 @@
34 * Insert LAST_ITEM_IN_LIST at the end of each mapping 34 * Insert LAST_ITEM_IN_LIST at the end of each mapping
35 */ 35 */
36static const struct button_mapping button_context_standard[] = { 36static const struct button_mapping button_context_standard[] = {
37 { ACTION_STD_PREV, BUTTON_SCROLL_BACK, BUTTON_NONE }, 37 { ACTION_STD_PREV, BUTTON_SCROLL_BACK, BUTTON_NONE },
38 { ACTION_STD_PREVREPEAT, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, 38 { ACTION_STD_PREVREPEAT, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE },
39 { ACTION_STD_NEXT, BUTTON_SCROLL_FWD, BUTTON_NONE }, 39 { ACTION_STD_NEXT, BUTTON_SCROLL_FWD, BUTTON_NONE },
40 { ACTION_STD_NEXTREPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, 40 { ACTION_STD_NEXTREPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE },
41 41
42 { ACTION_STD_MENU, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, 42 { ACTION_STD_MENU, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN },
43 { ACTION_STD_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, 43 { ACTION_STD_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE },
44 44
45 { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, 45 { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
46 { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, 46 { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE },
47 { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, 47 { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE },
48 { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, 48 { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE },
49 49
50 { ACTION_STD_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, 50 { ACTION_STD_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN },
51 { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, 51 { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT },
52 52
53 LAST_ITEM_IN_LIST 53 LAST_ITEM_IN_LIST
54}; /* button_context_standard */ 54}; /* button_context_standard */
@@ -70,8 +70,8 @@ static const struct button_mapping button_context_wps[] = {
70 { ACTION_WPS_ABSETA_PREVDIR, BUTTON_POWER|BUTTON_LEFT, BUTTON_POWER }, 70 { ACTION_WPS_ABSETA_PREVDIR, BUTTON_POWER|BUTTON_LEFT, BUTTON_POWER },
71 { ACTION_WPS_ABRESET, BUTTON_POWER|BUTTON_UP, BUTTON_POWER }, 71 { ACTION_WPS_ABRESET, BUTTON_POWER|BUTTON_UP, BUTTON_POWER },
72 72
73 { ACTION_WPS_VOLUP, BUTTON_SCROLL_FWD, BUTTON_NONE }, 73 { ACTION_WPS_VOLUP, BUTTON_SCROLL_FWD, BUTTON_NONE },
74 { ACTION_WPS_VOLUP, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, 74 { ACTION_WPS_VOLUP, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE },
75 { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_BACK, BUTTON_NONE }, 75 { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_BACK, BUTTON_NONE },
76 { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, 76 { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE },
77 77
@@ -211,18 +211,18 @@ static const struct button_mapping button_context_pitchscreen[] = {
211 211
212/** Recording Screen **/ 212/** Recording Screen **/
213static const struct button_mapping button_context_recscreen[] = { 213static const struct button_mapping button_context_recscreen[] = {
214 { ACTION_REC_PAUSE, BUTTON_UP|BUTTON_REL, BUTTON_UP }, 214 { ACTION_REC_PAUSE, BUTTON_UP|BUTTON_REL, BUTTON_UP },
215 { ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, 215 { ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
216 { ACTION_REC_NEWFILE, BUTTON_REC|BUTTON_REL, BUTTON_REC }, 216 { ACTION_REC_NEWFILE, BUTTON_REC|BUTTON_REL, BUTTON_REC },
217 { ACTION_STD_MENU, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE }, 217 { ACTION_STD_MENU, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT},
218 { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, 218 { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE },
219 { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, 219 { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
220 { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, 220 { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE },
221 { ACTION_SETTINGS_DECREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, 221 { ACTION_SETTINGS_DECREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
222 { ACTION_STD_PREV, BUTTON_SCROLL_BACK, BUTTON_NONE }, 222 { ACTION_STD_PREV, BUTTON_SCROLL_BACK, BUTTON_NONE },
223 { ACTION_STD_PREV, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, 223 { ACTION_STD_PREV, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE },
224 { ACTION_STD_NEXT, BUTTON_SCROLL_FWD, BUTTON_NONE }, 224 { ACTION_STD_NEXT, BUTTON_SCROLL_FWD, BUTTON_NONE },
225 { ACTION_STD_NEXT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, 225 { ACTION_STD_NEXT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE },
226 226
227 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 227 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
228}; /* button_context_recscreen */ 228}; /* button_context_recscreen */