devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

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.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5711 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2005-01-30 13:48:44 +00:00
parent c07eafa7bc
commit 9d42e2b396
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
apps/recorder/icons.c
View file

@ -248,15 +248,15 @@ void statusbar_icon_battery(int percent, bool charging)
fill = 100; fill = 100;
#ifdef SIMULATOR #ifdef SIMULATOR
if (global_settings.battery_type && (percent > -1)) { if (global_settings.battery_display && (percent > -1)) {
#else #else
#ifdef HAVE_CHARGE_CTRL /* Recorder */ #ifdef HAVE_CHARGE_CTRL /* Recorder */
/* show graphical animation when charging instead of numbers */ /* show graphical animation when charging instead of numbers */
if ((global_settings.battery_type) && if ((global_settings.battery_display) &&
(charge_state != 1) && (charge_state != 1) &&
(percent > -1)) { (percent > -1)) {
#else /* FM */ #else /* FM */
if (global_settings.battery_type && (percent > -1)) { if (global_settings.battery_display && (percent > -1)) {
#endif /* HAVE_CHARGE_CTRL */ #endif /* HAVE_CHARGE_CTRL */
#endif #endif
/* Numeric display */ /* Numeric display */

2
apps/settings.c
View file

@ -202,7 +202,7 @@ static const struct bit_entry rtc_bits[] =
{1, S_O(buttonbar), true, "buttonbar", off_on }, {1, S_O(buttonbar), true, "buttonbar", off_on },
#endif #endif
{1, S_O(volume_type), 0, "volume display", graphic_numeric }, {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" }, {1, S_O(timeformat), 0, "time format", "24hour,12hour" },
#endif #endif
{1, S_O(show_icons), true, "show icons", off_on }, {1, S_O(show_icons), true, "show icons", off_on },

2
apps/settings.h
View file

@ -206,7 +206,7 @@ struct user_settings
3=dirs+playlists, 4=ID3 database */ 3=dirs+playlists, 4=ID3 database */
bool sort_case; /* dir sort order: 0=case insensitive, 1=sensitive */ bool sort_case; /* dir sort order: 0=case insensitive, 1=sensitive */
int volume_type; /* how volume is displayed: 0=graphic, 1=percent */ 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 timeformat; /* time format: 0=24 hour clock, 1=12 hour clock */
int scroll_speed; /* long texts scrolling speed: 1-30 */ int scroll_speed; /* long texts scrolling speed: 1-30 */
bool playlist_shuffle; bool playlist_shuffle;

6
apps/settings_menu.c
View file

@ -136,14 +136,14 @@ static bool flip_display(void)
/** /**
* Menu to configure the battery display on status bar * 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[] = { static const struct opt_items names[] = {
{ STR(LANG_DISPLAY_GRAPHIC) }, { STR(LANG_DISPLAY_GRAPHIC) },
{ STR(LANG_DISPLAY_NUMERIC) } { STR(LANG_DISPLAY_NUMERIC) }
}; };
return set_option( str(LANG_BATTERY_DISPLAY), 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 }, { ID2P(LANG_BUTTON_BAR), button_bar },
#endif #endif
{ ID2P(LANG_VOLUME_DISPLAY), volume_type }, { 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, m=menu_init( items, sizeof(items) / sizeof(*items), NULL,