diff options
author | Robert Kukla <roolku@rockbox.org> | 2008-03-18 09:24:35 +0000 |
---|---|---|
committer | Robert Kukla <roolku@rockbox.org> | 2008-03-18 09:24:35 +0000 |
commit | 6e209443c52bb02d25d1a3f3b76a071a961a7563 (patch) | |
tree | e70a5041c531ba9c63eec8b4627f214af156f099 /apps | |
parent | 7b1de20544bd3bb0fdbd2d998c9a49327b5aa0c4 (diff) | |
download | rockbox-6e209443c52bb02d25d1a3f3b76a071a961a7563.tar.gz rockbox-6e209443c52bb02d25d1a3f3b76a071a961a7563.zip |
- add button descriptions to the m:robe 100 manual for the majority of plugins
- add gigabeat button descriptions which were missing
- fix a few inconsistencies I noticed doing the above (mainly outstanding r13278 follow-ons)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16693 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/calculator.c | 10 | ||||
-rw-r--r-- | apps/plugins/chessbox/chessbox.c | 10 | ||||
-rw-r--r-- | apps/plugins/chessbox/chessbox_pgn.c | 10 | ||||
-rw-r--r-- | apps/plugins/lib/pluginlib_actions.c | 6 | ||||
-rw-r--r-- | apps/plugins/reversi/reversi-gui.h | 4 |
5 files changed, 19 insertions, 21 deletions
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index 1819e983f7..cfc0f76448 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c | |||
@@ -171,9 +171,8 @@ PLUGIN_HEADER | |||
171 | #define CALCULATOR_UP BUTTON_UP | 171 | #define CALCULATOR_UP BUTTON_UP |
172 | #define CALCULATOR_DOWN BUTTON_DOWN | 172 | #define CALCULATOR_DOWN BUTTON_DOWN |
173 | #define CALCULATOR_QUIT BUTTON_POWER | 173 | #define CALCULATOR_QUIT BUTTON_POWER |
174 | #define CALCULATOR_INPUT_CALC_PRE BUTTON_MENU | 174 | #define CALCULATOR_INPUT BUTTON_SELECT |
175 | #define CALCULATOR_INPUT (BUTTON_MENU | BUTTON_REL) | 175 | #define CALCULATOR_CALC BUTTON_MENU |
176 | #define CALCULATOR_CALC BUTTON_SELECT | ||
177 | #define CALCULATOR_CLEAR BUTTON_A | 176 | #define CALCULATOR_CLEAR BUTTON_A |
178 | 177 | ||
179 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 178 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
@@ -211,9 +210,8 @@ PLUGIN_HEADER | |||
211 | #define CALCULATOR_UP BUTTON_UP | 210 | #define CALCULATOR_UP BUTTON_UP |
212 | #define CALCULATOR_DOWN BUTTON_DOWN | 211 | #define CALCULATOR_DOWN BUTTON_DOWN |
213 | #define CALCULATOR_QUIT BUTTON_POWER | 212 | #define CALCULATOR_QUIT BUTTON_POWER |
214 | #define CALCULATOR_INPUT_CALC_PRE BUTTON_MENU | 213 | #define CALCULATOR_INPUT BUTTON_SELECT |
215 | #define CALCULATOR_INPUT (BUTTON_MENU | BUTTON_REL) | 214 | #define CALCULATOR_CALC BUTTON_MENU |
216 | #define CALCULATOR_CALC BUTTON_SELECT | ||
217 | #define CALCULATOR_CLEAR BUTTON_DISPLAY | 215 | #define CALCULATOR_CLEAR BUTTON_DISPLAY |
218 | 216 | ||
219 | #else | 217 | #else |
diff --git a/apps/plugins/chessbox/chessbox.c b/apps/plugins/chessbox/chessbox.c index 47c46bf3c9..24198e507a 100644 --- a/apps/plugins/chessbox/chessbox.c +++ b/apps/plugins/chessbox/chessbox.c | |||
@@ -157,9 +157,9 @@ PLUGIN_HEADER | |||
157 | #define CB_DOWN BUTTON_DOWN | 157 | #define CB_DOWN BUTTON_DOWN |
158 | #define CB_LEFT BUTTON_LEFT | 158 | #define CB_LEFT BUTTON_LEFT |
159 | #define CB_RIGHT BUTTON_RIGHT | 159 | #define CB_RIGHT BUTTON_RIGHT |
160 | #define CB_PLAY BUTTON_POWER | 160 | #define CB_PLAY BUTTON_A |
161 | #define CB_LEVEL BUTTON_MENU | 161 | #define CB_LEVEL BUTTON_MENU |
162 | #define CB_MENU BUTTON_A | 162 | #define CB_MENU BUTTON_POWER |
163 | 163 | ||
164 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) | 164 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) |
165 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) | 165 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) |
@@ -232,9 +232,9 @@ PLUGIN_HEADER | |||
232 | #define CB_DOWN BUTTON_DOWN | 232 | #define CB_DOWN BUTTON_DOWN |
233 | #define CB_LEFT BUTTON_LEFT | 233 | #define CB_LEFT BUTTON_LEFT |
234 | #define CB_RIGHT BUTTON_RIGHT | 234 | #define CB_RIGHT BUTTON_RIGHT |
235 | #define CB_PLAY BUTTON_POWER | 235 | #define CB_PLAY BUTTON_PLAY |
236 | #define CB_LEVEL BUTTON_MENU | 236 | #define CB_LEVEL BUTTON_DISPLAY |
237 | #define CB_MENU BUTTON_DISPLAY | 237 | #define CB_MENU BUTTON_POWER |
238 | 238 | ||
239 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) | 239 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) |
240 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) | 240 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) |
diff --git a/apps/plugins/chessbox/chessbox_pgn.c b/apps/plugins/chessbox/chessbox_pgn.c index 7ad43ad4b1..b59d0fc308 100644 --- a/apps/plugins/chessbox/chessbox_pgn.c +++ b/apps/plugins/chessbox/chessbox_pgn.c | |||
@@ -143,9 +143,9 @@ | |||
143 | #define CB_DOWN BUTTON_DOWN | 143 | #define CB_DOWN BUTTON_DOWN |
144 | #define CB_LEFT BUTTON_LEFT | 144 | #define CB_LEFT BUTTON_LEFT |
145 | #define CB_RIGHT BUTTON_RIGHT | 145 | #define CB_RIGHT BUTTON_RIGHT |
146 | #define CB_PLAY BUTTON_POWER | 146 | #define CB_PLAY BUTTON_A |
147 | #define CB_LEVEL BUTTON_MENU | 147 | #define CB_LEVEL BUTTON_MENU |
148 | #define CB_MENU BUTTON_A | 148 | #define CB_MENU BUTTON_POWER |
149 | 149 | ||
150 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) | 150 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) |
151 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) | 151 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) |
@@ -220,9 +220,9 @@ | |||
220 | #define CB_DOWN BUTTON_DOWN | 220 | #define CB_DOWN BUTTON_DOWN |
221 | #define CB_LEFT BUTTON_LEFT | 221 | #define CB_LEFT BUTTON_LEFT |
222 | #define CB_RIGHT BUTTON_RIGHT | 222 | #define CB_RIGHT BUTTON_RIGHT |
223 | #define CB_PLAY BUTTON_POWER | 223 | #define CB_PLAY BUTTON_PLAY |
224 | #define CB_LEVEL BUTTON_MENU | 224 | #define CB_LEVEL BUTTON_DISPLAY |
225 | #define CB_MENU BUTTON_DISPLAY | 225 | #define CB_MENU BUTTON_POWER |
226 | 226 | ||
227 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) | 227 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) |
228 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) | 228 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) |
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index 85b65b26e4..a7fbb356e3 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c | |||
@@ -265,8 +265,8 @@ const struct button_mapping generic_actions[] = | |||
265 | {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, | 265 | {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, |
266 | {PLA_FIRE_REPEAT, BUTTON_RC_MODE|BUTTON_REPEAT, BUTTON_NONE}, | 266 | {PLA_FIRE_REPEAT, BUTTON_RC_MODE|BUTTON_REPEAT, BUTTON_NONE}, |
267 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 267 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
268 | {PLA_QUIT, BUTTON_A, BUTTON_NONE}, | 268 | {PLA_QUIT, BUTTON_POWER, BUTTON_NONE}, |
269 | {PLA_START, BUTTON_POWER, BUTTON_NONE}, | 269 | {PLA_START, BUTTON_A, BUTTON_NONE}, |
270 | {PLA_MENU, BUTTON_MENU, BUTTON_NONE}, | 270 | {PLA_MENU, BUTTON_MENU, BUTTON_NONE}, |
271 | {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, | 271 | {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, |
272 | {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, | 272 | {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, |
@@ -331,7 +331,7 @@ const struct button_mapping generic_actions[] = | |||
331 | {PLA_FIRE, BUTTON_RC_HEART, BUTTON_NONE}, | 331 | {PLA_FIRE, BUTTON_RC_HEART, BUTTON_NONE}, |
332 | {PLA_FIRE_REPEAT, BUTTON_RC_HEART|BUTTON_REPEAT, BUTTON_NONE}, | 332 | {PLA_FIRE_REPEAT, BUTTON_RC_HEART|BUTTON_REPEAT, BUTTON_NONE}, |
333 | #elif CONFIG_KEYPAD == MROBE100_PAD | 333 | #elif CONFIG_KEYPAD == MROBE100_PAD |
334 | {PLA_QUIT, BUTTON_DISPLAY, BUTTON_NONE}, | 334 | {PLA_QUIT, BUTTON_POWER, BUTTON_NONE}, |
335 | {PLA_START, BUTTON_PLAY, BUTTON_NONE}, | 335 | {PLA_START, BUTTON_PLAY, BUTTON_NONE}, |
336 | {PLA_MENU, BUTTON_MENU, BUTTON_NONE}, | 336 | {PLA_MENU, BUTTON_MENU, BUTTON_NONE}, |
337 | {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, | 337 | {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, |
diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h index 47ed3f52a8..84552c8fe1 100644 --- a/apps/plugins/reversi/reversi-gui.h +++ b/apps/plugins/reversi/reversi-gui.h | |||
@@ -78,7 +78,7 @@ | |||
78 | #define REVERSI_BUTTON_MENU BUTTON_PLAY | 78 | #define REVERSI_BUTTON_MENU BUTTON_PLAY |
79 | 79 | ||
80 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | 80 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) |
81 | #define REVERSI_BUTTON_QUIT BUTTON_A | 81 | #define REVERSI_BUTTON_QUIT BUTTON_POWER |
82 | #define REVERSI_BUTTON_UP BUTTON_UP | 82 | #define REVERSI_BUTTON_UP BUTTON_UP |
83 | #define REVERSI_BUTTON_DOWN BUTTON_DOWN | 83 | #define REVERSI_BUTTON_DOWN BUTTON_DOWN |
84 | #define REVERSI_BUTTON_LEFT BUTTON_LEFT | 84 | #define REVERSI_BUTTON_LEFT BUTTON_LEFT |
@@ -115,7 +115,7 @@ | |||
115 | #define REVERSI_BUTTON_MENU (BUTTON_POWER | BUTTON_REL) | 115 | #define REVERSI_BUTTON_MENU (BUTTON_POWER | BUTTON_REL) |
116 | 116 | ||
117 | #elif (CONFIG_KEYPAD == MROBE100_PAD) | 117 | #elif (CONFIG_KEYPAD == MROBE100_PAD) |
118 | #define REVERSI_BUTTON_QUIT BUTTON_DISPLAY | 118 | #define REVERSI_BUTTON_QUIT BUTTON_POWER |
119 | #define REVERSI_BUTTON_UP BUTTON_UP | 119 | #define REVERSI_BUTTON_UP BUTTON_UP |
120 | #define REVERSI_BUTTON_DOWN BUTTON_DOWN | 120 | #define REVERSI_BUTTON_DOWN BUTTON_DOWN |
121 | #define REVERSI_BUTTON_LEFT BUTTON_LEFT | 121 | #define REVERSI_BUTTON_LEFT BUTTON_LEFT |