amiconn: apps misc.c,1.23,1.24 main_menu.c,1.116,1.117

Update of /cvsroot/rockbox/apps
In directory labb:/tmp/cvs-serv26751/apps

Modified Files:
        misc.c main_menu.c 
Log Message:
Made total/free disk space info fit on the player lcd.

Index: main_menu.c
===================================================================
RCS file: /cvsroot/rockbox/apps/main_menu.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- main_menu.c 31 Jan 2005 00:39:20 -0000      1.116
+++ main_menu.c 31 Jan 2005 01:27:48 -0000      1.117
@@ -222,11 +222,19 @@
 
         if (state & 2) {
             output_dyn_value(s2, sizeof s2, size, kbyte_units, true);
+#ifdef HAVE_LCD_CHARCELLS
+            snprintf(s, sizeof s, "%s%s", str(LANG_DISK_SIZE_INFO), s2);
+#else
             snprintf(s, sizeof s, "%s %s", str(LANG_DISK_SIZE_INFO), s2);
+#endif
             lcd_puts(0, y++, s);
 
             output_dyn_value(s2, sizeof s2, free, kbyte_units, true);
+#ifdef HAVE_LCD_CHARCELLS
+            snprintf(s, sizeof s, "%s%s", str(LANG_DISK_FREE_INFO), s2);
+#else
             snprintf(s, sizeof s, "%s %s", str(LANG_DISK_FREE_INFO), s2);
+#endif
             lcd_puts(0, y++, s);
         }
         lcd_update();

Index: misc.c
===================================================================
RCS file: /cvsroot/rockbox/apps/misc.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- misc.c      31 Jan 2005 00:50:20 -0000      1.23
+++ misc.c      31 Jan 2005 01:27:48 -0000      1.24
@@ -77,7 +77,7 @@
             snprintf(tbuf, sizeof(tbuf), "%d%s%02d", value, str(LANG_POINT),
                      fraction / 10);
 
-        snprintf(buf, buf_size, "%s %s", tbuf, P2STR(units[unit_no]));
+        snprintf(buf, buf_size, "%s%s", tbuf, P2STR(units[unit_no]));
     }
     else
     {

_______________________________________________
http://cool.haxx.se/mailman/listinfo/rockbox-cvs