Skip to content

Commit 9ac4b44

Browse files
jdgordonjdgordon
committed
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.
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
1 parent 20b9020 commit 9ac4b44

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+87
-64
lines changed

‎apps/gui/skin_engine/skin_parser.c

+8-4
Original file line numberDiff line numberDiff line change
@@ -1245,11 +1245,15 @@ static int parse_progressbar(const char *wps_bufptr,
12451245
using - for any of the params uses "sane" values */
12461246
#ifdef HAVE_LCD_BITMAP
12471247
enum {
1248-
PB_FILENAME = 0,
1249-
PB_X,
1248+
PB_X = 0,
12501249
PB_Y,
12511250
PB_WIDTH,
1251+
<<<<<<< .mine
12521252
PB_HEIGHT,
1253+
PB_FILENAME,
1254+
=======
1255+
PB_HEIGHT,
1256+
>>>>>>> .r26726
12531257
};
12541258
const char *filename;
12551259
int x, y, height, width;
@@ -1293,8 +1297,8 @@ static int parse_progressbar(const char *wps_bufptr,
12931297
}
12941298
ptr = wps_bufptr + 1;
12951299

1296-
if (!(ptr = parse_list("sdddd", &set, ',', ptr, &filename,
1297-
&x, &y, &width, &height)))
1300+
if (!(ptr = parse_list("dddds", &set, ',', ptr,
1301+
&x, &y, &width, &height, &filename)))
12981302
return WPS_ERROR_INVALID_PARAM;
12991303

13001304
if (LIST_VALUE_PARSED(set, PB_FILENAME)) /* filename */

‎manual/appendix/wps_tags.tex

+2-2
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ \section{Playlist/Song Info}
124124
& This will replace the entire line with a progress bar. \\
125125
& You can set the position, width and height of the progressbar %
126126
(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}}} \\
128128
\opt{player}{%
129129
\config{\%pf} & Full-line progress bar \& time display\\
130130
}%
@@ -145,7 +145,7 @@ \section{Playlist/Song Info}
145145
{\textbar}N{\textgreater}}\\
146146
& 0 is used for mute, the last option is used for values greater than zero.\\
147147
\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}}} \\
149149
\config{\%pS} & Track is starting. An optional number gives how many seconds
150150
the tag remains true for after the start of the track. The default is
151151
10 seconds if no number is specified.\\

‎utils/skinupdater/skinupdater.c

