Accept FS #6677 by Roan Horning : improvements to the 'Rockboxed' WPS.

* Make file information be displayed if there is no metadata.
* Add a new progressbar bitmap for the H300 and iPod 4G color.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12418 a1c6a512-1295-4272-9138-f99709370657

12 files changed, 36 insertions, 36 deletions

diff --git a/wps/Rockboxed.112x64x1.wps b/wps/Rockboxed.112x64x1.wps
index 8235f95..272070f 100644
--- a/wps/Rockboxed.112x64x1.wps
+++ b/wps/Rockboxed.112x64x1.wps
@@ -37,11 +37,11 @@
 %xl|x|rs-mono-small.bmp|42|49|
 %xl|w|rab-mono-small.bmp|42|49|
 %x|i|b24-mono-small.bmp|68|49|
-%al %s%ac%?ia<%ia|Artist?>%ar 
-%al %s%ac%?id<%id|Album?>%ar 
-%al %s%ac%?it<%it|Title?>%ar 
+%al %s%ac%?ia<%ia|%d2>%ar 
+%al %s%ac%?id<%id|%d1>%ar 
+%al %s%ac%?it<%it|%fn>%ar 
 %ac%t3%ig;%t%iy 
-%pb|5|12|92|
+%pb|5|10|102|
 %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|unknown>%ar%pt 
 %?ps<%xdb|%xdu>
 %?mp<%xdo|%xdp|%xdq|%xdf|%xdr>
diff --git a/wps/Rockboxed.128x128x16.wps b/wps/Rockboxed.128x128x16.wps
index 6373660..4a2cc2d 100644
--- a/wps/Rockboxed.128x128x16.wps
+++ b/wps/Rockboxed.128x128x16.wps
@@ -43,7 +43,7 @@
 %al %s%ac%?it<%it|%fn>%ar 
 
 %ac%t3%ig;%t%iy 
-%pb|5|10|108|76|
+%pb|5|10|118|76|
 %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|unknown>%ar%pt 
 %?ps<%xdb>
 %?mp<%xdq|%xdp|%xdq|%xdf|%xdr>
diff --git a/wps/Rockboxed.138x110x2.wps b/wps/Rockboxed.138x110x2.wps
index 12e3703..6eb6005 100644
--- a/wps/Rockboxed.138x110x2.wps
+++ b/wps/Rockboxed.138x110x2.wps
@@ -34,11 +34,11 @@
 %xl|w|rab-mono-medium.bmp|51|91|
 %xl|h|hd-mono-big.bmp|88|90|
 
-%al %s%ac%?ia<%ia|Artist?>%ar 
-%al %s%ac%?id<%id|Album?>%ar 
-%al %s%ac%?it<%it|Title?>%ar 
+%al %s%ac%?ia<%ia|%d2>%ar 
+%al %s%ac%?id<%id|%d1>%ar 
+%al %s%ac%?it<%it|%fn>%ar 
 %ac%t3%ig;%t%iy 
-%pb|5|12|125|
+%pb|5|10|128|
 %al  %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|unknown>%ar%pt  
 %?ps<%xdb>
 %?mp<%xdq|%xdp|%xdq|%xdf|%xdr>
diff --git a/wps/Rockboxed.160x128x16.wps b/wps/Rockboxed.160x128x16.wps
index 3e957de..c9ac8c6 100644
--- a/wps/Rockboxed.160x128x16.wps
+++ b/wps/Rockboxed.160x128x16.wps
@@ -38,12 +38,12 @@
 %xl|w|rab-color-big.bmp|53|109|
 %xl|h|hd-color.bmp|95|108|
 
-%al %s%ac%?ia<%ia|Artist?>%ar 
-%al %s%ac%?id<%id|Album?>%ar 
-%al %s%ac%?it<%it|Title?>%ar 
+%al %s%ac%?ia<%ia|%d2>%ar 
+%al %s%ac%?id<%id|%d1>%ar 
+%al %s%ac%?it<%it|%fn>%ar 
 
 %ac%t3%ig;%t%iy 
-%pb|5|10|140|76|
+%pb|5|10|150|76|
 %al  %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|unknown>%ar%pt  
 %?ps<%xdb>
 %?mp<%xdq|%xdp|%xdq|%xdf|%xdr>
diff --git a/wps/Rockboxed.160x128x2.wps b/wps/Rockboxed.160x128x2.wps
index 0d7e8f2..b5b4aff 100644
--- a/wps/Rockboxed.160x128x2.wps
+++ b/wps/Rockboxed.160x128x2.wps
@@ -34,12 +34,12 @@
 %xl|w|rab-mono-big.bmp|53|109|
 %xl|h|hd-mono-big.bmp|95|108|
 
-%al %s%ac%?ia<%ia|Artist?>%ar 
-%al %s%ac%?id<%id|Album?>%ar 
-%al %s%ac%?it<%it|Title?>%ar 
+%al %s%ac%?ia<%ia|%d2>%ar 
+%al %s%ac%?id<%id|%d1>%ar 
+%al %s%ac%?it<%it|%fn>%ar 
 
 %ac%t3%ig;%t%iy 
-%pb|5|15|140|
+%pb|5|10|150|
 %al  %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|unknown>%ar%pt  
 %?ps<%xdb>
 %?mp<%xdq|%xdp|%xdq|%xdf|%xdr>
