Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

SKIN BREAK: %pb, %bl and %pv (bar types) changed so the image is the last param instead of the first. skin updater, skins and manual all updated.

Browse source 
NEW PARSER: add an 'N' param type which will accept any number of strings, will cause very big problems if this isnt the last param for a tag.



git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26727 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2010-06-09 16:15:01 +00:00
parent 20b9020adc
commit 9ac4b44610
57 changed files with 87 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/gui/skin_engine/skin_parser.c
View file

@ -1245,11 +1245,15 @@ static int parse_progressbar(const char *wps_bufptr,
using - for any of the params uses "sane" values */
#ifdef HAVE_LCD_BITMAP
enum {
PB_FILENAME = 0,
PB_X,
PB_X = 0,
PB_Y,
PB_WIDTH,
<<<<<<< .mine
PB_HEIGHT,
PB_FILENAME,
=======
PB_HEIGHT,
>>>>>>> .r26726
};
const char *filename;
int x, y, height, width;
@ -1293,8 +1297,8 @@ static int parse_progressbar(const char *wps_bufptr,
}
ptr = wps_bufptr + 1;
if (!(ptr = parse_list("sdddd", &set, ',', ptr, &filename,
&x, &y, &width, &height)))
if (!(ptr = parse_list("dddds", &set, ',', ptr,
&x, &y, &width, &height, &filename)))
return WPS_ERROR_INVALID_PARAM;
if (LIST_VALUE_PARSED(set, PB_FILENAME)) /* filename */

4
manual/appendix/wps_tags.tex
View file

@ -124,7 +124,7 @@ produce the information for the next file to be played.
& This will replace the entire line with a progress bar. \\
& You can set the position, width and height of the progressbar %
(in pixels) and load a custom image for it: %
\config{\%pb{\textbar}image.bmp{\textbar}x{\textbar}y{\textbar}width{\textbar}height{\textbar}}} \\
\config{\%pb{\textbar}x{\textbar}y{\textbar}width{\textbar}height{\textbar}image.bmp{\textbar}}} \\
\opt{player}{%
\config{\%pf} & Full-line progress bar \& time display\\
}%
@ -145,7 +145,7 @@ produce the information for the next file to be played.
{\textbar}N{\textgreater}}\\
& 0 is used for mute, the last option is used for values greater than zero.\\
\opt{lcd_bitmap}{& This can also be used like \%pb to provide a continuous scale:
\config{\%pv{\textbar}image.bmp{\textbar}x{\textbar}y{\textbar}width{\textbar}height{\textbar}}} \\
\config{\%pv{{\textbar}x{\textbar}y{\textbar}width{\textbar}height\textbar}image.bmp{\textbar}}} \\
\config{\%pS} & Track is starting. An optional number gives how many seconds
the tag remains true for after the start of the track. The default is
10 seconds if no number is specified.\\

18
utils/skinupdater/skinupdater.c
View file

@ -130,10 +130,26 @@ int parse_tag(FILE* out, const char* start, bool in_conditional)
{
if (*start == '|')
{
int i=0;
char filename[128];
len++; start++;
PUTCH(out, '(');
/* |file|x|y|width|height| -> (x,y,width,height,file) */
while (start[i] != '|')
{
filename[i] = start[i];
i++;
}
filename[i] = '\0';
len +=i+1;
start += i+1;
/* TODO: need to verify that we are actually using the long form... */
len += dump_arg(out, start, 5, true);
len += dump_arg(out, start, 4, false);
if (i>0)
{
fprintf(out, ",%s", filename);
}
PUTCH(out, ')');
}
}
else if (MATCH("d") || MATCH("D") || MATCH("mv") || MATCH("pS") || MATCH("pE") || MATCH("t") || MATCH("Tl"))

6
utils/themeeditor/skin_parser.c
View file

@ -543,7 +543,8 @@ int skin_parse_tag(struct skin_element* element, char** document)
element->params[i].type = NUMERIC;
element->params[i].data.numeric = scan_int(&cursor);
}
else if(tolower(*tag_args) == 's' || tolower(*tag_args) == 'f')
else if(tolower(*tag_args) == 'n' ||
tolower(*tag_args) == 's' || tolower(*tag_args) == 'f')
{
/* Scanning a string argument */
element->params[i].type = STRING;
@ -576,7 +577,8 @@ int skin_parse_tag(struct skin_element* element, char** document)
cursor++;
}
tag_args++;
if (*tag_args != 'N')
tag_args++;
/* Checking for the optional bar */
if(*tag_args == '|')

