diff options
author | Hardeep Sidhu <dyp@pobox.com> | 2006-06-15 20:17:47 +0000 |
---|---|---|
committer | Hardeep Sidhu <dyp@pobox.com> | 2006-06-15 20:17:47 +0000 |
commit | 2525b4d981098c010703aeb19b89e6b2507565fc (patch) | |
tree | a3729d35a13e9362d00b09215999a0397a2acef4 | |
parent | 30b0e66c602b3e3c0790d0fe89a8082590b7d058 (diff) | |
download | rockbox-2525b4d981098c010703aeb19b89e6b2507565fc.tar.gz rockbox-2525b4d981098c010703aeb19b89e6b2507565fc.zip |
Added support for multiple rwps for same theme for different devices. Updated iCatcher theme with different rwps for H1x0 and H3x0.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10126 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | wps/WPSLIST | 4 | ||||
-rwxr-xr-x | wps/iCatcher.128x64x1.160x128x2.wps (renamed from wps/iCatcher.128x64x1.wps) | 0 | ||||
-rwxr-xr-x | wps/iCatcher.128x64x1.220x176x16.wps | 47 | ||||
-rwxr-xr-x | wps/wpsbuild.pl | 10 |
4 files changed, 60 insertions, 1 deletions
diff --git a/wps/WPSLIST b/wps/WPSLIST index 8ada41afbf..c0ea1cc852 100644 --- a/wps/WPSLIST +++ b/wps/WPSLIST | |||
@@ -136,7 +136,7 @@ RWPS: iCatcher.rwps | |||
136 | Author: Ioannis Koutoulakis | 136 | Author: Ioannis Koutoulakis |
137 | Font.112x64x1: rockfont-8.fnt | 137 | Font.112x64x1: rockfont-8.fnt |
138 | Font.138x110x1: nedore-8.fnt | 138 | Font.138x110x1: nedore-8.fnt |
139 | Font.160x128x1: nedore-9.fnt | 139 | Font.160x128x2: nedore-9.fnt |
140 | Font.160x128x16: nedore-9.fnt | 140 | Font.160x128x16: nedore-9.fnt |
141 | Font.176x132x16: nedore-9.fnt | 141 | Font.176x132x16: nedore-9.fnt |
142 | Font.220x176x16: nimbus-14.fnt | 142 | Font.220x176x16: nimbus-14.fnt |
@@ -147,6 +147,8 @@ Statusbar: on | |||
147 | <rwps> | 147 | <rwps> |
148 | Name: iCatcher.rwps | 148 | Name: iCatcher.rwps |
149 | Author: Ioannis Koutoulakis | 149 | Author: Ioannis Koutoulakis |
150 | Font.160x128x2: nedore-9.fnt | ||
151 | Font.220x176x16: nimbus-14.fnt | ||
150 | Statusbar: on | 152 | Statusbar: on |
151 | </rwps> | 153 | </rwps> |
152 | 154 | ||
diff --git a/wps/iCatcher.128x64x1.wps b/wps/iCatcher.128x64x1.160x128x2.wps index cda358b5cb..cda358b5cb 100755 --- a/wps/iCatcher.128x64x1.wps +++ b/wps/iCatcher.128x64x1.160x128x2.wps | |||
diff --git a/wps/iCatcher.128x64x1.220x176x16.wps b/wps/iCatcher.128x64x1.220x176x16.wps new file mode 100755 index 0000000000..f1e45245ae --- /dev/null +++ b/wps/iCatcher.128x64x1.220x176x16.wps | |||
@@ -0,0 +1,47 @@ | |||
1 | %wd | ||
2 | |||
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%?d2<%?ia<%ac%ia|%ac%d2>|%?ia<%ac%ia|%acUnknown Artist>> | ||
5 | %s%?in<%?it<%ac%in - %it|%ac%in - %fm>|%?it<%ac%pp - %it|%ac%pp - %fm>> | ||
6 | |||
7 | %xl|A|bat0-s.bmp|109|2| | ||
8 | %xl|B|bat1-s.bmp|109|2| | ||
9 | %xl|C|bat2-s.bmp|109|2| | ||
10 | %xl|D|bat3-s.bmp|109|2| | ||
11 | %xl|E|bat4-s.bmp|109|2| | ||
12 | %t0.5 %?bp<%?bc<%xdA|%xdE>|%?bl<%xdA|%xdB|%xdC|%xdD|%xdE>>;%t0.5 %?bp<%?bc<%xdB|%xdE>|%?bl<%xdA|%xdB|%xdC|%xdD|%xdE>>;%t0.5 %?bp<%?bc<%xdC|%xdE>|%?bl<%xdA|%xdB|%xdC|%xdD|%xdE>>;%t0.5 %?bp<%?bc<%xdD|%xdE>|%?bl<%xdA|%xdB|%xdC|%xdD|%xdE>>;%t0.5 %?bp<%?bc<%xdE|%xdE>|%?bl<%xdA|%xdB|%xdC|%xdD|%xdE>> | ||
13 | %xl|G|holdmain-s.bmp|86|1| | ||
14 | %xl|H|holdremote-s.bmp|86|1| | ||
15 | %xl|I|holdboth-s.bmp|86|1| | ||
16 | %xl|K|repeatall-s.bmp|66|1| | ||
17 | %xl|L|repeatone-s.bmp|66|1| | ||
18 | %xl|M|repeatshuffle-s.bmp|66|1| | ||
19 | %xl|N|repeata-b-s.bmp|66|1| | ||
20 | %xl|O|shuffle0-s.bmp|46|3| | ||
21 | %xl|P|shuffle1-s.bmp|46|3| | ||
22 | %xl|R|pb-play-s.bmp|3|2| | ||
23 | %xl|S|pb-pause-s.bmp|3|2| | ||
24 | %xl|T|pb-fforward-s.bmp|3|2| | ||
25 | %xl|U|pb-rewind-s.bmp|3|2| | ||
26 | %?mh<%?mr<%xdI|%xdG>|%?mr<%xdH|>>%?mm<|%xdK|%xdL|%xdM|%xdN>%?ps<%xdP|%xdO>%?mp<|%xdR|%xdS|%xdT|%xdU> | ||
27 | %xl|a|vol0-s.bmp|16|0| | ||
28 | %xl|b|vol1-s.bmp|16|0| | ||
29 | %xl|c|vol2-s.bmp|16|0| | ||
30 | %xl|d|vol3-s.bmp|16|0| | ||
31 | %xl|e|vol4-s.bmp|16|0| | ||
32 | %xl|f|vol5-s.bmp|16|0| | ||
33 | %xl|g|vol6-s.bmp|16|0| | ||
34 | %xl|h|vol7-s.bmp|16|0| | ||
35 | %xl|i|vol8-s.bmp|16|0| | ||
36 | %xl|j|ani1-s.bmp|16|0| | ||
37 | %xl|k|ani2-s.bmp|16|0| | ||
38 | %xl|l|ani3-s.bmp|16|0| | ||
39 | %xl|m|ani4-s.bmp|16|0| | ||
40 | %xl|n|ani5-s.bmp|16|0| | ||
41 | %xl|o|ani6-s.bmp|16|0| | ||
42 | %xl|p|ani7-s.bmp|16|0| | ||
43 | %xl|q|ani8-s.bmp|16|0| | ||
44 | %t0.1 %?mp<%xda|%?pv<%xda|%xda|%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdj|%xdj|%xdj>;%t0.1 %?mp<%xda|%?pv<%xda|%xda|%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdk|%xdk|%xdk>;%t0.1 %?mp<%xda|%?pv<%xda|%xda|%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdl|%xdl|%xdl>;%t0.1 %?mp<%xda|%?pv<%xda|%xda|%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdm|%xdm|%xdm>;%t0.1 %?mp<%xda|%?pv<%xda|%xda|%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdn|%xdn|%xdn>;%t0.1 %?mp<%xda|%?pv<%xda|%xda|%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdo|%xdo|%xdo>;%t0.1 %?mp<%xda|%?pv<%xda|%xda|%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdp|%xdp|%xdp>;%t0.1 %?mp<%xda|%?pv<%xda|%xda|%xda|%xdb|%xdc|%xdd|%xde|%xdf|%xdg|%xdh|%xdi>|%xdq|%xdq|%xdq> | ||
45 | %xl|X|line2-128.bmp|0|12| | ||
46 | %xl|Y|line1-128.bmp|0|57| | ||
47 | %xdX%xdY \ No newline at end of file | ||
diff --git a/wps/wpsbuild.pl b/wps/wpsbuild.pl index 0334133aa6..4f92b876ac 100755 --- a/wps/wpsbuild.pl +++ b/wps/wpsbuild.pl | |||
@@ -248,6 +248,13 @@ while(<WPS>) { | |||
248 | 248 | ||
249 | $req_g_wps = $wps_prefix . "." . $req_g . ".wps"; | 249 | $req_g_wps = $wps_prefix . "." . $req_g . ".wps"; |
250 | last if (-e "$wpsdir/$req_g_wps"); | 250 | last if (-e "$wpsdir/$req_g_wps"); |
251 | |||
252 | if ($isrwps) { | ||
253 | $req_g = $req_g . "." . $main_width . "x" . $main_height . "x" . "$main_depth"; | ||
254 | |||
255 | $req_g_wps = $wps_prefix . "." . $req_g . ".wps"; | ||
256 | last if (-e "$wpsdir/$req_g_wps"); | ||
257 | } | ||
251 | } | 258 | } |
252 | $req_t_wps = $wps_prefix . ".txt" . ".wps"; | 259 | $req_t_wps = $wps_prefix . ".txt" . ".wps"; |
253 | 260 | ||
@@ -284,6 +291,9 @@ while(<WPS>) { | |||
284 | elsif($l =~ /^RWPS: (.*)/i) { | 291 | elsif($l =~ /^RWPS: (.*)/i) { |
285 | $rwps = $1; | 292 | $rwps = $1; |
286 | } | 293 | } |
294 | elsif($l =~ /^RWPS\.${main_width}x${main_height}x$main_depth: (.*)/i) { | ||
295 | $rwps = $1; | ||
296 | } | ||
287 | elsif($l =~ /^Author: (.*)/i) { | 297 | elsif($l =~ /^Author: (.*)/i) { |
288 | $author = $1; | 298 | $author = $1; |
289 | } | 299 | } |