diff options
Diffstat (limited to 'apps/root_menu.c')
-rw-r--r-- | apps/root_menu.c | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/apps/root_menu.c b/apps/root_menu.c index df59b1b846..b2684abfda 100644 --- a/apps/root_menu.c +++ b/apps/root_menu.c | |||
@@ -129,7 +129,7 @@ static int browser(void* param) | |||
129 | /* Maybe just needs to reboot due to delayed commit */ | 129 | /* Maybe just needs to reboot due to delayed commit */ |
130 | if (stat->commit_delayed) | 130 | if (stat->commit_delayed) |
131 | { | 131 | { |
132 | gui_syncsplash(HZ*2, str(LANG_PLEASE_REBOOT)); | 132 | gui_syncsplash(HZ*2, ID2P(LANG_PLEASE_REBOOT)); |
133 | break; | 133 | break; |
134 | } | 134 | } |
135 | 135 | ||
@@ -146,7 +146,7 @@ static int browser(void* param) | |||
146 | { | 146 | { |
147 | /* Prompt the user */ | 147 | /* Prompt the user */ |
148 | reinit_attempted = true; | 148 | reinit_attempted = true; |
149 | char *lines[]={str(LANG_TAGCACHE_BUSY), str(LANG_TAGCACHE_FORCE_UPDATE)}; | 149 | char *lines[]={ID2P(LANG_TAGCACHE_BUSY), ID2P(LANG_TAGCACHE_FORCE_UPDATE)}; |
150 | struct text_message message={lines, 2}; | 150 | struct text_message message={lines, 2}; |
151 | if(gui_syncyesno_run(&message, NULL, NULL) == YESNO_NO) | 151 | if(gui_syncyesno_run(&message, NULL, NULL) == YESNO_NO) |
152 | break; | 152 | break; |
@@ -159,6 +159,24 @@ static int browser(void* param) | |||
159 | } | 159 | } |
160 | 160 | ||
161 | /* Display building progress */ | 161 | /* Display building progress */ |
162 | static long talked_tick = 0; | ||
163 | if(talk_menus_enabled() && | ||
164 | (talked_tick == 0 | ||
165 | || TIME_AFTER(current_tick, talked_tick+7*HZ))) | ||
166 | { | ||
167 | talked_tick = current_tick; | ||
168 | if (stat->commit_step > 0) | ||
169 | { | ||
170 | talk_id(LANG_TAGCACHE_INIT, false); | ||
171 | talk_number(stat->commit_step, true); | ||
172 | talk_id(VOICE_OF, true); | ||
173 | talk_number(tagcache_get_max_commit_step(), true); | ||
174 | } else if(stat->processed_entries) | ||
175 | { | ||
176 | talk_number(stat->processed_entries, false); | ||
177 | talk_id(LANG_BUILDING_DATABASE, true); | ||
178 | } | ||
179 | } | ||
162 | if (stat->commit_step > 0) | 180 | if (stat->commit_step > 0) |
163 | { | 181 | { |
164 | gui_syncsplash(0, "%s [%d/%d]", | 182 | gui_syncsplash(0, "%s [%d/%d]", |
@@ -236,7 +254,7 @@ static int wpsscrn(void* param) | |||
236 | } | 254 | } |
237 | else | 255 | else |
238 | { | 256 | { |
239 | gui_syncsplash(HZ*2, str(LANG_NOTHING_TO_RESUME)); | 257 | gui_syncsplash(HZ*2, ID2P(LANG_NOTHING_TO_RESUME)); |
240 | } | 258 | } |
241 | #if LCD_DEPTH > 1 | 259 | #if LCD_DEPTH > 1 |
242 | show_main_backdrop(); | 260 | show_main_backdrop(); |