8
utils/themeeditor/tag_table.c
View file

@ -22,7 +22,7 @@
#include "tag_table.h"
#include <string.h>
#define BAR_PARAMS "*|IIIIN"
/* The tag definition table */
struct tag_info legal_tags[] =
{
@ -33,7 +33,7 @@ struct tag_info legal_tags[] =
{ SKIN_TOKEN_ALIGN_RIGHT_RTL, "aR", "" },
{ SKIN_TOKEN_ALIGN_LANGDIRECTION, "ax", "" },
{ SKIN_TOKEN_BATTERY_PERCENT, "bl" , "*fIIII" },
{ SKIN_TOKEN_BATTERY_PERCENT, "bl" , BAR_PARAMS },
{ SKIN_TOKEN_BATTERY_VOLTS, "bv", "" },
{ SKIN_TOKEN_BATTERY_TIME, "bt", "" },
{ SKIN_TOKEN_BATTERY_SLEEPTIME, "bs", "" },
@ -124,8 +124,8 @@ struct tag_info legal_tags[] =
{ SKIN_TOKEN_PEAKMETER, "pm", "" },
{ SKIN_TOKEN_PLAYER_PROGRESSBAR, "pf", "" },
{ SKIN_TOKEN_PROGRESSBAR, "pb" , "*fIIII" },
{ SKIN_TOKEN_VOLUME, "pv" , "*fIIII" },
{ SKIN_TOKEN_PROGRESSBAR, "pb" , BAR_PARAMS },
{ SKIN_TOKEN_VOLUME, "pv" , BAR_PARAMS },
{ SKIN_TOKEN_TRACK_ELAPSED_PERCENT, "px", "" },
{ SKIN_TOKEN_TRACK_TIME_ELAPSED, "pc", "" },

1
utils/themeeditor/tag_table.h
View file

@ -263,6 +263,7 @@ enum skin_token_type {
* F - Required file name
* f - Nullable file name
* C - Required skin code
* N - any amount of strings.. must be the last param in the list
* Any nullable parameter may be replaced in the WPS file
* with a '-'. To specify that parameters may be left off
* altogether, place a '|' in the parameter string. For

2
wps/Rockboxed.112x64x1.wps
View file

@ -12,7 +12,7 @@
%al%s%ac%?id<%id|%d(1)>%ar
%al%s%ac%?it<%it|%fn>%ar
%ac%t(3)%ig;%ac%iy
%pb(-,10,-,92,5)
%pb(10,-,92,5,-)
%al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|unknown>%ar%pt
%?ps<%xd(Ba)|%xd(Bb)>
%?mp<%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)>

2
wps/Rockboxed.128x128x16.wps
View file

@ -14,7 +14,7 @@
%al %s%ac%?it<%it|%fn>%ar
%ac%t(3)%ig;%ac%iy
%pb(pg-108.bmp,10,76,108,5)
%pb(10,76,108,5,pg-108.bmp)
%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
%?ps<%xd(B)>
%?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>

2
wps/Rockboxed.132x80x16.wps
View file

@ -12,7 +12,7 @@
%al %s%ac%?ia<%ia|%d(2)>%ar
%al %s%ac%?id<%id|%d(1)>%ar
%al %s%ac%?it<%it|%fn>%ar
%pb(pg-108.bmp,12,43,106,5)
%pb(12,43,106,5,pg-108.bmp)
%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
%?ps<%xd(B)>
%?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>

2
wps/Rockboxed.138x110x2.wps
View file

@ -13,7 +13,7 @@
%al %s%ac%?id<%id|%d(1)>%ar
%al %s%ac%?it<%it|%fn>%ar
%ac%t(3)%ig;%ac%iy
%pb(pg-grey-118.bmp,10,-,118,5)
%pb(10,-,118,5,pg-grey-118.bmp)
%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
%?ps<%xd(B)>
%?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>

2
wps/Rockboxed.160x128x16.wps
View file

@ -14,7 +14,7 @@
%al %s%ac%?it<%it|%fn>%ar
%ac%t(3)%ig;%ac%iy
%pb(pg-140.bmp,10,76,140,5)
%pb(10,76,140,5,pg-140.bmp)
%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
%?ps<%xd(B)>
%?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>

2
wps/Rockboxed.160x128x2.wps
View file

@ -14,7 +14,7 @@
%al %s%ac%?it<%it|%fn>%ar
%ac%t(3)%ig;%ac%iy
%pb(pg-grey-140.bmp,10,-,140,5)
%pb(10,-,140,5,pg-grey-140.bmp)
%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
%?ps<%xd(B)>
%?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>

2
wps/Rockboxed.176x132x16.wps
View file

@ -14,7 +14,7 @@
%al %s%ac%?it<%it|%fn>%ar
%ac%t(3)%ig;%ac%iy
%pb(pg-156.bmp,10,75,156,5)
%pb(10,75,156,5,pg-156.bmp)
%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
%?ps<%xd(B)>
%?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>

2
wps/Rockboxed.176x220x16.wps
View file

@ -22,7 +22,7 @@
%pb(pg-156.bmp,10,171,156,5)
%pb(10,171,156,5,pg-156.bmp)
%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
%?ps<%xd(B)>
%?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>

2
wps/Rockboxed.220x176x16.wps
View file

@ -16,7 +16,7 @@
%al %s%ac%?it<%it|%fn>%ar
%ac%t(3)%ig;%ac%iy
%pb(pg-200.bmp,10,116,200,5)
%pb(10,116,200,5,pg-200.bmp)
%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
%?ps<%xd(B)>
%?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>

2
wps/Rockboxed.240x320x16.wps
View file

@ -21,7 +21,7 @@
%ac%t(3)%ig;%ac%iy
%pb(pg-220.bmp,10,256,220,5)
%pb(10,256,220,5,pg-220.bmp)
%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
%?ps<%xd(B)>
%?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>

2
wps/Rockboxed.320x240x16.wps
View file

@ -17,7 +17,7 @@
%ac%t(3)%ig;%ac%iy
%pb(pg-300.bmp,10,178,300,5)
%pb(10,178,300,5,pg-300.bmp)
%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
%?ps<%xd(B)>
%?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>

2
wps/UniCatcher.128x96x1.wps
View file

@ -3,7 +3,7 @@
%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>
%s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
%s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
%pb(-,11,-,106,4)
%pb(11,-,106,4,-)
%s%ac%?in<%in|%pp> - %?it<%it|%fn>
%xl(A,battery-s.bmp,109,3,5)

2
wps/UniCatcher.160x128x16.wps
View file

@ -6,7 +6,7 @@
%s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
%s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
%al %fbKbps
%pb(-,10,-,140,4)
%pb(10,-,140,4,-)
%s%ac%?in<%in|%pp> - %?it<%it|%fn>
%xl(A,battery.bmp,135,8,5)

2
wps/UniCatcher.160x128x2.wps
View file

@ -6,7 +6,7 @@
%s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
%s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
%al %fbKbps
%pb(-,10,-,140,4)
%pb(10,-,140,4,-)
%s%ac%?in<%in|%pp> - %?it<%it|%fn>
%xl(A,battery-g.bmp,135,8,5)

2
wps/UniCatcher.176x132x16.wps
View file

@ -6,7 +6,7 @@
%s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
%s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
%al %fbKbps
%pb(-,10,-,156,4)
%pb(10,-,156,4,-)
%s%ac%?in<%in|%pp> - %?it<%it|%fn>
%xl(A,battery.bmp,151,8,5)

2
wps/UniCatcher.176x220x16.wps
View file

@ -11,7 +11,7 @@
%al %fbKbps
%pb(-,10,-,156,4)
%pb(10,-,156,4,-)
%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
%xl(A,battery.bmp,151,8,5)

2
wps/UniCatcher.220x176x16.wps
View file

@ -8,7 +8,7 @@
%s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
%s%ac%?in<%in|%pp> - %?it<%it|%fn>
%al %fbKbps
%pb(-,11,-,198,6)
%pb(11,-,198,6,-)
%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>

2
wps/UniCatcher.240x320x16.wps
View file

@ -16,7 +16,7 @@
%al %fbKbps
%pb(-,11,-,218,7)
%pb(11,-,218,7,-)
%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>

2
wps/UniCatcher.320x240x16.wps
View file

@ -11,7 +11,7 @@
%al %fbKbps
%pb(-,11,-,298,7)
%pb(11,-,298,7,-)
%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>

2
wps/boxes.220x176x16.wps
View file

@ -26,7 +26,7 @@
%fbk
%pb(pb-220.bmp,0,-,208,8)
%pb(0,-,208,8,pb-220.bmp)
%ac%t(5)%s%?It<%It|%Fn>;%ac%t(5)%s%?Ia<%Ia|%D(2)>

2
wps/cabbiev2.112x64x1.wps
View file

@ -14,7 +14,7 @@
%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
%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>>
%pb(pb-112x64x1.bmp,1,42,110,4)
%pb(1,42,110,4,pb-112x64x1.bmp)
%pc%ar%pr
#Bottom status bar
%?mh<%xd(Aa)|%xd(Ab)>

2
wps/cabbiev2.128x128x16.wps
View file

@ -10,7 +10,7 @@
%xl(E,repeat-128x128x16.bmp,97,110,4)
%xl(F,playmode-128x128x16.bmp,111,110,5)
%ax%Cl(4,12,60,60)
%pb(pb-128x128x16.bmp,3,87,122,6)
%pb(3,87,122,6,pb-128x128x16.bmp)
# images all in the default viewport
%?mh<%xd(Aa)|%xd(Ab)>
%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>

2
wps/cabbiev2.128x128x2.wps
View file

@ -10,7 +10,7 @@
%xl(E,repeat-160x128x2.bmp,93,113,4)
%xl(F,playmode-160x128x2.bmp,112,114,5)
%ax%Cl(4,12,60,60)
%pb(pb-128x96x2.bmp,1,87,125,7)
%pb(1,87,125,7,pb-128x96x2.bmp)
# images all in the default viewport
%?mh<%xd(Aa)|%xd(Ab)>
%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>

2
wps/cabbiev2.128x64x1.wps
View file

@ -6,7 +6,7 @@
# progressbar viewport
%V(0,0,128,6,1)
%x(a,pbbackground-128x64x1.bmp,1,0)
%pb(pb-128x64x1.bmp,2,1,124,4)
%pb(2,1,124,4,pb-128x64x1.bmp)
%V(0,8,128,8,1)
%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pc

2
wps/cabbiev2.128x96x2.wps
View file

@ -8,7 +8,7 @@
%xl(D,shuffle-160x128x2.bmp,72,2)
%xl(E,repeat-160x128x2.bmp,93,0,4)
%xl(F,playmode-160x128x2.bmp,112,1,5)
%pb(pb-128x96x2.bmp,1,61,125,7)
%pb(1,61,125,7,pb-128x96x2.bmp)
%V(0,83,128,13,1)%Vf(0)%Vb(3)
%?mh<%xd(Aa)|%xd(Ab)>
%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>

2
wps/cabbiev2.132x80x16.wps
View file

@ -9,7 +9,7 @@
%xl(E,repeat-132x80x16.bmp,105,67,4)
%xl(F,playmode-132x80x16.bmp,118,67,5)
%ax%Cl(3,14,40,40,c,c)
%pb(pb-132x80x16.bmp,2,58,127,6)
%pb(2,58,127,6,pb-132x80x16.bmp)
%?C<%Cd%Vd(a)|%Vd(b)>
#Images

2
wps/cabbiev2.138x110x2.wps
View file

@ -11,7 +11,7 @@
%xl(E,repeat-160x128x2.bmp,102,97,4)
%xl(F,playmode-160x128x2.bmp,123,98,5)
%ax%Cl(5,15,55,55)
%pb(pb-138x110x2.bmp,2,75,134,6)
%pb(2,75,134,6,pb-138x110x2.bmp)
#images
%?mh<%xd(Aa)|%xd(Ab)>
%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>

2
wps/cabbiev2.160x128x1.wps
View file

@ -11,7 +11,7 @@
%xl(D,shuffle-160x128x1.bmp,107,115)
%xl(E,repeat-160x128x1.bmp,127,113,4)
%xl(F,playmode-160x128x1.bmp,145,114,5)
%pb(pb-160x128x1.bmp,1,86,158,8)
%pb(1,86,158,8,pb-160x128x1.bmp)
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>

2
wps/cabbiev2.160x128x16.wps
View file

@ -10,7 +10,7 @@
%xl(E,repeat-160x128x16.bmp,125,112,4)
%xl(F,playmode-160x128x16.bmp,142,114,5)
%ax%Cl(7,16,65,65,c,c)
%pb(pb-160x128x16.bmp,6,86,149,8)
%pb(6,86,149,8,pb-160x128x16.bmp)
%?mh<%xd(Aa)|%xd(Ab)>
%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>
%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>

2
wps/cabbiev2.160x128x2.wps
View file

@ -12,7 +12,7 @@
%xl(E,repeat-160x128x2.bmp,127,113,4)
%xl(F,playmode-160x128x2.bmp,145,114,5)
%ax%Cl(2,16,64,64)
%pb(pb-160x128x2.bmp,1,86,158,8)
%pb(1,86,158,8,pb-160x128x2.bmp)
%?mh<%xd(Aa)|%xd(Ab)>
%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>
%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>

2
wps/cabbiev2.176x132x16.wps
View file

@ -11,7 +11,7 @@
%xl(E,repeat-176x132x16.bmp,139,113,4)
%xl(F,playmode-176x132x16.bmp,156,115,5)
%ax%Cl(9,16,65,65)
%pb(pb-176x132x16.bmp,8,86,160,8)
%pb(8,86,160,8,pb-176x132x16.bmp)
%?mh<%xd(Aa)|%xd(Ab)>
%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>
%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>

2
wps/cabbiev2.176x220x16.wps
View file

@ -9,7 +9,7 @@
%xl(E,repeat-176x220x16.bmp,144,204,4)
%xl(F,playmode-176x220x16.bmp,159,204,5)
%Cl(29,20,120,120,c,c)
%pb(pb-176x220x16.bmp,5,182,166,8)
%pb(5,182,166,8,pb-176x220x16.bmp)
#NowPlaying

2
wps/cabbiev2.220x176x16.wps
View file

@ -10,7 +10,7 @@
%xl(E,repeat-220x176x16.bmp,182,151,4)
%xl(F,playmode-220x176x16.bmp,200,152,5)
%ax%Cl(15,32,75,75)
%pb(pb-220x176x16.bmp,11,121,199,8)
%pb(11,121,199,8,pb-220x176x16.bmp)
%?mh<%xd(Aa)|%xd(Ab)>
%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>
%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>

2
wps/cabbiev2.240x320x16.mini2440.wps
View file

@ -17,7 +17,7 @@
%xl(E,repeat-240x320x16.bmp,182,292,4)
%xl(F,playmode-240x320x16.bmp,206,292,5)
%Cl(55,30,130,130,c,c)
%pb(pb-240x320x16.bmp,22,254,199,13)
%pb(22,254,199,13,pb-240x320x16.bmp)
%?C<|>
%?C<|%s%ac%?it<%it|%fn>>
%?C<|%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>>

2
wps/cabbiev2.240x320x16.wps
View file

@ -12,7 +12,7 @@
%xl(E,repeat-240x320x16.bmp,182,292,4)
%xl(F,playmode-240x320x16.bmp,206,292,5)
%Cl(55,30,130,130,c,c)
%pb(pb-240x320x16.bmp,22,254,199,13)
%pb(22,254,199,13,pb-240x320x16.bmp)
%?C<|>
%?C<|%s%ac%?it<%it|%fn>>
%?C<|%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>>

2
wps/cabbiev2.240x400x16.wps
View file

@ -6,7 +6,7 @@
%wd
%X(wpsbackdrop-240x400x16.bmp)
%Cl(55,50,130,130,c,c)
%pb(pb-240x320x16.bmp,22,284,199,13)
%pb(22,284,199,13,pb-240x320x16.bmp)
%T(22,284,199,13,progressbar)
%T(90,238,60,20,playlist)
%?Tl(2.5)<%Vd(t)|%Vd(u)>

2
wps/cabbiev2.320x240x16.mrobe500.wps
View file

@ -19,7 +19,7 @@
%?Tl(2.5)<%Vd(t)|%Vd(u)>
%Cl(16,32,120,120)
%pb(pb-320x240x16.bmp,10,162,300,15)
%pb(10,162,300,15,pb-320x240x16.bmp)
%?mh<%xd(Aa)|%xd(Ab)>
%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>
%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>

2
wps/cabbiev2.320x240x16.wps
View file

@ -10,7 +10,7 @@
%xl(E,repeat-320x240x16.bmp,261,207,4)
%xl(F,playmode-320x240x16.bmp,286,207,5)
%ax%Cl(16,32,120,120)
%pb(pb-320x240x16.bmp,10,162,300,15)
%pb(10,162,300,15,pb-320x240x16.bmp)
%?mh<%xd(Aa)|%xd(Ab)>
%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>
%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>

2
wps/iCatcher.112x64x1.wps
View file

@ -5,7 +5,7 @@
%s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
%s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
%s%ac%?in<%in|%pp> - %?it<%it|%fn>
%pb(-,11,-,90,3)
%pb(11,-,90,3,-)
%t(6)%s%ac%?Fm<%Sx(Next:) %?It<%It|%Fn>|%fbKbps %fc>;%t(6)%s%ac%?Fm<%Sx(Next:) %?It<%It|%Fn>|%fbKbps %fc>
%xl(A,battery-s.bmp,93,3,5)

2
wps/iCatcher.128x128x16.wps
View file

@ -11,7 +11,7 @@
%al %fbKbps
%pb(-,11,-,106,4)
%pb(11,-,106,4,-)
%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>

2
wps/iCatcher.128x64x1.160x128x2.wps
View file

@ -4,7 +4,7 @@
%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 >
%s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
%s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
%pb(-,11,-,106,4)
%pb(11,-,106,4,-)
%s%ac%?in<%in|%pp> - %?it<%it|%fn>
%xl(A,battery-s.bmp,109,3,5)

2
wps/iCatcher.128x96x1.wps
View file

@ -6,7 +6,7 @@
%s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
%s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
%s%ac%?in<%in|%pp> - %?it<%it|%fn>
%pb(-,11,-,106,4)
%pb(11,-,106,4,-)
%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>

2
wps/iCatcher.132x80x16.wps
View file

@ -6,7 +6,7 @@
%s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
%s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
%s%ac%?in<%in|%pp> - %?it<%it|%fn>
%pb(-,11,-,106,4)
%pb(11,-,106,4,-)
%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>

2
wps/iCatcher.138x110x2.wps
View file

@ -10,7 +10,7 @@
%s%ac%?in<%in|%pp> - %?it<%it|%fn>
%al %fbKbps
%pb(-,10,-,118,4)
%pb(10,-,118,4,-)
%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>

2
wps/iCatcher.160x128x16.wps
View file

@ -11,7 +11,7 @@
%s%ac%?in<%in|%pp> - %?it<%it|%fn>
%al %fbKbps
%pb(-,10,-,140,4)
%pb(10,-,140,4,-)
%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>

2
wps/iCatcher.160x128x2.wps
View file

@ -11,7 +11,7 @@
%s%ac%?in<%in|%pp> - %?it<%it|%fn>
%al %fbKbps
%pb(-,10,-,140,4)
%pb(10,-,140,4,-)
%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>

2
wps/iCatcher.176x132x16.wps
View file

@ -11,7 +11,7 @@
%s%ac%?in<%in|%pp> - %?it<%it|%fn>
%al %fbKbps
%pb(-,10,-,156,4)
%pb(10,-,156,4,-)
%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>

2
wps/iCatcher.176x220x16.wps
View file

@ -15,7 +15,7 @@
%al %fbKbps
%pb(-,10,-,156,4)
%pb(10,-,156,4,-)
%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>

2
wps/iCatcher.220x176x16.wps
View file

@ -9,7 +9,7 @@
%s%ac%?in<%in|%pp> - %?it<%it|%fn>
%al %fbKbps
%pb(-,11,-,198,6)
%pb(11,-,198,6,-)
%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>

2
wps/iCatcher.240x320x16.wps
View file

@ -13,7 +13,7 @@
%al %fbKbps
%pb(-,11,-,218,7)
%pb(11,-,218,7,-)
%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>

2
wps/iCatcher.320x240x16.wps
View file

@ -9,7 +9,7 @@
%s%ac%?in<%in|%pp> - %?it<%it|%fn>
%al %fbKbps
%pb(-,11,-,298,7)
%pb(11,-,298,7,-)
%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>