diff options
| author | Marianne Arnold <pixelma@rockbox.org> | 2008-06-18 20:07:47 +0000 |
|---|---|---|
| committer | Marianne Arnold <pixelma@rockbox.org> | 2008-06-18 20:07:47 +0000 |
| commit | efbd2b8d7a9295f1a5544717c1b86527cc27ac7b (patch) | |
| tree | de7a6f8c86a94bbe328b02286033ea4200c846e2 /apps/plugins | |
| parent | d131a312668f2503546d7e1047c4a6be47ca0589 (diff) | |
More calculate button changes: make the 'calculate' shortcut also work on the M5X5, the Ipod and the Gigabeat S pad. Also make 'select' actually select the number under the cursor and use 'menu' for calculating instead.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17731 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins')
| -rw-r--r-- | apps/plugins/calculator.c | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index e65d8bb703..b9529f4e54 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c @@ -161,24 +161,22 @@ PLUGIN_HEADER (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define CALCULATOR_LEFT BUTTON_LEFT -#define CALCULATOR_RIGHT BUTTON_RIGHT +#define CALCULATOR_RIGHT BUTTON_RIGHT #define CALCULATOR_UP_W_SHIFT BUTTON_SCROLL_BACK #define CALCULATOR_DOWN_W_SHIFT BUTTON_SCROLL_FWD -#define CALCULATOR_QUIT BUTTON_MENU -#define CALCULATOR_INPUT_CALC_PRE BUTTON_SELECT -#define CALCULATOR_INPUT (BUTTON_SELECT | BUTTON_REL) -#define CALCULATOR_CALC (BUTTON_PLAY | BUTTON_REPEAT) +#define CALCULATOR_QUIT BUTTON_MENU +#define CALCULATOR_INPUT BUTTON_SELECT +#define CALCULATOR_CALC BUTTON_PLAY #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) -#define CALCULATOR_LEFT BUTTON_LEFT +#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_PLAY +#define CALCULATOR_UP BUTTON_UP +#define CALCULATOR_DOWN BUTTON_DOWN +#define CALCULATOR_QUIT BUTTON_POWER +#define CALCULATOR_INPUT BUTTON_SELECT +#define CALCULATOR_CALC BUTTON_PLAY #define CALCULATOR_CLEAR BUTTON_REC #elif (CONFIG_KEYPAD == GIGABEAT_PAD) @@ -223,14 +221,13 @@ PLUGIN_HEADER #elif (CONFIG_KEYPAD == GIGABEAT_S_PAD) -#define CALCULATOR_LEFT BUTTON_LEFT +#define CALCULATOR_LEFT BUTTON_LEFT #define CALCULATOR_RIGHT BUTTON_RIGHT -#define CALCULATOR_UP BUTTON_UP -#define CALCULATOR_DOWN BUTTON_DOWN -#define CALCULATOR_QUIT BUTTON_BACK -#define CALCULATOR_INPUT_CALC_PRE BUTTON_MENU -#define CALCULATOR_INPUT (BUTTON_MENU | BUTTON_REL) -#define CALCULATOR_CALC BUTTON_SELECT +#define CALCULATOR_UP BUTTON_UP +#define CALCULATOR_DOWN BUTTON_DOWN +#define CALCULATOR_QUIT BUTTON_BACK +#define CALCULATOR_INPUT BUTTON_SELECT +#define CALCULATOR_CALC BUTTON_MENU #define CALCULATOR_CLEAR BUTTON_PLAY #elif (CONFIG_KEYPAD == MROBE100_PAD) |