diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/lang/english.lang | 6 | ||||
-rw-r--r-- | apps/settings.c | 1 | ||||
-rw-r--r-- | apps/settings.h | 3 | ||||
-rw-r--r-- | apps/settings_menu.c | 7 | ||||
-rw-r--r-- | apps/wps-display.c | 8 |
5 files changed, 2 insertions, 23 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 16c549703e..062c7a0d75 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -2793,9 +2793,3 @@ desc: in sound settings | |||
2793 | eng: "Super bass" | 2793 | eng: "Super bass" |
2794 | voice: "Super bass" | 2794 | voice: "Super bass" |
2795 | new: | 2795 | new: |
2796 | |||
2797 | id: LANG_PROGRESSBAR_SOLID | ||
2798 | desc: Appearance of the progress bar | ||
2799 | eng: "Solid progress bar" | ||
2800 | voice: "solid progress bar" | ||
2801 | new: | ||
diff --git a/apps/settings.c b/apps/settings.c index 9f4405f960..8434d3e211 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -193,7 +193,6 @@ static struct bit_entry rtc_bits[] = | |||
193 | {1, S_O(statusbar), true, "statusbar", off_on }, | 193 | {1, S_O(statusbar), true, "statusbar", off_on }, |
194 | {1, S_O(scrollbar), true, "scrollbar", off_on }, | 194 | {1, S_O(scrollbar), true, "scrollbar", off_on }, |
195 | {1, S_O(buttonbar), true, "buttonbar", off_on }, | 195 | {1, S_O(buttonbar), true, "buttonbar", off_on }, |
196 | {1, S_O(progressbar_solid), false, "solid progressbar", off_on }, | ||
197 | {1, S_O(volume_type), 0, "volume display", graphic_numeric }, | 196 | {1, S_O(volume_type), 0, "volume display", graphic_numeric }, |
198 | {1, S_O(battery_type), 0, "battery display", graphic_numeric }, | 197 | {1, S_O(battery_type), 0, "battery display", graphic_numeric }, |
199 | {1, S_O(timeformat), 0, "time format", "24hour,12hour" }, | 198 | {1, S_O(timeformat), 0, "time format", "24hour,12hour" }, |
diff --git a/apps/settings.h b/apps/settings.h index 51809836d8..b7b0864b4c 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -168,9 +168,6 @@ struct user_settings | |||
168 | /* show scroll bar */ | 168 | /* show scroll bar */ |
169 | bool scrollbar; /* 0=hide, 1=show */ | 169 | bool scrollbar; /* 0=hide, 1=show */ |
170 | 170 | ||
171 | /* Scrollbar mode */ | ||
172 | bool progressbar_solid; /* 0=slider, 1=solid */ | ||
173 | |||
174 | /* goto current song when exiting WPS */ | 171 | /* goto current song when exiting WPS */ |
175 | bool browse_current; /* 1=goto current song, | 172 | bool browse_current; /* 1=goto current song, |
176 | 0=goto previous location */ | 173 | 0=goto previous location */ |
diff --git a/apps/settings_menu.c b/apps/settings_menu.c index 9aae28a425..057191e603 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c | |||
@@ -959,12 +959,6 @@ static bool button_bar(void) | |||
959 | { | 959 | { |
960 | return set_bool( str(LANG_BUTTON_BAR), &global_settings.buttonbar ); | 960 | return set_bool( str(LANG_BUTTON_BAR), &global_settings.buttonbar ); |
961 | } | 961 | } |
962 | |||
963 | static bool progressbar_solid(void) | ||
964 | { | ||
965 | return set_bool( str(LANG_PROGRESSBAR_SOLID), | ||
966 | &global_settings.progressbar_solid ); | ||
967 | } | ||
968 | #endif | 962 | #endif |
969 | 963 | ||
970 | static bool ff_rewind_settings_menu(void) | 964 | static bool ff_rewind_settings_menu(void) |
@@ -1198,7 +1192,6 @@ static bool display_settings_menu(void) | |||
1198 | #ifdef HAVE_LCD_BITMAP | 1192 | #ifdef HAVE_LCD_BITMAP |
1199 | { STR(LANG_BARS_MENU), bars_settings_menu }, | 1193 | { STR(LANG_BARS_MENU), bars_settings_menu }, |
1200 | { STR(LANG_PM_MENU), peak_meter_menu }, | 1194 | { STR(LANG_PM_MENU), peak_meter_menu }, |
1201 | { STR(LANG_PROGRESSBAR_SOLID), progressbar_solid }, | ||
1202 | #endif | 1195 | #endif |
1203 | }; | 1196 | }; |
1204 | 1197 | ||
diff --git a/apps/wps-display.c b/apps/wps-display.c index 701d2e2d21..68b018b43e 100644 --- a/apps/wps-display.c +++ b/apps/wps-display.c | |||
@@ -916,12 +916,8 @@ bool wps_refresh(struct mp3entry* id3, | |||
916 | int percent= | 916 | int percent= |
917 | id3->length? | 917 | id3->length? |
918 | (id3->elapsed + ff_rewind_count) * 100 / id3->length:0; | 918 | (id3->elapsed + ff_rewind_count) * 100 / id3->length:0; |
919 | if(global_settings.progressbar_solid) | 919 | scrollbar(0, i*h + offset + 1, LCD_WIDTH, 6, 100, 0, |
920 | scrollbar(0, i*h + offset + 1, LCD_WIDTH, 6, 100, 0, | 920 | percent, HORIZONTAL); |
921 | percent, HORIZONTAL); | ||
922 | else | ||
923 | slidebar(0, i*h + offset + 1, LCD_WIDTH, 6, | ||
924 | percent, Grow_Right); | ||
925 | update_line = true; | 921 | update_line = true; |
926 | } | 922 | } |
927 | if (flags & refresh_mode & WPS_REFRESH_PEAK_METER) { | 923 | if (flags & refresh_mode & WPS_REFRESH_PEAK_METER) { |