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
This commit is contained in:
Marianne Arnold 2008-06-18 20:07:47 +00:00
parent d131a31266
commit efbd2b8d7a

View file

@ -161,24 +161,22 @@ PLUGIN_HEADER
(CONFIG_KEYPAD == IPOD_1G2G_PAD) (CONFIG_KEYPAD == IPOD_1G2G_PAD)
#define CALCULATOR_LEFT BUTTON_LEFT #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_UP_W_SHIFT BUTTON_SCROLL_BACK
#define CALCULATOR_DOWN_W_SHIFT BUTTON_SCROLL_FWD #define CALCULATOR_DOWN_W_SHIFT BUTTON_SCROLL_FWD
#define CALCULATOR_QUIT BUTTON_MENU #define CALCULATOR_QUIT BUTTON_MENU
#define CALCULATOR_INPUT_CALC_PRE BUTTON_SELECT #define CALCULATOR_INPUT BUTTON_SELECT
#define CALCULATOR_INPUT (BUTTON_SELECT | BUTTON_REL) #define CALCULATOR_CALC BUTTON_PLAY
#define CALCULATOR_CALC (BUTTON_PLAY | BUTTON_REPEAT)
#elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
#define CALCULATOR_LEFT BUTTON_LEFT #define CALCULATOR_LEFT BUTTON_LEFT
#define CALCULATOR_RIGHT BUTTON_RIGHT #define CALCULATOR_RIGHT BUTTON_RIGHT
#define CALCULATOR_UP BUTTON_UP #define CALCULATOR_UP BUTTON_UP
#define CALCULATOR_DOWN BUTTON_DOWN #define CALCULATOR_DOWN BUTTON_DOWN
#define CALCULATOR_QUIT BUTTON_POWER #define CALCULATOR_QUIT BUTTON_POWER
#define CALCULATOR_INPUT_CALC_PRE BUTTON_SELECT #define CALCULATOR_INPUT BUTTON_SELECT
#define CALCULATOR_INPUT (BUTTON_SELECT | BUTTON_REL) #define CALCULATOR_CALC BUTTON_PLAY
#define CALCULATOR_CALC BUTTON_PLAY
#define CALCULATOR_CLEAR BUTTON_REC #define CALCULATOR_CLEAR BUTTON_REC
#elif (CONFIG_KEYPAD == GIGABEAT_PAD) #elif (CONFIG_KEYPAD == GIGABEAT_PAD)
@ -223,14 +221,13 @@ PLUGIN_HEADER
#elif (CONFIG_KEYPAD == GIGABEAT_S_PAD) #elif (CONFIG_KEYPAD == GIGABEAT_S_PAD)
#define CALCULATOR_LEFT BUTTON_LEFT #define CALCULATOR_LEFT BUTTON_LEFT
#define CALCULATOR_RIGHT BUTTON_RIGHT #define CALCULATOR_RIGHT BUTTON_RIGHT
#define CALCULATOR_UP BUTTON_UP #define CALCULATOR_UP BUTTON_UP
#define CALCULATOR_DOWN BUTTON_DOWN #define CALCULATOR_DOWN BUTTON_DOWN
#define CALCULATOR_QUIT BUTTON_BACK #define CALCULATOR_QUIT BUTTON_BACK
#define CALCULATOR_INPUT_CALC_PRE BUTTON_MENU #define CALCULATOR_INPUT BUTTON_SELECT
#define CALCULATOR_INPUT (BUTTON_MENU | BUTTON_REL) #define CALCULATOR_CALC BUTTON_MENU
#define CALCULATOR_CALC BUTTON_SELECT
#define CALCULATOR_CLEAR BUTTON_PLAY #define CALCULATOR_CLEAR BUTTON_PLAY
#elif (CONFIG_KEYPAD == MROBE100_PAD) #elif (CONFIG_KEYPAD == MROBE100_PAD)