diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/recorder/icons.c | 6 | ||||
-rw-r--r-- | apps/settings.c | 2 | ||||
-rw-r--r-- | apps/settings.h | 2 | ||||
-rw-r--r-- | apps/settings_menu.c | 6 |
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) | |||
248 | fill = 100; | 248 | fill = 100; |
249 | 249 | ||
250 | #ifdef SIMULATOR | 250 | #ifdef SIMULATOR |
251 | if (global_settings.battery_type && (percent > -1)) { | 251 | if (global_settings.battery_display && (percent > -1)) { |
252 | #else | 252 | #else |
253 | #ifdef HAVE_CHARGE_CTRL /* Recorder */ | 253 | #ifdef HAVE_CHARGE_CTRL /* Recorder */ |
254 | /* show graphical animation when charging instead of numbers */ | 254 | /* show graphical animation when charging instead of numbers */ |
255 | if ((global_settings.battery_type) && | 255 | if ((global_settings.battery_display) && |
256 | (charge_state != 1) && | 256 | (charge_state != 1) && |
257 | (percent > -1)) { | 257 | (percent > -1)) { |
258 | #else /* FM */ | 258 | #else /* FM */ |
259 | if (global_settings.battery_type && (percent > -1)) { | 259 | if (global_settings.battery_display && (percent > -1)) { |
260 | #endif /* HAVE_CHARGE_CTRL */ | 260 | #endif /* HAVE_CHARGE_CTRL */ |
261 | #endif | 261 | #endif |
262 | /* Numeric display */ | 262 | /* 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[] = | |||
202 | {1, S_O(buttonbar), true, "buttonbar", off_on }, | 202 | {1, S_O(buttonbar), true, "buttonbar", off_on }, |
203 | #endif | 203 | #endif |
204 | {1, S_O(volume_type), 0, "volume display", graphic_numeric }, | 204 | {1, S_O(volume_type), 0, "volume display", graphic_numeric }, |
205 | {1, S_O(battery_type), 0, "battery display", graphic_numeric }, | 205 | {1, S_O(battery_display), 0, "battery display", graphic_numeric }, |
206 | {1, S_O(timeformat), 0, "time format", "24hour,12hour" }, | 206 | {1, S_O(timeformat), 0, "time format", "24hour,12hour" }, |
207 | #endif | 207 | #endif |
208 | {1, S_O(show_icons), true, "show icons", off_on }, | 208 | {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 | |||
206 | 3=dirs+playlists, 4=ID3 database */ | 206 | 3=dirs+playlists, 4=ID3 database */ |
207 | bool sort_case; /* dir sort order: 0=case insensitive, 1=sensitive */ | 207 | bool sort_case; /* dir sort order: 0=case insensitive, 1=sensitive */ |
208 | int volume_type; /* how volume is displayed: 0=graphic, 1=percent */ | 208 | int volume_type; /* how volume is displayed: 0=graphic, 1=percent */ |
209 | int battery_type; /* how battery is displayed: 0=graphic, 1=percent */ | 209 | int battery_display; /* how battery is displayed: 0=graphic, 1=percent */ |
210 | int timeformat; /* time format: 0=24 hour clock, 1=12 hour clock */ | 210 | int timeformat; /* time format: 0=24 hour clock, 1=12 hour clock */ |
211 | int scroll_speed; /* long texts scrolling speed: 1-30 */ | 211 | int scroll_speed; /* long texts scrolling speed: 1-30 */ |
212 | bool playlist_shuffle; | 212 | 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) | |||
136 | /** | 136 | /** |
137 | * Menu to configure the battery display on status bar | 137 | * Menu to configure the battery display on status bar |
138 | */ | 138 | */ |
139 | static bool battery_type(void) | 139 | static bool battery_display(void) |
140 | { | 140 | { |
141 | static const struct opt_items names[] = { | 141 | static const struct opt_items names[] = { |
142 | { STR(LANG_DISPLAY_GRAPHIC) }, | 142 | { STR(LANG_DISPLAY_GRAPHIC) }, |
143 | { STR(LANG_DISPLAY_NUMERIC) } | 143 | { STR(LANG_DISPLAY_NUMERIC) } |
144 | }; | 144 | }; |
145 | return set_option( str(LANG_BATTERY_DISPLAY), | 145 | return set_option( str(LANG_BATTERY_DISPLAY), |
146 | &global_settings.battery_type, INT, names, 2, NULL); | 146 | &global_settings.battery_display, INT, names, 2, NULL); |
147 | } | 147 | } |
148 | 148 | ||
149 | /** | 149 | /** |
@@ -1195,7 +1195,7 @@ static bool bars_settings_menu(void) | |||
1195 | { ID2P(LANG_BUTTON_BAR), button_bar }, | 1195 | { ID2P(LANG_BUTTON_BAR), button_bar }, |
1196 | #endif | 1196 | #endif |
1197 | { ID2P(LANG_VOLUME_DISPLAY), volume_type }, | 1197 | { ID2P(LANG_VOLUME_DISPLAY), volume_type }, |
1198 | { ID2P(LANG_BATTERY_DISPLAY), battery_type }, | 1198 | { ID2P(LANG_BATTERY_DISPLAY), battery_display }, |
1199 | }; | 1199 | }; |
1200 | 1200 | ||
1201 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL, | 1201 | m=menu_init( items, sizeof(items) / sizeof(*items), NULL, |