diff options
author | Marianne Arnold <pixelma@rockbox.org> | 2008-02-02 01:10:43 +0000 |
---|---|---|
committer | Marianne Arnold <pixelma@rockbox.org> | 2008-02-02 01:10:43 +0000 |
commit | d08af61394bb9d6c3cbb614f790091de44cbfd1b (patch) | |
tree | bf87dfef862aa9d41627e7e6c088a43e77e74c62 | |
parent | c077e1eb37b210f8df6ad46ac1d639ee59bf2c54 (diff) | |
download | rockbox-d08af61394bb9d6c3cbb614f790091de44cbfd1b.tar.gz rockbox-d08af61394bb9d6c3cbb614f790091de44cbfd1b.zip |
Several fixes for the cabbiev2 theme. (1) Rename the files used for the rwps and change the WPSLIST so that it is done the same way as for iCatcher and .rwps files are actually included in the zip. (2) Replace the Iaudio rwps background which was taken fron the unicode version before with the correct one. (3) Fix the e200 wps to look like the author intended and with the progressbar at the right spot. (4) Make the 160x128 greyscale version use the helvR10 font as the colour version does. This also fixes a potential issue with the Iaudio rwps. (5) Clean up the WPSLIST a bit and drop (hopefully) unnecessary definitions. I guess it could be even simplified some more, someone with a bit perl foo should look into this. -- (3) and (4) taken from the last entries in FS#8443 by Apoo Maha.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16196 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | wps/WPSLIST | 54 | ||||
-rw-r--r-- | wps/cabbiev2.128x64x1.wps (renamed from wps/cabbiev2.rwps-128x64x1.rwps) | 0 | ||||
-rw-r--r-- | wps/cabbiev2.128x96x2.wps (renamed from wps/cabbiev2.rwps-128x96x2.rwps) | 0 | ||||
-rw-r--r-- | wps/cabbiev2.160x128x2.wps | 8 | ||||
-rw-r--r-- | wps/cabbiev2.176x220x16.wps | 6 | ||||
-rw-r--r-- | wps/cabbiev2/background-128x96x2.bmp | bin | 36918 -> 12358 bytes | |||
-rw-r--r-- | wps/cabbiev2/lockclosed-160x128x2.bmp | bin | 274 -> 214 bytes | |||
-rw-r--r-- | wps/cabbiev2/lockopen-160x128x2.bmp | bin | 274 -> 214 bytes | |||
-rw-r--r-- | wps/cabbiev2/pb-176x220x16.bmp | bin | 3926 -> 4088 bytes | |||
-rw-r--r-- | wps/cabbiev2/wpsbackdrop-160x128x2.bmp | bin | 10358 -> 10358 bytes | |||
-rw-r--r-- | wps/cabbiev2/wpsbackdrop-176x220x16.bmp | bin | 116216 -> 116216 bytes |
11 files changed, 17 insertions, 51 deletions
diff --git a/wps/WPSLIST b/wps/WPSLIST index 79a3b56063..08171aad16 100644 --- a/wps/WPSLIST +++ b/wps/WPSLIST | |||
@@ -208,13 +208,10 @@ Author: Jens Arnold | |||
208 | 208 | ||
209 | <wps> | 209 | <wps> |
210 | Name: cabbiev2.wps | 210 | Name: cabbiev2.wps |
211 | RWPS: cabbiev2.rwps | ||
211 | # Real name of the creator of the WPS | 212 | # Real name of the creator of the WPS |
212 | Author: Johannes Voggenthaler, Apoo Maha, Marc Guay, Alex Vanderpol, Jerry Lange, Keith Perri, Mark Fawcus, and Marianne Arnold with support from Rockbox developers and forums. Based on Cabbie by Yohann Misquitta. | 213 | Author: Johannes Voggenthaler, Apoo Maha, Marc Guay, Alex Vanderpol, Jerry Lange, Keith Perri, Mark Fawcus, and Marianne Arnold with support from Rockbox developers and forums. Based on Cabbie by Yohann Misquitta. |
213 | 214 | ||
214 | #remote WPS settings | ||
215 | rwps: cabbiev2.rwps-128x96x2.rwps | ||
216 | rwps: cabbiev2.rwps-128x64x2.rwps | ||
217 | |||
218 | # Preferred font (including .fnt extension - leave blank for player): | 215 | # Preferred font (including .fnt extension - leave blank for player): |
219 | Font.320x240x16: helvR12.fnt | 216 | Font.320x240x16: helvR12.fnt |
220 | Font.240x320x16: helvR14.fnt | 217 | Font.240x320x16: helvR14.fnt |
@@ -222,7 +219,7 @@ Font.220x176x16: helvR10.fnt | |||
222 | Font.176x220x16: helvR10.fnt | 219 | Font.176x220x16: helvR10.fnt |
223 | Font.176x132x16: helvR10.fnt | 220 | Font.176x132x16: helvR10.fnt |
224 | Font.160x128x16: helvR10.fnt | 221 | Font.160x128x16: helvR10.fnt |
225 | Font.160x128x2: mix12.fnt | 222 | Font.160x128x2: helvR10.fnt |
226 | Font.138x110x2: helvR10.fnt | 223 | Font.138x110x2: helvR10.fnt |
227 | Font.128x128x16: helvR10.fnt | 224 | Font.128x128x16: helvR10.fnt |
228 | Font.132x80x16: Sazanami-Mincho-Regular-11.fnt | 225 | Font.132x80x16: Sazanami-Mincho-Regular-11.fnt |
@@ -283,43 +280,12 @@ viewers iconset.220x176x16: /.rockbox/icons/tango_small_viewers.bmp | |||
283 | viewers iconset.240x320x16: /.rockbox/icons/tango_small_viewers.bmp | 280 | viewers iconset.240x320x16: /.rockbox/icons/tango_small_viewers.bmp |
284 | 281 | ||
285 | # Whether the WPS is designed to have the statusbar on or off | 282 | # Whether the WPS is designed to have the statusbar on or off |
286 | Statusbar.320x240x16: on | 283 | Statusbar: on |
287 | Statusbar.240x320x16: on | ||
288 | Statusbar.220x176x16: on | ||
289 | Statusbar.176x220x16: on | ||
290 | Statusbar.176x132x16: on | ||
291 | Statusbar.160x128x16: on | ||
292 | Statusbar.160x128x2: on | ||
293 | Statusbar.138x110x2: on | ||
294 | Statusbar.128x128x16: on | ||
295 | Statusbar.132x80x16: on | ||
296 | Statusbar.112x64x1: on | ||
297 | |||
298 | # The minimum required pixel height for the WPS | ||
299 | # 176 for H3xx, 128 for H1xx, 64 for Recorder/Ondio, 14 for player | ||
300 | Height.320x240x16: 240 | ||
301 | Height.240x320x16: 320 | ||
302 | Height.220x176x16: 176 | ||
303 | Height.176x220x16: 220 | ||
304 | Height.176x132x16: 132 | ||
305 | Height.160x128x16: 128 | ||
306 | Height.160x128x2: 128 | ||
307 | Height.138x110x2: 110 | ||
308 | Height.128x128x16: 128 | ||
309 | Height.132x80x16: 80 | ||
310 | Height.112x64x1: 64 | ||
311 | |||
312 | # The minimum required pixel width for the WPS (160 for iRiver, | ||
313 | # 220 for H3xx, 160 for H1xx, 112 for Recorder/Ondio, 55 for player | ||
314 | Width.320x240x16: 320 | ||
315 | Width.240x320x16: 240 | ||
316 | Width.220x176x16: 220 | ||
317 | Width.176x220x16: 176 | ||
318 | Width.176x132x16: 176 | ||
319 | Width.160x128x16: 160 | ||
320 | Width.160x128x2: 160 | ||
321 | Width.138x110x2: 138 | ||
322 | Width.128x128x16: 128 | ||
323 | Width.132x80x16: 132 | ||
324 | Width.112x64x1: 112 | ||
325 | </wps> | 284 | </wps> |
285 | |||
286 | <rwps> | ||
287 | Name: cabbiev2.rwps | ||
288 | Author: Johannes Voggenthaler, Apoo Maha, Marc Guay, Alex Vanderpol, Jerry Lange, Keith Perri, Mark Fawcus, and Marianne Arnold with support from Rockbox developers and forums. Based on Cabbie by Yohann Misquitta. | ||
289 | Font: helvR10.fnt | ||
290 | Statusbar: on | ||
291 | </rwps> | ||
diff --git a/wps/cabbiev2.rwps-128x64x1.rwps b/wps/cabbiev2.128x64x1.wps index 744011fb56..744011fb56 100644 --- a/wps/cabbiev2.rwps-128x64x1.rwps +++ b/wps/cabbiev2.128x64x1.wps | |||
diff --git a/wps/cabbiev2.rwps-128x96x2.rwps b/wps/cabbiev2.128x96x2.wps index 6b1ac40b82..6b1ac40b82 100644 --- a/wps/cabbiev2.rwps-128x96x2.rwps +++ b/wps/cabbiev2.128x96x2.wps | |||
diff --git a/wps/cabbiev2.160x128x2.wps b/wps/cabbiev2.160x128x2.wps index 95c32f74dc..5d271b3b94 100644 --- a/wps/cabbiev2.160x128x2.wps +++ b/wps/cabbiev2.160x128x2.wps | |||
@@ -38,15 +38,15 @@ | |||
38 | %xl|Y|ff-160x128x2.bmp|145|114| | 38 | %xl|Y|ff-160x128x2.bmp|145|114| |
39 | %xl|Z|rew-160x128x2.bmp|145|114| | 39 | %xl|Z|rew-160x128x2.bmp|145|114| |
40 | %Cl|2|16|s64|s64| | 40 | %Cl|2|16|s64|s64| |
41 | %pb|8|1|159|88| | 41 | %pb|8|1|159|86| |
42 | %?C<%s%m|70|%al%?it<%it|%fn>|%s%ac%?it<%it|%fn>> | 42 | %?C<%s%m|70|%al%?it<%it|%fn>|%s%ac%?it<%it|%fn>> |
43 | %?C<%s%m|70|%al%?ia<%ia|%?d2<%d2|(root)>>|%s%ac%?ia<%ia|%?d2<%d2|(root)>>> | 43 | %?C<%s%m|70|%al%?ia<%ia|%?d2<%d2|(root)>>|%s%ac%?ia<%ia|%?d2<%d2|(root)>>> |
44 | %?C<%s%m|70|%al%?id<%id|%?d1<%d1|(root)>>|%s%ac%?id<%id|%?d1<%d1|(root)>>> | 44 | %?C<%s%m|70|%al%?id<%id|%?d1<%d1|(root)>>|%s%ac%?id<%id|%?d1<%d1|(root)>>> |
45 | 45 | ||
46 | %?C<%s%m|70|%al%?It<%It|%Fn>|%s%ac%?It<%It|%Fn>> | 46 | %?C<%s%m|70|%alNext Track:|%s%acNext Track:> |
47 | %?C<%s%m|70|%al%?It<%It|%Fn>|%s%ac%?It<%It|%Fn>> | ||
47 | 48 | ||
48 | %al %pc%ac%pp of %pe%ar%pr | 49 | %al %pc%ac%pp of %pe%ar%pr |
49 | |||
50 | %?mh<%xdA|%xdB> | 50 | %?mh<%xdA|%xdB> |
51 | %?bp<%?bc<%xdD|%xdC>|%?bl<|%xdE|%xdF|%xdG|%xdH|%xdI|%xdJ|%xdK|%xdL>> | 51 | %?bp<%?bc<%xdD|%xdC>|%?bl<|%xdE|%xdF|%xdG|%xdH|%xdI|%xdJ|%xdK|%xdL>> |
52 | %?pv<%xdM|%xdN|%xdO|%xdP|%xdp|%xdq|%xdr|%xds|%xdt> | 52 | %?pv<%xdM|%xdN|%xdO|%xdP|%xdp|%xdq|%xdr|%xds|%xdt> |
diff --git a/wps/cabbiev2.176x220x16.wps b/wps/cabbiev2.176x220x16.wps index d343db8b11..9303dc3e7c 100644 --- a/wps/cabbiev2.176x220x16.wps +++ b/wps/cabbiev2.176x220x16.wps | |||
@@ -23,8 +23,7 @@ | |||
23 | %xl|a|vol5-176x220x16.bmp|97|206| | 23 | %xl|a|vol5-176x220x16.bmp|97|206| |
24 | %xl|b|vol6-176x220x16.bmp|97|206| | 24 | %xl|b|vol6-176x220x16.bmp|97|206| |
25 | %xl|c|vol7-176x220x16.bmp|97|206| | 25 | %xl|c|vol7-176x220x16.bmp|97|206| |
26 | %xl|d|vol8-176x220x16.bmp|97|206| | 26 | %xl|d|vol8-176x220x16.bmp|97|206| |
27 | |||
28 | %xl|e|vol9-176x220x16.bmp|97|206| | 27 | %xl|e|vol9-176x220x16.bmp|97|206| |
29 | %xl|Q|shuffle-176x220x16.bmp|119|207| | 28 | %xl|Q|shuffle-176x220x16.bmp|119|207| |
30 | %xl|R|repeatall-176x220x16.bmp|144|204| | 29 | %xl|R|repeatall-176x220x16.bmp|144|204| |
@@ -37,8 +36,9 @@ | |||
37 | %xl|Y|ff-176x220x16.bmp|159|204| | 36 | %xl|Y|ff-176x220x16.bmp|159|204| |
38 | %xl|Z|rew-176x220x16.bmp|159|204| | 37 | %xl|Z|rew-176x220x16.bmp|159|204| |
39 | %Cl|29|20|c120|c120| | 38 | %Cl|29|20|c120|c120| |
40 | %pb|8|9|171|182| | 39 | %pb|8|5|171|182| |
41 | #NowPlaying | 40 | #NowPlaying |
41 | |||
42 | 42 | ||
43 | %?C<|%s%ac%?it<%it|%fn>> | 43 | %?C<|%s%ac%?it<%it|%fn>> |
44 | %?C<|%s%ac%?ia<%ia|%?d2<%d2|(root)>>> | 44 | %?C<|%s%ac%?ia<%ia|%?d2<%d2|(root)>>> |
diff --git a/wps/cabbiev2/background-128x96x2.bmp b/wps/cabbiev2/background-128x96x2.bmp index e1bfa875de..61b0b9490e 100644 --- a/wps/cabbiev2/background-128x96x2.bmp +++ b/wps/cabbiev2/background-128x96x2.bmp | |||
Binary files differ | |||
diff --git a/wps/cabbiev2/lockclosed-160x128x2.bmp b/wps/cabbiev2/lockclosed-160x128x2.bmp index 47c2985ede..6af64f246c 100644 --- a/wps/cabbiev2/lockclosed-160x128x2.bmp +++ b/wps/cabbiev2/lockclosed-160x128x2.bmp | |||
Binary files differ | |||
diff --git a/wps/cabbiev2/lockopen-160x128x2.bmp b/wps/cabbiev2/lockopen-160x128x2.bmp index f7f62f97c4..b458a25c68 100644 --- a/wps/cabbiev2/lockopen-160x128x2.bmp +++ b/wps/cabbiev2/lockopen-160x128x2.bmp | |||
Binary files differ | |||
diff --git a/wps/cabbiev2/pb-176x220x16.bmp b/wps/cabbiev2/pb-176x220x16.bmp index 75362128d8..614759a2a4 100644 --- a/wps/cabbiev2/pb-176x220x16.bmp +++ b/wps/cabbiev2/pb-176x220x16.bmp | |||
Binary files differ | |||
diff --git a/wps/cabbiev2/wpsbackdrop-160x128x2.bmp b/wps/cabbiev2/wpsbackdrop-160x128x2.bmp index b6ade7dd32..f82b45cd23 100644 --- a/wps/cabbiev2/wpsbackdrop-160x128x2.bmp +++ b/wps/cabbiev2/wpsbackdrop-160x128x2.bmp | |||
Binary files differ | |||
diff --git a/wps/cabbiev2/wpsbackdrop-176x220x16.bmp b/wps/cabbiev2/wpsbackdrop-176x220x16.bmp index b526140391..a367e77950 100644 --- a/wps/cabbiev2/wpsbackdrop-176x220x16.bmp +++ b/wps/cabbiev2/wpsbackdrop-176x220x16.bmp | |||
Binary files differ | |||