summaryrefslogtreecommitdiff
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)
779 { 67, C_GREEN }, 779 { 67, C_GREEN },
780 { 74, C_YELLOW }, 780 { 74, C_YELLOW },
781 { 80, C_RED }, 781 { 80, C_RED },
782 { -1, 0 }
782 }; 783 };
783 784
785#ifdef HAVE_LCD_COLOR
786 rb->lcd_set_background(LCD_BLACK);
787 rb->lcd_set_foreground(LCD_WHITE);
788#endif
789 int button;
784 if (display_text(WORDS, help_text, formation, NULL)==PLUGIN_USB_CONNECTED) 790 if (display_text(WORDS, help_text, formation, NULL)==PLUGIN_USB_CONNECTED)
785 return PLUGIN_USB_CONNECTED; 791 return PLUGIN_USB_CONNECTED;
786 int button;
787 do { 792 do {
788 button = rb->button_get(true); 793 button = rb->button_get(true);
789 if (button == SYS_USB_CONNECTED) { 794 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)
1275 { 42, C_RED }, 1275 { 42, C_RED },
1276 { -1, 0 } 1276 { -1, 0 }
1277 }; 1277 };
1278 int button;
1279
1280#ifdef HAVE_LCD_COLOR 1278#ifdef HAVE_LCD_COLOR
1281 rb->lcd_set_background(LCD_BLACK); 1279 rb->lcd_set_background(LCD_BLACK);
1282 rb->lcd_set_foreground(LCD_WHITE); 1280 rb->lcd_set_foreground(LCD_WHITE);
1283#endif 1281#endif
1282 int button;
1284 if (display_text(WORDS, help_text, formation, NULL)) 1283 if (display_text(WORDS, help_text, formation, NULL))
1285 return true; 1284 return true;
1286 do { 1285 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)
604 }; 604 };
605 static struct style_text formation[]={ 605 static struct style_text formation[]={
606 { 0, TEXT_CENTER|TEXT_UNDERLINE }, 606 { 0, TEXT_CENTER|TEXT_UNDERLINE },
607 { 2, C_RED } 607 { 2, C_RED },
608 { -1, 0 }
608 }; 609 };
610#ifdef HAVE_LCD_COLOR
611 rb->lcd_set_background(LCD_BLACK);
612 rb->lcd_set_foreground(LCD_WHITE);
613#endif
609 int button; 614 int button;
610
611 if (display_text(WORDS, help_text, formation, NULL)==PLUGIN_USB_CONNECTED) 615 if (display_text(WORDS, help_text, formation, NULL)==PLUGIN_USB_CONNECTED)
612 return true; 616 return true;
613
614 do { 617 do {
615 button = rb->button_get(true); 618 button = rb->button_get(true);
616 if (button == SYS_USB_CONNECTED) { 619 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)
990 "it", "as", "a", "mobile", "wall.", "The", "block", "cannot", "take", 990 "it", "as", "a", "mobile", "wall.", "The", "block", "cannot", "take",
991 "stars.", "", "", 991 "stars.", "", "",
992 "Controls", "", 992 "Controls", "",
993 STAR_TOGGLE_CONTROL_NAME":", "Toggle", "Control", "", 993 STAR_TOGGLE_CONTROL_NAME":", "Toggle", "control", "",
994 STAR_QUIT_NAME":", "", "Exit", "", 994 STAR_QUIT_NAME":", "Exit", "",
995 STAR_LEVEL_DOWN_NAME":", "Prev.", "level", "", 995 STAR_LEVEL_DOWN_NAME":", "Prev.", "level", "",
996 STAR_LEVEL_REPEAT_NAME":", "Reset", "level", "", 996 STAR_LEVEL_REPEAT_NAME":", "Reset", "level", "",
997 STAR_LEVEL_UP_NAME":", "Next", "level" 997 STAR_LEVEL_UP_NAME":", "Next", "level"
@@ -1025,7 +1025,7 @@ static int star_menu(void)
1025 /* get the size of char */ 1025 /* get the size of char */
1026 rb->lcd_getstringsize("a", &char_width, &char_height); 1026 rb->lcd_getstringsize("a", &char_width, &char_height);
1027 1027
1028 MENUITEM_STRINGLIST(menu,"Star Menu",NULL,"Play","Choose Level", 1028 MENUITEM_STRINGLIST(menu,"Star Menu",NULL,"Start Game","Choose Level",
1029 "Help", "Quit"); 1029 "Help", "Quit");
1030 1030
1031 while(!menu_quit) 1031 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.
48 \opt{MROBE100_PAD}{\ButtonSelect} 48 \opt{MROBE100_PAD}{\ButtonSelect}
49 \opt{SANSA_C200_PAD}{\ButtonSelect} 49 \opt{SANSA_C200_PAD}{\ButtonSelect}
50 \opt{HAVEREMOTEKEYMAP}{& } 50 \opt{HAVEREMOTEKEYMAP}{& }
51 & to select/save\\ 51 & to choose peg\\
52 52
53 \opt{RECORDER_PAD}{\ButtonFTwo} 53 \opt{RECORDER_PAD}{\ButtonFTwo}
54 \opt{ONDIO_PAD}{\ButtonMenu + \ButtonRight} 54 \opt{ONDIO_PAD}{\ButtonMenu + \ButtonRight}