len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-09 05:05:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Patch #985429 by Christi Scarborough, solid progress bar

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4851 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Linus Nielsen Feltzing 2004-07-08 10:52:09 +00:00
parent 64c53c6dc2
commit 5f6047075f
6 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
apps/lang/english.lang
View file

@ -2793,3 +2793,9 @@ desc: in sound settings
eng: "Super bass" eng: "Super bass"
voice: "Super bass" voice: "Super bass"
new: new:
id: LANG_PROGRESSBAR_SOLID
desc: Appearance of the progress bar
eng: "Solid progress bar"
voice: "solid progress bar"
new:

1
apps/settings.c
View file

@ -193,6 +193,7 @@ static struct bit_entry rtc_bits[] =
{1, S_O(statusbar), true, "statusbar", off_on }, {1, S_O(statusbar), true, "statusbar", off_on },
{1, S_O(scrollbar), true, "scrollbar", off_on }, {1, S_O(scrollbar), true, "scrollbar", off_on },
{1, S_O(buttonbar), true, "buttonbar", off_on }, {1, S_O(buttonbar), true, "buttonbar", off_on },
{1, S_O(progressbar_solid), false, "solid progressbar", off_on },
{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_type), 0, "battery display", graphic_numeric },
{1, S_O(timeformat), 0, "time format", "24hour,12hour" }, {1, S_O(timeformat), 0, "time format", "24hour,12hour" },

3
apps/settings.h
View file

@ -168,6 +168,9 @@ struct user_settings
/* show scroll bar */ /* show scroll bar */
bool scrollbar; /* 0=hide, 1=show */ bool scrollbar; /* 0=hide, 1=show */
/* Scrollbar mode */
bool progressbar_solid; /* 0=slider, 1=solid */
/* goto current song when exiting WPS */ /* goto current song when exiting WPS */
bool browse_current; /* 1=goto current song, bool browse_current; /* 1=goto current song,
0=goto previous location */ 0=goto previous location */

7
apps/settings_menu.c
View file

@ -959,6 +959,12 @@ static bool button_bar(void)
{ {
return set_bool( str(LANG_BUTTON_BAR), &global_settings.buttonbar ); return set_bool( str(LANG_BUTTON_BAR), &global_settings.buttonbar );
} }
static bool progressbar_solid(void)
{
return set_bool( str(LANG_PROGRESSBAR_SOLID),
&global_settings.progressbar_solid );
}
#endif #endif
static bool ff_rewind_settings_menu(void) static bool ff_rewind_settings_menu(void)
@ -1192,6 +1198,7 @@ static bool display_settings_menu(void)
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
{ STR(LANG_BARS_MENU), bars_settings_menu }, { STR(LANG_BARS_MENU), bars_settings_menu },
{ STR(LANG_PM_MENU), peak_meter_menu }, { STR(LANG_PM_MENU), peak_meter_menu },
{ STR(LANG_PROGRESSBAR_SOLID), progressbar_solid },
#endif #endif
}; };

8
apps/wps-display.c
View file

@ -916,8 +916,12 @@ bool wps_refresh(struct mp3entry* id3,
int percent= int percent=
id3->length? id3->length?
(id3->elapsed + ff_rewind_count) * 100 / id3->length:0; (id3->elapsed + ff_rewind_count) * 100 / id3->length:0;
slidebar(0, i*h + offset + 1, LCD_WIDTH, 6, if(global_settings.progressbar_solid)
percent, Grow_Right); scrollbar(0, i*h + offset + 1, LCD_WIDTH, 6, 100, 0,
percent, HORIZONTAL);
else
slidebar(0, i*h + offset + 1, LCD_WIDTH, 6,
percent, Grow_Right);
update_line = true; update_line = true;
} }
if (flags & refresh_mode & WPS_REFRESH_PEAK_METER) { if (flags & refresh_mode & WPS_REFRESH_PEAK_METER) {

1
docs/CREDITS
View file

@ -86,3 +86,4 @@ Matthias Wientapper
Brent Coutts Brent Coutts
Jens Arnold Jens Arnold
Gerald Vanbaren Gerald Vanbaren
Christi Scarborough