summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Schwarz <ubuntuxer@rockbox.org>2009-07-23 17:45:33 +0000
committerJohannes Schwarz <ubuntuxer@rockbox.org>2009-07-23 17:45:33 +0000
commit0d9b7ec73e71188632a4fd584dfd745aeb7571b3 (patch)
tree9b035784a8809984f953d367ec17a7fe0ba149a8
parent06d51630c19b4d5d4933bb03d61f2d69cbb5454f (diff)
downloadrockbox-0d9b7ec73e71188632a4fd584dfd745aeb7571b3.tar.gz
rockbox-0d9b7ec73e71188632a4fd584dfd745aeb7571b3.zip
Fix wrong text colour in help, adapt pegbox manual to r21867
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22016 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugins/brickmania.c7
-rw-r--r--apps/plugins/jewels.c3
-rw-r--r--apps/plugins/spacerocks.c9
-rw-r--r--apps/plugins/star.c6
-rw-r--r--manual/plugins/pegbox.tex2
5 files changed, 17 insertions, 10 deletions
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c
index 61d0f17bf1..034ac9c770 100644
--- a/apps/plugins/brickmania.c
+++ b/apps/plugins/brickmania.c
@@ -779,11 +779,16 @@ static int brickmania_help(void)
{ 67, C_GREEN },
{ 74, C_YELLOW },
{ 80, C_RED },
+ { -1, 0 }
};
+#ifdef HAVE_LCD_COLOR
+ rb->lcd_set_background(LCD_BLACK);
+ rb->lcd_set_foreground(LCD_WHITE);
+#endif
+ int button;
if (display_text(WORDS, help_text, formation, NULL)==PLUGIN_USB_CONNECTED)
return PLUGIN_USB_CONNECTED;
- int button;
do {
button = rb->button_get(true);
if (button == SYS_USB_CONNECTED) {
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c
index 77c4030f61..8696328c78 100644
--- a/apps/plugins/jewels.c
+++ b/apps/plugins/jewels.c
@@ -1275,12 +1275,11 @@ static bool jewels_help(void)
{ 42, C_RED },
{ -1, 0 }
};
- int button;
-
#ifdef HAVE_LCD_COLOR
rb->lcd_set_background(LCD_BLACK);
rb->lcd_set_foreground(LCD_WHITE);
#endif
+ int button;
if (display_text(WORDS, help_text, formation, NULL))
return true;
do {
diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c
index 778733c78e..d4fc45f754 100644
--- a/apps/plugins/spacerocks.c
+++ b/apps/plugins/spacerocks.c
@@ -604,13 +604,16 @@ static bool spacerocks_help(void)
};
static struct style_text formation[]={
{ 0, TEXT_CENTER|TEXT_UNDERLINE },
- { 2, C_RED }
+ { 2, C_RED },
+ { -1, 0 }
};
+#ifdef HAVE_LCD_COLOR
+ rb->lcd_set_background(LCD_BLACK);
+ rb->lcd_set_foreground(LCD_WHITE);
+#endif
int button;
-
if (display_text(WORDS, help_text, formation, NULL)==PLUGIN_USB_CONNECTED)
return true;
-
do {
button = rb->button_get(true);
if (button == SYS_USB_CONNECTED) {
diff --git a/apps/plugins/star.c b/apps/plugins/star.c
index 0ab6dce17b..bb216bf17c 100644
--- a/apps/plugins/star.c
+++ b/apps/plugins/star.c
@@ -990,8 +990,8 @@ static bool star_help(void)
"it", "as", "a", "mobile", "wall.", "The", "block", "cannot", "take",
"stars.", "", "",
"Controls", "",
- STAR_TOGGLE_CONTROL_NAME":", "Toggle", "Control", "",
- STAR_QUIT_NAME":", "", "Exit", "",
+ STAR_TOGGLE_CONTROL_NAME":", "Toggle", "control", "",
+ STAR_QUIT_NAME":", "Exit", "",
STAR_LEVEL_DOWN_NAME":", "Prev.", "level", "",
STAR_LEVEL_REPEAT_NAME":", "Reset", "level", "",
STAR_LEVEL_UP_NAME":", "Next", "level"
@@ -1025,7 +1025,7 @@ static int star_menu(void)
/* get the size of char */
rb->lcd_getstringsize("a", &char_width, &char_height);
- MENUITEM_STRINGLIST(menu,"Star Menu",NULL,"Play","Choose Level",
+ MENUITEM_STRINGLIST(menu,"Star Menu",NULL,"Start Game","Choose Level",
"Help", "Quit");
while(!menu_quit)
diff --git a/manual/plugins/pegbox.tex b/manual/plugins/pegbox.tex
index 93e9b4d132..0cda558684 100644
--- a/manual/plugins/pegbox.tex
+++ b/manual/plugins/pegbox.tex
@@ -48,7 +48,7 @@ block and crosses which allow you to choose a replacement block.
\opt{MROBE100_PAD}{\ButtonSelect}
\opt{SANSA_C200_PAD}{\ButtonSelect}
\opt{HAVEREMOTEKEYMAP}{& }
- & to select/save\\
+ & to choose peg\\
\opt{RECORDER_PAD}{\ButtonFTwo}
\opt{ONDIO_PAD}{\ButtonMenu + \ButtonRight}