summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorMarkus Braun <markus.braun@krawel.de>2003-02-16 12:39:07 +0000
committerMarkus Braun <markus.braun@krawel.de>2003-02-16 12:39:07 +0000
commit0f7ff15d86d6734858c1d93becda73efb73c566c (patch)
tree7d76af641eac81076232bef5fe8643a6184d8054 /apps
parent2eff1c6821d39835671a80f9ecdb6e80009fc949 (diff)
downloadrockbox-0f7ff15d86d6734858c1d93becda73efb73c566c.zip
rockbox-0f7ff15d86d6734858c1d93becda73efb73c566c.tar.gz
rockbox-0f7ff15d86d6734858c1d93becda73efb73c566c.tar.bz2
rockbox-0f7ff15d86d6734858c1d93becda73efb73c566c.tar.xz
The settings for battery and volume display were reversed in the expanded .cfg
loader. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3277 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/settings.c4
-rw-r--r--apps/settings.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/settings.c b/apps/settings.c
index 102b244..0a00fc7 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -904,11 +904,11 @@ bool settings_load_config(char* file)
else if (!strcasecmp(name, "play selected"))
set_cfg_bool(&global_settings.play_selected, value);
else if (!strcasecmp(name, "volume display")) {
- static char* options[] = {"numeric", "graphic"};
+ static char* options[] = {"graphic", "numeric"};
set_cfg_option(&global_settings.volume_type, value, options, 2);
}
else if (!strcasecmp(name, "battery display")) {
- static char* options[] = {"numeric", "graphic"};
+ static char* options[] = {"graphic", "numeric"};
set_cfg_option(&global_settings.battery_type, value, options, 2);
}
else if (!strcasecmp(name, "time format")) {
diff --git a/apps/settings.h b/apps/settings.h
index 68b2ba8..bfdf12b 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -112,7 +112,7 @@ struct user_settings
int dirfilter; /* 0=display all, 1=only supported, 2=only music */
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;
+ int battery_type; /* 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;