Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

VU_meter: Fix help texts for most targets. * Blackjack: Add help text for M3. * Bubbles: Adjust a text and fix hold behaviour for M3.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16757 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2008-03-23 08:26:42 +00:00
parent df4e4f5921
commit 8bfefe9ce1
3 changed files with 74 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/plugins/blackjack.c
View file

@ -1184,6 +1184,16 @@ static unsigned int blackjack_menu(struct game_context* bj) {
rb->lcd_puts(0, 7, "REC to view scores");
rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]);
rb->lcd_puts(0, 9, str);
#elif CONFIG_KEYPAD == IAUDIO_M3_PAD
rb->lcd_puts(0, 2, "PLAY to start & to");
rb->lcd_puts(0, 3, " hit");
rb->lcd_puts(0, 4, "REC to exit");
rb->lcd_puts(0, 5, "FF to stay");
rb->lcd_puts(0, 6, "REW to double down");
rb->lcd_puts(0, 7, "MODE to save/resume");
rb->lcd_puts(0, 8, "MENU to view scores");
rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]);
rb->lcd_puts(0, 10, str);
#endif
} else {
rb->snprintf(str, 12, "%s", "High Scores");

7
apps/plugins/bubbles.c
View file

@ -2284,8 +2284,9 @@ static int bubbles_handlebuttons(struct game_context* bb, bool animblock,
if (timeout < 0)
timeout = 0;
button = pluginlib_getaction(rb,timeout,plugin_contexts,2);
#ifdef HAS_BUTTON_HOLD
if (rb->button_hold())
#ifdef HAS_BUTTON_HOLD && !defined(HAVE_REMOTE_LCD_AS_MAIN)
/* FIXME: Should probably check remote hold here */
if (rb->button_hold())
button = BUBBLES_START;
#endif
@ -2455,7 +2456,7 @@ static int bubbles(struct game_context* bb) {
rb->lcd_puts(0, 5, "MODE to fire");
rb->lcd_puts(0, 6, " and show high scores");
rb->lcd_puts(0, 7, "REW/FF to aim");
rb->lcd_puts(0, 8, "VOL UP/DN to change level");
rb->lcd_puts(0, 8, "VOL UP/DN to chg. lvl");
#endif
#if LCD_WIDTH >= 138
rb->snprintf(str, 28, "Start on level %d of %d", startlevel+1,

72
apps/plugins/vu_meter.c
View file

@ -31,6 +31,10 @@ PLUGIN_HEADER
#define VUMETER_MENU_EXIT2 BUTTON_OFF
#define VUMETER_UP BUTTON_UP
#define VUMETER_DOWN BUTTON_DOWN
#define LABEL_HELP "ON"
#define LABEL_QUIT "OFF"
#define LABEL_MENU "F1"
#define LABEL_VOLUME "UP/DOWN"
#elif CONFIG_KEYPAD == ARCHOS_AV300_PAD
#define VUMETER_QUIT BUTTON_OFF
@ -40,6 +44,10 @@ PLUGIN_HEADER
#define VUMETER_MENU_EXIT2 BUTTON_OFF
#define VUMETER_UP BUTTON_UP
#define VUMETER_DOWN BUTTON_DOWN
#define LABEL_HELP "ON"
#define LABEL_QUIT "OFF"
#define LABEL_MENU "F1"
#define LABEL_VOLUME "UP/DOWN"
#elif CONFIG_KEYPAD == ONDIO_PAD
#define VUMETER_QUIT BUTTON_OFF
@ -51,6 +59,10 @@ PLUGIN_HEADER
#define VUMETER_MENU_EXIT2 BUTTON_OFF
#define VUMETER_UP BUTTON_UP
#define VUMETER_DOWN BUTTON_DOWN
#define LABEL_HELP "MODE"
#define LABEL_QUIT "OFF"
#define LABEL_MENU "MODE.."
#define LABEL_VOLUME "UP/DOWN"
#elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \
(CONFIG_KEYPAD == IRIVER_H300_PAD)
@ -62,6 +74,10 @@ PLUGIN_HEADER
#define VUMETER_MENU_EXIT2 BUTTON_OFF
#define VUMETER_UP BUTTON_UP
#define VUMETER_DOWN BUTTON_DOWN
#define LABEL_HELP "PLAY"
#define LABEL_QUIT "STOP"
#define LABEL_MENU "SELECT,MODE"
#define LABEL_VOLUME "UP/DOWN"
#define VUMETER_RC_QUIT BUTTON_RC_STOP
@ -75,6 +91,10 @@ PLUGIN_HEADER
#define VUMETER_MENU_EXIT2 BUTTON_MENU
#define VUMETER_UP BUTTON_SCROLL_FWD
#define VUMETER_DOWN BUTTON_SCROLL_BACK
#define LABEL_HELP "PLAY"
#define LABEL_QUIT "MENU"
#define LABEL_MENU "SELECT"
#define LABEL_VOLUME "Wheel"
#elif (CONFIG_KEYPAD == GIGABEAT_PAD)
#define VUMETER_QUIT BUTTON_POWER
@ -84,6 +104,10 @@ PLUGIN_HEADER
#define VUMETER_MENU_EXIT2 BUTTON_POWER
#define VUMETER_UP BUTTON_UP
#define VUMETER_DOWN BUTTON_DOWN
#define LABEL_HELP "A"
#define LABEL_QUIT "POWER"
#define LABEL_MENU "MENU"
#define LABEL_VOLUME "UP/DOWN"
#elif (CONFIG_KEYPAD == SANSA_E200_PAD)
#define VUMETER_QUIT BUTTON_POWER
@ -93,6 +117,10 @@ PLUGIN_HEADER
#define VUMETER_MENU_EXIT2 BUTTON_POWER
#define VUMETER_UP BUTTON_SCROLL_FWD
#define VUMETER_DOWN BUTTON_SCROLL_BACK
#define LABEL_HELP "REC"
#define LABEL_QUIT "POWER"
#define LABEL_MENU "SELECT"
#define LABEL_VOLUME "Wheel"
#elif (CONFIG_KEYPAD == SANSA_C200_PAD)
#define VUMETER_QUIT BUTTON_POWER
@ -102,6 +130,10 @@ PLUGIN_HEADER
#define VUMETER_MENU_EXIT2 BUTTON_POWER
#define VUMETER_UP BUTTON_VOL_UP
#define VUMETER_DOWN BUTTON_VOL_DOWN
#define LABEL_HELP "REC"
#define LABEL_QUIT "POWER"
#define LABEL_MENU "SELECT"
#define LABEL_VOLUME "VOL UP/DN"
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#define VUMETER_QUIT BUTTON_POWER
@ -111,6 +143,10 @@ PLUGIN_HEADER
#define VUMETER_MENU_EXIT2 BUTTON_POWER
#define VUMETER_UP BUTTON_UP
#define VUMETER_DOWN BUTTON_DOWN
#define LABEL_HELP "PLAY"
#define LABEL_QUIT "POWER"
#define LABEL_MENU "SELECT"
#define LABEL_VOLUME "UP/DOWN"
#elif CONFIG_KEYPAD == IRIVER_H10_PAD
#define VUMETER_QUIT BUTTON_POWER
@ -120,6 +156,10 @@ PLUGIN_HEADER
#define VUMETER_MENU_EXIT2 BUTTON_POWER
#define VUMETER_UP BUTTON_SCROLL_UP
#define VUMETER_DOWN BUTTON_SCROLL_DOWN
#define LABEL_HELP "PLAY"
#define LABEL_QUIT "POWER"
#define LABEL_MENU "REW"
#define LABEL_VOLUME "Scroller"
#elif (CONFIG_KEYPAD == GIGABEAT_S_PAD)
#define VUMETER_QUIT BUTTON_BACK
@ -129,6 +169,10 @@ PLUGIN_HEADER
#define VUMETER_MENU_EXIT2 BUTTON_PLAY
#define VUMETER_UP BUTTON_UP
#define VUMETER_DOWN BUTTON_DOWN
#define LABEL_HELP "NEXT"
#define LABEL_QUIT "BACK"
#define LABEL_MENU "MENU"
#define LABEL_VOLUME "UP/DOWN"
#elif (CONFIG_KEYPAD == MROBE100_PAD)
#define VUMETER_QUIT BUTTON_POWER
@ -138,6 +182,10 @@ PLUGIN_HEADER
#define VUMETER_MENU_EXIT2 BUTTON_POWER
#define VUMETER_UP BUTTON_UP
#define VUMETER_DOWN BUTTON_DOWN
#define LABEL_HELP "DISPLAY"
#define LABEL_QUIT "POWER"
#define LABEL_MENU "MENU"
#define LABEL_VOLUME "UP/DOWN"
#elif CONFIG_KEYPAD == IAUDIO_M3_PAD
#define VUMETER_QUIT BUTTON_RC_REC
@ -147,6 +195,10 @@ PLUGIN_HEADER
#define VUMETER_MENU_EXIT2 BUTTON_RC_REC
#define VUMETER_UP BUTTON_RC_VOL_UP
#define VUMETER_DOWN BUTTON_RC_VOL_DOWN
#define LABEL_HELP "MODE"
#define LABEL_QUIT "REC"
#define LABEL_MENU "MENU"
#define LABEL_VOLUME "VOL UP/DN"
#elif CONFIG_KEYPAD == COWOND2_PAD
#define VUMETER_QUIT BUTTON_POWER
@ -156,6 +208,10 @@ PLUGIN_HEADER
#define VUMETER_MENU_EXIT2 BUTTON_POWER
#define VUMETER_UP BUTTON_UP
#define VUMETER_DOWN BUTTON_DOWN
#define LABEL_HELP "SELECT"
#define LABEL_QUIT "POWER"
#define LABEL_MENU "MENU"
#define LABEL_VOLUME "UP/DOWN"
#else
#error No keymap defined!
@ -290,11 +346,7 @@ void load_settings(void) {
}
else {
reset_settings();
#if CONFIG_KEYPAD == RECORDER_PAD
rb->splash(HZ, "Press ON for help");
#elif CONFIG_KEYPAD == ONDIO_PAD
rb->splash(HZ, "Press MODE for help");
#endif
rb->splash(HZ, "Press " LABEL_HELP " for help");
}
}
@ -617,13 +669,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) {
break;
#endif
rb->lcd_clear_display();
rb->lcd_puts(0, 0, "OFF: Exit");
#if CONFIG_KEYPAD == RECORDER_PAD
rb->lcd_puts(0, 1, "F1: Settings");
#elif CONFIG_KEYPAD == ONDIO_PAD
rb->lcd_puts(0, 1, "MODE..: Settings");
#endif
rb->lcd_puts(0, 2, "UP/DOWN: Volume");
rb->lcd_puts(0, 0, LABEL_QUIT ": Exit");
rb->lcd_puts(0, 1, LABEL_MENU ": Settings");
rb->lcd_puts(0, 2, LABEL_VOLUME ": Volume");
rb->lcd_update();
rb->sleep(HZ*3);
break;