diff --git a/wps/Rockboxed.176x132x16.wps b/wps/Rockboxed.176x132x16.wps
index 6f43810..afd0e5f 100644
--- a/wps/Rockboxed.176x132x16.wps
+++ b/wps/Rockboxed.176x132x16.wps
@@ -46,7 +46,7 @@
 %al %s%ac%?it<%it|%fn>%ar 
 
 %ac%t3%ig;%t%iy
-%pb|5|10|156|75|
+%pb|5|10|166|75|
 %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|unknown>%ar%pt 
 %?ps<%xdb>
 %?mp<%xdq|%xdp|%xdq|%xdf|%xdr>
diff --git a/wps/Rockboxed.176x220x16.wps b/wps/Rockboxed.176x220x16.wps
index 6866f9a..90b94fc 100644
--- a/wps/Rockboxed.176x220x16.wps
+++ b/wps/Rockboxed.176x220x16.wps
@@ -45,16 +45,16 @@
 
 
 
-%al %s%ac%?ia<%ia|Artist?>%ar 
-%al %s%ac%?id<%id|Album?>%ar 
-%al %s%ac%?it<%it|Title?>%ar 
+%al %s%ac%?ia<%ia|%d2>%ar 
+%al %s%ac%?id<%id|%d1>%ar 
+%al %s%ac%?it<%it|%fn>%ar 
 
 %ac%t3%ig;%t%iy
 
 
 
 
-%pb|5|10|156|171|
+%pb|5|10|166|171|
 %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|unknown>%ar%pt 
 %?ps<%xdb>
 %?mp<%xdq|%xdp|%xdq|%xdf|%xdr>
diff --git a/wps/Rockboxed.220x176x16.wps b/wps/Rockboxed.220x176x16.wps
index e7ca53e..a68a2a1 100644
--- a/wps/Rockboxed.220x176x16.wps
+++ b/wps/Rockboxed.220x176x16.wps
@@ -2,8 +2,8 @@
 # License: GNU GPL v2 or later.
 %wd
 %X|bg-220x176x16.bmp|0|0|
-%P|pg-164.bmp|
-%x|o|pgln-164.bmp|28|116|
+%P|pg-200.bmp|
+%x|o|pgln-200.bmp|10|116|
 %xl|p|ply-color-big.bmp|102|156|
 %xl|q|ps-color-big.bmp|102|156|
 %xl|f|ff-color-big.bmp|102|156|
@@ -42,12 +42,12 @@
 
 
 
-%al %s%ac%?ia<%ia|Artist?>%ar 
-%al %s%ac%?id<%id|Album?>%ar 
-%al %s%ac%?it<%it|Title?>%ar 
+%al %s%ac%?ia<%ia|%d2>%ar 
+%al %s%ac%?id<%id|%d1>%ar 
+%al %s%ac%?it<%it|%fn>%ar 
 
 %ac%t3%ig;%t%iy 
-%pb|5|28|191|116|
+%pb|5|10|210|116|
 %al  %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|unknown>%ar%pt  
 %?ps<%xdb>
 %?mp<%xdq|%xdp|%xdq|%xdf|%xdr>
diff --git a/wps/Rockboxed.240x320x16.wps b/wps/Rockboxed.240x320x16.wps
index 75d5283..4e15492 100644
--- a/wps/Rockboxed.240x320x16.wps
+++ b/wps/Rockboxed.240x320x16.wps
@@ -44,15 +44,15 @@
 
 
 
-%al %s%ac%?ia<%ia|Artist?>%ar 
-%al %s%ac%?id<%id|Album?>%ar 
-%al %s%ac%?it<%it|Title?>%ar 
+%al %s%ac%?ia<%ia|%d2>%ar 
+%al %s%ac%?id<%id|%d1>%ar 
+%al %s%ac%?it<%it|%fn>%ar 
 
 
 
 %ac%t3%ig;%t%iy 
 
-%pb|5|10|220|256|
+%pb|5|10|230|256|
 %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|unknown>%ar%pt 
 %?ps<%xdb>
 %?mp<%xdq|%xdp|%xdq|%xdf|%xdr>
diff --git a/wps/Rockboxed.320x240x16.wps b/wps/Rockboxed.320x240x16.wps
index 3060b65..aa0aed5 100644
--- a/wps/Rockboxed.320x240x16.wps
+++ b/wps/Rockboxed.320x240x16.wps
@@ -42,13 +42,13 @@
 
 
 
-%al %s%ac%?ia<%ia|Artist?>%ar 
-%al %s%ac%?id<%id|Album?>%ar 
-%al %s%ac%?it<%it|Title?>%ar 
+%al %s%ac%?ia<%ia|%d2>%ar 
+%al %s%ac%?id<%id|%d1>%ar 
+%al %s%ac%?it<%it|%fn>%ar 
 
 
 %ac%t3%ig;%t%iy 
-%pb|5|10|300|178|
+%pb|5|10|310|178|
 %al %pc%ac%?fc<mp1|mp2|mp3|aiff|wav|vorbis|flac|mpc|a52|wavpack|alac|aac|shn|sid|adx|unknown>%ar%pt 
 %?ps<%xdb>
 %?mp<%xdq|%xdp|%xdq|%xdf|%xdr>
diff --git a/wps/Rockboxed/pg-200.bmp b/wps/Rockboxed/pg-200.bmp
new file mode 100644
index 0000000..6477044
--- /dev/null
+++ b/wps/Rockboxed/pg-200.bmp
diff --git a/wps/Rockboxed/pgln-200.bmp b/wps/Rockboxed/pgln-200.bmp
new file mode 100644
index 0000000..9b69523
--- /dev/null
+++ b/wps/Rockboxed/pgln-200.bmp