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.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5711 a1c6a512-1295-4272-9138-f99709370657

4 files changed, 8 insertions, 8 deletions

diff --git a/apps/recorder/icons.c b/apps/recorder/icons.c
index cb7e3a4d99..4e8601d77a 100644
--- a/apps/recorder/icons.c
+++ b/apps/recorder/icons.c
@@ -248,15 +248,15 @@ void statusbar_icon_battery(int percent, bool charging)
         fill = 100;
 
 #ifdef SIMULATOR
-    if (global_settings.battery_type && (percent > -1)) {
+    if (global_settings.battery_display && (percent > -1)) {
 #else
 #ifdef HAVE_CHARGE_CTRL /* Recorder */
     /* show graphical animation when charging instead of numbers */
-    if ((global_settings.battery_type) &&
+    if ((global_settings.battery_display) &&
         (charge_state != 1) &&
         (percent > -1)) {
 #else /* FM */
-    if (global_settings.battery_type && (percent > -1)) {
+    if (global_settings.battery_display && (percent > -1)) {
 #endif /* HAVE_CHARGE_CTRL */
 #endif
         /* Numeric display */
diff --git a/apps/settings.c b/apps/settings.c
index 0a369a49f0..de4254edad 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -202,7 +202,7 @@ static const struct bit_entry rtc_bits[] =
     {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 },
diff --git a/apps/settings.h b/apps/settings.h
index 45c9017de9..b28f4cedea 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -206,7 +206,7 @@ struct user_settings
                           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;
diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index 5d045be048..63f1415af8 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -136,14 +136,14 @@ static bool flip_display(void)
 /**
  * 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 @@ static bool bars_settings_menu(void)
         { 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,