diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2010-02-26 03:45:41 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2010-02-26 03:45:41 +0000 |
commit | 466e5d9aa4fcdc3da6172eb9ae125fd4157be0b9 (patch) | |
tree | 660ff0f1991703cd87e77bab3cccca190d0f5e28 /apps/gui/skin_engine | |
parent | ca755f767c2d67fb2b52c292402b3b3d3be28244 (diff) | |
download | rockbox-466e5d9aa4fcdc3da6172eb9ae125fd4157be0b9.tar.gz rockbox-466e5d9aa4fcdc3da6172eb9ae125fd4157be0b9.zip |
2 new tags for the base skin.
%Lt - the title text for the current list
%Li - the icon number. Same order as the CustomIcons list, except the first icon is the "no icon" icon.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24917 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui/skin_engine')
-rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 2 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_tokens.c | 8 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_tokens.h | 2 |
3 files changed, 12 insertions, 0 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index 844fe5f120..7fbf63bfeb 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c | |||
@@ -366,6 +366,8 @@ static const struct wps_tag all_tags[] = { | |||
366 | parse_viewport_display }, | 366 | parse_viewport_display }, |
367 | #ifdef HAVE_LCD_BITMAP | 367 | #ifdef HAVE_LCD_BITMAP |
368 | { WPS_VIEWPORT_CUSTOMLIST, "Vp", WPS_REFRESH_STATIC, parse_playlistview }, | 368 | { WPS_VIEWPORT_CUSTOMLIST, "Vp", WPS_REFRESH_STATIC, parse_playlistview }, |
369 | { WPS_TOKEN_LIST_TITLE_TEXT, "Lt", WPS_REFRESH_DYNAMIC, NULL }, | ||
370 | { WPS_TOKEN_LIST_TITLE_ICON, "Li", WPS_REFRESH_DYNAMIC, NULL }, | ||
369 | #endif | 371 | #endif |
370 | { WPS_NO_TOKEN, "V", 0, parse_viewport }, | 372 | { WPS_NO_TOKEN, "V", 0, parse_viewport }, |
371 | 373 | ||
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c index 1189925ea0..a682bdf87a 100644 --- a/apps/gui/skin_engine/skin_tokens.c +++ b/apps/gui/skin_engine/skin_tokens.c | |||
@@ -416,6 +416,14 @@ const char *get_token_value(struct gui_wps *gwps, | |||
416 | case WPS_TOKEN_PLAYLIST_ENTRIES: | 416 | case WPS_TOKEN_PLAYLIST_ENTRIES: |
417 | snprintf(buf, buf_size, "%d", playlist_amount()); | 417 | snprintf(buf, buf_size, "%d", playlist_amount()); |
418 | return buf; | 418 | return buf; |
419 | |||
420 | case WPS_TOKEN_LIST_TITLE_TEXT: | ||
421 | return (char*)token->value.data; | ||
422 | case WPS_TOKEN_LIST_TITLE_ICON: | ||
423 | if (intval) | ||
424 | *intval = token->value.i; | ||
425 | snprintf(buf, buf_size, "%d", token->value.i); | ||
426 | return buf; | ||
419 | 427 | ||
420 | case WPS_TOKEN_PLAYLIST_NAME: | 428 | case WPS_TOKEN_PLAYLIST_NAME: |
421 | return playlist_name(NULL, buf, buf_size); | 429 | return playlist_name(NULL, buf, buf_size); |
diff --git a/apps/gui/skin_engine/skin_tokens.h b/apps/gui/skin_engine/skin_tokens.h index 5778f95808..d0df058cf0 100644 --- a/apps/gui/skin_engine/skin_tokens.h +++ b/apps/gui/skin_engine/skin_tokens.h | |||
@@ -189,6 +189,8 @@ enum wps_token_type { | |||
189 | 189 | ||
190 | /* buttons */ | 190 | /* buttons */ |
191 | TOKEN_MARKER_MISC, | 191 | TOKEN_MARKER_MISC, |
192 | WPS_TOKEN_LIST_TITLE_TEXT, | ||
193 | WPS_TOKEN_LIST_TITLE_ICON, | ||
192 | WPS_TOKEN_BUTTON_VOLUME, | 194 | WPS_TOKEN_BUTTON_VOLUME, |
193 | WPS_TOKEN_LASTTOUCH, | 195 | WPS_TOKEN_LASTTOUCH, |
194 | #if (CONFIG_LED == LED_VIRTUAL) || defined(HAVE_REMOTE_LCD) | 196 | #if (CONFIG_LED == LED_VIRTUAL) || defined(HAVE_REMOTE_LCD) |