diff options
| author | Johannes Schwarz <ubuntuxer@rockbox.org> | 2009-07-14 08:13:24 +0000 |
|---|---|---|
| committer | Johannes Schwarz <ubuntuxer@rockbox.org> | 2009-07-14 08:13:24 +0000 |
| commit | 394e1346ffd86f10523bf663e10e8d0ff8ad62c9 (patch) | |
| tree | 9946dbfec85abcc0e1d9c80cdce3385cd2320c38 | |
| parent | fd6afc05f8715b3cc8eea5547895b0271ef5b860 (diff) | |
try to make buttons in jewels more unified (part of FS#10193)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21854 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/plugins/jewels.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index ae69e0ade5..ec726cec8a 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c @@ -59,11 +59,10 @@ PLUGIN_HEADER #define JEWELS_LEFT BUTTON_LEFT #define JEWELS_RIGHT BUTTON_RIGHT #define JEWELS_SELECT BUTTON_SELECT -#define JEWELS_MENU BUTTON_MODE #define JEWELS_CANCEL BUTTON_OFF #define JEWELS_RC_CANCEL BUTTON_RC_STOP -#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define JEWELS_SCROLLWHEEL #define JEWELS_UP BUTTON_MENU @@ -73,6 +72,15 @@ PLUGIN_HEADER #define JEWELS_PREV BUTTON_SCROLL_BACK #define JEWELS_NEXT BUTTON_SCROLL_FWD #define JEWELS_SELECT BUTTON_SELECT +#define JEWELS_CANCEL (BUTTON_SELECT | BUTTON_MENU) + +#elif (CONFIG_KEYPAD == IPOD_3G_PAD) +#define JEWELS_LEFT BUTTON_LEFT +#define JEWELS_RIGHT BUTTON_RIGHT +#define JEWELS_UP BUTTON_SCROLL_BACK +#define JEWELS_DOWN BUTTON_SCROLL_FWD +#define JEWELS_SELECT BUTTON_SELECT +#define JEWELS_CANCEL BUTTON_MENU #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD #define JEWELS_UP BUTTON_UP @@ -144,7 +152,6 @@ CONFIG_KEYPAD == SANSA_M200_PAD #define JEWELS_LEFT BUTTON_LEFT #define JEWELS_RIGHT BUTTON_RIGHT #define JEWELS_SELECT BUTTON_SELECT -#define JEWELS_MENU BUTTON_MENU #define JEWELS_CANCEL BUTTON_BACK #elif CONFIG_KEYPAD == MROBE100_PAD @@ -162,7 +169,6 @@ CONFIG_KEYPAD == SANSA_M200_PAD #define JEWELS_RIGHT BUTTON_RC_FF #define JEWELS_SELECT BUTTON_RC_PLAY #define JEWELS_CANCEL BUTTON_RC_REC - #define JEWELS_RC_CANCEL BUTTON_REC #elif CONFIG_KEYPAD == COWOND2_PAD @@ -192,7 +198,8 @@ CONFIG_KEYPAD == SANSA_M200_PAD #define JEWELS_SELECT BUTTON_SELECT #define JEWELS_CANCEL BUTTON_POWER -#elif CONFIG_KEYPAD == ONDAVX747_PAD || CONFIG_KEYPAD == MROBE500_PAD +#elif CONFIG_KEYPAD == ONDAVX747_PAD || \ +CONFIG_KEYPAD == MROBE500_PAD #define JEWELS_CANCEL BUTTON_POWER #else |