+17-1
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,26 @@ int parse_tag(FILE* out, const char* start, bool in_conditional)
130130
{
131131
if (*start == '|')
132132
{
133+
int i=0;
134+
char filename[128];
133135
len++; start++;
134136
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;
135146
/* 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, ')');
137153
}
138154
}
139155
else if (MATCH("d") || MATCH("D") || MATCH("mv") || MATCH("pS") || MATCH("pE") || MATCH("t") || MATCH("Tl"))

‎utils/themeeditor/skin_parser.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,8 @@ int skin_parse_tag(struct skin_element* element, char** document)
543543
element->params[i].type = NUMERIC;
544544
element->params[i].data.numeric = scan_int(&cursor);
545545
}
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')
547548
{
548549
/* Scanning a string argument */
549550
element->params[i].type = STRING;
@@ -576,7 +577,8 @@ int skin_parse_tag(struct skin_element* element, char** document)
576577
cursor++;
577578
}
578579

579-
tag_args++;
580+
if (*tag_args != 'N')
581+
tag_args++;
580582

581583
/* Checking for the optional bar */
582584
if(*tag_args == '|')

‎utils/themeeditor/tag_table.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "tag_table.h"
2323

2424
#include <string.h>
25-
25+
#define BAR_PARAMS "*|IIIIN"
2626
/* The tag definition table */
2727
struct tag_info legal_tags[] =
2828
{
@@ -33,7 +33,7 @@ struct tag_info legal_tags[] =
3333
{ SKIN_TOKEN_ALIGN_RIGHT_RTL, "aR", "" },
3434
{ SKIN_TOKEN_ALIGN_LANGDIRECTION, "ax", "" },
3535

36-
{ SKIN_TOKEN_BATTERY_PERCENT, "bl" , "*fIIII" },
36+
{ SKIN_TOKEN_BATTERY_PERCENT, "bl" , BAR_PARAMS },
3737
{ SKIN_TOKEN_BATTERY_VOLTS, "bv", "" },
3838
{ SKIN_TOKEN_BATTERY_TIME, "bt", "" },
3939
{ SKIN_TOKEN_BATTERY_SLEEPTIME, "bs", "" },
@@ -124,8 +124,8 @@ struct tag_info legal_tags[] =
124124

125125
{ SKIN_TOKEN_PEAKMETER, "pm", "" },
126126
{ SKIN_TOKEN_PLAYER_PROGRESSBAR, "pf", "" },
127-
{ SKIN_TOKEN_PROGRESSBAR, "pb" , "*fIIII" },
128-
{ SKIN_TOKEN_VOLUME, "pv" , "*fIIII" },
127+
{ SKIN_TOKEN_PROGRESSBAR, "pb" , BAR_PARAMS },
128+
{ SKIN_TOKEN_VOLUME, "pv" , BAR_PARAMS },
129129

130130
{ SKIN_TOKEN_TRACK_ELAPSED_PERCENT, "px", "" },
131131
{ SKIN_TOKEN_TRACK_TIME_ELAPSED, "pc", "" },

‎utils/themeeditor/tag_table.h

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

‎wps/Rockboxed.112x64x1.wps

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

‎wps/Rockboxed.128x128x16.wps

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
%al %s%ac%?it<%it|%fn>%ar
1515

1616
%ac%t(3)%ig;%ac%iy
17-
%pb(pg-108.bmp,10,76,108,5)
17+
%pb(10,76,108,5,pg-108.bmp)
1818
%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
1919
%?ps<%xd(B)>
2020
%?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>

‎wps/Rockboxed.132x80x16.wps

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
%al %s%ac%?ia<%ia|%d(2)>%ar
1313
%al %s%ac%?id<%id|%d(1)>%ar
1414
%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)
1616
%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
1717
%?ps<%xd(B)>
1818
%?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>

‎wps/Rockboxed.138x110x2.wps

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
%al %s%ac%?id<%id|%d(1)>%ar
1414
%al %s%ac%?it<%it|%fn>%ar
1515
%ac%t(3)%ig;%ac%iy
16-
%pb(pg-grey-118.bmp,10,-,118,5)
16+
%pb(10,-,118,5,pg-grey-118.bmp)
1717
%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
1818
%?ps<%xd(B)>
1919
%?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>

‎wps/Rockboxed.160x128x16.wps

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
%al %s%ac%?it<%it|%fn>%ar
1515

1616
%ac%t(3)%ig;%ac%iy
17-
%pb(pg-140.bmp,10,76,140,5)
17+
%pb(10,76,140,5,pg-140.bmp)
1818
%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
1919
%?ps<%xd(B)>
2020
%?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>

‎wps/Rockboxed.160x128x2.wps

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
%al %s%ac%?it<%it|%fn>%ar
1515

1616
%ac%t(3)%ig;%ac%iy
17-
%pb(pg-grey-140.bmp,10,-,140,5)
17+
%pb(10,-,140,5,pg-grey-140.bmp)
1818
%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
1919
%?ps<%xd(B)>
2020
%?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>

‎wps/Rockboxed.176x132x16.wps

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
%al %s%ac%?it<%it|%fn>%ar
1515

1616
%ac%t(3)%ig;%ac%iy
17-
%pb(pg-156.bmp,10,75,156,5)
17+
%pb(10,75,156,5,pg-156.bmp)
1818
%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
1919
%?ps<%xd(B)>
2020
%?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>

‎wps/Rockboxed.176x220x16.wps

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323

2424

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

‎wps/Rockboxed.220x176x16.wps

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
%al %s%ac%?it<%it|%fn>%ar
1717

1818
%ac%t(3)%ig;%ac%iy
19-
%pb(pg-200.bmp,10,116,200,5)
19+
%pb(10,116,200,5,pg-200.bmp)
2020
%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
2121
%?ps<%xd(B)>
2222
%?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>

‎wps/Rockboxed.240x320x16.wps

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
%ac%t(3)%ig;%ac%iy
2323

24-
%pb(pg-220.bmp,10,256,220,5)
24+
%pb(10,256,220,5,pg-220.bmp)
2525
%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
2626
%?ps<%xd(B)>
2727
%?mp<%xd(Ab)|%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)>

‎wps/Rockboxed.320x240x16.wps

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818

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

‎wps/UniCatcher.128x96x1.wps

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
%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>
44
%s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
55
%s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
6-
%pb(-,11,-,106,4)
6+
%pb(11,-,106,4,-)
77
%s%ac%?in<%in|%pp> - %?it<%it|%fn>
88

99
%xl(A,battery-s.bmp,109,3,5)

