summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2007-06-07 06:05:08 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2007-06-07 06:05:08 +0000
commit66f42ac12dbfdaa70f5440c16567c53205aed059 (patch)
treeda2a6f1a258fbd8f14a6e4eaad528c9236918b74 /apps
parent9e7b3ca6c41efa8629e06d5288f7c9b85925c1b3 (diff)
downloadrockbox-66f42ac12dbfdaa70f5440c16567c53205aed059.zip
rockbox-66f42ac12dbfdaa70f5440c16567c53205aed059.tar.gz
rockbox-66f42ac12dbfdaa70f5440c16567c53205aed059.tar.bz2
rockbox-66f42ac12dbfdaa70f5440c16567c53205aed059.tar.xz
show the version in the rockbox info screen
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13581 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/menus/main_menu.c24
1 files changed, 20 insertions, 4 deletions
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c
index 1632c43..ecc3d86 100644
--- a/apps/menus/main_menu.c
+++ b/apps/menus/main_menu.c
@@ -45,6 +45,7 @@
#if defined(SIMULATOR) && defined(ROCKBOX_HAS_LOGF)
#include "logfdisp.h"
#endif
+#include "version.h"
@@ -231,13 +232,24 @@ static bool show_info(void)
#endif
}
#ifdef HAVE_LCD_BITMAP
- y += 2;
+ y++;
#endif
-
#ifdef HAVE_LCD_CHARCELLS
if (page == 0)
#endif
{
+ snprintf(s, sizeof(s), "%s: %s", str(LANG_VERSION), appsversion);
+ FOR_NB_SCREENS(i)
+ screens[i].puts_scroll(0, y, (unsigned char *)s);
+#ifdef HAVE_LCD_BITMAP
+ y += 2;
+#endif
+ }
+
+#ifdef HAVE_LCD_CHARCELLS
+ if (page == 1)
+#endif
+ {
int integer = buflen / 1000;
int decimal = buflen % 1000;
@@ -271,7 +283,7 @@ static bool show_info(void)
}
#ifdef HAVE_LCD_CHARCELLS
- if (page == 1)
+ if (page == 2)
#endif
{
#ifdef HAVE_MULTIVOLUME
@@ -319,8 +331,12 @@ static bool show_info(void)
#ifdef HAVE_LCD_CHARCELLS
case ACTION_STD_NEXT:
+ page = (page+1)%3;
+ break;
case ACTION_STD_PREV:
- page = (page == 0) ? 1 : 0;
+ page--;
+ if (page < 0)
+ page = 2;
break;
#endif