From e6cbad69745455d0ad23004c609a909a2cdabcf4 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Fri, 10 Apr 2009 17:28:26 +0000 Subject: FS#10075 - FUZE: QUIT Plugin by selecting BUTTON_HOME by Johannes Schwarz. Updates the plugin keymap to use Long Home to exit plugins to be more inline with the core keymap. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20680 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/calculator.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) (limited to 'apps/plugins/calculator.c') diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index df9fb9b18b..6414de645c 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c @@ -192,27 +192,40 @@ PLUGIN_HEADER #define CALCULATOR_CALC BUTTON_MENU #define CALCULATOR_CLEAR BUTTON_A -#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ - (CONFIG_KEYPAD == SANSA_C200_PAD) || \ - (CONFIG_KEYPAD == SANSA_FUZE_PAD) +#elif (CONFIG_KEYPAD == SANSA_E200_PAD) #define CALCULATOR_LEFT BUTTON_LEFT #define CALCULATOR_RIGHT BUTTON_RIGHT #define CALCULATOR_UP BUTTON_UP #define CALCULATOR_DOWN BUTTON_DOWN -#if defined(HAVE_SCROLLWHEEL) -/* c200 does not have a scroll wheel */ #define CALCULATOR_UP_W_SHIFT BUTTON_SCROLL_BACK #define CALCULATOR_DOWN_W_SHIFT BUTTON_SCROLL_FWD -#endif #define CALCULATOR_QUIT BUTTON_POWER #define CALCULATOR_INPUT_CALC_PRE BUTTON_SELECT #define CALCULATOR_INPUT (BUTTON_SELECT|BUTTON_REL) #define CALCULATOR_CALC (BUTTON_SELECT|BUTTON_REPEAT) -#if (CONFIG_KEYPAD == SANSA_E200_PAD) #define CALCULATOR_CLEAR BUTTON_REC + +#elif (CONFIG_KEYPAD == SANSA_C200_PAD) +#define CALCULATOR_LEFT BUTTON_LEFT +#define CALCULATOR_RIGHT BUTTON_RIGHT +#define CALCULATOR_UP BUTTON_UP +#define CALCULATOR_DOWN BUTTON_DOWN +#define CALCULATOR_QUIT BUTTON_POWER +#define CALCULATOR_INPUT_CALC_PRE BUTTON_SELECT +#define CALCULATOR_INPUT (BUTTON_SELECT|BUTTON_REL) +#define CALCULATOR_CALC (BUTTON_SELECT|BUTTON_REPEAT) + #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) -#define CALCULATOR_CLEAR BUTTON_HOME -#endif +#define CALCULATOR_LEFT BUTTON_LEFT +#define CALCULATOR_RIGHT BUTTON_RIGHT +#define CALCULATOR_UP BUTTON_UP +#define CALCULATOR_DOWN BUTTON_DOWN +#define CALCULATOR_UP_W_SHIFT BUTTON_SCROLL_BACK +#define CALCULATOR_DOWN_W_SHIFT BUTTON_SCROLL_FWD +#define CALCULATOR_QUIT (BUTTON_HOME|BUTTON_REPEAT) +#define CALCULATOR_INPUT_CALC_PRE BUTTON_SELECT +#define CALCULATOR_INPUT (BUTTON_SELECT|BUTTON_REL) +#define CALCULATOR_CALC (BUTTON_SELECT|BUTTON_REPEAT) #elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) -- cgit v1.2.3