diff options
Diffstat (limited to 'apps/menus/main_menu.c')
-rw-r--r-- | apps/menus/main_menu.c | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index 1632c438dd..ecc3d86ad9 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c | |||
@@ -45,6 +45,7 @@ | |||
45 | #if defined(SIMULATOR) && defined(ROCKBOX_HAS_LOGF) | 45 | #if defined(SIMULATOR) && defined(ROCKBOX_HAS_LOGF) |
46 | #include "logfdisp.h" | 46 | #include "logfdisp.h" |
47 | #endif | 47 | #endif |
48 | #include "version.h" | ||
48 | 49 | ||
49 | 50 | ||
50 | 51 | ||
@@ -231,13 +232,24 @@ static bool show_info(void) | |||
231 | #endif | 232 | #endif |
232 | } | 233 | } |
233 | #ifdef HAVE_LCD_BITMAP | 234 | #ifdef HAVE_LCD_BITMAP |
234 | y += 2; | 235 | y++; |
235 | #endif | 236 | #endif |
236 | |||
237 | #ifdef HAVE_LCD_CHARCELLS | 237 | #ifdef HAVE_LCD_CHARCELLS |
238 | if (page == 0) | 238 | if (page == 0) |
239 | #endif | 239 | #endif |
240 | { | 240 | { |
241 | snprintf(s, sizeof(s), "%s: %s", str(LANG_VERSION), appsversion); | ||
242 | FOR_NB_SCREENS(i) | ||
243 | screens[i].puts_scroll(0, y, (unsigned char *)s); | ||
244 | #ifdef HAVE_LCD_BITMAP | ||
245 | y += 2; | ||
246 | #endif | ||
247 | } | ||
248 | |||
249 | #ifdef HAVE_LCD_CHARCELLS | ||
250 | if (page == 1) | ||
251 | #endif | ||
252 | { | ||
241 | int integer = buflen / 1000; | 253 | int integer = buflen / 1000; |
242 | int decimal = buflen % 1000; | 254 | int decimal = buflen % 1000; |
243 | 255 | ||
@@ -271,7 +283,7 @@ static bool show_info(void) | |||
271 | } | 283 | } |
272 | 284 | ||
273 | #ifdef HAVE_LCD_CHARCELLS | 285 | #ifdef HAVE_LCD_CHARCELLS |
274 | if (page == 1) | 286 | if (page == 2) |
275 | #endif | 287 | #endif |
276 | { | 288 | { |
277 | #ifdef HAVE_MULTIVOLUME | 289 | #ifdef HAVE_MULTIVOLUME |
@@ -319,8 +331,12 @@ static bool show_info(void) | |||
319 | 331 | ||
320 | #ifdef HAVE_LCD_CHARCELLS | 332 | #ifdef HAVE_LCD_CHARCELLS |
321 | case ACTION_STD_NEXT: | 333 | case ACTION_STD_NEXT: |
334 | page = (page+1)%3; | ||
335 | break; | ||
322 | case ACTION_STD_PREV: | 336 | case ACTION_STD_PREV: |
323 | page = (page == 0) ? 1 : 0; | 337 | page--; |
338 | if (page < 0) | ||
339 | page = 2; | ||
324 | break; | 340 | break; |
325 | #endif | 341 | #endif |
326 | 342 | ||