amiconn: apps settings.c, 1.253, 1.254 settings.h, 1.129, 1.130 settings_menu.c, 1.167, 1.168

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

Modified Files:
        settings.c settings.h settings_menu.c 
Log Message:
Renamed the config variable for the battery display type to battery_display to 
get it out of the way for the upcoming battery_type setting for the Ondio. Also 
seems more logical.

Index: settings.c
===================================================================
RCS file: /cvsroot/rockbox/apps/settings.c,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -d -r1.253 -r1.254
--- settings.c  24 Jan 2005 01:39:24 -0000      1.253
+++ settings.c  30 Jan 2005 13:48:44 -0000      1.254
@@ -202,7 +202,7 @@
     {1, S_O(buttonbar), true, "buttonbar", off_on },
 #endif
     {1, S_O(volume_type), 0, "volume display", graphic_numeric },
-    {1, S_O(battery_type), 0, "battery display", graphic_numeric },
+    {1, S_O(battery_display), 0, "battery display", graphic_numeric },
     {1, S_O(timeformat), 0, "time format", "24hour,12hour" },
 #endif
     {1, S_O(show_icons), true, "show icons", off_on },

Index: settings_menu.c
===================================================================
RCS file: /cvsroot/rockbox/apps/settings_menu.c,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -d -r1.167 -r1.168
--- settings_menu.c     17 Jan 2005 23:55:55 -0000      1.167
+++ settings_menu.c     30 Jan 2005 13:48:44 -0000      1.168
@@ -136,14 +136,14 @@
 /**
  * Menu to configure the battery display on status bar
  */
-static bool battery_type(void)
+static bool battery_display(void)
 {
     static const struct opt_items names[] = {
         { STR(LANG_DISPLAY_GRAPHIC) }, 
         { STR(LANG_DISPLAY_NUMERIC) }
     };
     return set_option( str(LANG_BATTERY_DISPLAY), 
-                       &global_settings.battery_type, INT, names, 2, NULL);
+                       &global_settings.battery_display, INT, names, 2, NULL);
 }
 
 /**
@@ -1195,7 +1195,7 @@
         { ID2P(LANG_BUTTON_BAR),      button_bar },
 #endif
         { ID2P(LANG_VOLUME_DISPLAY),  volume_type },
-        { ID2P(LANG_BATTERY_DISPLAY), battery_type },
+        { ID2P(LANG_BATTERY_DISPLAY), battery_display },
     };
 
     m=menu_init( items, sizeof(items) / sizeof(*items), NULL,

Index: settings.h
===================================================================
RCS file: /cvsroot/rockbox/apps/settings.h,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- settings.h  23 Jan 2005 01:01:14 -0000      1.129
+++ settings.h  30 Jan 2005 13:48:44 -0000      1.130
@@ -206,7 +206,7 @@
                           3=dirs+playlists, 4=ID3 database */
     bool sort_case;    /* dir sort order: 0=case insensitive, 1=sensitive */
     int volume_type;   /* how volume is displayed: 0=graphic, 1=percent */
-    int battery_type;  /* how battery is displayed: 0=graphic, 1=percent */
+    int battery_display; /* how battery is displayed: 0=graphic, 1=percent */
     int timeformat;    /* time format: 0=24 hour clock, 1=12 hour clock */
     int scroll_speed;  /* long texts scrolling speed: 1-30 */
     bool playlist_shuffle;

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