diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-04-10 17:28:26 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-04-10 17:28:26 +0000 |
commit | e6cbad69745455d0ad23004c609a909a2cdabcf4 (patch) | |
tree | f512eab0f41420969f750138b76b46931bf57956 /apps/plugins/calculator.c | |
parent | ec797ed62225a5f78f37e9342ac6e183332f795b (diff) | |
download | rockbox-e6cbad69745455d0ad23004c609a909a2cdabcf4.tar.gz rockbox-e6cbad69745455d0ad23004c609a909a2cdabcf4.zip |
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
Diffstat (limited to 'apps/plugins/calculator.c')
-rw-r--r-- | apps/plugins/calculator.c | 31 |
1 files changed, 22 insertions, 9 deletions
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 | |||
192 | #define CALCULATOR_CALC BUTTON_MENU | 192 | #define CALCULATOR_CALC BUTTON_MENU |
193 | #define CALCULATOR_CLEAR BUTTON_A | 193 | #define CALCULATOR_CLEAR BUTTON_A |
194 | 194 | ||
195 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 195 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) |
196 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | ||
197 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
198 | #define CALCULATOR_LEFT BUTTON_LEFT | 196 | #define CALCULATOR_LEFT BUTTON_LEFT |
199 | #define CALCULATOR_RIGHT BUTTON_RIGHT | 197 | #define CALCULATOR_RIGHT BUTTON_RIGHT |
200 | #define CALCULATOR_UP BUTTON_UP | 198 | #define CALCULATOR_UP BUTTON_UP |
201 | #define CALCULATOR_DOWN BUTTON_DOWN | 199 | #define CALCULATOR_DOWN BUTTON_DOWN |
202 | #if defined(HAVE_SCROLLWHEEL) | ||
203 | /* c200 does not have a scroll wheel */ | ||
204 | #define CALCULATOR_UP_W_SHIFT BUTTON_SCROLL_BACK | 200 | #define CALCULATOR_UP_W_SHIFT BUTTON_SCROLL_BACK |
205 | #define CALCULATOR_DOWN_W_SHIFT BUTTON_SCROLL_FWD | 201 | #define CALCULATOR_DOWN_W_SHIFT BUTTON_SCROLL_FWD |
206 | #endif | ||
207 | #define CALCULATOR_QUIT BUTTON_POWER | 202 | #define CALCULATOR_QUIT BUTTON_POWER |
208 | #define CALCULATOR_INPUT_CALC_PRE BUTTON_SELECT | 203 | #define CALCULATOR_INPUT_CALC_PRE BUTTON_SELECT |
209 | #define CALCULATOR_INPUT (BUTTON_SELECT|BUTTON_REL) | 204 | #define CALCULATOR_INPUT (BUTTON_SELECT|BUTTON_REL) |
210 | #define CALCULATOR_CALC (BUTTON_SELECT|BUTTON_REPEAT) | 205 | #define CALCULATOR_CALC (BUTTON_SELECT|BUTTON_REPEAT) |
211 | #if (CONFIG_KEYPAD == SANSA_E200_PAD) | ||
212 | #define CALCULATOR_CLEAR BUTTON_REC | 206 | #define CALCULATOR_CLEAR BUTTON_REC |
207 | |||
208 | #elif (CONFIG_KEYPAD == SANSA_C200_PAD) | ||
209 | #define CALCULATOR_LEFT BUTTON_LEFT | ||
210 | #define CALCULATOR_RIGHT BUTTON_RIGHT | ||
211 | #define CALCULATOR_UP BUTTON_UP | ||
212 | #define CALCULATOR_DOWN BUTTON_DOWN | ||
213 | #define CALCULATOR_QUIT BUTTON_POWER | ||
214 | #define CALCULATOR_INPUT_CALC_PRE BUTTON_SELECT | ||
215 | #define CALCULATOR_INPUT (BUTTON_SELECT|BUTTON_REL) | ||
216 | #define CALCULATOR_CALC (BUTTON_SELECT|BUTTON_REPEAT) | ||
217 | |||
213 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | 218 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) |
214 | #define CALCULATOR_CLEAR BUTTON_HOME | 219 | #define CALCULATOR_LEFT BUTTON_LEFT |
215 | #endif | 220 | #define CALCULATOR_RIGHT BUTTON_RIGHT |
221 | #define CALCULATOR_UP BUTTON_UP | ||
222 | #define CALCULATOR_DOWN BUTTON_DOWN | ||
223 | #define CALCULATOR_UP_W_SHIFT BUTTON_SCROLL_BACK | ||
224 | #define CALCULATOR_DOWN_W_SHIFT BUTTON_SCROLL_FWD | ||
225 | #define CALCULATOR_QUIT (BUTTON_HOME|BUTTON_REPEAT) | ||
226 | #define CALCULATOR_INPUT_CALC_PRE BUTTON_SELECT | ||
227 | #define CALCULATOR_INPUT (BUTTON_SELECT|BUTTON_REL) | ||
228 | #define CALCULATOR_CALC (BUTTON_SELECT|BUTTON_REPEAT) | ||
216 | 229 | ||
217 | 230 | ||
218 | #elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) | 231 | #elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) |