diff options
author | Christi Scarborough <christi@coraline.org> | 2005-06-29 08:10:19 +0000 |
---|---|---|
committer | Christi Scarborough <christi@coraline.org> | 2005-06-29 08:10:19 +0000 |
commit | 1f45cce4262bde3f91844701085076892b4743f8 (patch) | |
tree | 74dafdb3ddcb44209f99f9a8f5cf18692d75d792 | |
parent | 5eb0fff07be422884c42ae465bb04f6ac3722a4d (diff) | |
download | rockbox-1f45cce4262bde3f91844701085076892b4743f8.tar.gz rockbox-1f45cce4262bde3f91844701085076892b4743f8.zip |
Move quick menu to MODE button to avoid conflict with page up/down in WPS
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6910 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/screens.h | 2 | ||||
-rw-r--r-- | apps/tree.h | 5 | ||||
-rw-r--r-- | apps/wps.h | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/apps/screens.h b/apps/screens.h index e1935e6273..a3940db76b 100644 --- a/apps/screens.h +++ b/apps/screens.h | |||
@@ -39,7 +39,7 @@ bool quick_screen(const int, const int); | |||
39 | 39 | ||
40 | #if CONFIG_KEYPAD == IRIVER_H100_PAD | 40 | #if CONFIG_KEYPAD == IRIVER_H100_PAD |
41 | bool quick_screen(const int, const int); | 41 | bool quick_screen(const int, const int); |
42 | #define SCREENS_QUICK BUTTON_ON | 42 | #define SCREENS_QUICK BUTTON_MODE |
43 | /* Long press already detected so not needed here */ | 43 | /* Long press already detected so not needed here */ |
44 | #endif | 44 | #endif |
45 | 45 | ||
diff --git a/apps/tree.h b/apps/tree.h index 2c973cc358..a105004d73 100644 --- a/apps/tree.h +++ b/apps/tree.h | |||
@@ -30,7 +30,8 @@ | |||
30 | #define TREE_ENTER BUTTON_RIGHT | 30 | #define TREE_ENTER BUTTON_RIGHT |
31 | #define TREE_RUN (BUTTON_SELECT | BUTTON_REL) | 31 | #define TREE_RUN (BUTTON_SELECT | BUTTON_REL) |
32 | #define TREE_RUN_PRE BUTTON_SELECT | 32 | #define TREE_RUN_PRE BUTTON_SELECT |
33 | #define TREE_MENU BUTTON_MODE | 33 | #define TREE_MENU ( BUTTON_MODE | BUTTON_REL) |
34 | #define TREE_MENU_PRE BUTTON_MODE | ||
34 | #define TREE_OFF BUTTON_OFF | 35 | #define TREE_OFF BUTTON_OFF |
35 | #define TREE_WPS (BUTTON_ON | BUTTON_REL) | 36 | #define TREE_WPS (BUTTON_ON | BUTTON_REL) |
36 | #define TREE_WPS_PRE BUTTON_ON | 37 | #define TREE_WPS_PRE BUTTON_ON |
@@ -39,7 +40,7 @@ | |||
39 | #define TREE_CONTEXT (BUTTON_SELECT | BUTTON_REPEAT) | 40 | #define TREE_CONTEXT (BUTTON_SELECT | BUTTON_REPEAT) |
40 | #define TREE_CONTEXT2 (BUTTON_ON | BUTTON_SELECT) | 41 | #define TREE_CONTEXT2 (BUTTON_ON | BUTTON_SELECT) |
41 | #define TREE_POWER_BTN BUTTON_ON | 42 | #define TREE_POWER_BTN BUTTON_ON |
42 | #define TREE_QUICK (BUTTON_ON | BUTTON_REPEAT) | 43 | #define TREE_QUICK (BUTTON_MODE | BUTTON_REPEAT) |
43 | 44 | ||
44 | #define TREE_RC_NEXT BUTTON_RC_FF | 45 | #define TREE_RC_NEXT BUTTON_RC_FF |
45 | #define TREE_RC_PREV BUTTON_RC_REW | 46 | #define TREE_RC_PREV BUTTON_RC_REW |
diff --git a/apps/wps.h b/apps/wps.h index 3fac42d648..c9c872d35e 100644 --- a/apps/wps.h +++ b/apps/wps.h | |||
@@ -40,7 +40,7 @@ | |||
40 | #define WPS_EXIT BUTTON_OFF | 40 | #define WPS_EXIT BUTTON_OFF |
41 | #define WPS_ID3 (BUTTON_MODE | BUTTON_ON) | 41 | #define WPS_ID3 (BUTTON_MODE | BUTTON_ON) |
42 | #define WPS_CONTEXT (BUTTON_SELECT | BUTTON_REPEAT) | 42 | #define WPS_CONTEXT (BUTTON_SELECT | BUTTON_REPEAT) |
43 | #define WPS_QUICK (BUTTON_ON | BUTTON_REPEAT) | 43 | #define WPS_QUICK (BUTTON_MODE | BUTTON_REPEAT) |
44 | 44 | ||
45 | #define WPS_RC_NEXT (BUTTON_RC_FF | BUTTON_REL) | 45 | #define WPS_RC_NEXT (BUTTON_RC_FF | BUTTON_REL) |
46 | #define WPS_RC_NEXT_PRE BUTTON_RC_FF | 46 | #define WPS_RC_NEXT_PRE BUTTON_RC_FF |