diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2006-10-09 11:22:42 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2006-10-09 11:22:42 +0000 |
commit | a9505c52244edcdad32c419527e89b9d106dcb87 (patch) | |
tree | 4cf2b68996bfdb39fb80024aedf97fcb2287919f | |
parent | 27ad51fb15d6ba753ee8f7d7d9dafd43d20e6551 (diff) | |
download | rockbox-a9505c52244edcdad32c419527e89b9d106dcb87.tar.gz rockbox-a9505c52244edcdad32c419527e89b9d106dcb87.zip |
fixed typo and builds
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11159 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/lang/english.lang | 2 | ||||
-rw-r--r-- | apps/plugins/random_folder_advance_config.c | 12 | ||||
-rw-r--r-- | apps/settings_menu.c | 2 |
3 files changed, 13 insertions, 3 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index eee33b7d08..8a2341b204 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -9928,7 +9928,7 @@ | |||
9928 | </voice> | 9928 | </voice> |
9929 | </phrase> | 9929 | </phrase> |
9930 | <phrase> | 9930 | <phrase> |
9931 | id: LANG_RANOOM | 9931 | id: LANG_RANDOM |
9932 | desc: random folder | 9932 | desc: random folder |
9933 | <source> | 9933 | <source> |
9934 | *: "Random" | 9934 | *: "Random" |
diff --git a/apps/plugins/random_folder_advance_config.c b/apps/plugins/random_folder_advance_config.c index 033232a29e..46d6eea381 100644 --- a/apps/plugins/random_folder_advance_config.c +++ b/apps/plugins/random_folder_advance_config.c | |||
@@ -57,6 +57,7 @@ struct file_format *list = NULL; | |||
57 | void update_screen(void) | 57 | void update_screen(void) |
58 | { | 58 | { |
59 | char buf[15]; | 59 | char buf[15]; |
60 | #if defined(HAVE_LCD_BITMAP) || defined(HAVE_REMOTE_LCD) /* always bitmap */ | ||
60 | int i; | 61 | int i; |
61 | FOR_NB_SCREENS(i) | 62 | FOR_NB_SCREENS(i) |
62 | { | 63 | { |
@@ -65,6 +66,11 @@ void update_screen(void) | |||
65 | rb->screens[i]->putsxy(0,0,buf); | 66 | rb->screens[i]->putsxy(0,0,buf); |
66 | rb->screens[i]->update(); | 67 | rb->screens[i]->update(); |
67 | } | 68 | } |
69 | #else | ||
70 | rb->snprintf(buf,15,"Folders: %d",dirs_count); | ||
71 | rb->lcd_clear_display(); | ||
72 | rb->lcd_puts(0,0,buf); | ||
73 | #endif | ||
68 | } | 74 | } |
69 | 75 | ||
70 | void traversedir(char* location, char* name) | 76 | void traversedir(char* location, char* name) |
@@ -130,7 +136,9 @@ void generate(void) | |||
130 | rb->splash(HZ, true, "Couldnt open %s", RFA_FILE); | 136 | rb->splash(HZ, true, "Couldnt open %s", RFA_FILE); |
131 | return; | 137 | return; |
132 | } | 138 | } |
139 | #ifndef HAVE_LCD_CHARCELLS | ||
133 | update_screen(); | 140 | update_screen(); |
141 | #endif | ||
134 | lasttick = *rb->current_tick; | 142 | lasttick = *rb->current_tick; |
135 | 143 | ||
136 | traversedir("", ""); | 144 | traversedir("", ""); |
@@ -170,7 +178,9 @@ void edit_list(void) | |||
170 | while (!exit) | 178 | while (!exit) |
171 | { | 179 | { |
172 | rb->gui_synclist_draw(&lists); | 180 | rb->gui_synclist_draw(&lists); |
173 | rb->lcd_update(); | 181 | #ifndef HAVE_LCD_CHARCELLS |
182 | update_screen(); | ||
183 | #endif | ||
174 | button = rb->get_action(CONTEXT_LIST,TIMEOUT_BLOCK); | 184 | button = rb->get_action(CONTEXT_LIST,TIMEOUT_BLOCK); |
175 | if (rb->gui_synclist_do_button(&lists,button)) | 185 | if (rb->gui_synclist_do_button(&lists,button)) |
176 | continue; | 186 | continue; |
diff --git a/apps/settings_menu.c b/apps/settings_menu.c index 9c19f19fb1..35bdccb49c 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c | |||
@@ -1380,7 +1380,7 @@ static bool next_folder(void) | |||
1380 | static const struct opt_items names[] = { | 1380 | static const struct opt_items names[] = { |
1381 | { STR(LANG_SET_BOOL_NO) }, | 1381 | { STR(LANG_SET_BOOL_NO) }, |
1382 | { STR(LANG_SET_BOOL_YES) }, | 1382 | { STR(LANG_SET_BOOL_YES) }, |
1383 | { STR(LANG_RANOOM) }, | 1383 | { STR(LANG_RANDOM) }, |
1384 | }; | 1384 | }; |
1385 | return set_option(str(LANG_NEXT_FOLDER), | 1385 | return set_option(str(LANG_NEXT_FOLDER), |
1386 | &global_settings.next_folder, | 1386 | &global_settings.next_folder, |