diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2010-06-07 03:44:11 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2010-06-07 03:44:11 +0000 |
commit | 5b0521c9aadee11886e2c92df7d768d5e76063a6 (patch) | |
tree | a6fc72ca29627bb53276c05a5606a559f78bae83 /apps/gui/skin_engine/skin_display.c | |
parent | 53b619c6e80c9efc6993c23ff7b1035e8e101834 (diff) | |
download | rockbox-5b0521c9aadee11886e2c92df7d768d5e76063a6.tar.gz rockbox-5b0521c9aadee11886e2c92df7d768d5e76063a6.zip |
Changeover to the new skin format. SkinBreakingChange in the wiki has the runown of the changes.
Major changes are paramerterised tags now use %tag(param,param), colours are removed from the %V() tag, %Vi gets a required (but can be -) label as its first param).
utils/skinupdater/ has a program to update individual skins, and a perl script to update a whole zip.
Themesite will be unusable for the time being (you should be able to upload new themes once it updates checkwps though).
I obviously havnt tested every updated wps in this change so let me know if one doesnt load
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26641 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui/skin_engine/skin_display.c')
-rw-r--r-- | apps/gui/skin_engine/skin_display.c | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c index 848a09eced..6759521473 100644 --- a/apps/gui/skin_engine/skin_display.c +++ b/apps/gui/skin_engine/skin_display.c | |||
@@ -755,7 +755,20 @@ static bool get_line(struct gui_wps *gwps, | |||
755 | skip to the end of the conditional structure */ | 755 | skip to the end of the conditional structure */ |
756 | i = find_conditional_end(data, i); | 756 | i = find_conditional_end(data, i); |
757 | break; | 757 | break; |
758 | 758 | #if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1)) | |
759 | case WPS_TOKEN_VIEWPORT_FGCOLOUR: | ||
760 | { | ||
761 | struct viewport_colour *col = data->tokens[i].value.data; | ||
762 | col->vp->fg_pattern = col->colour; | ||
763 | } | ||
764 | break; | ||
765 | case WPS_TOKEN_VIEWPORT_BGCOLOUR: | ||
766 | { | ||
767 | struct viewport_colour *col = data->tokens[i].value.data; | ||
768 | col->vp->bg_pattern = col->colour; | ||
769 | } | ||
770 | break; | ||
771 | #endif | ||
759 | #ifdef HAVE_LCD_BITMAP | 772 | #ifdef HAVE_LCD_BITMAP |
760 | case WPS_TOKEN_PEAKMETER: | 773 | case WPS_TOKEN_PEAKMETER: |
761 | data->peak_meter_enabled = true; | 774 | data->peak_meter_enabled = true; |
@@ -1208,14 +1221,16 @@ static bool skin_redraw(struct gui_wps *gwps, unsigned refresh_mode) | |||
1208 | } | 1221 | } |
1209 | } | 1222 | } |
1210 | } | 1223 | } |
1211 | int viewport_count = 0; | ||
1212 | for (viewport_list = data->viewports; | 1224 | for (viewport_list = data->viewports; |
1213 | viewport_list; viewport_list = viewport_list->next, viewport_count++) | 1225 | viewport_list; viewport_list = viewport_list->next) |
1214 | { | 1226 | { |
1215 | struct skin_viewport *skin_viewport = | 1227 | struct skin_viewport *skin_viewport = |
1216 | (struct skin_viewport *)viewport_list->token->value.data; | 1228 | (struct skin_viewport *)viewport_list->token->value.data; |
1217 | unsigned vp_refresh_mode = refresh_mode; | 1229 | unsigned vp_refresh_mode = refresh_mode; |
1218 | 1230 | #if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1) | |
1231 | skin_viewport->vp.fg_pattern = skin_viewport->start_fgcolour; | ||
1232 | skin_viewport->vp.bg_pattern = skin_viewport->start_bgcolour; | ||
1233 | #endif | ||
1219 | display->set_viewport(&skin_viewport->vp); | 1234 | display->set_viewport(&skin_viewport->vp); |
1220 | 1235 | ||
1221 | int hidden_vp = 0; | 1236 | int hidden_vp = 0; |