diff options
52 files changed, 297 insertions, 205 deletions
diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c index 634d199461..6e159b88b4 100644 --- a/apps/gui/gwps-common.c +++ b/apps/gui/gwps-common.c | |||
@@ -506,53 +506,33 @@ void display_keylock_text(bool locked) | |||
506 | 506 | ||
507 | #ifdef HAVE_LCD_BITMAP | 507 | #ifdef HAVE_LCD_BITMAP |
508 | 508 | ||
509 | static void draw_progressbar(struct gui_wps *gwps, int line) | 509 | static void draw_progressbar(struct gui_wps *gwps, |
510 | struct progressbar *pb) | ||
510 | { | 511 | { |
511 | struct wps_data *data = gwps->data; | ||
512 | struct screen *display = gwps->display; | 512 | struct screen *display = gwps->display; |
513 | struct wps_state *state = gwps->state; | 513 | struct wps_state *state = gwps->state; |
514 | int h = font_get(display->getfont())->height; | 514 | if (pb->have_bitmap_pb) |
515 | 515 | gui_bitmap_scrollbar_draw(display, pb->bm, | |
516 | int sb_y; | 516 | pb->x, pb->y, pb->width, pb->bm.height, |
517 | if (data->progress_top < 0) | ||
518 | sb_y = line*h + display->getymargin() + | ||
519 | ((h > data->progress_height + 1) | ||
520 | ? (h - data->progress_height) / 2 : 1); | ||
521 | else | ||
522 | sb_y = data->progress_top; | ||
523 | |||
524 | if (!data->progress_end) | ||
525 | data->progress_end=display->getwidth(); | ||
526 | |||
527 | if (gwps->data->progressbar.have_bitmap_pb) | ||
528 | gui_bitmap_scrollbar_draw(display, data->progressbar.bm, | ||
529 | data->progress_start, sb_y, | ||
530 | data->progress_end-data->progress_start, | ||
531 | data->progressbar.bm.height, | ||
532 | state->id3->length ? state->id3->length : 1, 0, | 517 | state->id3->length ? state->id3->length : 1, 0, |
533 | state->id3->length ? state->id3->elapsed | 518 | state->id3->length ? state->id3->elapsed |
534 | + state->ff_rewind_count : 0, | 519 | + state->ff_rewind_count : 0, |
535 | HORIZONTAL); | 520 | HORIZONTAL); |
536 | else | 521 | else |
537 | gui_scrollbar_draw(display, data->progress_start, sb_y, | 522 | gui_scrollbar_draw(display, pb->x, pb->y, pb->width, pb->height, |
538 | data->progress_end-data->progress_start, | ||
539 | data->progress_height, | ||
540 | state->id3->length ? state->id3->length : 1, 0, | 523 | state->id3->length ? state->id3->length : 1, 0, |
541 | state->id3->length ? state->id3->elapsed | 524 | state->id3->length ? state->id3->elapsed |
542 | + state->ff_rewind_count : 0, | 525 | + state->ff_rewind_count : 0, |
543 | HORIZONTAL); | 526 | HORIZONTAL); |
544 | |||
545 | #ifdef AB_REPEAT_ENABLE | 527 | #ifdef AB_REPEAT_ENABLE |
546 | if ( ab_repeat_mode_enabled() && state->id3->length != 0 ) | 528 | if ( ab_repeat_mode_enabled() && state->id3->length != 0 ) |
547 | ab_draw_markers(display, state->id3->length, | 529 | ab_draw_markers(display, state->id3->length, |
548 | data->progress_start, data->progress_end, sb_y, | 530 | pb->x, pb->x + pb->width, pb->y, pb->height); |
549 | data->progress_height); | ||
550 | #endif | 531 | #endif |
551 | 532 | ||
552 | if ( cuesheet_is_enabled() && state->id3->cuesheet_type ) | 533 | if ( cuesheet_is_enabled() && state->id3->cuesheet_type ) |
553 | cue_draw_markers(display, state->id3->length, | 534 | cue_draw_markers(display, state->id3->length, |
554 | data->progress_start, data->progress_end, | 535 | pb->x, pb->x + pb->width, pb->y+1, pb->height-2); |
555 | sb_y+1, data->progress_height-2); | ||
556 | } | 536 | } |
557 | 537 | ||
558 | /* clears the area where the image was shown */ | 538 | /* clears the area where the image was shown */ |
@@ -1621,7 +1601,24 @@ static bool get_line(struct gui_wps *gwps, | |||
1621 | *buf++ = 0; | 1601 | *buf++ = 0; |
1622 | cur_align_start = buf; | 1602 | cur_align_start = buf; |
1623 | break; | 1603 | break; |
1624 | 1604 | case WPS_VIEWPORT_ENABLE: | |
1605 | { | ||
1606 | char label = data->tokens[i].value.i; | ||
1607 | int j; | ||
1608 | char temp = VP_DRAW_HIDEABLE; | ||
1609 | for(j=0;j<data->num_viewports;j++) | ||
1610 | { | ||
1611 | temp = VP_DRAW_HIDEABLE; | ||
1612 | if ((data->viewports[j].hidden_flags&VP_DRAW_HIDEABLE) && | ||
1613 | (data->viewports[j].label == label)) | ||
1614 | { | ||
1615 | if (data->viewports[j].hidden_flags&VP_DRAW_WASHIDDEN) | ||
1616 | temp |= VP_DRAW_WASHIDDEN; | ||
1617 | data->viewports[j].hidden_flags = temp; | ||
1618 | } | ||
1619 | } | ||
1620 | } | ||
1621 | break; | ||
1625 | default: | 1622 | default: |
1626 | { | 1623 | { |
1627 | /* get the value of the tag and copy it to the buffer */ | 1624 | /* get the value of the tag and copy it to the buffer */ |
@@ -1945,6 +1942,7 @@ bool gui_wps_refresh(struct gui_wps *gwps, | |||
1945 | int v, line, i, subline_idx; | 1942 | int v, line, i, subline_idx; |
1946 | unsigned char flags; | 1943 | unsigned char flags; |
1947 | char linebuf[MAX_PATH]; | 1944 | char linebuf[MAX_PATH]; |
1945 | unsigned char vp_refresh_mode; | ||
1948 | 1946 | ||
1949 | struct align_pos align; | 1947 | struct align_pos align; |
1950 | align.left = NULL; | 1948 | align.left = NULL; |
@@ -1994,14 +1992,21 @@ bool gui_wps_refresh(struct gui_wps *gwps, | |||
1994 | 1992 | ||
1995 | state->ff_rewind_count = ffwd_offset; | 1993 | state->ff_rewind_count = ffwd_offset; |
1996 | 1994 | ||
1995 | /* disable any viewports which are conditionally displayed */ | ||
1997 | for (v = 0; v < data->num_viewports; v++) | 1996 | for (v = 0; v < data->num_viewports; v++) |
1998 | { | 1997 | { |
1999 | display->set_viewport(&data->viewports[v].vp); | 1998 | if (data->viewports[v].hidden_flags&VP_DRAW_HIDEABLE) |
2000 | |||
2001 | if (refresh_mode == WPS_REFRESH_ALL) | ||
2002 | { | 1999 | { |
2003 | display->clear_viewport(); | 2000 | if (data->viewports[v].hidden_flags&VP_DRAW_HIDDEN) |
2001 | data->viewports[v].hidden_flags |= VP_DRAW_WASHIDDEN; | ||
2002 | else | ||
2003 | data->viewports[v].hidden_flags |= VP_DRAW_HIDDEN; | ||
2004 | } | 2004 | } |
2005 | } | ||
2006 | for (v = 0; v < data->num_viewports; v++) | ||
2007 | { | ||
2008 | display->set_viewport(&data->viewports[v].vp); | ||
2009 | vp_refresh_mode = refresh_mode; | ||
2005 | 2010 | ||
2006 | #ifdef HAVE_LCD_BITMAP | 2011 | #ifdef HAVE_LCD_BITMAP |
2007 | /* Set images to not to be displayed */ | 2012 | /* Set images to not to be displayed */ |
@@ -2010,7 +2015,26 @@ bool gui_wps_refresh(struct gui_wps *gwps, | |||
2010 | data->img[i].display = -1; | 2015 | data->img[i].display = -1; |
2011 | } | 2016 | } |
2012 | #endif | 2017 | #endif |
2013 | 2018 | /* dont redraw the viewport if its disabled */ | |
2019 | if ((data->viewports[v].hidden_flags&VP_DRAW_HIDDEN)) | ||
2020 | { | ||
2021 | if (!(data->viewports[v].hidden_flags&VP_DRAW_WASHIDDEN)) | ||
2022 | display->scroll_stop(&data->viewports[v].vp); | ||
2023 | data->viewports[v].hidden_flags |= VP_DRAW_WASHIDDEN; | ||
2024 | continue; | ||
2025 | } | ||
2026 | else if (((data->viewports[v].hidden_flags& | ||
2027 | (VP_DRAW_WASHIDDEN|VP_DRAW_HIDEABLE)) | ||
2028 | == (VP_DRAW_WASHIDDEN|VP_DRAW_HIDEABLE))) | ||
2029 | { | ||
2030 | vp_refresh_mode = WPS_REFRESH_ALL; | ||
2031 | data->viewports[v].hidden_flags = VP_DRAW_HIDEABLE; | ||
2032 | } | ||
2033 | if (vp_refresh_mode == WPS_REFRESH_ALL) | ||
2034 | { | ||
2035 | display->clear_viewport(); | ||
2036 | } | ||
2037 | |||
2014 | for (line = data->viewports[v].first_line; | 2038 | for (line = data->viewports[v].first_line; |
2015 | line <= data->viewports[v].last_line; line++) | 2039 | line <= data->viewports[v].last_line; line++) |
2016 | { | 2040 | { |
@@ -2024,30 +2048,21 @@ bool gui_wps_refresh(struct gui_wps *gwps, | |||
2024 | data->lines[line].curr_subline); | 2048 | data->lines[line].curr_subline); |
2025 | flags = data->sublines[subline_idx].line_type; | 2049 | flags = data->sublines[subline_idx].line_type; |
2026 | 2050 | ||
2027 | if (refresh_mode == WPS_REFRESH_ALL || (flags & refresh_mode) | 2051 | if (vp_refresh_mode == WPS_REFRESH_ALL || (flags & vp_refresh_mode) |
2028 | || new_subline_refresh) | 2052 | || new_subline_refresh) |
2029 | { | 2053 | { |
2030 | /* get_line tells us if we need to update the line */ | 2054 | /* get_line tells us if we need to update the line */ |
2031 | update_line = get_line(gwps, line, data->lines[line].curr_subline, | 2055 | update_line = get_line(gwps, line, data->lines[line].curr_subline, |
2032 | &align, linebuf, sizeof(linebuf)); | 2056 | &align, linebuf, sizeof(linebuf)); |
2033 | } | 2057 | } |
2034 | |||
2035 | #ifdef HAVE_LCD_BITMAP | 2058 | #ifdef HAVE_LCD_BITMAP |
2036 | /* progressbar */ | ||
2037 | if (flags & refresh_mode & WPS_REFRESH_PLAYER_PROGRESS) | ||
2038 | { | ||
2039 | /* the progressbar should be alone on its line */ | ||
2040 | update_line = false; | ||
2041 | draw_progressbar(gwps, line - data->viewports[v].first_line); | ||
2042 | } | ||
2043 | |||
2044 | /* peakmeter */ | 2059 | /* peakmeter */ |
2045 | if (flags & refresh_mode & WPS_REFRESH_PEAK_METER) | 2060 | if (flags & vp_refresh_mode & WPS_REFRESH_PEAK_METER) |
2046 | { | 2061 | { |
2047 | /* the peakmeter should be alone on its line */ | 2062 | /* the peakmeter should be alone on its line */ |
2048 | update_line = false; | 2063 | update_line = false; |
2049 | 2064 | ||
2050 | int h = font_get(display->getfont())->height; | 2065 | int h = font_get(data->viewports[v].vp.font)->height; |
2051 | int peak_meter_y = display->getymargin() + (line - data->viewports[v].first_line)* h; | 2066 | int peak_meter_y = display->getymargin() + (line - data->viewports[v].first_line)* h; |
2052 | 2067 | ||
2053 | /* The user might decide to have the peak meter in the last | 2068 | /* The user might decide to have the peak meter in the last |
@@ -2066,7 +2081,7 @@ bool gui_wps_refresh(struct gui_wps *gwps, | |||
2066 | #else /* HAVE_LCD_CHARCELL */ | 2081 | #else /* HAVE_LCD_CHARCELL */ |
2067 | 2082 | ||
2068 | /* progressbar */ | 2083 | /* progressbar */ |
2069 | if (flags & refresh_mode & WPS_REFRESH_PLAYER_PROGRESS) | 2084 | if (flags & vp_refresh_mode & WPS_REFRESH_PLAYER_PROGRESS) |
2070 | { | 2085 | { |
2071 | if (data->full_line_progressbar) | 2086 | if (data->full_line_progressbar) |
2072 | draw_player_fullbar(gwps, linebuf, sizeof(linebuf)); | 2087 | draw_player_fullbar(gwps, linebuf, sizeof(linebuf)); |
@@ -2075,22 +2090,32 @@ bool gui_wps_refresh(struct gui_wps *gwps, | |||
2075 | } | 2090 | } |
2076 | #endif | 2091 | #endif |
2077 | 2092 | ||
2078 | if (update_line) | 2093 | if (update_line && |
2094 | /* conditionals clear the line which means if the %Vd is put into the default | ||
2095 | viewport there will be a blank line. | ||
2096 | To get around this we dont allow any actual drawing to happen in the | ||
2097 | deault vp if other vp's are defined */ | ||
2098 | ((data->num_viewports>1 && v!=0) || data->num_viewports == 1)) | ||
2079 | { | 2099 | { |
2080 | if (flags & WPS_REFRESH_SCROLL) | 2100 | if (flags & WPS_REFRESH_SCROLL) |
2081 | { | 2101 | { |
2082 | /* if the line is a scrolling one we don't want to update | 2102 | /* if the line is a scrolling one we don't want to update |
2083 | too often, so that it has the time to scroll */ | 2103 | too often, so that it has the time to scroll */ |
2084 | if ((refresh_mode & WPS_REFRESH_SCROLL) || new_subline_refresh) | 2104 | if ((vp_refresh_mode & WPS_REFRESH_SCROLL) || new_subline_refresh) |
2085 | write_line(display, &align, line - data->viewports[v].first_line, true); | 2105 | write_line(display, &align, line - data->viewports[v].first_line, true); |
2086 | } | 2106 | } |
2087 | else | 2107 | else |
2088 | write_line(display, &align, line - data->viewports[v].first_line, false); | 2108 | write_line(display, &align, line - data->viewports[v].first_line, false); |
2089 | } | 2109 | } |
2090 | |||
2091 | } | 2110 | } |
2092 | 2111 | ||
2093 | #ifdef HAVE_LCD_BITMAP | 2112 | #ifdef HAVE_LCD_BITMAP |
2113 | /* progressbar */ | ||
2114 | if (vp_refresh_mode & WPS_REFRESH_PLAYER_PROGRESS) | ||
2115 | { | ||
2116 | if (data->viewports[v].pb) | ||
2117 | draw_progressbar(gwps, data->viewports[v].pb); | ||
2118 | } | ||
2094 | /* Now display any images in this viewport */ | 2119 | /* Now display any images in this viewport */ |
2095 | wps_display_images(gwps, &data->viewports[v].vp); | 2120 | wps_display_images(gwps, &data->viewports[v].vp); |
2096 | #endif | 2121 | #endif |
diff --git a/apps/gui/gwps.h b/apps/gui/gwps.h index 494d12a084..25cfc08505 100644 --- a/apps/gui/gwps.h +++ b/apps/gui/gwps.h | |||
@@ -70,7 +70,13 @@ struct gui_img{ | |||
70 | bool always_display; /* not using the preload/display mechanism */ | 70 | bool always_display; /* not using the preload/display mechanism */ |
71 | }; | 71 | }; |
72 | 72 | ||
73 | struct prog_img{ /*progressbar image*/ | 73 | struct progressbar { |
74 | /* regular pb */ | ||
75 | short x; | ||
76 | short y; | ||
77 | short width; | ||
78 | short height; | ||
79 | /*progressbar image*/ | ||
74 | struct bitmap bm; | 80 | struct bitmap bm; |
75 | bool have_bitmap_pb; | 81 | bool have_bitmap_pb; |
76 | }; | 82 | }; |
@@ -85,6 +91,7 @@ struct align_pos { | |||
85 | #ifdef HAVE_LCD_BITMAP | 91 | #ifdef HAVE_LCD_BITMAP |
86 | 92 | ||
87 | #define MAX_IMAGES (26*2) /* a-z and A-Z */ | 93 | #define MAX_IMAGES (26*2) /* a-z and A-Z */ |
94 | #define MAX_PROGRESSBARS 3 | ||
88 | 95 | ||
89 | /* The image buffer is big enough to store one full-screen native bitmap, | 96 | /* The image buffer is big enough to store one full-screen native bitmap, |
90 | plus two full-screen mono bitmaps. */ | 97 | plus two full-screen mono bitmaps. */ |
@@ -92,7 +99,7 @@ struct align_pos { | |||
92 | #define IMG_BUFSIZE ((LCD_HEIGHT*LCD_WIDTH*LCD_DEPTH/8) \ | 99 | #define IMG_BUFSIZE ((LCD_HEIGHT*LCD_WIDTH*LCD_DEPTH/8) \ |
93 | + (2*LCD_HEIGHT*LCD_WIDTH/8)) | 100 | + (2*LCD_HEIGHT*LCD_WIDTH/8)) |
94 | 101 | ||
95 | #define WPS_MAX_VIEWPORTS 16 | 102 | #define WPS_MAX_VIEWPORTS 24 |
96 | #define WPS_MAX_LINES ((LCD_HEIGHT/5+1) * 2) | 103 | #define WPS_MAX_LINES ((LCD_HEIGHT/5+1) * 2) |
97 | #define WPS_MAX_SUBLINES (WPS_MAX_LINES*3) | 104 | #define WPS_MAX_SUBLINES (WPS_MAX_LINES*3) |
98 | #define WPS_MAX_TOKENS 1024 | 105 | #define WPS_MAX_TOKENS 1024 |
@@ -271,8 +278,11 @@ enum wps_token_type { | |||
271 | 278 | ||
272 | #if (CONFIG_LED == LED_VIRTUAL) || defined(HAVE_REMOTE_LCD) | 279 | #if (CONFIG_LED == LED_VIRTUAL) || defined(HAVE_REMOTE_LCD) |
273 | /* Virtual LED */ | 280 | /* Virtual LED */ |
274 | WPS_TOKEN_VLED_HDD | 281 | WPS_TOKEN_VLED_HDD, |
275 | #endif | 282 | #endif |
283 | |||
284 | /* Viewport display */ | ||
285 | WPS_VIEWPORT_ENABLE | ||
276 | }; | 286 | }; |
277 | 287 | ||
278 | struct wps_token { | 288 | struct wps_token { |
@@ -323,12 +333,17 @@ struct wps_line { | |||
323 | long subline_expire_time; | 333 | long subline_expire_time; |
324 | }; | 334 | }; |
325 | 335 | ||
336 | #define VP_DRAW_HIDEABLE 0x1 | ||
337 | #define VP_DRAW_HIDDEN 0x2 | ||
338 | #define VP_DRAW_WASHIDDEN 0x4 | ||
326 | struct wps_viewport { | 339 | struct wps_viewport { |
327 | struct viewport vp; /* The LCD viewport struct */ | 340 | struct viewport vp; /* The LCD viewport struct */ |
328 | 341 | struct progressbar *pb; | |
329 | /* Indexes of the first and last lines belonging to this viewport in the | 342 | /* Indexes of the first and last lines belonging to this viewport in the |
330 | lines[] array */ | 343 | lines[] array */ |
331 | int first_line, last_line; | 344 | int first_line, last_line; |
345 | char hidden_flags; | ||
346 | char label; | ||
332 | }; | 347 | }; |
333 | 348 | ||
334 | /* wps_data | 349 | /* wps_data |
@@ -338,17 +353,15 @@ struct wps_data | |||
338 | { | 353 | { |
339 | #ifdef HAVE_LCD_BITMAP | 354 | #ifdef HAVE_LCD_BITMAP |
340 | struct gui_img img[MAX_IMAGES]; | 355 | struct gui_img img[MAX_IMAGES]; |
341 | struct prog_img progressbar; | ||
342 | unsigned char img_buf[IMG_BUFSIZE]; | 356 | unsigned char img_buf[IMG_BUFSIZE]; |
343 | unsigned char* img_buf_ptr; | 357 | unsigned char* img_buf_ptr; |
344 | int img_buf_free; | 358 | int img_buf_free; |
345 | bool wps_sb_tag; | 359 | bool wps_sb_tag; |
346 | bool show_sb_on_wps; | 360 | bool show_sb_on_wps; |
347 | 361 | ||
348 | short progress_top; | 362 | struct progressbar progressbar[MAX_PROGRESSBARS]; |
349 | short progress_height; | 363 | short progressbar_count; |
350 | short progress_start; | 364 | |
351 | short progress_end; | ||
352 | bool peak_meter_enabled; | 365 | bool peak_meter_enabled; |
353 | 366 | ||
354 | #ifdef HAVE_ALBUMART | 367 | #ifdef HAVE_ALBUMART |
diff --git a/apps/gui/wps_debug.c b/apps/gui/wps_debug.c index 9bff1d23ae..4fa12167f2 100644 --- a/apps/gui/wps_debug.c +++ b/apps/gui/wps_debug.c | |||
@@ -431,6 +431,10 @@ static char *get_token_desc(struct wps_token *token, struct wps_data *data, | |||
431 | snprintf(buf, bufsize, "pitch value"); | 431 | snprintf(buf, bufsize, "pitch value"); |
432 | break; | 432 | break; |
433 | #endif | 433 | #endif |
434 | case WPS_VIEWPORT_ENABLE: | ||
435 | snprintf(buf, bufsize, "enable VP:%d", | ||
436 | token->value.i); | ||
437 | break; | ||
434 | 438 | ||
435 | default: | 439 | default: |
436 | snprintf(buf, bufsize, "FIXME (code: %d)", | 440 | snprintf(buf, bufsize, "FIXME (code: %d)", |
diff --git a/apps/gui/wps_parser.c b/apps/gui/wps_parser.c index 53605e27cc..dc9abd98fb 100644 --- a/apps/gui/wps_parser.c +++ b/apps/gui/wps_parser.c | |||
@@ -80,13 +80,13 @@ static int line; | |||
80 | #ifdef HAVE_LCD_BITMAP | 80 | #ifdef HAVE_LCD_BITMAP |
81 | 81 | ||
82 | #if LCD_DEPTH > 1 | 82 | #if LCD_DEPTH > 1 |
83 | #define MAX_BITMAPS (MAX_IMAGES+2) /* WPS images + pbar bitmap + backdrop */ | 83 | #define MAX_BITMAPS (MAX_IMAGES+MAX_PROGRESSBARS+1) /* WPS images + pbar bitmap + backdrop */ |
84 | #else | 84 | #else |
85 | #define MAX_BITMAPS (MAX_IMAGES+1) /* WPS images + pbar bitmap */ | 85 | #define MAX_BITMAPS (MAX_IMAGES+MAX_PROGRESSBARS) /* WPS images + pbar bitmap */ |
86 | #endif | 86 | #endif |
87 | 87 | ||
88 | #define PROGRESSBAR_BMP MAX_IMAGES | 88 | #define PROGRESSBAR_BMP MAX_IMAGES |
89 | #define BACKDROP_BMP (MAX_IMAGES+1) | 89 | #define BACKDROP_BMP (MAX_BITMAPS-1) |
90 | 90 | ||
91 | /* pointers to the bitmap filenames in the WPS source */ | 91 | /* pointers to the bitmap filenames in the WPS source */ |
92 | static const char *bmp_names[MAX_BITMAPS]; | 92 | static const char *bmp_names[MAX_BITMAPS]; |
@@ -129,6 +129,8 @@ static int parse_dir_level(const char *wps_bufptr, | |||
129 | struct wps_token *token, struct wps_data *wps_data); | 129 | struct wps_token *token, struct wps_data *wps_data); |
130 | 130 | ||
131 | #ifdef HAVE_LCD_BITMAP | 131 | #ifdef HAVE_LCD_BITMAP |
132 | static int parse_viewport_display(const char *wps_bufptr, | ||
133 | struct wps_token *token, struct wps_data *wps_data); | ||
132 | static int parse_viewport(const char *wps_bufptr, | 134 | static int parse_viewport(const char *wps_bufptr, |
133 | struct wps_token *token, struct wps_data *wps_data); | 135 | struct wps_token *token, struct wps_data *wps_data); |
134 | static int parse_leftmargin(const char *wps_bufptr, | 136 | static int parse_leftmargin(const char *wps_bufptr, |
@@ -317,13 +319,14 @@ static const struct wps_tag all_tags[] = { | |||
317 | parse_image_display }, | 319 | parse_image_display }, |
318 | 320 | ||
319 | { WPS_TOKEN_IMAGE_DISPLAY, "x", 0, parse_image_load }, | 321 | { WPS_TOKEN_IMAGE_DISPLAY, "x", 0, parse_image_load }, |
320 | { WPS_TOKEN_IMAGE_PROGRESS_BAR, "P", 0, parse_image_special }, | ||
321 | #ifdef HAVE_ALBUMART | 322 | #ifdef HAVE_ALBUMART |
322 | { WPS_NO_TOKEN, "Cl", 0, parse_albumart_load }, | 323 | { WPS_NO_TOKEN, "Cl", 0, parse_albumart_load }, |
323 | { WPS_TOKEN_ALBUMART_DISPLAY, "C", WPS_REFRESH_STATIC, | 324 | { WPS_TOKEN_ALBUMART_DISPLAY, "C", WPS_REFRESH_STATIC, |
324 | parse_albumart_conditional }, | 325 | parse_albumart_conditional }, |
325 | #endif | 326 | #endif |
326 | 327 | ||
328 | { WPS_VIEWPORT_ENABLE, "Vd", WPS_REFRESH_DYNAMIC, | ||
329 | parse_viewport_display }, | ||
327 | { WPS_NO_TOKEN, "V", 0, parse_viewport }, | 330 | { WPS_NO_TOKEN, "V", 0, parse_viewport }, |
328 | 331 | ||
329 | #if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1)) | 332 | #if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1)) |
@@ -536,6 +539,22 @@ static int parse_image_load(const char *wps_bufptr, | |||
536 | return skip_end_of_line(wps_bufptr); | 539 | return skip_end_of_line(wps_bufptr); |
537 | } | 540 | } |
538 | 541 | ||
542 | static int parse_viewport_display(const char *wps_bufptr, | ||
543 | struct wps_token *token, | ||
544 | struct wps_data *wps_data) | ||
545 | { | ||
546 | (void)wps_data; | ||
547 | char letter = wps_bufptr[0]; | ||
548 | |||
549 | if (letter < 'a' || letter > 'z') | ||
550 | { | ||
551 | /* invalid viewport tag */ | ||
552 | return WPS_ERROR_INVALID_PARAM; | ||
553 | } | ||
554 | token->value.i = letter; | ||
555 | return 1; | ||
556 | } | ||
557 | |||
539 | static int parse_viewport(const char *wps_bufptr, | 558 | static int parse_viewport(const char *wps_bufptr, |
540 | struct wps_token *token, | 559 | struct wps_token *token, |
541 | struct wps_data *wps_data) | 560 | struct wps_data *wps_data) |
@@ -563,17 +582,35 @@ static int parse_viewport(const char *wps_bufptr, | |||
563 | } | 582 | } |
564 | #endif | 583 | #endif |
565 | 584 | ||
566 | if (*wps_bufptr != '|') | ||
567 | return WPS_ERROR_INVALID_PARAM; /* malformed token: e.g. %Cl7 */ | ||
568 | |||
569 | ptr = wps_bufptr + 1; | ||
570 | /* format: %V|x|y|width|height|font|fg_pattern|bg_pattern| */ | ||
571 | |||
572 | if (wps_data->num_viewports >= WPS_MAX_VIEWPORTS) | 585 | if (wps_data->num_viewports >= WPS_MAX_VIEWPORTS) |
573 | return WPS_ERROR_INVALID_PARAM; | 586 | return WPS_ERROR_INVALID_PARAM; |
574 | 587 | ||
575 | wps_data->num_viewports++; | 588 | wps_data->num_viewports++; |
589 | /* check for the optional letter to signify its a hideable viewport */ | ||
590 | /* %Vl|<label>|<rest of tags>| */ | ||
591 | wps_data->viewports[wps_data->num_viewports].hidden_flags = 0; | ||
592 | |||
593 | if (*ptr == 'l') | ||
594 | { | ||
595 | if (*(ptr+1) == '|') | ||
596 | { | ||
597 | char label = *(ptr+2); | ||
598 | if (label >= 'a' && label < 'a' + WPS_MAX_VIEWPORTS) | ||
599 | { | ||
600 | wps_data->viewports[wps_data->num_viewports].hidden_flags = VP_DRAW_HIDEABLE; | ||
601 | wps_data->viewports[wps_data->num_viewports].label = label; | ||
602 | } | ||
603 | else | ||
604 | return WPS_ERROR_INVALID_PARAM; /* malformed token: e.g. %Cl7 */ | ||
605 | ptr += 3; | ||
606 | } | ||
607 | } | ||
608 | if (*ptr != '|') | ||
609 | return WPS_ERROR_INVALID_PARAM; | ||
610 | |||
611 | ptr++; | ||
576 | vp = &wps_data->viewports[wps_data->num_viewports].vp; | 612 | vp = &wps_data->viewports[wps_data->num_viewports].vp; |
613 | /* format: %V|x|y|width|height|font|fg_pattern|bg_pattern| */ | ||
577 | 614 | ||
578 | /* Set the defaults for fields not user-specified */ | 615 | /* Set the defaults for fields not user-specified */ |
579 | vp->drawmode = DRMODE_SOLID; | 616 | vp->drawmode = DRMODE_SOLID; |
@@ -687,14 +724,8 @@ static int parse_image_special(const char *wps_bufptr, | |||
687 | 724 | ||
688 | if (pos > newline) | 725 | if (pos > newline) |
689 | return WPS_ERROR_INVALID_PARAM; | 726 | return WPS_ERROR_INVALID_PARAM; |
690 | |||
691 | if (token->type == WPS_TOKEN_IMAGE_PROGRESS_BAR) | ||
692 | { | ||
693 | /* format: %P|filename.bmp| */ | ||
694 | bmp_names[PROGRESSBAR_BMP] = wps_bufptr + 1; | ||
695 | } | ||
696 | #if LCD_DEPTH > 1 | 727 | #if LCD_DEPTH > 1 |
697 | else if (token->type == WPS_TOKEN_IMAGE_BACKDROP) | 728 | if (token->type == WPS_TOKEN_IMAGE_BACKDROP) |
698 | { | 729 | { |
699 | /* format: %X|filename.bmp| */ | 730 | /* format: %X|filename.bmp| */ |
700 | bmp_names[BACKDROP_BMP] = wps_bufptr + 1; | 731 | bmp_names[BACKDROP_BMP] = wps_bufptr + 1; |
@@ -762,40 +793,82 @@ static int parse_progressbar(const char *wps_bufptr, | |||
762 | struct wps_data *wps_data) | 793 | struct wps_data *wps_data) |
763 | { | 794 | { |
764 | (void)token; /* Kill warnings */ | 795 | (void)token; /* Kill warnings */ |
796 | /* %pb or %pb|filename|x|y|width|height| | ||
797 | using - for any of the params uses "sane" values */ | ||
765 | #ifdef HAVE_LCD_BITMAP | 798 | #ifdef HAVE_LCD_BITMAP |
799 | enum { | ||
800 | PB_FILENAME = 0, | ||
801 | PB_X, | ||
802 | PB_Y, | ||
803 | PB_WIDTH, | ||
804 | PB_HEIGHT | ||
805 | }; | ||
806 | const char *filename; | ||
807 | int x, y, height, width, set = 0; | ||
808 | const char *ptr = wps_bufptr; | ||
809 | struct progressbar *pb; | ||
810 | struct viewport *vp = &wps_data->viewports[wps_data->num_viewports].vp; | ||
811 | int font_height = font_get(vp->font)->height; | ||
812 | int line_y_pos = font_height*(wps_data->num_lines - | ||
813 | wps_data->viewports[wps_data->num_viewports].first_line); | ||
814 | |||
815 | /** Remove this bit when the remove lcd margins patch goes in **/ | ||
816 | bool draw_sb = global_settings.statusbar; | ||
766 | 817 | ||
767 | short *vals[] = { | 818 | if (wps_data->wps_sb_tag) |
768 | &wps_data->progress_height, | 819 | draw_sb = wps_data->show_sb_on_wps; |
769 | &wps_data->progress_start, | ||
770 | &wps_data->progress_end, | ||
771 | &wps_data->progress_top }; | ||
772 | |||
773 | /* default values : */ | ||
774 | wps_data->progress_height = 6; | ||
775 | wps_data->progress_start = 0; | ||
776 | wps_data->progress_end = 0; | ||
777 | wps_data->progress_top = -1; | ||
778 | |||
779 | int i = 0; | ||
780 | char *newline = strchr(wps_bufptr, '\n'); | ||
781 | char *prev = strchr(wps_bufptr, '|'); | ||
782 | if (prev && prev < newline) { | ||
783 | char *next = strchr(prev+1, '|'); | ||
784 | while (i < 4 && next && next < newline) | ||
785 | { | ||
786 | *(vals[i++]) = atoi(++prev); | ||
787 | prev = strchr(prev, '|'); | ||
788 | next = strchr(++next, '|'); | ||
789 | } | ||
790 | 820 | ||
791 | if (wps_data->progress_height < 3) | 821 | if (wps_data->num_viewports == 0 && draw_sb) |
792 | wps_data->progress_height = 3; | 822 | line_y_pos += STATUSBAR_HEIGHT; |
793 | if (wps_data->progress_end < wps_data->progress_start + 3) | 823 | /** Remove the above bit when the remove lcd margins patch goes in **/ |
794 | wps_data->progress_end = 0; | 824 | |
825 | if (wps_data->progressbar_count +1 >= MAX_PROGRESSBARS) | ||
826 | return WPS_ERROR_INVALID_PARAM; | ||
827 | |||
828 | pb = &wps_data->progressbar[wps_data->progressbar_count]; | ||
829 | pb->have_bitmap_pb = false; | ||
830 | |||
831 | if (*wps_bufptr != '|') /* regular old style */ | ||
832 | { | ||
833 | pb->x = 0; | ||
834 | pb->width = vp->width; | ||
835 | pb->height = SYSFONT_HEIGHT-2; | ||
836 | pb->y = line_y_pos + (font_height-pb->height)/2; | ||
837 | |||
838 | wps_data->viewports[wps_data->num_viewports].pb = | ||
839 | &wps_data->progressbar[wps_data->progressbar_count]; | ||
840 | wps_data->progressbar_count++; | ||
841 | return 0; | ||
795 | } | 842 | } |
796 | 843 | ptr = wps_bufptr + 1; | |
797 | return newline - wps_bufptr; | 844 | |
798 | 845 | if (!(ptr = parse_list("sdddd", &set, '|', ptr, &filename, | |
846 | &x, &y, &width, &height))) | ||
847 | return WPS_ERROR_INVALID_PARAM; | ||
848 | if (LIST_VALUE_PARSED(set, PB_FILENAME)) /* filename */ | ||
849 | bmp_names[PROGRESSBAR_BMP+wps_data->progressbar_count] = filename; | ||
850 | if (LIST_VALUE_PARSED(set, PB_X)) /* x */ | ||
851 | pb->x = x; | ||
852 | else | ||
853 | pb->x = vp->x; | ||
854 | if (LIST_VALUE_PARSED(set, PB_WIDTH)) /* width */ | ||
855 | pb->width = width; | ||
856 | else | ||
857 | pb->width = vp->width - pb->x; | ||
858 | if (LIST_VALUE_PARSED(set, PB_HEIGHT)) /* height, default to font height */ | ||
859 | pb->height = height; | ||
860 | else | ||
861 | pb->height = font_height; | ||
862 | if (LIST_VALUE_PARSED(set, PB_Y)) /* y */ | ||
863 | pb->y = y; | ||
864 | else | ||
865 | pb->y = line_y_pos + (font_height-pb->height)/2; | ||
866 | wps_data->progressbar[wps_data->progressbar_count].have_bitmap_pb = false; | ||
867 | wps_data->viewports[wps_data->num_viewports].pb = | ||
868 | &wps_data->progressbar[wps_data->progressbar_count]; | ||
869 | wps_data->progressbar_count++; | ||
870 | /* Skip the rest of the line */ | ||
871 | return skip_end_of_line(wps_bufptr)-1; | ||
799 | #else | 872 | #else |
800 | 873 | ||
801 | if (*(wps_bufptr-1) == 'f') | 874 | if (*(wps_bufptr-1) == 'f') |
@@ -1359,7 +1432,6 @@ static void wps_images_clear(struct wps_data *data) | |||
1359 | data->img[i].always_display = false; | 1432 | data->img[i].always_display = false; |
1360 | data->img[i].num_subimages = 1; | 1433 | data->img[i].num_subimages = 1; |
1361 | } | 1434 | } |
1362 | data->progressbar.have_bitmap_pb = false; | ||
1363 | } | 1435 | } |
1364 | #endif | 1436 | #endif |
1365 | 1437 | ||
@@ -1373,6 +1445,8 @@ void wps_data_init(struct wps_data *wps_data) | |||
1373 | wps_data->img_buf_ptr = wps_data->img_buf; /* where in image buffer */ | 1445 | wps_data->img_buf_ptr = wps_data->img_buf; /* where in image buffer */ |
1374 | wps_data->img_buf_free = IMG_BUFSIZE; /* free space in image buffer */ | 1446 | wps_data->img_buf_free = IMG_BUFSIZE; /* free space in image buffer */ |
1375 | wps_data->peak_meter_enabled = false; | 1447 | wps_data->peak_meter_enabled = false; |
1448 | /* progress bars */ | ||
1449 | wps_data->progressbar_count = 0; | ||
1376 | #else /* HAVE_LCD_CHARCELLS */ | 1450 | #else /* HAVE_LCD_CHARCELLS */ |
1377 | int i; | 1451 | int i; |
1378 | for (i = 0; i < 8; i++) | 1452 | for (i = 0; i < 8; i++) |
@@ -1414,10 +1488,10 @@ static bool load_wps_bitmaps(struct wps_data *wps_data, char *bmpdir) | |||
1414 | get_image_filename(bmp_names[n], bmpdir, | 1488 | get_image_filename(bmp_names[n], bmpdir, |
1415 | img_path, sizeof(img_path)); | 1489 | img_path, sizeof(img_path)); |
1416 | 1490 | ||
1417 | if (n == PROGRESSBAR_BMP) { | 1491 | if (n >= PROGRESSBAR_BMP ) { |
1418 | /* progressbar bitmap */ | 1492 | /* progressbar bitmap */ |
1419 | bitmap = &wps_data->progressbar.bm; | 1493 | bitmap = &wps_data->progressbar[n-PROGRESSBAR_BMP].bm; |
1420 | loaded = &wps_data->progressbar.have_bitmap_pb; | 1494 | loaded = &wps_data->progressbar[n-PROGRESSBAR_BMP].have_bitmap_pb; |
1421 | } else { | 1495 | } else { |
1422 | /* regular bitmap */ | 1496 | /* regular bitmap */ |
1423 | bitmap = &wps_data->img[n].bm; | 1497 | bitmap = &wps_data->img[n].bm; |
diff --git a/apps/settings.c b/apps/settings.c index 340adba5b8..8834c9d9bf 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -791,6 +791,25 @@ void settings_apply(bool read_disk) | |||
791 | 791 | ||
792 | if (read_disk) | 792 | if (read_disk) |
793 | { | 793 | { |
794 | |||
795 | #ifdef HAVE_LCD_BITMAP | ||
796 | /* fonts need to be loaded before the WPS */ | ||
797 | if ( global_settings.font_file[0]) { | ||
798 | snprintf(buf, sizeof buf, FONT_DIR "/%s.fnt", | ||
799 | global_settings.font_file); | ||
800 | font_load(buf); | ||
801 | } | ||
802 | else | ||
803 | font_reset(); | ||
804 | |||
805 | if ( global_settings.kbd_file[0]) { | ||
806 | snprintf(buf, sizeof buf, ROCKBOX_DIR "/%s.kbd", | ||
807 | global_settings.kbd_file); | ||
808 | load_kbd(buf); | ||
809 | } | ||
810 | else | ||
811 | load_kbd(NULL); | ||
812 | #endif | ||
794 | #if LCD_DEPTH > 1 | 813 | #if LCD_DEPTH > 1 |
795 | unload_wps_backdrop(); | 814 | unload_wps_backdrop(); |
796 | #endif | 815 | #endif |
@@ -838,24 +857,6 @@ void settings_apply(bool read_disk) | |||
838 | gui_wps[1].data->remote_wps = true; | 857 | gui_wps[1].data->remote_wps = true; |
839 | } | 858 | } |
840 | #endif | 859 | #endif |
841 | |||
842 | #ifdef HAVE_LCD_BITMAP | ||
843 | if ( global_settings.font_file[0]) { | ||
844 | snprintf(buf, sizeof buf, FONT_DIR "/%s.fnt", | ||
845 | global_settings.font_file); | ||
846 | font_load(buf); | ||
847 | } | ||
848 | else | ||
849 | font_reset(); | ||
850 | |||
851 | if ( global_settings.kbd_file[0]) { | ||
852 | snprintf(buf, sizeof buf, ROCKBOX_DIR "/%s.kbd", | ||
853 | global_settings.kbd_file); | ||
854 | load_kbd(buf); | ||
855 | } | ||
856 | else | ||
857 | load_kbd(NULL); | ||
858 | #endif | ||
859 | if ( global_settings.lang_file[0]) { | 860 | if ( global_settings.lang_file[0]) { |
860 | snprintf(buf, sizeof buf, LANG_DIR "/%s.lng", | 861 | snprintf(buf, sizeof buf, LANG_DIR "/%s.lng", |
861 | global_settings.lang_file); | 862 | global_settings.lang_file); |
diff --git a/wps/Rockboxed.112x64x1.wps b/wps/Rockboxed.112x64x1.wps index fee3a5c081..17a1223680 100644 --- a/wps/Rockboxed.112x64x1.wps +++ b/wps/Rockboxed.112x64x1.wps | |||
@@ -12,7 +12,7 @@ | |||
12 | %al%s%ac%?id<%id|%d1>%ar | 12 | %al%s%ac%?id<%id|%d1>%ar |
13 | %al%s%ac%?it<%it|%fn>%ar | 13 | %al%s%ac%?it<%it|%fn>%ar |
14 | %ac%t3%ig;%ac%iy | 14 | %ac%t3%ig;%ac%iy |
15 | %pb|5|10|102| | 15 | %pb|-|10|-|92|5| |
16 | %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|unknown>%ar%pt | 16 | %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|unknown>%ar%pt |
17 | %?ps<%xdBa|%xdBb> | 17 | %?ps<%xdBa|%xdBb> |
18 | %?mp<%xdAa|%xdAb|%xdAc|%xdAd|%xdAe> | 18 | %?mp<%xdAa|%xdAb|%xdAc|%xdAd|%xdAe> |
diff --git a/wps/Rockboxed.128x128x16.wps b/wps/Rockboxed.128x128x16.wps index ffd749148f..66b47459ab 100644 --- a/wps/Rockboxed.128x128x16.wps +++ b/wps/Rockboxed.128x128x16.wps | |||
@@ -2,7 +2,6 @@ | |||
2 | # License: GNU GPL v2 or later. | 2 | # License: GNU GPL v2 or later. |
3 | %wd | 3 | %wd |
4 | %X|bg-128x128x16.bmp| | 4 | %X|bg-128x128x16.bmp| |
5 | %P|pg-108.bmp| | ||
6 | %xl|A|mode-color-small.bmp|62|109|4| | 5 | %xl|A|mode-color-small.bmp|62|109|4| |
7 | %xl|B|shuffle-color-small.bmp|34|109| | 6 | %xl|B|shuffle-color-small.bmp|34|109| |
8 | %xl|C|volume-color-small.bmp|15|111|9| | 7 | %xl|C|volume-color-small.bmp|15|111|9| |
@@ -15,7 +14,7 @@ | |||
15 | %al %s%ac%?it<%it|%fn>%ar | 14 | %al %s%ac%?it<%it|%fn>%ar |
16 | 15 | ||
17 | %ac%t3%ig;%ac%iy | 16 | %ac%t3%ig;%ac%iy |
18 | %pb|5|10|118|76| | 17 | %pb|pg-108.bmp|10|76|108|5| |
19 | %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt | 18 | %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt |
20 | %?ps<%xdB> | 19 | %?ps<%xdB> |
21 | %?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd> | 20 | %?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd> |
diff --git a/wps/Rockboxed.132x80x16.wps b/wps/Rockboxed.132x80x16.wps index 437a6ed9a9..c4ec5a1cea 100644 --- a/wps/Rockboxed.132x80x16.wps +++ b/wps/Rockboxed.132x80x16.wps | |||
@@ -2,7 +2,6 @@ | |||
2 | # License: GNU GPL v2 or later. | 2 | # License: GNU GPL v2 or later. |
3 | %wd | 3 | %wd |
4 | %X|bg-132x80x16.bmp| | 4 | %X|bg-132x80x16.bmp| |
5 | %P|pg-108.bmp| | ||
6 | %xl|A|mode-color-small.bmp|62|65|4| | 5 | %xl|A|mode-color-small.bmp|62|65|4| |
7 | %xl|B|shuffle-color-small.bmp|34|65| | 6 | %xl|B|shuffle-color-small.bmp|34|65| |
8 | %xl|C|volume-color-small.bmp|15|67|9| | 7 | %xl|C|volume-color-small.bmp|15|67|9| |
@@ -13,7 +12,7 @@ | |||
13 | %al %s%ac%?ia<%ia|%d2>%ar | 12 | %al %s%ac%?ia<%ia|%d2>%ar |
14 | %al %s%ac%?id<%id|%d1>%ar | 13 | %al %s%ac%?id<%id|%d1>%ar |
15 | %al %s%ac%?it<%it|%fn>%ar | 14 | %al %s%ac%?it<%it|%fn>%ar |
16 | %pb|5|12|118|43| | 15 | %pb|pg-108.bmp|12|43|106|5| |
17 | %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|unknown|nsf|speex|spc|ape|wma>%ar%pt | 16 | %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|unknown|nsf|speex|spc|ape|wma>%ar%pt |
18 | %?ps<%xdB> | 17 | %?ps<%xdB> |
19 | %?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd> | 18 | %?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd> |
diff --git a/wps/Rockboxed.138x110x2.wps b/wps/Rockboxed.138x110x2.wps index 419141292c..e871b07feb 100644 --- a/wps/Rockboxed.138x110x2.wps +++ b/wps/Rockboxed.138x110x2.wps | |||
@@ -2,7 +2,6 @@ | |||
2 | # License: GNU GPL v2 or later. | 2 | # License: GNU GPL v2 or later. |
3 | %wd | 3 | %wd |
4 | %X|bg-138x110x2.bmp| | 4 | %X|bg-138x110x2.bmp| |
5 | %P|pg-grey-118.bmp| | ||
6 | %xl|A|mode-grey.bmp|68|91|4| | 5 | %xl|A|mode-grey.bmp|68|91|4| |
7 | %xl|B|shuffle-grey-medium.bmp|35|91| | 6 | %xl|B|shuffle-grey-medium.bmp|35|91| |
8 | %xl|C|volume-grey.bmp|15|93|9| | 7 | %xl|C|volume-grey.bmp|15|93|9| |
@@ -14,7 +13,7 @@ | |||
14 | %al %s%ac%?id<%id|%d1>%ar | 13 | %al %s%ac%?id<%id|%d1>%ar |
15 | %al %s%ac%?it<%it|%fn>%ar | 14 | %al %s%ac%?it<%it|%fn>%ar |
16 | %ac%t3%ig;%ac%iy | 15 | %ac%t3%ig;%ac%iy |
17 | %pb|5|10|128| | 16 | %pb|pg-grey-118.bmp|10|-|118|5| |
18 | %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt | 17 | %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt |
19 | %?ps<%xdB> | 18 | %?ps<%xdB> |
20 | %?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd> | 19 | %?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd> |
diff --git a/wps/Rockboxed.160x128x16.wps b/wps/Rockboxed.160x128x16.wps index 41cd72f41d..37e8256521 100644 --- a/wps/Rockboxed.160x128x16.wps +++ b/wps/Rockboxed.160x128x16.wps | |||
@@ -2,7 +2,6 @@ | |||
2 | # License: GNU GPL v2 or later. | 2 | # License: GNU GPL v2 or later. |
3 | %wd | 3 | %wd |
4 | %X|bg-160x128x16.bmp| | 4 | %X|bg-160x128x16.bmp| |
5 | %P|pg-140.bmp| | ||
6 | %xl|A|mode-color-big.bmp|72|109|4| | 5 | %xl|A|mode-color-big.bmp|72|109|4| |
7 | %xl|B|shuffle-color-big.bmp|36|109| | 6 | %xl|B|shuffle-color-big.bmp|36|109| |
8 | %xl|C|volume-color-medium.bmp|15|111|9| | 7 | %xl|C|volume-color-medium.bmp|15|111|9| |
@@ -15,7 +14,7 @@ | |||
15 | %al %s%ac%?it<%it|%fn>%ar | 14 | %al %s%ac%?it<%it|%fn>%ar |
16 | 15 | ||
17 | %ac%t3%ig;%ac%iy | 16 | %ac%t3%ig;%ac%iy |
18 | %pb|5|10|150|76| | 17 | %pb|pg-140.bmp|10|76|140|5| |
19 | %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt | 18 | %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt |
20 | %?ps<%xdB> | 19 | %?ps<%xdB> |
21 | %?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd> | 20 | %?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd> |
diff --git a/wps/Rockboxed.160x128x2.wps b/wps/Rockboxed.160x128x2.wps index 328d86d650..2ee7c08502 100644 --- a/wps/Rockboxed.160x128x2.wps +++ b/wps/Rockboxed.160x128x2.wps | |||
@@ -2,7 +2,6 @@ | |||
2 | # License: GNU GPL v2 or later. | 2 | # License: GNU GPL v2 or later. |
3 | %wd | 3 | %wd |
4 | %X|bg-160x128x2.bmp| | 4 | %X|bg-160x128x2.bmp| |
5 | %P|pg-grey-140.bmp| | ||
6 | %xl|A|mode-grey.bmp|72|109|4| | 5 | %xl|A|mode-grey.bmp|72|109|4| |
7 | %xl|B|shuffle-grey-big.bmp|36|109| | 6 | %xl|B|shuffle-grey-big.bmp|36|109| |
8 | %xl|C|volume-grey.bmp|15|111|9| | 7 | %xl|C|volume-grey.bmp|15|111|9| |
@@ -15,7 +14,7 @@ | |||
15 | %al %s%ac%?it<%it|%fn>%ar | 14 | %al %s%ac%?it<%it|%fn>%ar |
16 | 15 | ||
17 | %ac%t3%ig;%ac%iy | 16 | %ac%t3%ig;%ac%iy |
18 | %pb|5|10|150| | 17 | %pb|pg-grey-140.bmp|10|-|140|5| |
19 | %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt | 18 | %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt |
20 | %?ps<%xdB> | 19 | %?ps<%xdB> |
21 | %?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd> | 20 | %?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd> |
diff --git a/wps/Rockboxed.176x132x16.wps b/wps/Rockboxed.176x132x16.wps index c710e96fee..92cae29fe1 100644 --- a/wps/Rockboxed.176x132x16.wps +++ b/wps/Rockboxed.176x132x16.wps | |||
@@ -2,7 +2,6 @@ | |||
2 | # License: GNU GPL v2 or later. | 2 | # License: GNU GPL v2 or later. |
3 | %wd | 3 | %wd |
4 | %X|bg-176x132x16.bmp| | 4 | %X|bg-176x132x16.bmp| |
5 | %P|pg-156.bmp| | ||
6 | %xl|A|mode-color-big.bmp|81|113|4| | 5 | %xl|A|mode-color-big.bmp|81|113|4| |
7 | %xl|B|shuffle-color-big.bmp|40|113| | 6 | %xl|B|shuffle-color-big.bmp|40|113| |
8 | %xl|C|volume-color-big.bmp|15|115|11| | 7 | %xl|C|volume-color-big.bmp|15|115|11| |
@@ -15,7 +14,7 @@ | |||
15 | %al %s%ac%?it<%it|%fn>%ar | 14 | %al %s%ac%?it<%it|%fn>%ar |
16 | 15 | ||
17 | %ac%t3%ig;%ac%iy | 16 | %ac%t3%ig;%ac%iy |
18 | %pb|5|10|166|75| | 17 | %pb|pg-156.bmp|10|75|156|5| |
19 | %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt | 18 | %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt |
20 | %?ps<%xdB> | 19 | %?ps<%xdB> |
21 | %?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd> | 20 | %?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd> |
diff --git a/wps/Rockboxed.176x220x16.wps b/wps/Rockboxed.176x220x16.wps index c483127764..ddbd790094 100644 --- a/wps/Rockboxed.176x220x16.wps +++ b/wps/Rockboxed.176x220x16.wps | |||
@@ -2,7 +2,6 @@ | |||
2 | # License: GNU GPL v2 or later. | 2 | # License: GNU GPL v2 or later. |
3 | %wd | 3 | %wd |
4 | %X|bg-176x220x16.bmp| | 4 | %X|bg-176x220x16.bmp| |
5 | %P|pg-156.bmp| | ||
6 | %xl|A|mode-color-big.bmp|81|201|4| | 5 | %xl|A|mode-color-big.bmp|81|201|4| |
7 | %xl|B|shuffle-color-big.bmp|40|201| | 6 | %xl|B|shuffle-color-big.bmp|40|201| |
8 | %xl|C|volume-color-big.bmp|15|203|11| | 7 | %xl|C|volume-color-big.bmp|15|203|11| |
@@ -23,7 +22,7 @@ | |||
23 | 22 | ||
24 | 23 | ||
25 | 24 | ||
26 | %pb|5|10|166|171| | 25 | %pb|pg-156.bmp|10|171|156|5| |
27 | %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt | 26 | %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt |
28 | %?ps<%xdB> | 27 | %?ps<%xdB> |
29 | %?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd> | 28 | %?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd> |
diff --git a/wps/Rockboxed.220x176x16.wps b/wps/Rockboxed.220x176x16.wps index 97781a2274..9814b1372b 100644 --- a/wps/Rockboxed.220x176x16.wps +++ b/wps/Rockboxed.220x176x16.wps | |||
@@ -2,7 +2,6 @@ | |||
2 | # License: GNU GPL v2 or later. | 2 | # License: GNU GPL v2 or later. |
3 | %wd | 3 | %wd |
4 | %X|bg-220x176x16.bmp| | 4 | %X|bg-220x176x16.bmp| |
5 | %P|pg-200.bmp| | ||
6 | %xl|A|mode-color-big.bmp|102|156|4| | 5 | %xl|A|mode-color-big.bmp|102|156|4| |
7 | %xl|B|shuffle-color-big.bmp|57|156| | 6 | %xl|B|shuffle-color-big.bmp|57|156| |
8 | %xl|C|volume-color-big.bmp|15|158|11| | 7 | %xl|C|volume-color-big.bmp|15|158|11| |
@@ -17,7 +16,7 @@ | |||
17 | %al %s%ac%?it<%it|%fn>%ar | 16 | %al %s%ac%?it<%it|%fn>%ar |
18 | 17 | ||
19 | %ac%t3%ig;%ac%iy | 18 | %ac%t3%ig;%ac%iy |
20 | %pb|5|10|210|116| | 19 | %pb|pg-200.bmp|10|116|200|5| |
21 | %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt | 20 | %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt |
22 | %?ps<%xdB> | 21 | %?ps<%xdB> |
23 | %?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd> | 22 | %?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd> |
diff --git a/wps/Rockboxed.240x320x16.wps b/wps/Rockboxed.240x320x16.wps index 37f1c3512b..291f1894fb 100644 --- a/wps/Rockboxed.240x320x16.wps +++ b/wps/Rockboxed.240x320x16.wps | |||
@@ -2,7 +2,6 @@ | |||
2 | # License: GNU GPL v2 or later. | 2 | # License: GNU GPL v2 or later. |
3 | %wd | 3 | %wd |
4 | %X|bg-240x320x16.bmp| | 4 | %X|bg-240x320x16.bmp| |
5 | %P|pg-220.bmp| | ||
6 | %xl|A|mode-color-big.bmp|112|300|4| | 5 | %xl|A|mode-color-big.bmp|112|300|4| |
7 | %xl|B|shuffle-color-big.bmp|57|300| | 6 | %xl|B|shuffle-color-big.bmp|57|300| |
8 | %xl|C|volume-color-big.bmp|15|302|11| | 7 | %xl|C|volume-color-big.bmp|15|302|11| |
@@ -22,7 +21,7 @@ | |||
22 | 21 | ||
23 | %ac%t3%ig;%ac%iy | 22 | %ac%t3%ig;%ac%iy |
24 | 23 | ||
25 | %pb|5|10|230|256| | 24 | %pb|pg-220.bmp|10|256|220|5| |
26 | %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt | 25 | %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt |
27 | %?ps<%xdB> | 26 | %?ps<%xdB> |
28 | %?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd> | 27 | %?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd> |
diff --git a/wps/Rockboxed.320x240x16.wps b/wps/Rockboxed.320x240x16.wps index 23ffa83ec3..05d1077feb 100644 --- a/wps/Rockboxed.320x240x16.wps +++ b/wps/Rockboxed.320x240x16.wps | |||
@@ -2,7 +2,6 @@ | |||
2 | # License: GNU GPL v2 or later. | 2 | # License: GNU GPL v2 or later. |
3 | %wd | 3 | %wd |
4 | %X|bg-320x240x16.bmp| | 4 | %X|bg-320x240x16.bmp| |
5 | %P|pg-300.bmp| | ||
6 | %xl|A|mode-color-big.bmp|153|220|4| | 5 | %xl|A|mode-color-big.bmp|153|220|4| |
7 | %xl|B|shuffle-color-big.bmp|113|220| | 6 | %xl|B|shuffle-color-big.bmp|113|220| |
8 | %xl|C|volume-color-big.bmp|15|222|11| | 7 | %xl|C|volume-color-big.bmp|15|222|11| |
@@ -18,7 +17,7 @@ | |||
18 | 17 | ||
19 | 18 | ||
20 | %ac%t3%ig;%ac%iy | 19 | %ac%t3%ig;%ac%iy |
21 | %pb|5|10|310|178| | 20 | %pb|pg-300.bmp|10|178|300|5| |
22 | %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt | 21 | %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|nsf|speex|spc|ape|wma|unknown>%ar%pt |
23 | %?ps<%xdB> | 22 | %?ps<%xdB> |
24 | %?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd> | 23 | %?mp<%xdAb|%xdAa|%xdAb|%xdAc|%xdAd> |
diff --git a/wps/UniCatcher.128x96x1.wps b/wps/UniCatcher.128x96x1.wps index e6ef042edf..b96ff5b9e4 100644 --- a/wps/UniCatcher.128x96x1.wps +++ b/wps/UniCatcher.128x96x1.wps | |||
@@ -3,7 +3,7 @@ | |||
3 | %t1 %?mp<%al%pp/%pe%ar-:--/-:--|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt>;%t1 %?mp<%al%pp/%pe%ar-:--/-:--|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt> | 3 | %t1 %?mp<%al%pp/%pe%ar-:--/-:--|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt>;%t1 %?mp<%al%pp/%pe%ar-:--/-:--|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe|%al%pp/%pe%ar%pc/%pt|%al%pp/%pe%ar%pc/%pt> |
4 | %s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>> | 4 | %s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>> |
5 | %s%ac%?id<%id|%?d1<%d1|Unknown Album>> | 5 | %s%ac%?id<%id|%?d1<%d1|Unknown Album>> |
6 | %pb|4|11|117| | 6 | %pb|-|11|-|106|4| |
7 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> | 7 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> |
8 | 8 | ||
9 | %xl|A|battery-s.bmp|109|3|5| | 9 | %xl|A|battery-s.bmp|109|3|5| |
diff --git a/wps/UniCatcher.160x128x16.wps b/wps/UniCatcher.160x128x16.wps index d3aa176c4d..4fe806f090 100644 --- a/wps/UniCatcher.160x128x16.wps +++ b/wps/UniCatcher.160x128x16.wps | |||
@@ -6,7 +6,7 @@ | |||
6 | %s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>> | 6 | %s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>> |
7 | %s%ac%?id<%id|%?d1<%d1|Unknown Album>> | 7 | %s%ac%?id<%id|%?d1<%d1|Unknown Album>> |
8 | %al %fbKbps | 8 | %al %fbKbps |
9 | %pb|4|10|150| | 9 | %pb|-|10|-|140|4| |
10 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> | 10 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> |
11 | 11 | ||
12 | %xl|A|battery.bmp|135|8|5| | 12 | %xl|A|battery.bmp|135|8|5| |
diff --git a/wps/UniCatcher.160x128x2.wps b/wps/UniCatcher.160x128x2.wps index 2ba0d6dc7a..85f964ac24 100644 --- a/wps/UniCatcher.160x128x2.wps +++ b/wps/UniCatcher.160x128x2.wps | |||
@@ -6,7 +6,7 @@ | |||
6 | %s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>> | 6 | %s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>> |
7 | %s%ac%?id<%id|%?d1<%d1|Unknown Album>> | 7 | %s%ac%?id<%id|%?d1<%d1|Unknown Album>> |
8 | %al %fbKbps | 8 | %al %fbKbps |
9 | %pb|4|10|150| | 9 | %pb|-|10|-|140|4| |
10 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> | 10 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> |
11 | 11 | ||
12 | %xl|A|battery-g.bmp|135|8|5| | 12 | %xl|A|battery-g.bmp|135|8|5| |
diff --git a/wps/UniCatcher.176x132x16.wps b/wps/UniCatcher.176x132x16.wps index 41cd648c63..df850d99b4 100644 --- a/wps/UniCatcher.176x132x16.wps +++ b/wps/UniCatcher.176x132x16.wps | |||
@@ -6,7 +6,7 @@ | |||
6 | %s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>> | 6 | %s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>> |
7 | %s%ac%?id<%id|%?d1<%d1|Unknown Album>> | 7 | %s%ac%?id<%id|%?d1<%d1|Unknown Album>> |
8 | %al %fbKbps | 8 | %al %fbKbps |
9 | %pb|4|10|166| | 9 | %pb|-|10|-|156|4| |
10 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> | 10 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> |
11 | 11 | ||
12 | %xl|A|battery.bmp|151|8|5| | 12 | %xl|A|battery.bmp|151|8|5| |
diff --git a/wps/UniCatcher.176x220x16.wps b/wps/UniCatcher.176x220x16.wps index 2100b1d72a..9d60ff5ae7 100644 --- a/wps/UniCatcher.176x220x16.wps +++ b/wps/UniCatcher.176x220x16.wps | |||
@@ -11,7 +11,7 @@ | |||
11 | 11 | ||
12 | 12 | ||
13 | %al %fbKbps | 13 | %al %fbKbps |
14 | %pb|4|10|166| | 14 | %pb|-|10|-|156|4| |
15 | %s%acNext: %?It<%It|%?Fn<%Fn|?>> | 15 | %s%acNext: %?It<%It|%?Fn<%Fn|?>> |
16 | 16 | ||
17 | %xl|A|battery.bmp|151|8|5| | 17 | %xl|A|battery.bmp|151|8|5| |
diff --git a/wps/UniCatcher.220x176x16.wps b/wps/UniCatcher.220x176x16.wps index 0ed45ce35d..44ceda9fb5 100644 --- a/wps/UniCatcher.220x176x16.wps +++ b/wps/UniCatcher.220x176x16.wps | |||
@@ -8,7 +8,7 @@ | |||
8 | %s%ac%?id<%id|%?d1<%d1|Unknown Album>> | 8 | %s%ac%?id<%id|%?d1<%d1|Unknown Album>> |
9 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> | 9 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> |
10 | %al %fbKbps | 10 | %al %fbKbps |
11 | %pb|6|11|209| | 11 | %pb|-|11|-|198|6| |
12 | 12 | ||
13 | %s%acNext: %?It<%It|%?Fn<%Fn|?>> | 13 | %s%acNext: %?It<%It|%?Fn<%Fn|?>> |
14 | 14 | ||
diff --git a/wps/UniCatcher.240x320x16.wps b/wps/UniCatcher.240x320x16.wps index cd0532bf80..17e3bcc256 100644 --- a/wps/UniCatcher.240x320x16.wps +++ b/wps/UniCatcher.240x320x16.wps | |||
@@ -16,7 +16,7 @@ | |||
16 | 16 | ||
17 | 17 | ||
18 | %al %fbKbps | 18 | %al %fbKbps |
19 | %pb|7|11|229| | 19 | %pb|-|11|-|218|7| |
20 | 20 | ||
21 | %s%acNext: %?It<%It|%?Fn<%Fn|?>> | 21 | %s%acNext: %?It<%It|%?Fn<%Fn|?>> |
22 | 22 | ||
diff --git a/wps/UniCatcher.320x240x16.wps b/wps/UniCatcher.320x240x16.wps index b6410c3b7a..f36d11ea07 100644 --- a/wps/UniCatcher.320x240x16.wps +++ b/wps/UniCatcher.320x240x16.wps | |||
@@ -11,7 +11,7 @@ | |||
11 | 11 | ||
12 | 12 | ||
13 | %al %fbKbps | 13 | %al %fbKbps |
14 | %pb|7|11|309| | 14 | %pb|-|11|-|298|7| |
15 | 15 | ||
16 | %s%acNext: %?It<%It|%?Fn<%Fn|?>> | 16 | %s%acNext: %?It<%It|%?Fn<%Fn|?>> |
17 | 17 | ||
diff --git a/wps/boxes.220x176x16.wps b/wps/boxes.220x176x16.wps index f008223ffb..4b6fdd6f3c 100644 --- a/wps/boxes.220x176x16.wps +++ b/wps/boxes.220x176x16.wps | |||
@@ -1,5 +1,4 @@ | |||
1 | %X|backdrop-220x176.bmp| | 1 | %X|backdrop-220x176.bmp| |
2 | %P|pb-220.bmp| | ||
3 | %xl|A|codec.bmp|40|102|22| | 2 | %xl|A|codec.bmp|40|102|22| |
4 | %xl|B|encoding.bmp|40|108|2| | 3 | %xl|B|encoding.bmp|40|108|2| |
5 | %xl|C|repeat.bmp|124|10|4| | 4 | %xl|C|repeat.bmp|124|10|4| |
@@ -27,7 +26,7 @@ | |||
27 | 26 | ||
28 | %fbk | 27 | %fbk |
29 | 28 | ||
30 | %pb|8|0|208| | 29 | %pb|pb-220.bmp|0|-|208|8| |
31 | 30 | ||
32 | 31 | ||
33 | %ac%t5%s%?It<%It|%Fn>;%ac%t5%s%?Ia<%Ia|%D2> | 32 | %ac%t5%s%?It<%It|%Fn>;%ac%t5%s%?Ia<%Ia|%D2> |
diff --git a/wps/cabbiev2.112x64x1.wps b/wps/cabbiev2.112x64x1.wps index 2982c1cedd..bf981b1197 100644 --- a/wps/cabbiev2.112x64x1.wps +++ b/wps/cabbiev2.112x64x1.wps | |||
@@ -2,7 +2,6 @@ | |||
2 | # derived from cabbie 2.0 default (C) 2007, Johannes Voggenthaler (Zinc Alloy) | 2 | # derived from cabbie 2.0 default (C) 2007, Johannes Voggenthaler (Zinc Alloy) |
3 | %wd | 3 | %wd |
4 | %x|z|wpsbackdrop-112x64x1.bmp|0|0| | 4 | %x|z|wpsbackdrop-112x64x1.bmp|0|0| |
5 | %P|pb-112x64x1.bmp| | ||
6 | %xl|A|lock-112x64x1.bmp|4|56|2| | 5 | %xl|A|lock-112x64x1.bmp|4|56|2| |
7 | %xl|B|battery-112x64x1.bmp|22|56|9| | 6 | %xl|B|battery-112x64x1.bmp|22|56|9| |
8 | %xl|C|volume-112x64x1.bmp|41|56|9| | 7 | %xl|C|volume-112x64x1.bmp|41|56|9| |
@@ -15,7 +14,7 @@ | |||
15 | %s%ac%?ia<%ia|%?d2<%d2|(root)>> | 14 | %s%ac%?ia<%ia|%?d2<%d2|(root)>> |
16 | %s%ac%?id<%id|%?d1<%d1|(root)>> | 15 | %s%ac%?id<%id|%?d1<%d1|(root)>> |
17 | %t5%ac%s%?Fn<Next: %?It<%It|%Fn>|%ac%pp of %pe>;%t5%ac%s%?Fn<Next: %?Ia<%Ia|%Fn>|%ac%pp of %pe> | 16 | %t5%ac%s%?Fn<Next: %?It<%It|%Fn>|%ac%pp of %pe>;%t5%ac%s%?Fn<Next: %?Ia<%Ia|%Fn>|%ac%pp of %pe> |
18 | %pb|4|1|111|42| | 17 | %pb|pb-112x64x1.bmp|1|42|110|4| |
19 | %pc%ar%pr | 18 | %pc%ar%pr |
20 | #Bottom status bar | 19 | #Bottom status bar |
21 | %?mh<%xdAa|%xdAb> | 20 | %?mh<%xdAa|%xdAb> |
diff --git a/wps/cabbiev2.128x128x16.wps b/wps/cabbiev2.128x128x16.wps index 0d4567e49d..99cda7b93a 100644 --- a/wps/cabbiev2.128x128x16.wps +++ b/wps/cabbiev2.128x128x16.wps | |||
@@ -3,7 +3,6 @@ | |||
3 | #derived from "cabbie" (C) Yohann Misquitta | 3 | #derived from "cabbie" (C) Yohann Misquitta |
4 | %wd | 4 | %wd |
5 | %X|wpsbackdrop-128x128x16.bmp| | 5 | %X|wpsbackdrop-128x128x16.bmp| |
6 | %P|pb-128x128x16.bmp| | ||
7 | %xl|A|lock-128x128x16.bmp|3|110|2| | 6 | %xl|A|lock-128x128x16.bmp|3|110|2| |
8 | %xl|B|battery-128x128x16.bmp|23|110|10| | 7 | %xl|B|battery-128x128x16.bmp|23|110|10| |
9 | %xl|C|volume-128x128x16.bmp|51|110|10| | 8 | %xl|C|volume-128x128x16.bmp|51|110|10| |
@@ -11,7 +10,7 @@ | |||
11 | %xl|E|repeat-128x128x16.bmp|97|110|4| | 10 | %xl|E|repeat-128x128x16.bmp|97|110|4| |
12 | %xl|F|playmode-128x128x16.bmp|111|110|5| | 11 | %xl|F|playmode-128x128x16.bmp|111|110|5| |
13 | %Cl|4|12|s60|s60| | 12 | %Cl|4|12|s60|s60| |
14 | %pb|6|3|125|87| | 13 | %pb|pb-128x128x16.bmp|3|87|122|6| |
15 | #NowPlaying | 14 | #NowPlaying |
16 | %?C<%s%m|70|%al%?it<%it|%fn>|%s%ac%?it<%it|%fn>> | 15 | %?C<%s%m|70|%al%?it<%it|%fn>|%s%ac%?it<%it|%fn>> |
17 | %?C<%s%m|70|%al%?ia<%ia|%?d2<%d2|(root)>>|%s%ac%?ia<%ia|%?d2<%d2|(root)>>> | 16 | %?C<%s%m|70|%al%?ia<%ia|%?d2<%d2|(root)>>|%s%ac%?ia<%ia|%?d2<%d2|(root)>>> |
diff --git a/wps/cabbiev2.128x64x1.wps b/wps/cabbiev2.128x64x1.wps index 8b360291a6..7ea6889b75 100644 --- a/wps/cabbiev2.128x64x1.wps +++ b/wps/cabbiev2.128x64x1.wps | |||
@@ -1,9 +1,8 @@ | |||
1 | # cabbie 2.0 default rwps for Iriver Players by Johannes Voggenthaler (Zinc Alloy) | 1 | # cabbie 2.0 default rwps for Iriver Players by Johannes Voggenthaler (Zinc Alloy) |
2 | # derived from cabbie 2.0 default rwps (C) 2007, Marc Guay | 2 | # derived from cabbie 2.0 default rwps (C) 2007, Marc Guay |
3 | %wd | 3 | %wd |
4 | %P|pb-128x64x1.bmp| | ||
5 | %x|A|wpsbackdrop-128x64x1.bmp|0|0| | 4 | %x|A|wpsbackdrop-128x64x1.bmp|0|0| |
6 | %pb|8|1|126|38| | 5 | %pb|pb-128x64x1.bmp|1|38|125|8| |
7 | %s%ac%?it<%it|%fn> | 6 | %s%ac%?it<%it|%fn> |
8 | %s%ac%?ia<%ia|%?d2<%d2|(root)>> | 7 | %s%ac%?ia<%ia|%?d2<%d2|(root)>> |
9 | 8 | ||
diff --git a/wps/cabbiev2.128x96x2.wps b/wps/cabbiev2.128x96x2.wps index 637e74e5b9..c3e4337ff0 100644 --- a/wps/cabbiev2.128x96x2.wps +++ b/wps/cabbiev2.128x96x2.wps | |||
@@ -2,14 +2,13 @@ | |||
2 | # derived from cabbie 2.0 default (C) 2007, Johannes Voggenthaler (Zinc Alloy) | 2 | # derived from cabbie 2.0 default (C) 2007, Johannes Voggenthaler (Zinc Alloy) |
3 | %wd | 3 | %wd |
4 | %X|wpsbackdrop-128x96x2.bmp| | 4 | %X|wpsbackdrop-128x96x2.bmp| |
5 | %P|pb-128x96x2.bmp| | ||
6 | %xl|A|lock-160x128x2.bmp|3|1|2| | 5 | %xl|A|lock-160x128x2.bmp|3|1|2| |
7 | %xl|B|battery-160x128x2.bmp|26|2|10| | 6 | %xl|B|battery-160x128x2.bmp|26|2|10| |
8 | %xl|C|volume-160x128x2.bmp|49|1|10| | 7 | %xl|C|volume-160x128x2.bmp|49|1|10| |
9 | %xl|D|shuffle-160x128x2.bmp|72|2| | 8 | %xl|D|shuffle-160x128x2.bmp|72|2| |
10 | %xl|E|repeat-160x128x2.bmp|93|0|4| | 9 | %xl|E|repeat-160x128x2.bmp|93|0|4| |
11 | %xl|F|playmode-160x128x2.bmp|112|1|5| | 10 | %xl|F|playmode-160x128x2.bmp|112|1|5| |
12 | %pb|7|1|126|61| | 11 | %pb|pb-128x96x2.bmp|1|61|125|7| |
13 | %V|0|83|128|13|1|0|3| | 12 | %V|0|83|128|13|1|0|3| |
14 | %?mh<%xdAa|%xdAb> | 13 | %?mh<%xdAa|%xdAb> |
15 | %?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>> | 14 | %?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>> |
diff --git a/wps/cabbiev2.132x80x16.wps b/wps/cabbiev2.132x80x16.wps index 2b0caed4fb..cfc8a38900 100644 --- a/wps/cabbiev2.132x80x16.wps +++ b/wps/cabbiev2.132x80x16.wps | |||
@@ -2,7 +2,6 @@ | |||
2 | # derived from cabbie 2.0 default (C) 2007, Johannes Voggenthaler (Zinc Alloy) | 2 | # derived from cabbie 2.0 default (C) 2007, Johannes Voggenthaler (Zinc Alloy) |
3 | %wd | 3 | %wd |
4 | %X|wpsbackdrop-132x80x16.bmp| | 4 | %X|wpsbackdrop-132x80x16.bmp| |
5 | %P|pb-132x80x16.bmp| | ||
6 | %xl|A|lock-132x80x16.bmp|36|69|2| | 5 | %xl|A|lock-132x80x16.bmp|36|69|2| |
7 | %xl|B|battery-132x80x16.bmp|51|69|10| | 6 | %xl|B|battery-132x80x16.bmp|51|69|10| |
8 | %xl|C|volume-132x80x16.bmp|69|69|10| | 7 | %xl|C|volume-132x80x16.bmp|69|69|10| |
@@ -10,7 +9,7 @@ | |||
10 | %xl|E|repeat-132x80x16.bmp|105|67|4| | 9 | %xl|E|repeat-132x80x16.bmp|105|67|4| |
11 | %xl|F|playmode-132x80x16.bmp|118|67|5| | 10 | %xl|F|playmode-132x80x16.bmp|118|67|5| |
12 | %Cl|3|14|c40|c40| | 11 | %Cl|3|14|c40|c40| |
13 | %pb|6|2|129|58| | 12 | %pb|pb-132x80x16.bmp|2|58|127|6| |
14 | #NowPlaying | 13 | #NowPlaying |
15 | %?C<%s%m|48|%al%?it<%it|%fn>|%s%ac%?it<%it|%fn>> | 14 | %?C<%s%m|48|%al%?it<%it|%fn>|%s%ac%?it<%it|%fn>> |
16 | %?C<%s%m|48|%al%?ia<%ia|%?d2<%d2|(root)>>|%s%ac%?ia<%ia|%?d2<%d2|(root)>>> | 15 | %?C<%s%m|48|%al%?ia<%ia|%?d2<%d2|(root)>>|%s%ac%?ia<%ia|%?d2<%d2|(root)>>> |
diff --git a/wps/cabbiev2.138x110x2.wps b/wps/cabbiev2.138x110x2.wps index 0112b479c7..c9d4c5a900 100644 --- a/wps/cabbiev2.138x110x2.wps +++ b/wps/cabbiev2.138x110x2.wps | |||
@@ -4,7 +4,6 @@ | |||
4 | # derived from "cabbie" (C) Yohann Misquitta | 4 | # derived from "cabbie" (C) Yohann Misquitta |
5 | %wd | 5 | %wd |
6 | %X|wpsbackdrop-138x110x2.bmp| | 6 | %X|wpsbackdrop-138x110x2.bmp| |
7 | %P|pb-138x110x2.bmp| | ||
8 | %xl|A|lock-160x128x2.bmp|4|98|2| | 7 | %xl|A|lock-160x128x2.bmp|4|98|2| |
9 | %xl|B|battery-160x128x2.bmp|28|99|10| | 8 | %xl|B|battery-160x128x2.bmp|28|99|10| |
10 | %xl|C|volume-160x128x2.bmp|53|98|10| | 9 | %xl|C|volume-160x128x2.bmp|53|98|10| |
@@ -12,7 +11,7 @@ | |||
12 | %xl|E|repeat-160x128x2.bmp|102|97|4| | 11 | %xl|E|repeat-160x128x2.bmp|102|97|4| |
13 | %xl|F|playmode-160x128x2.bmp|123|98|5| | 12 | %xl|F|playmode-160x128x2.bmp|123|98|5| |
14 | %Cl|5|15|s55|s55| | 13 | %Cl|5|15|s55|s55| |
15 | %pb|6|2|136|75| | 14 | %pb|pb-138x110x2.bmp|2|75|134|6| |
16 | %?C<%s%m|65|%al%?it<%it|%fn>|%s%ac%?it<%it|%fn>> | 15 | %?C<%s%m|65|%al%?it<%it|%fn>|%s%ac%?it<%it|%fn>> |
17 | %?C<%s%m|65|%al%?ia<%ia|%?d2<%d2|(root)>>|%s%ac%?ia<%ia|%?d2<%d2|(root)>>> | 16 | %?C<%s%m|65|%al%?ia<%ia|%?d2<%d2|(root)>>|%s%ac%?ia<%ia|%?d2<%d2|(root)>>> |
18 | %?C<%s%m|65|%al%?id<%id|%?d1<%d1|(root)>>|%s%ac%?id<%id|%?d1<%d1|(root)>>> | 17 | %?C<%s%m|65|%al%?id<%id|%?d1<%d1|(root)>>|%s%ac%?id<%id|%?d1<%d1|(root)>>> |
diff --git a/wps/cabbiev2.160x128x1.wps b/wps/cabbiev2.160x128x1.wps index 8727a446a6..643ddd136c 100644 --- a/wps/cabbiev2.160x128x1.wps +++ b/wps/cabbiev2.160x128x1.wps | |||
@@ -5,14 +5,13 @@ | |||
5 | # derived from "cabbie" (C) Yohann Misquitta | 5 | # derived from "cabbie" (C) Yohann Misquitta |
6 | %wd | 6 | %wd |
7 | %x|z|wpsbackdrop-160x128x1.bmp|0|0| | 7 | %x|z|wpsbackdrop-160x128x1.bmp|0|0| |
8 | %P|pb-160x128x1.bmp| | ||
9 | %xl|A|lock-160x128x1.bmp|48|114|2| | 8 | %xl|A|lock-160x128x1.bmp|48|114|2| |
10 | %xl|B|battery-160x128x1.bmp|66|115|10| | 9 | %xl|B|battery-160x128x1.bmp|66|115|10| |
11 | %xl|C|volume-160x128x1.bmp|87|114|10| | 10 | %xl|C|volume-160x128x1.bmp|87|114|10| |
12 | %xl|D|shuffle-160x128x1.bmp|107|115| | 11 | %xl|D|shuffle-160x128x1.bmp|107|115| |
13 | %xl|E|repeat-160x128x1.bmp|127|113|4| | 12 | %xl|E|repeat-160x128x1.bmp|127|113|4| |
14 | %xl|F|playmode-160x128x1.bmp|145|114|5| | 13 | %xl|F|playmode-160x128x1.bmp|145|114|5| |
15 | %pb|8|1|159|86| | 14 | %pb|pb-160x128x1.bmp|1|86|158|8| |
16 | %s%ac%?it<%it|%fn> | 15 | %s%ac%?it<%it|%fn> |
17 | %s%ac%?ia<%ia|%?d2<%d2|(root)>> | 16 | %s%ac%?ia<%ia|%?d2<%d2|(root)>> |
18 | %s%ac%?id<%id|%?d1<%d1|(root)>> | 17 | %s%ac%?id<%id|%?d1<%d1|(root)>> |
diff --git a/wps/cabbiev2.160x128x16.wps b/wps/cabbiev2.160x128x16.wps index f35eb2dda3..ed5135c41b 100644 --- a/wps/cabbiev2.160x128x16.wps +++ b/wps/cabbiev2.160x128x16.wps | |||
@@ -2,7 +2,6 @@ | |||
2 | # (C) 2007, Johannes Voggenthaler (Zinc Alloy) | 2 | # (C) 2007, Johannes Voggenthaler (Zinc Alloy) |
3 | #derived from "cabbie" (C) Yohann Misquitta | 3 | #derived from "cabbie" (C) Yohann Misquitta |
4 | %wd | 4 | %wd |
5 | %P|pb-160x128x16.bmp| | ||
6 | %X|wpsbackdrop-160x128x16.bmp| | 5 | %X|wpsbackdrop-160x128x16.bmp| |
7 | %xl|A|lock-160x128x16.bmp|48|114|2| | 6 | %xl|A|lock-160x128x16.bmp|48|114|2| |
8 | %xl|B|battery-160x128x16.bmp|66|115|10| | 7 | %xl|B|battery-160x128x16.bmp|66|115|10| |
@@ -11,7 +10,7 @@ | |||
11 | %xl|E|repeat-160x128x16.bmp|125|112|4| | 10 | %xl|E|repeat-160x128x16.bmp|125|112|4| |
12 | %xl|F|playmode-160x128x16.bmp|142|114|5| | 11 | %xl|F|playmode-160x128x16.bmp|142|114|5| |
13 | %Cl|7|16|c65|c65| | 12 | %Cl|7|16|c65|c65| |
14 | %pb|8|6|155|86| | 13 | %pb|pb-160x128x16.bmp|6|86|149|8| |
15 | #NowPlaying | 14 | #NowPlaying |
16 | %?C<%s%m|77|%al%?it<%it|%fn>|%s%ac%?it<%it|%fn>> | 15 | %?C<%s%m|77|%al%?it<%it|%fn>|%s%ac%?it<%it|%fn>> |
17 | %?C<%s%m|77|%al%?ia<%ia|%?d2<%d2|(root)>>|%s%ac%?ia<%ia|%?d2<%d2|(root)>>> | 16 | %?C<%s%m|77|%al%?ia<%ia|%?d2<%d2|(root)>>|%s%ac%?ia<%ia|%?d2<%d2|(root)>>> |
diff --git a/wps/cabbiev2.160x128x2.wps b/wps/cabbiev2.160x128x2.wps index 6307129407..20025525aa 100644 --- a/wps/cabbiev2.160x128x2.wps +++ b/wps/cabbiev2.160x128x2.wps | |||
@@ -5,7 +5,6 @@ | |||
5 | # derived from "cabbie" (C) Yohann Misquitta | 5 | # derived from "cabbie" (C) Yohann Misquitta |
6 | %wd | 6 | %wd |
7 | %X|wpsbackdrop-160x128x2.bmp| | 7 | %X|wpsbackdrop-160x128x2.bmp| |
8 | %P|pb-160x128x2.bmp| | ||
9 | %xl|A|lock-160x128x2.bmp|48|114|2| | 8 | %xl|A|lock-160x128x2.bmp|48|114|2| |
10 | %xl|B|battery-160x128x2.bmp|66|115|10| | 9 | %xl|B|battery-160x128x2.bmp|66|115|10| |
11 | %xl|C|volume-160x128x2.bmp|87|114|10| | 10 | %xl|C|volume-160x128x2.bmp|87|114|10| |
@@ -13,7 +12,7 @@ | |||
13 | %xl|E|repeat-160x128x2.bmp|127|113|4| | 12 | %xl|E|repeat-160x128x2.bmp|127|113|4| |
14 | %xl|F|playmode-160x128x2.bmp|145|114|5| | 13 | %xl|F|playmode-160x128x2.bmp|145|114|5| |
15 | %Cl|2|16|s64|s64| | 14 | %Cl|2|16|s64|s64| |
16 | %pb|8|1|159|86| | 15 | %pb|pb-160x128x2.bmp|1|86|158|8| |
17 | %?C<%s%m|70|%al%?it<%it|%fn>|%s%ac%?it<%it|%fn>> | 16 | %?C<%s%m|70|%al%?it<%it|%fn>|%s%ac%?it<%it|%fn>> |
18 | %?C<%s%m|70|%al%?ia<%ia|%?d2<%d2|(root)>>|%s%ac%?ia<%ia|%?d2<%d2|(root)>>> | 17 | %?C<%s%m|70|%al%?ia<%ia|%?d2<%d2|(root)>>|%s%ac%?ia<%ia|%?d2<%d2|(root)>>> |
19 | %?C<%s%m|70|%al%?id<%id|%?d1<%d1|(root)>>|%s%ac%?id<%id|%?d1<%d1|(root)>>> | 18 | %?C<%s%m|70|%al%?id<%id|%?d1<%d1|(root)>>|%s%ac%?id<%id|%?d1<%d1|(root)>>> |
diff --git a/wps/cabbiev2.176x132x16.wps b/wps/cabbiev2.176x132x16.wps index 93a207bc10..85d40fc4b9 100644 --- a/wps/cabbiev2.176x132x16.wps +++ b/wps/cabbiev2.176x132x16.wps | |||
@@ -3,7 +3,6 @@ | |||
3 | #derived from "cabbie" (C) Yohann Misquitta | 3 | #derived from "cabbie" (C) Yohann Misquitta |
4 | #Ported to nano by crzyboyster | 4 | #Ported to nano by crzyboyster |
5 | %wd | 5 | %wd |
6 | %P|pb-176x132x16.bmp| | ||
7 | %X|wpsbackdrop-176x132x16.bmp| | 6 | %X|wpsbackdrop-176x132x16.bmp| |
8 | %xl|A|lock-176x132x16.bmp|65|116|2| | 7 | %xl|A|lock-176x132x16.bmp|65|116|2| |
9 | %xl|B|battery-176x132x16.bmp|83|117|10| | 8 | %xl|B|battery-176x132x16.bmp|83|117|10| |
@@ -12,7 +11,7 @@ | |||
12 | %xl|E|repeat-176x132x16.bmp|139|113|4| | 11 | %xl|E|repeat-176x132x16.bmp|139|113|4| |
13 | %xl|F|playmode-176x132x16.bmp|156|115|5| | 12 | %xl|F|playmode-176x132x16.bmp|156|115|5| |
14 | %Cl|9|16|s65|s65| | 13 | %Cl|9|16|s65|s65| |
15 | %pb|8|8|168|86| | 14 | %pb|pb-176x132x16.bmp|8|86|160|8| |
16 | #NowPlaying | 15 | #NowPlaying |
17 | %?C<%s%m|81|%al%?it<%it|%fn>|%s%ac%?it<%it|%fn>> | 16 | %?C<%s%m|81|%al%?it<%it|%fn>|%s%ac%?it<%it|%fn>> |
18 | %?C<%s%m|81|%al%?ia<%ia|%?d2<%d2|(root)>>|%s%ac%?ia<%ia|%?d2<%d2|(root)>>> | 17 | %?C<%s%m|81|%al%?ia<%ia|%?d2<%d2|(root)>>|%s%ac%?ia<%ia|%?d2<%d2|(root)>>> |
diff --git a/wps/cabbiev2.176x220x16.wps b/wps/cabbiev2.176x220x16.wps index 042ffcdf01..3c8cd035ee 100644 --- a/wps/cabbiev2.176x220x16.wps +++ b/wps/cabbiev2.176x220x16.wps | |||
@@ -2,7 +2,6 @@ | |||
2 | # derived from cabbie 2.0 default (C) 2007, Johannes Voggenthaler (Zinc Alloy) | 2 | # derived from cabbie 2.0 default (C) 2007, Johannes Voggenthaler (Zinc Alloy) |
3 | %wd | 3 | %wd |
4 | %X|wpsbackdrop-176x220x16.bmp| | 4 | %X|wpsbackdrop-176x220x16.bmp| |
5 | %P|pb-176x220x16.bmp| | ||
6 | %xl|A|lock-176x220x16.bmp|51|204|2| | 5 | %xl|A|lock-176x220x16.bmp|51|204|2| |
7 | %xl|B|battery-176x220x16.bmp|73|206|10| | 6 | %xl|B|battery-176x220x16.bmp|73|206|10| |
8 | %xl|C|volume-176x220x16.bmp|97|206|10| | 7 | %xl|C|volume-176x220x16.bmp|97|206|10| |
@@ -10,7 +9,7 @@ | |||
10 | %xl|E|repeat-176x220x16.bmp|144|204|4| | 9 | %xl|E|repeat-176x220x16.bmp|144|204|4| |
11 | %xl|F|playmode-176x220x16.bmp|159|204|5| | 10 | %xl|F|playmode-176x220x16.bmp|159|204|5| |
12 | %Cl|29|20|c120|c120| | 11 | %Cl|29|20|c120|c120| |
13 | %pb|8|5|171|182| | 12 | %pb|pb-176x220x16.bmp|5|182|166|8| |
14 | #NowPlaying | 13 | #NowPlaying |
15 | 14 | ||
16 | 15 | ||
diff --git a/wps/cabbiev2.220x176x16.wps b/wps/cabbiev2.220x176x16.wps index 94cf128d43..ce8dc2b091 100644 --- a/wps/cabbiev2.220x176x16.wps +++ b/wps/cabbiev2.220x176x16.wps | |||
@@ -3,7 +3,6 @@ | |||
3 | #derived from "cabbie" (C) Yohann Misquitta | 3 | #derived from "cabbie" (C) Yohann Misquitta |
4 | %wd | 4 | %wd |
5 | %X|wpsbackdrop-220x176x16.bmp| | 5 | %X|wpsbackdrop-220x176x16.bmp| |
6 | %P|pb-220x176x16.bmp| | ||
7 | %xl|A|lock-220x176x16.bmp|88|152|2| | 6 | %xl|A|lock-220x176x16.bmp|88|152|2| |
8 | %xl|B|battery-220x176x16.bmp|110|153|10| | 7 | %xl|B|battery-220x176x16.bmp|110|153|10| |
9 | %xl|C|volume-220x176x16.bmp|134|153|10| | 8 | %xl|C|volume-220x176x16.bmp|134|153|10| |
@@ -11,7 +10,7 @@ | |||
11 | %xl|E|repeat-220x176x16.bmp|182|151|4| | 10 | %xl|E|repeat-220x176x16.bmp|182|151|4| |
12 | %xl|F|playmode-220x176x16.bmp|200|152|5| | 11 | %xl|F|playmode-220x176x16.bmp|200|152|5| |
13 | %Cl|15|32|s75|s75| | 12 | %Cl|15|32|s75|s75| |
14 | %pb|8|11|210|121| | 13 | %pb|pb-220x176x16.bmp|11|121|199|8| |
15 | #NowPlaying | 14 | #NowPlaying |
16 | 15 | ||
17 | 16 | ||
diff --git a/wps/cabbiev2.240x320x16.wps b/wps/cabbiev2.240x320x16.wps index 2ed0b4a842..207052b1d6 100644 --- a/wps/cabbiev2.240x320x16.wps +++ b/wps/cabbiev2.240x320x16.wps | |||
@@ -5,7 +5,6 @@ | |||
5 | %wd | 5 | %wd |
6 | 6 | ||
7 | %X|wpsbackdrop-240x320x16.bmp| | 7 | %X|wpsbackdrop-240x320x16.bmp| |
8 | %P|pb-240x320x16.bmp| | ||
9 | %xl|A|lock-240x320x16.bmp|11|292|2| | 8 | %xl|A|lock-240x320x16.bmp|11|292|2| |
10 | %xl|B|battery-240x320x16.bmp|46|292|10| | 9 | %xl|B|battery-240x320x16.bmp|46|292|10| |
11 | %xl|C|volume-240x320x16.bmp|98|292|10| | 10 | %xl|C|volume-240x320x16.bmp|98|292|10| |
@@ -13,7 +12,7 @@ | |||
13 | %xl|E|repeat-240x320x16.bmp|182|292|4| | 12 | %xl|E|repeat-240x320x16.bmp|182|292|4| |
14 | %xl|F|playmode-240x320x16.bmp|206|292|5| | 13 | %xl|F|playmode-240x320x16.bmp|206|292|5| |
15 | %Cl|55|30|c130|c130| | 14 | %Cl|55|30|c130|c130| |
16 | %pb|13|22|221|254| | 15 | %pb|pb-240x320x16.bmp|22|254|199|13| |
17 | %?C<|> | 16 | %?C<|> |
18 | %?C<|%s%ac%?it<%it|%fn>> | 17 | %?C<|%s%ac%?it<%it|%fn>> |
19 | %?C<|%s%ac%?ia<%ia|%?d2<%d2|(root)>>> | 18 | %?C<|%s%ac%?ia<%ia|%?d2<%d2|(root)>>> |
diff --git a/wps/cabbiev2.320x240x16.wps b/wps/cabbiev2.320x240x16.wps index f6495948e9..cbe967d9a9 100644 --- a/wps/cabbiev2.320x240x16.wps +++ b/wps/cabbiev2.320x240x16.wps | |||
@@ -3,7 +3,6 @@ | |||
3 | #derived from "cabbie" (C) Yohann Misquitta | 3 | #derived from "cabbie" (C) Yohann Misquitta |
4 | %wd | 4 | %wd |
5 | %X|wpsbackdrop-320x240x16.bmp| | 5 | %X|wpsbackdrop-320x240x16.bmp| |
6 | %P|pb-320x240x16.bmp| | ||
7 | %xl|A|lock-320x240x16.bmp|91|207|2| | 6 | %xl|A|lock-320x240x16.bmp|91|207|2| |
8 | %xl|B|battery-320x240x16.bmp|126|207|10| | 7 | %xl|B|battery-320x240x16.bmp|126|207|10| |
9 | %xl|C|volume-320x240x16.bmp|177|207|10| | 8 | %xl|C|volume-320x240x16.bmp|177|207|10| |
@@ -11,7 +10,7 @@ | |||
11 | %xl|E|repeat-320x240x16.bmp|261|207|4| | 10 | %xl|E|repeat-320x240x16.bmp|261|207|4| |
12 | %xl|F|playmode-320x240x16.bmp|286|207|5| | 11 | %xl|F|playmode-320x240x16.bmp|286|207|5| |
13 | %Cl|16|32|s120|s120| | 12 | %Cl|16|32|s120|s120| |
14 | %pb|15|10|310|162| | 13 | %pb|pb-320x240x16.bmp|10|162|300|15| |
15 | #NowPlaying | 14 | #NowPlaying |
16 | 15 | ||
17 | %?C<%s%m|153|%al%?it<%it|%fn>|%s%ac%?it<%it|%fn>> | 16 | %?C<%s%m|153|%al%?it<%it|%fn>|%s%ac%?it<%it|%fn>> |
diff --git a/wps/iCatcher.112x64x1.wps b/wps/iCatcher.112x64x1.wps index 68cfd79a2a..1f54a1193b 100644 --- a/wps/iCatcher.112x64x1.wps +++ b/wps/iCatcher.112x64x1.wps | |||
@@ -5,7 +5,7 @@ | |||
5 | %s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>> | 5 | %s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>> |
6 | %s%ac%?id<%id|%?d1<%d1|Unknown Album>> | 6 | %s%ac%?id<%id|%?d1<%d1|Unknown Album>> |
7 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> | 7 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> |
8 | %pb|3|11|101| | 8 | %pb|-|11|-|90|3| |
9 | %t6%s%ac%?Fm<Next: %?It<%It|%Fn>|%fbKbps %fc>;%t6%s%ac%?Fm<Next: %?It<%It|%Fn>|%fbKbps %fc> | 9 | %t6%s%ac%?Fm<Next: %?It<%It|%Fn>|%fbKbps %fc>;%t6%s%ac%?Fm<Next: %?It<%It|%Fn>|%fbKbps %fc> |
10 | 10 | ||
11 | %xl|A|battery-s.bmp|93|3|5| | 11 | %xl|A|battery-s.bmp|93|3|5| |
diff --git a/wps/iCatcher.128x128x16.wps b/wps/iCatcher.128x128x16.wps index 691ed8d9c4..9f24f09cce 100644 --- a/wps/iCatcher.128x128x16.wps +++ b/wps/iCatcher.128x128x16.wps | |||
@@ -11,7 +11,7 @@ | |||
11 | 11 | ||
12 | 12 | ||
13 | %al %fbKbps | 13 | %al %fbKbps |
14 | %pb|4|11|117| | 14 | %pb|-|11|-|106|4| |
15 | 15 | ||
16 | %s%acNext: %?It<%It|%?Fn<%Fn|?>> | 16 | %s%acNext: %?It<%It|%?Fn<%Fn|?>> |
17 | 17 | ||
diff --git a/wps/iCatcher.128x64x1.160x128x2.wps b/wps/iCatcher.128x64x1.160x128x2.wps index e137a08be6..3d0702644c 100644 --- a/wps/iCatcher.128x64x1.160x128x2.wps +++ b/wps/iCatcher.128x64x1.160x128x2.wps | |||
@@ -4,7 +4,7 @@ | |||
4 | %t1 %?mp<%al %pp/%pe%ar-:--/-:-- |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt >;%t1 %?mp<%al %pp/%pe%ar-:--/-:-- |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe|%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt > | 4 | %t1 %?mp<%al %pp/%pe%ar-:--/-:-- |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt >;%t1 %?mp<%al %pp/%pe%ar-:--/-:-- |%al %pp/%pe%ar%pc/%pt |%al %pp/%pe|%al %pp/%pe%ar%pc/%pt |%al %pp/%pe%ar%pc/%pt > |
5 | %s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>> | 5 | %s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>> |
6 | %s%ac%?id<%id|%?d1<%d1|Unknown Album>> | 6 | %s%ac%?id<%id|%?d1<%d1|Unknown Album>> |
7 | %pb|4|11|117| | 7 | %pb|-|11|-|106|4| |
8 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> | 8 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> |
9 | 9 | ||
10 | %xl|A|battery-s.bmp|109|3|5| | 10 | %xl|A|battery-s.bmp|109|3|5| |
diff --git a/wps/iCatcher.128x96x1.wps b/wps/iCatcher.128x96x1.wps index 0ebea5f7d5..1222642adf 100644 --- a/wps/iCatcher.128x96x1.wps +++ b/wps/iCatcher.128x96x1.wps | |||
@@ -6,7 +6,7 @@ | |||
6 | %s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>> | 6 | %s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>> |
7 | %s%ac%?id<%id|%?d1<%d1|Unknown Album>> | 7 | %s%ac%?id<%id|%?d1<%d1|Unknown Album>> |
8 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> | 8 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> |
9 | %pb|4|11|117| | 9 | %pb|-|11|-|106|4| |
10 | 10 | ||
11 | %s%acNext: %?It<%It|%?Fn<%Fn|?>> | 11 | %s%acNext: %?It<%It|%?Fn<%Fn|?>> |
12 | 12 | ||
diff --git a/wps/iCatcher.132x80x16.wps b/wps/iCatcher.132x80x16.wps index 428d28b7c2..bc730a2c2f 100644 --- a/wps/iCatcher.132x80x16.wps +++ b/wps/iCatcher.132x80x16.wps | |||
@@ -6,7 +6,7 @@ | |||
6 | %s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>> | 6 | %s%ac%?ia<%ia|%?d2<%d2|Unknown Artist>> |
7 | %s%ac%?id<%id|%?d1<%d1|Unknown Album>> | 7 | %s%ac%?id<%id|%?d1<%d1|Unknown Album>> |
8 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> | 8 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> |
9 | %pb|4|11|117| | 9 | %pb|-|11|-|106|4| |
10 | 10 | ||
11 | %s%acNext: %?It<%It|%?Fn<%Fn|?>> | 11 | %s%acNext: %?It<%It|%?Fn<%Fn|?>> |
12 | 12 | ||
diff --git a/wps/iCatcher.138x110x2.wps b/wps/iCatcher.138x110x2.wps index 5e1c651b4a..c4a64acc92 100644 --- a/wps/iCatcher.138x110x2.wps +++ b/wps/iCatcher.138x110x2.wps | |||
@@ -10,7 +10,7 @@ | |||
10 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> | 10 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> |
11 | 11 | ||
12 | %al %fbKbps | 12 | %al %fbKbps |
13 | %pb|4|10|128| | 13 | %pb|-|10|-|118|4| |
14 | 14 | ||
15 | %s%acNext: %?It<%It|%?Fn<%Fn|?>> | 15 | %s%acNext: %?It<%It|%?Fn<%Fn|?>> |
16 | 16 | ||
diff --git a/wps/iCatcher.160x128x16.wps b/wps/iCatcher.160x128x16.wps index 8147214b70..8604ba39b0 100644 --- a/wps/iCatcher.160x128x16.wps +++ b/wps/iCatcher.160x128x16.wps | |||
@@ -11,7 +11,7 @@ | |||
11 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> | 11 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> |
12 | 12 | ||
13 | %al %fbKbps | 13 | %al %fbKbps |
14 | %pb|4|10|150| | 14 | %pb|-|10|-|140|4| |
15 | 15 | ||
16 | %s%acNext: %?It<%It|%?Fn<%Fn|?>> | 16 | %s%acNext: %?It<%It|%?Fn<%Fn|?>> |
17 | 17 | ||
diff --git a/wps/iCatcher.160x128x2.wps b/wps/iCatcher.160x128x2.wps index e2d786de3b..1405dc3ad6 100644 --- a/wps/iCatcher.160x128x2.wps +++ b/wps/iCatcher.160x128x2.wps | |||
@@ -11,7 +11,7 @@ | |||
11 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> | 11 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> |
12 | 12 | ||
13 | %al %fbKbps | 13 | %al %fbKbps |
14 | %pb|4|10|150| | 14 | %pb|-|10|-|140|4| |
15 | 15 | ||
16 | %s%acNext: %?It<%It|%?Fn<%Fn|?>> | 16 | %s%acNext: %?It<%It|%?Fn<%Fn|?>> |
17 | 17 | ||
diff --git a/wps/iCatcher.176x132x16.wps b/wps/iCatcher.176x132x16.wps index 2064246e7d..b6bd62a699 100644 --- a/wps/iCatcher.176x132x16.wps +++ b/wps/iCatcher.176x132x16.wps | |||
@@ -11,7 +11,7 @@ | |||
11 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> | 11 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> |
12 | 12 | ||
13 | %al %fbKbps | 13 | %al %fbKbps |
14 | %pb|4|10|166| | 14 | %pb|-|10|-|156|4| |
15 | 15 | ||
16 | %s%acNext: %?It<%It|%?Fn<%Fn|?>> | 16 | %s%acNext: %?It<%It|%?Fn<%Fn|?>> |
17 | 17 | ||
diff --git a/wps/iCatcher.176x220x16.wps b/wps/iCatcher.176x220x16.wps index 4c74d53bdf..18a634a867 100644 --- a/wps/iCatcher.176x220x16.wps +++ b/wps/iCatcher.176x220x16.wps | |||
@@ -15,7 +15,7 @@ | |||
15 | 15 | ||
16 | 16 | ||
17 | %al %fbKbps | 17 | %al %fbKbps |
18 | %pb|4|10|166| | 18 | %pb|-|10|-|156|4| |
19 | 19 | ||
20 | %s%acNext: %?It<%It|%?Fn<%Fn|?>> | 20 | %s%acNext: %?It<%It|%?Fn<%Fn|?>> |
21 | 21 | ||
diff --git a/wps/iCatcher.220x176x16.wps b/wps/iCatcher.220x176x16.wps index 45ead21d42..dea2c1a3d9 100644 --- a/wps/iCatcher.220x176x16.wps +++ b/wps/iCatcher.220x176x16.wps | |||
@@ -9,7 +9,7 @@ | |||
9 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> | 9 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> |
10 | 10 | ||
11 | %al %fbKbps | 11 | %al %fbKbps |
12 | %pb|6|11|209| | 12 | %pb|-|11|-|198|6| |
13 | 13 | ||
14 | %s%acNext: %?It<%It|%?Fn<%Fn|?>> | 14 | %s%acNext: %?It<%It|%?Fn<%Fn|?>> |
15 | 15 | ||
diff --git a/wps/iCatcher.240x320x16.wps b/wps/iCatcher.240x320x16.wps index dff593068b..b2774d46dd 100644 --- a/wps/iCatcher.240x320x16.wps +++ b/wps/iCatcher.240x320x16.wps | |||
@@ -13,7 +13,7 @@ | |||
13 | 13 | ||
14 | 14 | ||
15 | %al %fbKbps | 15 | %al %fbKbps |
16 | %pb|7|11|229| | 16 | %pb|-|11|-|218|7| |
17 | 17 | ||
18 | %s%acNext: %?It<%It|%?Fn<%Fn|?>> | 18 | %s%acNext: %?It<%It|%?Fn<%Fn|?>> |
19 | 19 | ||
diff --git a/wps/iCatcher.320x240x16.wps b/wps/iCatcher.320x240x16.wps index ec7cef15dd..59d9d49925 100644 --- a/wps/iCatcher.320x240x16.wps +++ b/wps/iCatcher.320x240x16.wps | |||
@@ -9,7 +9,7 @@ | |||
9 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> | 9 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> |
10 | 10 | ||
11 | %al %fbKbps | 11 | %al %fbKbps |
12 | %pb|7|11|309| | 12 | %pb|-|11|-|298|7| |
13 | 13 | ||
14 | %s%acNext: %?It<%It|%?Fn<%Fn|?>> | 14 | %s%acNext: %?It<%It|%?Fn<%Fn|?>> |
15 | 15 | ||