summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2010-06-08 14:52:03 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2010-06-08 14:52:03 +0000
commit2309d6d1e14c843250e4efa7cfac019e63d620ac (patch)
tree9dbfd76a50febf7ee92a14439c97622f6b011ab7 /utils
parentc4fbb07a762e6c64514b8742ac0d091718d4f237 (diff)
downloadrockbox-2309d6d1e14c843250e4efa7cfac019e63d620ac.tar.gz
rockbox-2309d6d1e14c843250e4efa7cfac019e63d620ac.zip
change to %Cd to display albumart (instead of %C to make it more consistant with %Vd/%Vl and %xd/%xl)
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
Diffstat (limited to 'utils')
-rw-r--r--utils/skinupdater/skinupdater.c8
-rw-r--r--utils/themeeditor/tag_table.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/utils/skinupdater/skinupdater.c b/utils/skinupdater/skinupdater.c
index f724232ff8..d2fbc9cf85 100644
--- a/utils/skinupdater/skinupdater.c
+++ b/utils/skinupdater/skinupdater.c
@@ -190,6 +190,10 @@ int parse_tag(FILE* out, const char* start, bool in_conditional)
190 PUTCH(out, '('); 190 PUTCH(out, '(');
191 len += 1+dump_arg(out, start+1, 2, true); 191 len += 1+dump_arg(out, start+1, 2, true);
192 } 192 }
193 else if (MATCH("C"))
194 {
195 fprintf(out, "%%Cd");
196 }
193 else if (MATCH("Cl")) 197 else if (MATCH("Cl"))
194 { 198 {
195 int read; 199 int read;
@@ -395,6 +399,10 @@ top:
395 PUTCH(out, *in++); 399 PUTCH(out, *in++);
396 } 400 }
397 } 401 }
402 else if (*in == ';')
403 {
404 PUTCH(out, *in++);
405 }
398 else 406 else
399 { 407 {
400 if (find_escape_character(*in)) 408 if (find_escape_character(*in))
diff --git a/utils/themeeditor/tag_table.c b/utils/themeeditor/tag_table.c
index 91d1b0bde4..f579ce9b18 100644
--- a/utils/themeeditor/tag_table.c
+++ b/utils/themeeditor/tag_table.c
@@ -173,7 +173,7 @@ struct tag_info legal_tags[] =
173 173
174 { SKIN_TOKEN_LOAD_FONT, "Fl" , "IF"}, 174 { SKIN_TOKEN_LOAD_FONT, "Fl" , "IF"},
175 { SKIN_TOKEN_ALBUMART_LOAD, "Cl" , "IIII|ss"}, 175 { SKIN_TOKEN_ALBUMART_LOAD, "Cl" , "IIII|ss"},
176 { SKIN_TOKEN_ALBUMART_DISPLAY, "C" , ""}, 176 { SKIN_TOKEN_ALBUMART_DISPLAY, "Cd" , ""},
177 177
178 { SKIN_TOKEN_VIEWPORT_ENABLE, "Vd" , "S"}, 178 { SKIN_TOKEN_VIEWPORT_ENABLE, "Vd" , "S"},
179 { SKIN_TOKEN_UIVIEWPORT_ENABLE, "VI" , "S"}, 179 { SKIN_TOKEN_UIVIEWPORT_ENABLE, "VI" , "S"},