diff options
57 files changed, 87 insertions, 64 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index 23b3d27cbb..561eb978a2 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c | |||
@@ -1245,11 +1245,15 @@ static int parse_progressbar(const char *wps_bufptr, | |||
1245 | using - for any of the params uses "sane" values */ | 1245 | using - for any of the params uses "sane" values */ |
1246 | #ifdef HAVE_LCD_BITMAP | 1246 | #ifdef HAVE_LCD_BITMAP |
1247 | enum { | 1247 | enum { |
1248 | PB_FILENAME = 0, | 1248 | PB_X = 0, |
1249 | PB_X, | ||
1250 | PB_Y, | 1249 | PB_Y, |
1251 | PB_WIDTH, | 1250 | PB_WIDTH, |
1251 | <<<<<<< .mine | ||
1252 | PB_HEIGHT, | 1252 | PB_HEIGHT, |
1253 | PB_FILENAME, | ||
1254 | ======= | ||
1255 | PB_HEIGHT, | ||
1256 | >>>>>>> .r26726 | ||
1253 | }; | 1257 | }; |
1254 | const char *filename; | 1258 | const char *filename; |
1255 | int x, y, height, width; | 1259 | int x, y, height, width; |
@@ -1293,8 +1297,8 @@ static int parse_progressbar(const char *wps_bufptr, | |||
1293 | } | 1297 | } |
1294 | ptr = wps_bufptr + 1; | 1298 | ptr = wps_bufptr + 1; |
1295 | 1299 | ||
1296 | if (!(ptr = parse_list("sdddd", &set, ',', ptr, &filename, | 1300 | if (!(ptr = parse_list("dddds", &set, ',', ptr, |
1297 | &x, &y, &width, &height))) | 1301 | &x, &y, &width, &height, &filename))) |
1298 | return WPS_ERROR_INVALID_PARAM; | 1302 | return WPS_ERROR_INVALID_PARAM; |
1299 | 1303 | ||
1300 | if (LIST_VALUE_PARSED(set, PB_FILENAME)) /* filename */ | 1304 | if (LIST_VALUE_PARSED(set, PB_FILENAME)) /* filename */ |
diff --git a/manual/appendix/wps_tags.tex b/manual/appendix/wps_tags.tex index a60c4d2b0b..5459f7da3c 100644 --- a/manual/appendix/wps_tags.tex +++ b/manual/appendix/wps_tags.tex | |||
@@ -124,7 +124,7 @@ produce the information for the next file to be played. | |||
124 | & This will replace the entire line with a progress bar. \\ | 124 | & This will replace the entire line with a progress bar. \\ |
125 | & You can set the position, width and height of the progressbar % | 125 | & You can set the position, width and height of the progressbar % |
126 | (in pixels) and load a custom image for it: % | 126 | (in pixels) and load a custom image for it: % |
127 | \config{\%pb{\textbar}image.bmp{\textbar}x{\textbar}y{\textbar}width{\textbar}height{\textbar}}} \\ | 127 | \config{\%pb{\textbar}x{\textbar}y{\textbar}width{\textbar}height{\textbar}image.bmp{\textbar}}} \\ |
128 | \opt{player}{% | 128 | \opt{player}{% |
129 | \config{\%pf} & Full-line progress bar \& time display\\ | 129 | \config{\%pf} & Full-line progress bar \& time display\\ |
130 | }% | 130 | }% |
@@ -145,7 +145,7 @@ produce the information for the next file to be played. | |||
145 | {\textbar}N{\textgreater}}\\ | 145 | {\textbar}N{\textgreater}}\\ |
146 | & 0 is used for mute, the last option is used for values greater than zero.\\ | 146 | & 0 is used for mute, the last option is used for values greater than zero.\\ |
147 | \opt{lcd_bitmap}{& This can also be used like \%pb to provide a continuous scale: | 147 | \opt{lcd_bitmap}{& This can also be used like \%pb to provide a continuous scale: |
148 | \config{\%pv{\textbar}image.bmp{\textbar}x{\textbar}y{\textbar}width{\textbar}height{\textbar}}} \\ | 148 | \config{\%pv{{\textbar}x{\textbar}y{\textbar}width{\textbar}height\textbar}image.bmp{\textbar}}} \\ |
149 | \config{\%pS} & Track is starting. An optional number gives how many seconds | 149 | \config{\%pS} & Track is starting. An optional number gives how many seconds |
150 | the tag remains true for after the start of the track. The default is | 150 | the tag remains true for after the start of the track. The default is |
151 | 10 seconds if no number is specified.\\ | 151 | 10 seconds if no number is specified.\\ |
diff --git a/utils/skinupdater/skinupdater.c b/utils/skinupdater/skinupdater.c index 0bb305fb5e..fe7edbb81b 100644 --- a/utils/skinupdater/skinupdater.c +++ b/utils/skinupdater/skinupdater.c | |||
@@ -130,10 +130,26 @@ int parse_tag(FILE* out, const char* start, bool in_conditional) | |||
130 | { | 130 | { |
131 | if (*start == '|') | 131 | if (*start == '|') |
132 | { | 132 | { |
133 | int i=0; | ||
134 | char filename[128]; | ||
133 | len++; start++; | 135 | len++; start++; |
134 | PUTCH(out, '('); | 136 | PUTCH(out, '('); |
137 | /* |file|x|y|width|height| -> (x,y,width,height,file) */ | ||
138 | while (start[i] != '|') | ||
139 | { | ||
140 | filename[i] = start[i]; | ||
141 | i++; | ||
142 | } | ||
143 | filename[i] = '\0'; | ||
144 | len +=i+1; | ||
145 | start += i+1; | ||
135 | /* TODO: need to verify that we are actually using the long form... */ | 146 | /* TODO: need to verify that we are actually using the long form... */ |
136 | len += dump_arg(out, start, 5, true); | 147 | len += dump_arg(out, start, 4, false); |
148 | if (i>0) | ||
149 | { | ||
150 | fprintf(out, ",%s", filename); | ||
151 | } | ||
152 | PUTCH(out, ')'); | ||
137 | } | 153 | } |
138 | } | 154 | } |
139 | else if (MATCH("d") || MATCH("D") || MATCH("mv") || MATCH("pS") || MATCH("pE") || MATCH("t") || MATCH("Tl")) | 155 | else if (MATCH("d") || MATCH("D") || MATCH("mv") || MATCH("pS") || MATCH("pE") || MATCH("t") || MATCH("Tl")) |
diff --git a/utils/themeeditor/skin_parser.c b/utils/themeeditor/skin_parser.c index 707fffd87a..401181cc3d 100644 --- a/utils/themeeditor/skin_parser.c +++ b/utils/themeeditor/skin_parser.c | |||
@@ -543,7 +543,8 @@ int skin_parse_tag(struct skin_element* element, char** document) | |||
543 | element->params[i].type = NUMERIC; | 543 | element->params[i].type = NUMERIC; |
544 | element->params[i].data.numeric = scan_int(&cursor); | 544 | element->params[i].data.numeric = scan_int(&cursor); |
545 | } | 545 | } |
546 | else if(tolower(*tag_args) == 's' || tolower(*tag_args) == 'f') | 546 | else if(tolower(*tag_args) == 'n' || |
547 | tolower(*tag_args) == 's' || tolower(*tag_args) == 'f') | ||
547 | { | 548 | { |
548 | /* Scanning a string argument */ | 549 | /* Scanning a string argument */ |
549 | element->params[i].type = STRING; | 550 | element->params[i].type = STRING; |
@@ -576,7 +577,8 @@ int skin_parse_tag(struct skin_element* element, char** document) | |||
576 | cursor++; | 577 | cursor++; |
577 | } | 578 | } |
578 | 579 | ||
579 | tag_args++; | 580 | if (*tag_args != 'N') |
581 | tag_args++; | ||
580 | 582 | ||
581 | /* Checking for the optional bar */ | 583 | /* Checking for the optional bar */ |
582 | if(*tag_args == '|') | 584 | if(*tag_args == '|') |
diff --git a/utils/themeeditor/tag_table.c b/utils/themeeditor/tag_table.c index bf35c9bf71..d03f2444dd 100644 --- a/utils/themeeditor/tag_table.c +++ b/utils/themeeditor/tag_table.c | |||
@@ -22,7 +22,7 @@ | |||
22 | #include "tag_table.h" | 22 | #include "tag_table.h" |
23 | 23 | ||
24 | #include <string.h> | 24 | #include <string.h> |
25 | 25 | #define BAR_PARAMS "*|IIIIN" | |
26 | /* The tag definition table */ | 26 | /* The tag definition table */ |
27 | struct tag_info legal_tags[] = | 27 | struct tag_info legal_tags[] = |
28 | { | 28 | { |
@@ -33,7 +33,7 @@ struct tag_info legal_tags[] = | |||
33 | { SKIN_TOKEN_ALIGN_RIGHT_RTL, "aR", "" }, | 33 | { SKIN_TOKEN_ALIGN_RIGHT_RTL, "aR", "" }, |
34 | { SKIN_TOKEN_ALIGN_LANGDIRECTION, "ax", "" }, | 34 | { SKIN_TOKEN_ALIGN_LANGDIRECTION, "ax", "" }, |
35 | 35 | ||
36 | { SKIN_TOKEN_BATTERY_PERCENT, "bl" , "*fIIII" }, | 36 | { SKIN_TOKEN_BATTERY_PERCENT, "bl" , BAR_PARAMS }, |
37 | { SKIN_TOKEN_BATTERY_VOLTS, "bv", "" }, | 37 | { SKIN_TOKEN_BATTERY_VOLTS, "bv", "" }, |
38 | { SKIN_TOKEN_BATTERY_TIME, "bt", "" }, | 38 | { SKIN_TOKEN_BATTERY_TIME, "bt", "" }, |
39 | { SKIN_TOKEN_BATTERY_SLEEPTIME, "bs", "" }, | 39 | { SKIN_TOKEN_BATTERY_SLEEPTIME, "bs", "" }, |
@@ -124,8 +124,8 @@ struct tag_info legal_tags[] = | |||
124 | 124 | ||
125 | { SKIN_TOKEN_PEAKMETER, "pm", "" }, | 125 | { SKIN_TOKEN_PEAKMETER, "pm", "" }, |
126 | { SKIN_TOKEN_PLAYER_PROGRESSBAR, "pf", "" }, | 126 | { SKIN_TOKEN_PLAYER_PROGRESSBAR, "pf", "" }, |
127 | { SKIN_TOKEN_PROGRESSBAR, "pb" , "*fIIII" }, | 127 | { SKIN_TOKEN_PROGRESSBAR, "pb" , BAR_PARAMS }, |
128 | { SKIN_TOKEN_VOLUME, "pv" , "*fIIII" }, | 128 | { SKIN_TOKEN_VOLUME, "pv" , BAR_PARAMS }, |
129 | 129 | ||
130 | { SKIN_TOKEN_TRACK_ELAPSED_PERCENT, "px", "" }, | 130 | { SKIN_TOKEN_TRACK_ELAPSED_PERCENT, "px", "" }, |
131 | { SKIN_TOKEN_TRACK_TIME_ELAPSED, "pc", "" }, | 131 | { SKIN_TOKEN_TRACK_TIME_ELAPSED, "pc", "" }, |
diff --git a/utils/themeeditor/tag_table.h b/utils/themeeditor/tag_table.h index 760c9f5f61..ec9a1021ab 100644 --- a/utils/themeeditor/tag_table.h +++ b/utils/themeeditor/tag_table.h | |||
@@ -263,6 +263,7 @@ enum skin_token_type { | |||
263 | * F - Required file name | 263 | * F - Required file name |
264 | * f - Nullable file name | 264 | * f - Nullable file name |
265 | * C - Required skin code | 265 | * C - Required skin code |
266 | * N - any amount of strings.. must be the last param in the list | ||
266 | * Any nullable parameter may be replaced in the WPS file | 267 | * Any nullable parameter may be replaced in the WPS file |
267 | * with a '-'. To specify that parameters may be left off | 268 | * with a '-'. To specify that parameters may be left off |
268 | * altogether, place a '|' in the parameter string. For | 269 | * altogether, place a '|' in the parameter string. For |
diff --git a/wps/Rockboxed.112x64x1.wps b/wps/Rockboxed.112x64x1.wps index 0ca6d497d0..8ab30f3c36 100644 --- a/wps/Rockboxed.112x64x1.wps +++ b/wps/Rockboxed.112x64x1.wps | |||
@@ -12,7 +12,7 @@ | |||
12 | %al%s%ac%?id<%id|%d(1)>%ar | 12 | %al%s%ac%?id<%id|%d(1)>%ar |
13 | %al%s%ac%?it<%it|%fn>%ar | 13 | %al%s%ac%?it<%it|%fn>%ar |
14 | %ac%t(3)%ig;%ac%iy | 14 | %ac%t(3)%ig;%ac%iy |
15 | %pb(-,10,-,92,5) | 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<%xd(Ba)|%xd(Bb)> | 17 | %?ps<%xd(Ba)|%xd(Bb)> |
18 | %?mp<%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)> | 18 | %?mp<%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)> |
diff --git a/wps/Rockboxed.128x128x16.wps b/wps/Rockboxed.128x128x16.wps index 142cbbf04f..579983be42 100644 --- a/wps/Rockboxed.128x128x16.wps +++ b/wps/Rockboxed.128x128x16.wps | |||
@@ -14,7 +14,7 @@ | |||
14 | %al %s%ac%?it<%it|%fn>%ar | 14 | %al %s%ac%?it<%it|%fn>%ar |
15 | 15 | ||
16 | %ac%t(3)%ig;%ac%iy | 16 | %ac%t(3)%ig;%ac%iy |
17 | %pb(pg-108.bmp,10,76,108,5) | 17 | %pb(10,76,108,5,pg-108.bmp) |
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 | 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 |
19 | %?ps<%xd(B)> | 19 | %?ps<%xd(B)> |
20 | %?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)> | 20 | %?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)> |
diff --git a/wps/Rockboxed.132x80x16.wps b/wps/Rockboxed.132x80x16.wps index 24af5b553b..1c714ab7e1 100644 --- a/wps/Rockboxed.132x80x16.wps +++ b/wps/Rockboxed.132x80x16.wps | |||
@@ -12,7 +12,7 @@ | |||
12 | %al %s%ac%?ia<%ia|%d(2)>%ar | 12 | %al %s%ac%?ia<%ia|%d(2)>%ar |
13 | %al %s%ac%?id<%id|%d(1)>%ar | 13 | %al %s%ac%?id<%id|%d(1)>%ar |
14 | %al %s%ac%?it<%it|%fn>%ar | 14 | %al %s%ac%?it<%it|%fn>%ar |
15 | %pb(pg-108.bmp,12,43,106,5) | 15 | %pb(12,43,106,5,pg-108.bmp) |
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 | 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 |
17 | %?ps<%xd(B)> | 17 | %?ps<%xd(B)> |
18 | %?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)> | 18 | %?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)> |
diff --git a/wps/Rockboxed.138x110x2.wps b/wps/Rockboxed.138x110x2.wps index fbb8fd6209..a39fcf2f3c 100644 --- a/wps/Rockboxed.138x110x2.wps +++ b/wps/Rockboxed.138x110x2.wps | |||
@@ -13,7 +13,7 @@ | |||
13 | %al %s%ac%?id<%id|%d(1)>%ar | 13 | %al %s%ac%?id<%id|%d(1)>%ar |
14 | %al %s%ac%?it<%it|%fn>%ar | 14 | %al %s%ac%?it<%it|%fn>%ar |
15 | %ac%t(3)%ig;%ac%iy | 15 | %ac%t(3)%ig;%ac%iy |
16 | %pb(pg-grey-118.bmp,10,-,118,5) | 16 | %pb(10,-,118,5,pg-grey-118.bmp) |
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 | 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 |
18 | %?ps<%xd(B)> | 18 | %?ps<%xd(B)> |
19 | %?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)> | 19 | %?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)> |
diff --git a/wps/Rockboxed.160x128x16.wps b/wps/Rockboxed.160x128x16.wps index 62d265ab8a..d4178f11c1 100644 --- a/wps/Rockboxed.160x128x16.wps +++ b/wps/Rockboxed.160x128x16.wps | |||
@@ -14,7 +14,7 @@ | |||
14 | %al %s%ac%?it<%it|%fn>%ar | 14 | %al %s%ac%?it<%it|%fn>%ar |
15 | 15 | ||
16 | %ac%t(3)%ig;%ac%iy | 16 | %ac%t(3)%ig;%ac%iy |
17 | %pb(pg-140.bmp,10,76,140,5) | 17 | %pb(10,76,140,5,pg-140.bmp) |
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 | 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 |
19 | %?ps<%xd(B)> | 19 | %?ps<%xd(B)> |
20 | %?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)> | 20 | %?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)> |
diff --git a/wps/Rockboxed.160x128x2.wps b/wps/Rockboxed.160x128x2.wps index 95f4f65cbc..ca8422328a 100644 --- a/wps/Rockboxed.160x128x2.wps +++ b/wps/Rockboxed.160x128x2.wps | |||
@@ -14,7 +14,7 @@ | |||
14 | %al %s%ac%?it<%it|%fn>%ar | 14 | %al %s%ac%?it<%it|%fn>%ar |
15 | 15 | ||
16 | %ac%t(3)%ig;%ac%iy | 16 | %ac%t(3)%ig;%ac%iy |
17 | %pb(pg-grey-140.bmp,10,-,140,5) | 17 | %pb(10,-,140,5,pg-grey-140.bmp) |
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 | 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 |
19 | %?ps<%xd(B)> | 19 | %?ps<%xd(B)> |
20 | %?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)> | 20 | %?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)> |
diff --git a/wps/Rockboxed.176x132x16.wps b/wps/Rockboxed.176x132x16.wps index aa1e24ed84..cc85088697 100644 --- a/wps/Rockboxed.176x132x16.wps +++ b/wps/Rockboxed.176x132x16.wps | |||
@@ -14,7 +14,7 @@ | |||
14 | %al %s%ac%?it<%it|%fn>%ar | 14 | %al %s%ac%?it<%it|%fn>%ar |
15 | 15 | ||
16 | %ac%t(3)%ig;%ac%iy | 16 | %ac%t(3)%ig;%ac%iy |
17 | %pb(pg-156.bmp,10,75,156,5) | 17 | %pb(10,75,156,5,pg-156.bmp) |
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 | 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 |
19 | %?ps<%xd(B)> | 19 | %?ps<%xd(B)> |
20 | %?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)> | 20 | %?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)> |
diff --git a/wps/Rockboxed.176x220x16.wps b/wps/Rockboxed.176x220x16.wps index 231a8f63da..71fe50042f 100644 --- a/wps/Rockboxed.176x220x16.wps +++ b/wps/Rockboxed.176x220x16.wps | |||
@@ -22,7 +22,7 @@ | |||
22 | 22 | ||
23 | 23 | ||
24 | 24 | ||
25 | %pb(pg-156.bmp,10,171,156,5) | 25 | %pb(10,171,156,5,pg-156.bmp) |
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 | 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 |
27 | %?ps<%xd(B)> | 27 | %?ps<%xd(B)> |
28 | %?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)> | 28 | %?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)> |
diff --git a/wps/Rockboxed.220x176x16.wps b/wps/Rockboxed.220x176x16.wps index 86cd6a14e2..76183d7c2e 100644 --- a/wps/Rockboxed.220x176x16.wps +++ b/wps/Rockboxed.220x176x16.wps | |||
@@ -16,7 +16,7 @@ | |||
16 | %al %s%ac%?it<%it|%fn>%ar | 16 | %al %s%ac%?it<%it|%fn>%ar |
17 | 17 | ||
18 | %ac%t(3)%ig;%ac%iy | 18 | %ac%t(3)%ig;%ac%iy |
19 | %pb(pg-200.bmp,10,116,200,5) | 19 | %pb(10,116,200,5,pg-200.bmp) |
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 | 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 |
21 | %?ps<%xd(B)> | 21 | %?ps<%xd(B)> |
22 | %?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)> | 22 | %?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)> |
diff --git a/wps/Rockboxed.240x320x16.wps b/wps/Rockboxed.240x320x16.wps index dab77880f9..d1e5593e2e 100644 --- a/wps/Rockboxed.240x320x16.wps +++ b/wps/Rockboxed.240x320x16.wps | |||
@@ -21,7 +21,7 @@ | |||
21 | 21 | ||
22 | %ac%t(3)%ig;%ac%iy | 22 | %ac%t(3)%ig;%ac%iy |
23 | 23 | ||
24 | %pb(pg-220.bmp,10,256,220,5) | 24 | %pb(10,256,220,5,pg-220.bmp) |
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 | 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 |
26 | %?ps<%xd(B)> | 26 | %?ps<%xd(B)> |
27 | %?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)> | 27 | %?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)> |
diff --git a/wps/Rockboxed.320x240x16.wps b/wps/Rockboxed.320x240x16.wps index 1f3a34e7fd..304e5763c0 100644 --- a/wps/Rockboxed.320x240x16.wps +++ b/wps/Rockboxed.320x240x16.wps | |||
@@ -17,7 +17,7 @@ | |||
17 | 17 | ||
18 | 18 | ||
19 | %ac%t(3)%ig;%ac%iy | 19 | %ac%t(3)%ig;%ac%iy |
20 | %pb(pg-300.bmp,10,178,300,5) | 20 | %pb(10,178,300,5,pg-300.bmp) |
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 | 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 |
22 | %?ps<%xd(B)> | 22 | %?ps<%xd(B)> |
23 | %?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)> | 23 | %?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)> |
diff --git a/wps/UniCatcher.128x96x1.wps b/wps/UniCatcher.128x96x1.wps index 3be3066c51..1aefde64d4 100644 --- a/wps/UniCatcher.128x96x1.wps +++ b/wps/UniCatcher.128x96x1.wps | |||
@@ -3,7 +3,7 @@ | |||
3 | %t(1) %?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>;%t(1) %?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 | %t(1) %?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>;%t(1) %?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|%?d(2)<%d(2)|Unknown Artist>> | 4 | %s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>> |
5 | %s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>> | 5 | %s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>> |
6 | %pb(-,11,-,106,4) | 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 28fa7db619..5285e976c0 100644 --- a/wps/UniCatcher.160x128x16.wps +++ b/wps/UniCatcher.160x128x16.wps | |||
@@ -6,7 +6,7 @@ | |||
6 | %s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>> | 6 | %s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>> |
7 | %s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>> | 7 | %s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>> |
8 | %al %fbKbps | 8 | %al %fbKbps |
9 | %pb(-,10,-,140,4) | 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 1e3418b83e..d25ce44ee3 100644 --- a/wps/UniCatcher.160x128x2.wps +++ b/wps/UniCatcher.160x128x2.wps | |||
@@ -6,7 +6,7 @@ | |||
6 | %s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>> | 6 | %s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>> |
7 | %s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>> | 7 | %s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>> |
8 | %al %fbKbps | 8 | %al %fbKbps |
9 | %pb(-,10,-,140,4) | 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 155f51c1f7..164c6f4aa6 100644 --- a/wps/UniCatcher.176x132x16.wps +++ b/wps/UniCatcher.176x132x16.wps | |||
@@ -6,7 +6,7 @@ | |||
6 | %s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>> | 6 | %s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>> |
7 | %s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>> | 7 | %s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>> |
8 | %al %fbKbps | 8 | %al %fbKbps |
9 | %pb(-,10,-,156,4) | 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 c221ffcebb..badca5371c 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(-,10,-,156,4) | 14 | %pb(10,-,156,4,-) |
15 | %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>> | 15 | %s%ac%Sx(Next:) %?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 7b66e86434..296fb4640f 100644 --- a/wps/UniCatcher.220x176x16.wps +++ b/wps/UniCatcher.220x176x16.wps | |||
@@ -8,7 +8,7 @@ | |||
8 | %s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>> | 8 | %s%ac%?id<%id|%?d(1)<%d(1)|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(-,11,-,198,6) | 11 | %pb(11,-,198,6,-) |
12 | 12 | ||
13 | %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>> | 13 | %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>> |
14 | 14 | ||
diff --git a/wps/UniCatcher.240x320x16.wps b/wps/UniCatcher.240x320x16.wps index 7f705f151a..0cd370d754 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(-,11,-,218,7) | 19 | %pb(11,-,218,7,-) |
20 | 20 | ||
21 | %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>> | 21 | %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>> |
22 | 22 | ||
diff --git a/wps/UniCatcher.320x240x16.wps b/wps/UniCatcher.320x240x16.wps index cd58bc1ffb..b299f182e1 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(-,11,-,298,7) | 14 | %pb(11,-,298,7,-) |
15 | 15 | ||
16 | %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>> | 16 | %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>> |
17 | 17 | ||
diff --git a/wps/boxes.220x176x16.wps b/wps/boxes.220x176x16.wps index df507b28dc..11f800a923 100644 --- a/wps/boxes.220x176x16.wps +++ b/wps/boxes.220x176x16.wps | |||
@@ -26,7 +26,7 @@ | |||
26 | 26 | ||
27 | %fbk | 27 | %fbk |
28 | 28 | ||
29 | %pb(pb-220.bmp,0,-,208,8) | 29 | %pb(0,-,208,8,pb-220.bmp) |
30 | 30 | ||
31 | 31 | ||
32 | %ac%t(5)%s%?It<%It|%Fn>;%ac%t(5)%s%?Ia<%Ia|%D(2)> | 32 | %ac%t(5)%s%?It<%It|%Fn>;%ac%t(5)%s%?Ia<%Ia|%D(2)> |
diff --git a/wps/cabbiev2.112x64x1.wps b/wps/cabbiev2.112x64x1.wps index 9f5055fd2d..c1923ecfe3 100644 --- a/wps/cabbiev2.112x64x1.wps +++ b/wps/cabbiev2.112x64x1.wps | |||
@@ -14,7 +14,7 @@ | |||
14 | %s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>> | 14 | %s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>> |
15 | %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>> | 15 | %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>> |
16 | %t(5)%ac%s%?Fn<%Sx(Next:) %?It<%It|%Fn>|%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>>%;%t(5)%ac%s%?Fn<%Sx(Next:) %?Ia<%Ia|%Fn>|%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>> | 16 | %t(5)%ac%s%?Fn<%Sx(Next:) %?It<%It|%Fn>|%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>>%;%t(5)%ac%s%?Fn<%Sx(Next:) %?Ia<%Ia|%Fn>|%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>> |
17 | %pb(pb-112x64x1.bmp,1,42,110,4) | 17 | %pb(1,42,110,4,pb-112x64x1.bmp) |
18 | %pc%ar%pr | 18 | %pc%ar%pr |
19 | #Bottom status bar | 19 | #Bottom status bar |
20 | %?mh<%xd(Aa)|%xd(Ab)> | 20 | %?mh<%xd(Aa)|%xd(Ab)> |
diff --git a/wps/cabbiev2.128x128x16.wps b/wps/cabbiev2.128x128x16.wps index caca739b5a..8fa5938b0e 100644 --- a/wps/cabbiev2.128x128x16.wps +++ b/wps/cabbiev2.128x128x16.wps | |||
@@ -10,7 +10,7 @@ | |||
10 | %xl(E,repeat-128x128x16.bmp,97,110,4) | 10 | %xl(E,repeat-128x128x16.bmp,97,110,4) |
11 | %xl(F,playmode-128x128x16.bmp,111,110,5) | 11 | %xl(F,playmode-128x128x16.bmp,111,110,5) |
12 | %ax%Cl(4,12,60,60) | 12 | %ax%Cl(4,12,60,60) |
13 | %pb(pb-128x128x16.bmp,3,87,122,6) | 13 | %pb(3,87,122,6,pb-128x128x16.bmp) |
14 | # images all in the default viewport | 14 | # images all in the default viewport |
15 | %?mh<%xd(Aa)|%xd(Ab)> | 15 | %?mh<%xd(Aa)|%xd(Ab)> |
16 | %?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>> | 16 | %?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>> |
diff --git a/wps/cabbiev2.128x128x2.wps b/wps/cabbiev2.128x128x2.wps index 17dfcfa88a..717290a932 100644 --- a/wps/cabbiev2.128x128x2.wps +++ b/wps/cabbiev2.128x128x2.wps | |||
@@ -10,7 +10,7 @@ | |||
10 | %xl(E,repeat-160x128x2.bmp,93,113,4) | 10 | %xl(E,repeat-160x128x2.bmp,93,113,4) |
11 | %xl(F,playmode-160x128x2.bmp,112,114,5) | 11 | %xl(F,playmode-160x128x2.bmp,112,114,5) |
12 | %ax%Cl(4,12,60,60) | 12 | %ax%Cl(4,12,60,60) |
13 | %pb(pb-128x96x2.bmp,1,87,125,7) | 13 | %pb(1,87,125,7,pb-128x96x2.bmp) |
14 | # images all in the default viewport | 14 | # images all in the default viewport |
15 | %?mh<%xd(Aa)|%xd(Ab)> | 15 | %?mh<%xd(Aa)|%xd(Ab)> |
16 | %?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>> | 16 | %?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>> |
diff --git a/wps/cabbiev2.128x64x1.wps b/wps/cabbiev2.128x64x1.wps index f5b89d24e6..2461e48dd6 100644 --- a/wps/cabbiev2.128x64x1.wps +++ b/wps/cabbiev2.128x64x1.wps | |||
@@ -6,7 +6,7 @@ | |||
6 | # progressbar viewport | 6 | # progressbar viewport |
7 | %V(0,0,128,6,1) | 7 | %V(0,0,128,6,1) |
8 | %x(a,pbbackground-128x64x1.bmp,1,0) | 8 | %x(a,pbbackground-128x64x1.bmp,1,0) |
9 | %pb(pb-128x64x1.bmp,2,1,124,4) | 9 | %pb(2,1,124,4,pb-128x64x1.bmp) |
10 | 10 | ||
11 | %V(0,8,128,8,1) | 11 | %V(0,8,128,8,1) |
12 | %?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pc | 12 | %?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pc |
diff --git a/wps/cabbiev2.128x96x2.wps b/wps/cabbiev2.128x96x2.wps index 32b35f512b..4a649763fb 100644 --- a/wps/cabbiev2.128x96x2.wps +++ b/wps/cabbiev2.128x96x2.wps | |||
@@ -8,7 +8,7 @@ | |||
8 | %xl(D,shuffle-160x128x2.bmp,72,2) | 8 | %xl(D,shuffle-160x128x2.bmp,72,2) |
9 | %xl(E,repeat-160x128x2.bmp,93,0,4) | 9 | %xl(E,repeat-160x128x2.bmp,93,0,4) |
10 | %xl(F,playmode-160x128x2.bmp,112,1,5) | 10 | %xl(F,playmode-160x128x2.bmp,112,1,5) |
11 | %pb(pb-128x96x2.bmp,1,61,125,7) | 11 | %pb(1,61,125,7,pb-128x96x2.bmp) |
12 | %V(0,83,128,13,1)%Vf(0)%Vb(3) | 12 | %V(0,83,128,13,1)%Vf(0)%Vb(3) |
13 | %?mh<%xd(Aa)|%xd(Ab)> | 13 | %?mh<%xd(Aa)|%xd(Ab)> |
14 | %?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>> | 14 | %?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>> |
diff --git a/wps/cabbiev2.132x80x16.wps b/wps/cabbiev2.132x80x16.wps index 29342dfdac..978a547572 100644 --- a/wps/cabbiev2.132x80x16.wps +++ b/wps/cabbiev2.132x80x16.wps | |||
@@ -9,7 +9,7 @@ | |||
9 | %xl(E,repeat-132x80x16.bmp,105,67,4) | 9 | %xl(E,repeat-132x80x16.bmp,105,67,4) |
10 | %xl(F,playmode-132x80x16.bmp,118,67,5) | 10 | %xl(F,playmode-132x80x16.bmp,118,67,5) |
11 | %ax%Cl(3,14,40,40,c,c) | 11 | %ax%Cl(3,14,40,40,c,c) |
12 | %pb(pb-132x80x16.bmp,2,58,127,6) | 12 | %pb(2,58,127,6,pb-132x80x16.bmp) |
13 | %?C<%Cd%Vd(a)|%Vd(b)> | 13 | %?C<%Cd%Vd(a)|%Vd(b)> |
14 | 14 | ||
15 | #Images | 15 | #Images |
diff --git a/wps/cabbiev2.138x110x2.wps b/wps/cabbiev2.138x110x2.wps index 081e38d84f..6930d8c428 100644 --- a/wps/cabbiev2.138x110x2.wps +++ b/wps/cabbiev2.138x110x2.wps | |||
@@ -11,7 +11,7 @@ | |||
11 | %xl(E,repeat-160x128x2.bmp,102,97,4) | 11 | %xl(E,repeat-160x128x2.bmp,102,97,4) |
12 | %xl(F,playmode-160x128x2.bmp,123,98,5) | 12 | %xl(F,playmode-160x128x2.bmp,123,98,5) |
13 | %ax%Cl(5,15,55,55) | 13 | %ax%Cl(5,15,55,55) |
14 | %pb(pb-138x110x2.bmp,2,75,134,6) | 14 | %pb(2,75,134,6,pb-138x110x2.bmp) |
15 | #images | 15 | #images |
16 | %?mh<%xd(Aa)|%xd(Ab)> | 16 | %?mh<%xd(Aa)|%xd(Ab)> |
17 | %?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>> | 17 | %?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>> |
diff --git a/wps/cabbiev2.160x128x1.wps b/wps/cabbiev2.160x128x1.wps index 6c7891151b..122c49cc0f 100644 --- a/wps/cabbiev2.160x128x1.wps +++ b/wps/cabbiev2.160x128x1.wps | |||
@@ -11,7 +11,7 @@ | |||
11 | %xl(D,shuffle-160x128x1.bmp,107,115) | 11 | %xl(D,shuffle-160x128x1.bmp,107,115) |
12 | %xl(E,repeat-160x128x1.bmp,127,113,4) | 12 | %xl(E,repeat-160x128x1.bmp,127,113,4) |
13 | %xl(F,playmode-160x128x1.bmp,145,114,5) | 13 | %xl(F,playmode-160x128x1.bmp,145,114,5) |
14 | %pb(pb-160x128x1.bmp,1,86,158,8) | 14 | %pb(1,86,158,8,pb-160x128x1.bmp) |
15 | %s%ac%?it<%it|%fn> | 15 | %s%ac%?it<%it|%fn> |
16 | %s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>> | 16 | %s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>> |
17 | %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>> | 17 | %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>> |
diff --git a/wps/cabbiev2.160x128x16.wps b/wps/cabbiev2.160x128x16.wps index b1477b452f..2a0a03afb6 100644 --- a/wps/cabbiev2.160x128x16.wps +++ b/wps/cabbiev2.160x128x16.wps | |||
@@ -10,7 +10,7 @@ | |||
10 | %xl(E,repeat-160x128x16.bmp,125,112,4) | 10 | %xl(E,repeat-160x128x16.bmp,125,112,4) |
11 | %xl(F,playmode-160x128x16.bmp,142,114,5) | 11 | %xl(F,playmode-160x128x16.bmp,142,114,5) |
12 | %ax%Cl(7,16,65,65,c,c) | 12 | %ax%Cl(7,16,65,65,c,c) |
13 | %pb(pb-160x128x16.bmp,6,86,149,8) | 13 | %pb(6,86,149,8,pb-160x128x16.bmp) |
14 | %?mh<%xd(Aa)|%xd(Ab)> | 14 | %?mh<%xd(Aa)|%xd(Ab)> |
15 | %?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>> | 15 | %?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>> |
16 | %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)> | 16 | %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)> |
diff --git a/wps/cabbiev2.160x128x2.wps b/wps/cabbiev2.160x128x2.wps index 39876c9073..b47275a53e 100644 --- a/wps/cabbiev2.160x128x2.wps +++ b/wps/cabbiev2.160x128x2.wps | |||
@@ -12,7 +12,7 @@ | |||
12 | %xl(E,repeat-160x128x2.bmp,127,113,4) | 12 | %xl(E,repeat-160x128x2.bmp,127,113,4) |
13 | %xl(F,playmode-160x128x2.bmp,145,114,5) | 13 | %xl(F,playmode-160x128x2.bmp,145,114,5) |
14 | %ax%Cl(2,16,64,64) | 14 | %ax%Cl(2,16,64,64) |
15 | %pb(pb-160x128x2.bmp,1,86,158,8) | 15 | %pb(1,86,158,8,pb-160x128x2.bmp) |
16 | %?mh<%xd(Aa)|%xd(Ab)> | 16 | %?mh<%xd(Aa)|%xd(Ab)> |
17 | %?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>> | 17 | %?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>> |
18 | %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)> | 18 | %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)> |
diff --git a/wps/cabbiev2.176x132x16.wps b/wps/cabbiev2.176x132x16.wps index 3be806d902..53ab87f453 100644 --- a/wps/cabbiev2.176x132x16.wps +++ b/wps/cabbiev2.176x132x16.wps | |||
@@ -11,7 +11,7 @@ | |||
11 | %xl(E,repeat-176x132x16.bmp,139,113,4) | 11 | %xl(E,repeat-176x132x16.bmp,139,113,4) |
12 | %xl(F,playmode-176x132x16.bmp,156,115,5) | 12 | %xl(F,playmode-176x132x16.bmp,156,115,5) |
13 | %ax%Cl(9,16,65,65) | 13 | %ax%Cl(9,16,65,65) |
14 | %pb(pb-176x132x16.bmp,8,86,160,8) | 14 | %pb(8,86,160,8,pb-176x132x16.bmp) |
15 | %?mh<%xd(Aa)|%xd(Ab)> | 15 | %?mh<%xd(Aa)|%xd(Ab)> |
16 | %?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>> | 16 | %?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>> |
17 | %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)> | 17 | %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)> |
diff --git a/wps/cabbiev2.176x220x16.wps b/wps/cabbiev2.176x220x16.wps index 5a3416876d..c0c7cfc827 100644 --- a/wps/cabbiev2.176x220x16.wps +++ b/wps/cabbiev2.176x220x16.wps | |||
@@ -9,7 +9,7 @@ | |||
9 | %xl(E,repeat-176x220x16.bmp,144,204,4) | 9 | %xl(E,repeat-176x220x16.bmp,144,204,4) |
10 | %xl(F,playmode-176x220x16.bmp,159,204,5) | 10 | %xl(F,playmode-176x220x16.bmp,159,204,5) |
11 | %Cl(29,20,120,120,c,c) | 11 | %Cl(29,20,120,120,c,c) |
12 | %pb(pb-176x220x16.bmp,5,182,166,8) | 12 | %pb(5,182,166,8,pb-176x220x16.bmp) |
13 | #NowPlaying | 13 | #NowPlaying |
14 | 14 | ||
15 | 15 | ||
diff --git a/wps/cabbiev2.220x176x16.wps b/wps/cabbiev2.220x176x16.wps index c88c74b1ef..0c42f637a3 100644 --- a/wps/cabbiev2.220x176x16.wps +++ b/wps/cabbiev2.220x176x16.wps | |||
@@ -10,7 +10,7 @@ | |||
10 | %xl(E,repeat-220x176x16.bmp,182,151,4) | 10 | %xl(E,repeat-220x176x16.bmp,182,151,4) |
11 | %xl(F,playmode-220x176x16.bmp,200,152,5) | 11 | %xl(F,playmode-220x176x16.bmp,200,152,5) |
12 | %ax%Cl(15,32,75,75) | 12 | %ax%Cl(15,32,75,75) |
13 | %pb(pb-220x176x16.bmp,11,121,199,8) | 13 | %pb(11,121,199,8,pb-220x176x16.bmp) |
14 | %?mh<%xd(Aa)|%xd(Ab)> | 14 | %?mh<%xd(Aa)|%xd(Ab)> |
15 | %?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>> | 15 | %?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>> |
16 | %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)> | 16 | %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)> |
diff --git a/wps/cabbiev2.240x320x16.mini2440.wps b/wps/cabbiev2.240x320x16.mini2440.wps index 8733ac41a8..8eba53e6f8 100644 --- a/wps/cabbiev2.240x320x16.mini2440.wps +++ b/wps/cabbiev2.240x320x16.mini2440.wps | |||
@@ -17,7 +17,7 @@ | |||
17 | %xl(E,repeat-240x320x16.bmp,182,292,4) | 17 | %xl(E,repeat-240x320x16.bmp,182,292,4) |
18 | %xl(F,playmode-240x320x16.bmp,206,292,5) | 18 | %xl(F,playmode-240x320x16.bmp,206,292,5) |
19 | %Cl(55,30,130,130,c,c) | 19 | %Cl(55,30,130,130,c,c) |
20 | %pb(pb-240x320x16.bmp,22,254,199,13) | 20 | %pb(22,254,199,13,pb-240x320x16.bmp) |
21 | %?C<|> | 21 | %?C<|> |
22 | %?C<|%s%ac%?it<%it|%fn>> | 22 | %?C<|%s%ac%?it<%it|%fn>> |
23 | %?C<|%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>> | 23 | %?C<|%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>> |
diff --git a/wps/cabbiev2.240x320x16.wps b/wps/cabbiev2.240x320x16.wps index b667e6b0eb..435e713e6c 100644 --- a/wps/cabbiev2.240x320x16.wps +++ b/wps/cabbiev2.240x320x16.wps | |||
@@ -12,7 +12,7 @@ | |||
12 | %xl(E,repeat-240x320x16.bmp,182,292,4) | 12 | %xl(E,repeat-240x320x16.bmp,182,292,4) |
13 | %xl(F,playmode-240x320x16.bmp,206,292,5) | 13 | %xl(F,playmode-240x320x16.bmp,206,292,5) |
14 | %Cl(55,30,130,130,c,c) | 14 | %Cl(55,30,130,130,c,c) |
15 | %pb(pb-240x320x16.bmp,22,254,199,13) | 15 | %pb(22,254,199,13,pb-240x320x16.bmp) |
16 | %?C<|> | 16 | %?C<|> |
17 | %?C<|%s%ac%?it<%it|%fn>> | 17 | %?C<|%s%ac%?it<%it|%fn>> |
18 | %?C<|%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>> | 18 | %?C<|%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>> |
diff --git a/wps/cabbiev2.240x400x16.wps b/wps/cabbiev2.240x400x16.wps index 94c7109d98..a64fa6fcf7 100644 --- a/wps/cabbiev2.240x400x16.wps +++ b/wps/cabbiev2.240x400x16.wps | |||
@@ -6,7 +6,7 @@ | |||
6 | %wd | 6 | %wd |
7 | %X(wpsbackdrop-240x400x16.bmp) | 7 | %X(wpsbackdrop-240x400x16.bmp) |
8 | %Cl(55,50,130,130,c,c) | 8 | %Cl(55,50,130,130,c,c) |
9 | %pb(pb-240x320x16.bmp,22,284,199,13) | 9 | %pb(22,284,199,13,pb-240x320x16.bmp) |
10 | %T(22,284,199,13,progressbar) | 10 | %T(22,284,199,13,progressbar) |
11 | %T(90,238,60,20,playlist) | 11 | %T(90,238,60,20,playlist) |
12 | %?Tl(2.5)<%Vd(t)|%Vd(u)> | 12 | %?Tl(2.5)<%Vd(t)|%Vd(u)> |
diff --git a/wps/cabbiev2.320x240x16.mrobe500.wps b/wps/cabbiev2.320x240x16.mrobe500.wps index f6e70d52f3..0d9e2cc0a2 100644 --- a/wps/cabbiev2.320x240x16.mrobe500.wps +++ b/wps/cabbiev2.320x240x16.mrobe500.wps | |||
@@ -19,7 +19,7 @@ | |||
19 | %?Tl(2.5)<%Vd(t)|%Vd(u)> | 19 | %?Tl(2.5)<%Vd(t)|%Vd(u)> |
20 | 20 | ||
21 | %Cl(16,32,120,120) | 21 | %Cl(16,32,120,120) |
22 | %pb(pb-320x240x16.bmp,10,162,300,15) | 22 | %pb(10,162,300,15,pb-320x240x16.bmp) |
23 | %?mh<%xd(Aa)|%xd(Ab)> | 23 | %?mh<%xd(Aa)|%xd(Ab)> |
24 | %?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>> | 24 | %?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>> |
25 | %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)> | 25 | %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)> |
diff --git a/wps/cabbiev2.320x240x16.wps b/wps/cabbiev2.320x240x16.wps index 1c6ddb6383..f84c52eece 100644 --- a/wps/cabbiev2.320x240x16.wps +++ b/wps/cabbiev2.320x240x16.wps | |||
@@ -10,7 +10,7 @@ | |||
10 | %xl(E,repeat-320x240x16.bmp,261,207,4) | 10 | %xl(E,repeat-320x240x16.bmp,261,207,4) |
11 | %xl(F,playmode-320x240x16.bmp,286,207,5) | 11 | %xl(F,playmode-320x240x16.bmp,286,207,5) |
12 | %ax%Cl(16,32,120,120) | 12 | %ax%Cl(16,32,120,120) |
13 | %pb(pb-320x240x16.bmp,10,162,300,15) | 13 | %pb(10,162,300,15,pb-320x240x16.bmp) |
14 | %?mh<%xd(Aa)|%xd(Ab)> | 14 | %?mh<%xd(Aa)|%xd(Ab)> |
15 | %?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>> | 15 | %?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>> |
16 | %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)> | 16 | %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)> |
diff --git a/wps/iCatcher.112x64x1.wps b/wps/iCatcher.112x64x1.wps index d3154b12b5..458b1a5a3f 100644 --- a/wps/iCatcher.112x64x1.wps +++ b/wps/iCatcher.112x64x1.wps | |||
@@ -5,7 +5,7 @@ | |||
5 | %s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>> | 5 | %s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>> |
6 | %s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>> | 6 | %s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>> |
7 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> | 7 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> |
8 | %pb(-,11,-,90,3) | 8 | %pb(11,-,90,3,-) |
9 | %t(6)%s%ac%?Fm<%Sx(Next:) %?It<%It|%Fn>|%fbKbps %fc>;%t(6)%s%ac%?Fm<%Sx(Next:) %?It<%It|%Fn>|%fbKbps %fc> | 9 | %t(6)%s%ac%?Fm<%Sx(Next:) %?It<%It|%Fn>|%fbKbps %fc>;%t(6)%s%ac%?Fm<%Sx(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 f4ca8efecf..2e3d83e905 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(-,11,-,106,4) | 14 | %pb(11,-,106,4,-) |
15 | 15 | ||
16 | %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>> | 16 | %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>> |
17 | 17 | ||
diff --git a/wps/iCatcher.128x64x1.160x128x2.wps b/wps/iCatcher.128x64x1.160x128x2.wps index 55eb1ff51f..801aecafb5 100644 --- a/wps/iCatcher.128x64x1.160x128x2.wps +++ b/wps/iCatcher.128x64x1.160x128x2.wps | |||
@@ -4,7 +4,7 @@ | |||
4 | %t(1) %?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 >;%t(1) %?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 | %t(1) %?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 >;%t(1) %?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|%?d(2)<%d(2)|Unknown Artist>> | 5 | %s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>> |
6 | %s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>> | 6 | %s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>> |
7 | %pb(-,11,-,106,4) | 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 2c19ae21b0..7a63817d6b 100644 --- a/wps/iCatcher.128x96x1.wps +++ b/wps/iCatcher.128x96x1.wps | |||
@@ -6,7 +6,7 @@ | |||
6 | %s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>> | 6 | %s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>> |
7 | %s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>> | 7 | %s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>> |
8 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> | 8 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> |
9 | %pb(-,11,-,106,4) | 9 | %pb(11,-,106,4,-) |
10 | 10 | ||
11 | %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>> | 11 | %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>> |
12 | 12 | ||
diff --git a/wps/iCatcher.132x80x16.wps b/wps/iCatcher.132x80x16.wps index e35a062887..8d1fcf6a33 100644 --- a/wps/iCatcher.132x80x16.wps +++ b/wps/iCatcher.132x80x16.wps | |||
@@ -6,7 +6,7 @@ | |||
6 | %s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>> | 6 | %s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>> |
7 | %s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>> | 7 | %s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>> |
8 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> | 8 | %s%ac%?in<%in|%pp> - %?it<%it|%fn> |
9 | %pb(-,11,-,106,4) | 9 | %pb(11,-,106,4,-) |
10 | 10 | ||
11 | %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>> | 11 | %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>> |
12 | 12 | ||
diff --git a/wps/iCatcher.138x110x2.wps b/wps/iCatcher.138x110x2.wps index 6c2658c9d2..8af79c66b5 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(-,10,-,118,4) | 13 | %pb(10,-,118,4,-) |
14 | 14 | ||
15 | %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>> | 15 | %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>> |
16 | 16 | ||
diff --git a/wps/iCatcher.160x128x16.wps b/wps/iCatcher.160x128x16.wps index 60e0edca0f..e33030f359 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(-,10,-,140,4) | 14 | %pb(10,-,140,4,-) |
15 | 15 | ||
16 | %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>> | 16 | %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>> |
17 | 17 | ||
diff --git a/wps/iCatcher.160x128x2.wps b/wps/iCatcher.160x128x2.wps index bb6276944c..cffbd1c46c 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(-,10,-,140,4) | 14 | %pb(10,-,140,4,-) |
15 | 15 | ||
16 | %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>> | 16 | %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>> |
17 | 17 | ||
diff --git a/wps/iCatcher.176x132x16.wps b/wps/iCatcher.176x132x16.wps index c743eef8da..51bcbbf95b 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(-,10,-,156,4) | 14 | %pb(10,-,156,4,-) |
15 | 15 | ||
16 | %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>> | 16 | %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>> |
17 | 17 | ||
diff --git a/wps/iCatcher.176x220x16.wps b/wps/iCatcher.176x220x16.wps index 9066482dc5..db19c1e503 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(-,10,-,156,4) | 18 | %pb(10,-,156,4,-) |
19 | 19 | ||
20 | %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>> | 20 | %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>> |
21 | 21 | ||
diff --git a/wps/iCatcher.220x176x16.wps b/wps/iCatcher.220x176x16.wps index c0efa9ca8a..03f15287b3 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(-,11,-,198,6) | 12 | %pb(11,-,198,6,-) |
13 | 13 | ||
14 | %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>> | 14 | %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>> |
15 | 15 | ||
diff --git a/wps/iCatcher.240x320x16.wps b/wps/iCatcher.240x320x16.wps index 0bf5249af7..31e3b606f7 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(-,11,-,218,7) | 16 | %pb(11,-,218,7,-) |
17 | 17 | ||
18 | %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>> | 18 | %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>> |
19 | 19 | ||
diff --git a/wps/iCatcher.320x240x16.wps b/wps/iCatcher.320x240x16.wps index 4437cc3a11..0c192f18d9 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(-,11,-,298,7) | 12 | %pb(11,-,298,7,-) |
13 | 13 | ||
14 | %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>> | 14 | %s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>> |
15 | 15 | ||