‎wps/UniCatcher.160x128x16.wps

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
%s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
77
%s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
88
%al %fbKbps
9-
%pb(-,10,-,140,4)
9+
%pb(10,-,140,4,-)
1010
%s%ac%?in<%in|%pp> - %?it<%it|%fn>
1111

1212
%xl(A,battery.bmp,135,8,5)

‎wps/UniCatcher.160x128x2.wps

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
%s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
77
%s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
88
%al %fbKbps
9-
%pb(-,10,-,140,4)
9+
%pb(10,-,140,4,-)
1010
%s%ac%?in<%in|%pp> - %?it<%it|%fn>
1111

1212
%xl(A,battery-g.bmp,135,8,5)

‎wps/UniCatcher.176x132x16.wps

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
%s%ac%?ia<%ia|%?d(2)<%d(2)|Unknown Artist>>
77
%s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
88
%al %fbKbps
9-
%pb(-,10,-,156,4)
9+
%pb(10,-,156,4,-)
1010
%s%ac%?in<%in|%pp> - %?it<%it|%fn>
1111

1212
%xl(A,battery.bmp,151,8,5)

‎wps/UniCatcher.176x220x16.wps

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212

1313
%al %fbKbps
14-
%pb(-,10,-,156,4)
14+
%pb(10,-,156,4,-)
1515
%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
1616

1717
%xl(A,battery.bmp,151,8,5)

‎wps/UniCatcher.220x176x16.wps

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
%s%ac%?id<%id|%?d(1)<%d(1)|Unknown Album>>
99
%s%ac%?in<%in|%pp> - %?it<%it|%fn>
1010
%al %fbKbps
11-
%pb(-,11,-,198,6)
11+
%pb(11,-,198,6,-)
1212

1313
%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
1414

‎wps/UniCatcher.240x320x16.wps

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717

1818
%al %fbKbps
19-
%pb(-,11,-,218,7)
19+
%pb(11,-,218,7,-)
2020

2121
%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
2222

‎wps/UniCatcher.320x240x16.wps

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212

1313
%al %fbKbps
14-
%pb(-,11,-,298,7)
14+
%pb(11,-,298,7,-)
1515

1616
%s%ac%Sx(Next:) %?It<%It|%?Fn<%Fn|?>>
1717

‎wps/boxes.220x176x16.wps

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
%fbk
2828

29-
%pb(pb-220.bmp,0,-,208,8)
29+
%pb(0,-,208,8,pb-220.bmp)
3030

3131

3232
%ac%t(5)%s%?It<%It|%Fn>;%ac%t(5)%s%?Ia<%Ia|%D(2)>

‎wps/cabbiev2.112x64x1.wps

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
1515
%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
1616
%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)
1818
%pc%ar%pr
1919
#Bottom status bar
2020
%?mh<%xd(Aa)|%xd(Ab)>

‎wps/cabbiev2.128x128x16.wps

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

‎wps/cabbiev2.128x128x2.wps

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

‎wps/cabbiev2.128x64x1.wps

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# progressbar viewport
77
%V(0,0,128,6,1)
88
%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)
1010

1111
%V(0,8,128,8,1)
1212
%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pc

‎wps/cabbiev2.128x96x2.wps

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
%xl(D,shuffle-160x128x2.bmp,72,2)
99
%xl(E,repeat-160x128x2.bmp,93,0,4)
1010
%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)
1212
%V(0,83,128,13,1)%Vf(0)%Vb(3)
1313
%?mh<%xd(Aa)|%xd(Ab)>
1414
%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>

‎wps/cabbiev2.132x80x16.wps

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
%xl(E,repeat-132x80x16.bmp,105,67,4)
1010
%xl(F,playmode-132x80x16.bmp,118,67,5)
1111
%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)
1313
%?C<%Cd%Vd(a)|%Vd(b)>
1414

1515
#Images

‎wps/cabbiev2.138x110x2.wps

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

‎wps/cabbiev2.160x128x1.wps

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%xl(D,shuffle-160x128x1.bmp,107,115)
1212
%xl(E,repeat-160x128x1.bmp,127,113,4)
1313
%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)
1515
%s%ac%?it<%it|%fn>
1616
%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
1717
%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>

‎wps/cabbiev2.160x128x16.wps

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
%xl(E,repeat-160x128x16.bmp,125,112,4)
1111
%xl(F,playmode-160x128x16.bmp,142,114,5)
1212
%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)
1414
%?mh<%xd(Aa)|%xd(Ab)>
1515
%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>
1616
%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>

0 commit comments

Comments
 (0)