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

change to %Cd to display albumart (instead of %C to make it more consistant with %Vd/%Vl and %xd/%xl)

Browse source 
Also assume ; in skins are for sublines.. this means if you want ; in text you need to manually escape it (%;) far less false positives then


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26693 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2010-06-08 14:52:03 +00:00
parent c4fbb07a76
commit 2309d6d1e1
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/gui/skin_engine/skin_parser.c
View file

@ -390,7 +390,7 @@ static const struct wps_tag all_tags[] = {
{ WPS_NO_TOKEN, "Fl", 0, parse_font_load }, { WPS_NO_TOKEN, "Fl", 0, parse_font_load },
#ifdef HAVE_ALBUMART #ifdef HAVE_ALBUMART
{ WPS_NO_TOKEN, "Cl", 0, parse_albumart_load }, { WPS_NO_TOKEN, "Cl", 0, parse_albumart_load },
{ WPS_TOKEN_ALBUMART_DISPLAY, "C", WPS_REFRESH_STATIC, parse_albumart_display }, { WPS_TOKEN_ALBUMART_DISPLAY, "Cd", WPS_REFRESH_STATIC, parse_albumart_display },
#endif #endif
{ WPS_VIEWPORT_ENABLE, "Vd", WPS_REFRESH_DYNAMIC, { WPS_VIEWPORT_ENABLE, "Vd", WPS_REFRESH_DYNAMIC,

8
utils/skinupdater/skinupdater.c
View file

@ -190,6 +190,10 @@ int parse_tag(FILE* out, const char* start, bool in_conditional)
PUTCH(out, '('); PUTCH(out, '(');
len += 1+dump_arg(out, start+1, 2, true); len += 1+dump_arg(out, start+1, 2, true);
} }
else if (MATCH("C"))
{
fprintf(out, "%%Cd");
}
else if (MATCH("Cl")) else if (MATCH("Cl"))
{ {
int read; int read;
@ -395,6 +399,10 @@ top:
PUTCH(out, *in++); PUTCH(out, *in++);
} }
} }
else if (*in == ';')
{
PUTCH(out, *in++);
}
else else
{ {
if (find_escape_character(*in)) if (find_escape_character(*in))

2
utils/themeeditor/tag_table.c
View file

@ -173,7 +173,7 @@ struct tag_info legal_tags[] =
{ SKIN_TOKEN_LOAD_FONT, "Fl" , "IF"}, { SKIN_TOKEN_LOAD_FONT, "Fl" , "IF"},
{ SKIN_TOKEN_ALBUMART_LOAD, "Cl" , "IIII|ss"}, { SKIN_TOKEN_ALBUMART_LOAD, "Cl" , "IIII|ss"},
{ SKIN_TOKEN_ALBUMART_DISPLAY, "C" , ""}, { SKIN_TOKEN_ALBUMART_DISPLAY, "Cd" , ""},
{ SKIN_TOKEN_VIEWPORT_ENABLE, "Vd" , "S"}, { SKIN_TOKEN_VIEWPORT_ENABLE, "Vd" , "S"},
{ SKIN_TOKEN_UIVIEWPORT_ENABLE, "VI" , "S"}, { SKIN_TOKEN_UIVIEWPORT_ENABLE, "VI" , "S"},