fix %C, and the viewport colour tags so they parse

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26726 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 5 insertions, 3 deletions

diff --git a/utils/themeeditor/tag_table.c b/utils/themeeditor/tag_table.c
index f579ce9b18..bf35c9bf71 100644
--- a/utils/themeeditor/tag_table.c
+++ b/utils/themeeditor/tag_table.c
@@ -174,6 +174,7 @@ struct tag_info legal_tags[] =
     { SKIN_TOKEN_LOAD_FONT,             "Fl" , "IF"},
     { SKIN_TOKEN_ALBUMART_LOAD,         "Cl" , "IIII|ss"},
     { SKIN_TOKEN_ALBUMART_DISPLAY,      "Cd" , ""},
+    { SKIN_TOKEN_ALBUMART_FOUND,        "C" , ""},
     
     { SKIN_TOKEN_VIEWPORT_ENABLE,       "Vd" , "S"},
     { SKIN_TOKEN_UIVIEWPORT_ENABLE,     "VI" , "S"},
@@ -182,8 +183,8 @@ struct tag_info legal_tags[] =
     { SKIN_TOKEN_LIST_TITLE_TEXT,       "Lt" , ""},
     { SKIN_TOKEN_LIST_TITLE_ICON,       "Li" , ""},
     
-    { SKIN_TOKEN_VIEWPORT_FGCOLOUR,       "Vf" , "I"},
-    { SKIN_TOKEN_VIEWPORT_BGCOLOUR,       "Vb" , "I"},
+    { SKIN_TOKEN_VIEWPORT_FGCOLOUR,       "Vf" , "S"},
+    { SKIN_TOKEN_VIEWPORT_BGCOLOUR,       "Vb" , "S"},
     
     { SKIN_TOKEN_VIEWPORT_CONDITIONAL,  "Vl" , "SIIiii|ii"},
     { SKIN_TOKEN_UIVIEWPORT_LOAD,       "Vi" , "sIIiii|ii"},
diff --git a/utils/themeeditor/tag_table.h b/utils/themeeditor/tag_table.h
index 4b11a6fbcf..760c9f5f61 100644
--- a/utils/themeeditor/tag_table.h
+++ b/utils/themeeditor/tag_table.h
@@ -145,6 +145,7 @@ enum skin_token_type {
     /* Albumart */
     SKIN_TOKEN_ALBUMART_LOAD,
     SKIN_TOKEN_ALBUMART_DISPLAY,
+    SKIN_TOKEN_ALBUMART_FOUND,
 
     /* Metadata */
   TOKEN_MARKER_METADATA,
@@ -261,7 +262,7 @@ enum skin_token_type {
  *             s - Nullable string
  *             F - Required file name
  *             f - Nullable file name
- *             C - Required WPS code
+ *             C - Required skin code
  *          Any nullable parameter may be replaced in the WPS file
  *          with a '-'.  To specify that parameters may be left off
  *          altogether, place a '|' in the parameter string.  For