diff options
author | Jens Arnold <amiconn@rockbox.org> | 2004-12-26 14:56:05 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2004-12-26 14:56:05 +0000 |
commit | b8c9a0caa3e0ae1aad8abe3ec98b7c0a6d967be7 (patch) | |
tree | 36b1bb387adc24243ed5ebf4fe77f2769160a6ca | |
parent | dfa95c334b9cffff28059e0de39ae5305e315ee6 (diff) | |
download | rockbox-b8c9a0caa3e0ae1aad8abe3ec98b7c0a6d967be7.tar.gz rockbox-b8c9a0caa3e0ae1aad8abe3ec98b7c0a6d967be7.zip |
Plugin fixes: Correct button name for MODE key in help texts, conforming to the manual & wiki documentation (Ondio plugins). Alternate image is selected with MINUS, not MENU (rockbox_flash for player). Shortened some help lines that didn't fit on the display with the default font (solitaire). Fixed a number of typos.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5512 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/plugins/euroconverter.c | 32 | ||||
-rw-r--r-- | apps/plugins/flipit.c | 2 | ||||
-rw-r--r-- | apps/plugins/metronome.c | 4 | ||||
-rw-r--r-- | apps/plugins/minesweeper.c | 2 | ||||
-rw-r--r-- | apps/plugins/rockbox_flash.c | 2 | ||||
-rw-r--r-- | apps/plugins/sliding_puzzle.c | 4 | ||||
-rw-r--r-- | apps/plugins/snake.c | 4 | ||||
-rw-r--r-- | apps/plugins/sokoban.c | 2 | ||||
-rw-r--r-- | apps/plugins/solitaire.c | 14 | ||||
-rw-r--r-- | apps/plugins/star.c | 2 | ||||
-rw-r--r-- | apps/plugins/vu_meter.c | 4 |
11 files changed, 36 insertions, 36 deletions
diff --git a/apps/plugins/euroconverter.c b/apps/plugins/euroconverter.c index a75a5f055e..f98fc27db8 100644 --- a/apps/plugins/euroconverter.c +++ b/apps/plugins/euroconverter.c | |||
@@ -60,7 +60,7 @@ static int currency[12]={ | |||
60 | 4033990, /*BEF Belgium*/ | 60 | 4033990, /*BEF Belgium*/ |
61 | 16638600, /*ESP Spain*/ | 61 | 16638600, /*ESP Spain*/ |
62 | 594573, /*FIM Finland*/ | 62 | 594573, /*FIM Finland*/ |
63 | 78756, /*IEP Irland*/ | 63 | 78756, /*IEP Ireland*/ |
64 | 193627000, /*ITL Italy*/ | 64 | 193627000, /*ITL Italy*/ |
65 | 4033990, /*LUF Luxemburg*/ | 65 | 4033990, /*LUF Luxemburg*/ |
66 | 220371, /*NLG Netherlands*/ | 66 | 220371, /*NLG Netherlands*/ |
@@ -76,7 +76,7 @@ static int nb_digit[12]={ | |||
76 | 2, /*BEF Belgium*/ | 76 | 2, /*BEF Belgium*/ |
77 | 0, /*ESP Spain*/ | 77 | 0, /*ESP Spain*/ |
78 | 2, /*FIM Finland*/ | 78 | 2, /*FIM Finland*/ |
79 | 2, /*IEP Irland*/ | 79 | 2, /*IEP Ireland*/ |
80 | 0, /*ITL Italy*/ | 80 | 0, /*ITL Italy*/ |
81 | 2, /*LUF Luxemburg*/ | 81 | 2, /*LUF Luxemburg*/ |
82 | 2, /*NLG Netherlands*/ | 82 | 2, /*NLG Netherlands*/ |
@@ -86,15 +86,15 @@ static int nb_digit[12]={ | |||
86 | 86 | ||
87 | /* max euro to have home currency */ | 87 | /* max euro to have home currency */ |
88 | static long long max_euro[12]={ | 88 | static long long max_euro[12]={ |
89 | 99999999000LL, /*FRF France 999 999.99 */ | 89 | 99999999000LL, /*FRF France 999 999.99 */ |
90 | 99999999000LL, /*DEM Germany 999 999.99 */ | 90 | 99999999000LL, /*DEM Germany 999 999.99 */ |
91 | 99999999000LL, /*ATS Austria 999 999.99 */ | 91 | 99999999000LL, /*ATS Austria 999 999.99 */ |
92 | 99999999000LL, /*BEF Belgium 999 999.99 */ | 92 | 99999999000LL, /*BEF Belgium 999 999.99 */ |
93 | 99999999000LL, /*ESP Spain 99 999 999 */ | 93 | 99999999000LL, /*ESP Spain 99 999 999 */ |
94 | 99999999000LL, /*FIM Finland 999 999.99 */ | 94 | 99999999000LL, /*FIM Finland 999 999.99 */ |
95 | 99999999000LL, /*IEP Irland 999 999.99 */ | 95 | 99999999000LL, /*IEP Ireland 999 999.99 */ |
96 | 51645690000LL, /*ITL Italy 999 999 999 */ | 96 | 51645690000LL, /*ITL Italy 999 999 999 */ |
97 | 99999999000LL, /*LUF Luxemburg 999 999.99 */ | 97 | 99999999000LL, /*LUF Luxemburg 999 999.99 */ |
98 | 99999999000LL, /*NLG Netherlands 999 999.99 */ | 98 | 99999999000LL, /*NLG Netherlands 999 999.99 */ |
99 | 99999999000LL, /*PTE Portugal 99 999 999 */ | 99 | 99999999000LL, /*PTE Portugal 99 999 999 */ |
100 | 29347028000LL /*GRD Greece 99 999 999 */ | 100 | 29347028000LL /*GRD Greece 99 999 999 */ |
@@ -107,14 +107,14 @@ static long long max_curr[12]={ | |||
107 | 99999999000LL, /*DEM Germany 511291.88 */ | 107 | 99999999000LL, /*DEM Germany 511291.88 */ |
108 | 99999999000LL, /*ATS Austria 72672.83 */ | 108 | 99999999000LL, /*ATS Austria 72672.83 */ |
109 | 99999999000LL, /*BEF Belgium 24789.35 */ | 109 | 99999999000LL, /*BEF Belgium 24789.35 */ |
110 | 92233720300000LL, /*ESP Spain 5543358.23 */ | 110 | 92233720300000LL,/*ESP Spain 5543358.23 */ |
111 | 99999999000LL, /*FIM Finland 168187.92 */ | 111 | 99999999000LL, /*FIM Finland 168187.92 */ |
112 | 9999999900LL, /*IEP Irland 1269744.51 exact value=1269738.07 */ | 112 | 9999999900LL, /*IEP Ireland 1269744.51 exact value=1269738.07 */ |
113 | 92233720300000LL,/*ITL Italy 476347.41 */ | 113 | 92233720300000LL,/*ITL Italy 476347.41 */ |
114 | 99999999000LL, /*LUF Luxemburg 24789.35 */ | 114 | 99999999000LL, /*LUF Luxemburg 24789.35 */ |
115 | 99999999000LL, /*NLG Netherlands 453780.21 */ | 115 | 99999999000LL, /*NLG Netherlands 453780.21 */ |
116 | 92233720300000LL, /*PTE Portugal 4600598.57 */ | 116 | 92233720300000LL,/*PTE Portugal 4600598.57 */ |
117 | 92233720300000LL /*GRD Greece 2706777.69 */ | 117 | 92233720300000LL /*GRD Greece 2706777.69 */ |
118 | }; | 118 | }; |
119 | 119 | ||
120 | static unsigned char *abbrev_str[12] = { | 120 | static unsigned char *abbrev_str[12] = { |
@@ -124,7 +124,7 @@ static unsigned char *abbrev_str[12] = { | |||
124 | "...BEF...", /*Belgium*/ | 124 | "...BEF...", /*Belgium*/ |
125 | "...ESP...", /*Spain*/ | 125 | "...ESP...", /*Spain*/ |
126 | "...FIM...", /*Finland*/ | 126 | "...FIM...", /*Finland*/ |
127 | "...IEP...", /*Irland*/ | 127 | "...IEP...", /*Ireland*/ |
128 | "...ITL...", /*Italy*/ | 128 | "...ITL...", /*Italy*/ |
129 | "...LUF...", /*Luxemburg*/ | 129 | "...LUF...", /*Luxemburg*/ |
130 | "...NLG...", /*Netherlands*/ | 130 | "...NLG...", /*Netherlands*/ |
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index 973e27e299..02867d9d8b 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c | |||
@@ -286,7 +286,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
286 | rb->lcd_putsxy(2, 48, "[F3] step by step"); | 286 | rb->lcd_putsxy(2, 48, "[F3] step by step"); |
287 | #elif CONFIG_KEYPAD == ONDIO_PAD | 287 | #elif CONFIG_KEYPAD == ONDIO_PAD |
288 | rb->lcd_putsxy(2, 8, "[OFF] to stop"); | 288 | rb->lcd_putsxy(2, 8, "[OFF] to stop"); |
289 | rb->lcd_putsxy(2, 18, "[MENU] toggle"); | 289 | rb->lcd_putsxy(2, 18, "[MODE] toggle"); |
290 | rb->lcd_putsxy(2, 28, "[M-LEFT] shuffle"); | 290 | rb->lcd_putsxy(2, 28, "[M-LEFT] shuffle"); |
291 | rb->lcd_putsxy(2, 38, "[M-UP] solution"); | 291 | rb->lcd_putsxy(2, 38, "[M-UP] solution"); |
292 | rb->lcd_putsxy(2, 48, "[M-RIGHT] step by step"); | 292 | rb->lcd_putsxy(2, 48, "[M-RIGHT] step by step"); |
diff --git a/apps/plugins/metronome.c b/apps/plugins/metronome.c index cf93aa5b11..d2608d38a8 100644 --- a/apps/plugins/metronome.c +++ b/apps/plugins/metronome.c | |||
@@ -36,8 +36,8 @@ | |||
36 | #define METRONOME_PAUSE (BUTTON_MENU | BUTTON_REPEAT) | 36 | #define METRONOME_PAUSE (BUTTON_MENU | BUTTON_REPEAT) |
37 | #define METRONOME_VOL_UP BUTTON_UP | 37 | #define METRONOME_VOL_UP BUTTON_UP |
38 | #define METRONOME_VOL_DOWN BUTTON_DOWN | 38 | #define METRONOME_VOL_DOWN BUTTON_DOWN |
39 | #define METRONOME_MSG_START "start: menu" | 39 | #define METRONOME_MSG_START "start: mode" |
40 | #define METRONOME_MSG_STOP "pause: hold menu" | 40 | #define METRONOME_MSG_STOP "pause: hold mode" |
41 | 41 | ||
42 | #elif CONFIG_KEYPAD == PLAYER_PAD | 42 | #elif CONFIG_KEYPAD == PLAYER_PAD |
43 | #define METRONOME_QUIT BUTTON_STOP | 43 | #define METRONOME_QUIT BUTTON_STOP |
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index 81ed24096a..b6636bbfb7 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c | |||
@@ -304,7 +304,7 @@ int minesweeper(void) | |||
304 | #if CONFIG_KEYPAD == RECORDER_PAD | 304 | #if CONFIG_KEYPAD == RECORDER_PAD |
305 | rb->lcd_putsxy(1,44,"ON to start"); | 305 | rb->lcd_putsxy(1,44,"ON to start"); |
306 | #elif CONFIG_KEYPAD == ONDIO_PAD | 306 | #elif CONFIG_KEYPAD == ONDIO_PAD |
307 | rb->lcd_putsxy(1,44,"MENU to start"); | 307 | rb->lcd_putsxy(1,44,"MODE to start"); |
308 | #endif | 308 | #endif |
309 | 309 | ||
310 | rb->lcd_update(); | 310 | rb->lcd_update(); |
diff --git a/apps/plugins/rockbox_flash.c b/apps/plugins/rockbox_flash.c index 91d440e1e0..7d0f630474 100644 --- a/apps/plugins/rockbox_flash.c +++ b/apps/plugins/rockbox_flash.c | |||
@@ -966,7 +966,7 @@ void DoUserDialog(char* filename) | |||
966 | { | 966 | { |
967 | rb->snprintf(buf, sizeof(buf), "Verify fail! %d errors", rc); | 967 | rb->snprintf(buf, sizeof(buf), "Verify fail! %d errors", rc); |
968 | rb->lcd_puts_scroll(0, 0, buf); | 968 | rb->lcd_puts_scroll(0, 0, buf); |
969 | rb->lcd_puts_scroll(0, 1, "Use safe image if booting hangs: [Menu] during power-on"); | 969 | rb->lcd_puts_scroll(0, 1, "Use safe image if booting hangs: [-] during power-on"); |
970 | button = WaitForButton(); | 970 | button = WaitForButton(); |
971 | } | 971 | } |
972 | } | 972 | } |
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index 789e8789e8..aaaf0f78cb 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c | |||
@@ -334,8 +334,8 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
334 | rb->lcd_putsxy(3, 38, "[F2] change pic"); | 334 | rb->lcd_putsxy(3, 38, "[F2] change pic"); |
335 | #elif CONFIG_KEYPAD == ONDIO_PAD | 335 | #elif CONFIG_KEYPAD == ONDIO_PAD |
336 | rb->lcd_putsxy(0, 18, "[OFF] to stop"); | 336 | rb->lcd_putsxy(0, 18, "[OFF] to stop"); |
337 | rb->lcd_putsxy(0, 28, "[MENU..] shuffle"); | 337 | rb->lcd_putsxy(0, 28, "[MODE..] shuffle"); |
338 | rb->lcd_putsxy(0, 38, "[MENU] change pic"); | 338 | rb->lcd_putsxy(0, 38, "[MODE] change pic"); |
339 | #endif | 339 | #endif |
340 | rb->lcd_update(); | 340 | rb->lcd_update(); |
341 | rb->sleep(HZ*2); | 341 | rb->sleep(HZ*2); |
diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c index 242c432e8b..3a672f9972 100644 --- a/apps/plugins/snake.c +++ b/apps/plugins/snake.c | |||
@@ -173,7 +173,7 @@ void game_pause (void) { | |||
173 | #if CONFIG_KEYPAD == RECORDER_PAD | 173 | #if CONFIG_KEYPAD == RECORDER_PAD |
174 | rb->lcd_putsxy(3,22,"[Play] to resume"); | 174 | rb->lcd_putsxy(3,22,"[Play] to resume"); |
175 | #elif CONFIG_KEYPAD == ONDIO_PAD | 175 | #elif CONFIG_KEYPAD == ONDIO_PAD |
176 | rb->lcd_putsxy(3,22,"[Menu] to resume"); | 176 | rb->lcd_putsxy(3,22,"[Mode] to resume"); |
177 | #endif | 177 | #endif |
178 | rb->lcd_putsxy(3,32,"[Off] to quit"); | 178 | rb->lcd_putsxy(3,32,"[Off] to quit"); |
179 | rb->lcd_update(); | 179 | rb->lcd_update(); |
@@ -279,7 +279,7 @@ void game_init(void) { | |||
279 | #if CONFIG_KEYPAD == RECORDER_PAD | 279 | #if CONFIG_KEYPAD == RECORDER_PAD |
280 | rb->lcd_puts(0,3, "PLAY - start/pause"); | 280 | rb->lcd_puts(0,3, "PLAY - start/pause"); |
281 | #elif CONFIG_KEYPAD == ONDIO_PAD | 281 | #elif CONFIG_KEYPAD == ONDIO_PAD |
282 | rb->lcd_puts(0,3, "MENU - start/pause"); | 282 | rb->lcd_puts(0,3, "MODE - start/pause"); |
283 | #endif | 283 | #endif |
284 | rb->lcd_puts(0,4, phscore); | 284 | rb->lcd_puts(0,4, phscore); |
285 | rb->lcd_update(); | 285 | rb->lcd_update(); |
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index 6365e6c3ae..5b0eae1bc6 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c | |||
@@ -878,7 +878,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
878 | rb->lcd_putsxy(3, 46, "[F3] + Level"); | 878 | rb->lcd_putsxy(3, 46, "[F3] + Level"); |
879 | #elif CONFIG_KEYPAD == ONDIO_PAD | 879 | #elif CONFIG_KEYPAD == ONDIO_PAD |
880 | rb->lcd_putsxy(3, 6, "[OFF] To Stop"); | 880 | rb->lcd_putsxy(3, 6, "[OFF] To Stop"); |
881 | rb->lcd_putsxy(3, 16, "[MENU] To Undo"); | 881 | rb->lcd_putsxy(3, 16, "[MODE] To Undo"); |
882 | rb->lcd_putsxy(3, 26, "[M-LEFT] - Level"); | 882 | rb->lcd_putsxy(3, 26, "[M-LEFT] - Level"); |
883 | rb->lcd_putsxy(3, 36, "[M-UP] Same Level"); | 883 | rb->lcd_putsxy(3, 36, "[M-UP] Same Level"); |
884 | rb->lcd_putsxy(3, 46, "[M-RIGHT] + Level"); | 884 | rb->lcd_putsxy(3, 46, "[M-RIGHT] + Level"); |
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index fa01fbd1cf..9e8347fb79 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c | |||
@@ -102,8 +102,8 @@ static struct plugin_api* rb; | |||
102 | #define HELP_SOL_REM2STACK "F3: Put the card on top of the remains' stack on one of the 4 final color stacks." | 102 | #define HELP_SOL_REM2STACK "F3: Put the card on top of the remains' stack on one of the 4 final color stacks." |
103 | 103 | ||
104 | #elif CONFIG_KEYPAD == ONDIO_PAD | 104 | #elif CONFIG_KEYPAD == ONDIO_PAD |
105 | #define HELP_SOL_MOVE "MENU: Select cards, Move cards, reveal hidden cards ..." | 105 | #define HELP_SOL_MOVE "MODE: Select cards, Move cards, reveal hidden cards ..." |
106 | #define HELP_SOL_DRAW "MENU..: Un-select a card if it was selected. Else, draw 3 new cards out of the remains' stack." | 106 | #define HELP_SOL_DRAW "MODE..: Un-select a card if it was selected. Else, draw 3 new cards out of the remains' stack." |
107 | #define HELP_SOL_REM2CUR "LEFT..: Put the card on top of the remains' stack on top of the cursor." | 107 | #define HELP_SOL_REM2CUR "LEFT..: Put the card on top of the remains' stack on top of the cursor." |
108 | #define HELP_SOL_CUR2STACK "RIGHT..: Put the card under the cursor on one of the 4 final color stacks." | 108 | #define HELP_SOL_CUR2STACK "RIGHT..: Put the card under the cursor on one of the 4 final color stacks." |
109 | #define HELP_SOL_REM2STACK "UP..: Put the card on top of the remains' stack on one of the 4 final color stacks." | 109 | #define HELP_SOL_REM2STACK "UP..: Put the card on top of the remains' stack on one of the 4 final color stacks." |
@@ -341,13 +341,13 @@ int solitaire_help(void){ | |||
341 | rb->lcd_putsxy(0, 49, "be done using"); | 341 | rb->lcd_putsxy(0, 49, "be done using"); |
342 | rb->lcd_putsxy(0, 56, "arrows, ON and F2."); | 342 | rb->lcd_putsxy(0, 56, "arrows, ON and F2."); |
343 | #elif CONFIG_KEYPAD == ONDIO_PAD | 343 | #elif CONFIG_KEYPAD == ONDIO_PAD |
344 | rb->lcd_putsxy(0, 0, "Press a key short or"); | 344 | rb->lcd_putsxy(0, 0, "Press a key short"); |
345 | rb->lcd_putsxy(0, 7, "long to see it's role."); | 345 | rb->lcd_putsxy(0, 7, "or long to see it's"); |
346 | rb->lcd_putsxy(0, 21, "Press OFF to"); | 346 | rb->lcd_putsxy(0, 21, "role. Press OFF to"); |
347 | rb->lcd_putsxy(0, 28, "return to menu."); | 347 | rb->lcd_putsxy(0, 28, "return to menu."); |
348 | rb->lcd_putsxy(0, 42, "All actions can be"); | 348 | rb->lcd_putsxy(0, 42, "All actions can be"); |
349 | rb->lcd_putsxy(0, 49, "done using arows,"); | 349 | rb->lcd_putsxy(0, 49, "done using arrows,"); |
350 | rb->lcd_putsxy(0, 56, "short & long MENU."); | 350 | rb->lcd_putsxy(0, 56, "short & long MODE."); |
351 | #endif | 351 | #endif |
352 | 352 | ||
353 | rb->lcd_update(); | 353 | rb->lcd_update(); |
diff --git a/apps/plugins/star.c b/apps/plugins/star.c index e2f11a5c07..1b9dca8f40 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c | |||
@@ -808,7 +808,7 @@ static int star_menu(void) | |||
808 | "[F3] Next level", true); | 808 | "[F3] Next level", true); |
809 | #elif CONFIG_KEYPAD == ONDIO_PAD | 809 | #elif CONFIG_KEYPAD == ONDIO_PAD |
810 | star_display_text("KEYS\n\n" | 810 | star_display_text("KEYS\n\n" |
811 | "[MENU] Toggle Ctl\n" | 811 | "[MODE] Toggle Ctl\n" |
812 | "[OFF] Exit\n" | 812 | "[OFF] Exit\n" |
813 | "[M <] Prev. level\n" | 813 | "[M <] Prev. level\n" |
814 | "[M ^] Reset level\n" | 814 | "[M ^] Reset level\n" |
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index 1cb37e4161..ba218903e7 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c | |||
@@ -119,7 +119,7 @@ void load_settings(void) { | |||
119 | #if CONFIG_KEYPAD == RECORDER_PAD | 119 | #if CONFIG_KEYPAD == RECORDER_PAD |
120 | rb->splash(HZ, true, "Press ON for help"); | 120 | rb->splash(HZ, true, "Press ON for help"); |
121 | #elif CONFIG_KEYPAD == ONDIO_PAD | 121 | #elif CONFIG_KEYPAD == ONDIO_PAD |
122 | rb->splash(HZ, true, "Press MENU for help"); | 122 | rb->splash(HZ, true, "Press MODE for help"); |
123 | #endif | 123 | #endif |
124 | } | 124 | } |
125 | } | 125 | } |
@@ -448,7 +448,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) { | |||
448 | #if CONFIG_KEYPAD == RECORDER_PAD | 448 | #if CONFIG_KEYPAD == RECORDER_PAD |
449 | rb->lcd_puts(0, 1, "F1: Settings"); | 449 | rb->lcd_puts(0, 1, "F1: Settings"); |
450 | #elif CONFIG_KEYPAD == ONDIO_PAD | 450 | #elif CONFIG_KEYPAD == ONDIO_PAD |
451 | rb->lcd_puts(0, 1, "MENU..: Settings"); | 451 | rb->lcd_puts(0, 1, "MODE..: Settings"); |
452 | #endif | 452 | #endif |
453 | rb->lcd_puts(0, 2, "UP/DOWN: Volume"); | 453 | rb->lcd_puts(0, 2, "UP/DOWN: Volume"); |
454 | rb->lcd_update(); | 454 | rb->lcd_update(); |