iCatcher updates: 1) Add APE icon for Monkey's Audio files; 2) Use a backdrop on greyscale targets to free some image tags (thanks to Marianne Arnold for the suggestion). However, there are still five codecs without icons (SID, ADX, NSF, Speex and SPC), and only two free image slots left...

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

20 files changed, 20 insertions, 19 deletions

diff --git a/wps/iCatcher.128x128x16.wps b/wps/iCatcher.128x128x16.wps
index 9cb5970..d841f6d 100644
--- a/wps/iCatcher.128x128x16.wps
+++ b/wps/iCatcher.128x128x16.wps
@@ -69,4 +69,5 @@
 %xl|X|codec-aac-sc.bmp|92|88|
 %xl|Y|codec-shorten-sc.bmp|92|88|
 %xl|Z|codec-unknown-sc.bmp|92|88|
-%?fc<%xdr|%xds|%xdt|%xdu|%xdv|%xdw|%xdx|%xdy|%xdz|%xdV|%xdW|%xdX|%xdY|%xdZ>
+%xl|Q|codec-ape-sc.bmp|92|88|
+%?fc<%xdr|%xds|%xdt|%xdu|%xdv|%xdw|%xdx|%xdy|%xdz|%xdV|%xdW|%xdX|%xdY|%xdZ|%xdZ|%xdZ|%xdZ|%xdZ|%xdQ>
diff --git a/wps/iCatcher.138x110x2.wps b/wps/iCatcher.138x110x2.wps
index ee551da..dfbfbb6 100644
--- a/wps/iCatcher.138x110x2.wps
+++ b/wps/iCatcher.138x110x2.wps
@@ -1,4 +1,5 @@
 %wd
+%X|bg-138x110x2.bmp|
 
 
 
@@ -68,8 +69,5 @@
 %xl|X|codec-aac-g.bmp|95|66|
 %xl|Y|codec-shorten-g.bmp|95|66|
 %xl|Z|codec-unknown-g.bmp|95|66|
-%?fc<%xdr|%xds|%xdt|%xdu|%xdv|%xdw|%xdx|%xdy|%xdz|%xdV|%xdW|%xdX|%xdY|%xdZ>
-%xl|F|upbar-138.bmp|0|0|
-%xl|J|bottomline-138.bmp|0|92|
-%xl|Q|batlevel.bmp|4|32|
-%xdF%xdJ%xdQ
+%xl|Q|codec-ape-g.bmp|95|66|
+%?fc<%xdr|%xds|%xdt|%xdu|%xdv|%xdw|%xdx|%xdy|%xdz|%xdV|%xdW|%xdX|%xdY|%xdZ|%xdZ|%xdZ|%xdZ|%xdZ|%xdQ>
diff --git a/wps/iCatcher.160x128x16.wps b/wps/iCatcher.160x128x16.wps
index da7c624..e59d986 100644
--- a/wps/iCatcher.160x128x16.wps
+++ b/wps/iCatcher.160x128x16.wps
@@ -72,4 +72,5 @@
 %xl|X|codec-aac.bmp|115|85|
 %xl|Y|codec-shorten.bmp|115|85|
 %xl|Z|codec-unknown.bmp|115|85|
-%?fc<%xdr|%xds|%xdt|%xdu|%xdv|%xdw|%xdx|%xdy|%xdz|%xdV|%xdW|%xdX|%xdY|%xdZ>
+%xl|Q|codec-ape.bmp|115|85|
+%?fc<%xdr|%xds|%xdt|%xdu|%xdv|%xdw|%xdx|%xdy|%xdz|%xdV|%xdW|%xdX|%xdY|%xdZ|%xdZ|%xdZ|%xdZ|%xdZ|%xdQ>
diff --git a/wps/iCatcher.160x128x2.wps b/wps/iCatcher.160x128x2.wps
index 9a82863..17578d9 100644
--- a/wps/iCatcher.160x128x2.wps
+++ b/wps/iCatcher.160x128x2.wps
@@ -1,4 +1,5 @@
 %wd
+%X|bg-160x128x2.bmp|
 
 
 
@@ -69,10 +70,5 @@
 %xl|X|codec-aac-g.bmp|115|85|
 %xl|Y|codec-shorten-g.bmp|115|85|
 %xl|Z|codec-unknown-g.bmp|115|85|
-%?fc<%xdr|%xds|%xdt|%xdu|%xdv|%xdw|%xdx|%xdy|%xdz|%xdV|%xdW|%xdX|%xdY|%xdZ>
-%xl|F|upbar-160.bmp|0|0|
-%xl|J|bottomline-160.bmp|0|111|
-%xl|Q|batlevel.bmp|4|36|
-%xdF
-%xdJ
-%xdQ
+%xl|Q|codec-ape-g.bmp|115|85|
+%?fc<%xdr|%xds|%xdt|%xdu|%xdv|%xdw|%xdx|%xdy|%xdz|%xdV|%xdW|%xdX|%xdY|%xdZ|%xdZ|%xdZ|%xdZ|%xdZ|%xdQ>
diff --git a/wps/iCatcher.176x132x16.wps b/wps/iCatcher.176x132x16.wps
index 7c3f3eb..b907d32 100644
--- a/wps/iCatcher.176x132x16.wps
+++ b/wps/iCatcher.176x132x16.wps
@@ -72,4 +72,5 @@
 %xl|X|codec-aac.bmp|131|85|
 %xl|Y|codec-shorten.bmp|131|85|
 %xl|Z|codec-unknown.bmp|131|85|
-%?fc<%xdr|%xds|%xdt|%xdu|%xdv|%xdw|%xdx|%xdy|%xdz|%xdV|%xdW|%xdX|%xdY|%xdZ>
+%xl|Q|codec-ape.bmp|131|85|
+%?fc<%xdr|%xds|%xdt|%xdu|%xdv|%xdw|%xdx|%xdy|%xdz|%xdV|%xdW|%xdX|%xdY|%xdZ|%xdZ|%xdZ|%xdZ|%xdZ|%xdQ>
diff --git a/wps/iCatcher.176x220x16.wps b/wps/iCatcher.176x220x16.wps
index b711401..205eee4 100644
--- a/wps/iCatcher.176x220x16.wps
+++ b/wps/iCatcher.176x220x16.wps
@@ -76,4 +76,5 @@
 %xl|X|codec-aac.bmp|131|167|
 %xl|Y|codec-shorten.bmp|131|167|
 %xl|Z|codec-unknown.bmp|131|167|
-%?fc<%xdr|%xds|%xdt|%xdu|%xdv|%xdw|%xdx|%xdy|%xdz|%xdV|%xdW|%xdX|%xdY|%xdZ>
+%xl|Q|codec-ape.bmp|131|167|
+%?fc<%xdr|%xds|%xdt|%xdu|%xdv|%xdw|%xdx|%xdy|%xdz|%xdV|%xdW|%xdX|%xdY|%xdZ|%xdZ|%xdZ|%xdZ|%xdZ|%xdQ>
diff --git a/wps/iCatcher.220x176x16.wps b/wps/iCatcher.220x176x16.wps
index e41560c..cd1dad3 100644
--- a/wps/iCatcher.220x176x16.wps
+++ b/wps/iCatcher.220x176x16.wps
@@ -70,4 +70,5 @@
 %xl|X|codec-aac.bmp|173|112|
 %xl|Y|codec-shorten.bmp|173|112|
 %xl|Z|codec-unknown.bmp|173|112|
-%?fc<%xdr|%xds|%xdt|%xdu|%xdv|%xdw|%xdx|%xdy|%xdz|%xdV|%xdW|%xdX|%xdY|%xdZ>
+%xl|Q|codec-ape.bmp|173|112|
+%?fc<%xdr|%xds|%xdt|%xdu|%xdv|%xdw|%xdx|%xdy|%xdz|%xdV|%xdW|%xdX|%xdY|%xdZ|%xdZ|%xdZ|%xdZ|%xdZ|%xdQ>
diff --git a/wps/iCatcher.240x320x16.wps b/wps/iCatcher.240x320x16.wps
index c68e8de..1a220a0 100644
--- a/wps/iCatcher.240x320x16.wps
+++ b/wps/iCatcher.240x320x16.wps
@@ -74,4 +74,5 @@
 %xl|X|codec-aac-b.bmp|168|229|
 %xl|Y|codec-shorten-b.bmp|168|229|
 %xl|Z|codec-unknown-b.bmp|168|229|
-%?fc<%xdr|%xds|%xdt|%xdu|%xdv|%xdw|%xdx|%xdy|%xdz|%xdV|%xdW|%xdX|%xdY|%xdZ>
+%xl|Q|codec-ape-b.bmp|168|229|
+%?fc<%xdr|%xds|%xdt|%xdu|%xdv|%xdw|%xdx|%xdy|%xdz|%xdV|%xdW|%xdX|%xdY|%xdZ|%xdZ|%xdZ|%xdZ|%xdZ|%xdQ>
diff --git a/wps/iCatcher.320x240x16.wps b/wps/iCatcher.320x240x16.wps
index 30c71ad..c1ad31f 100644
--- a/wps/iCatcher.320x240x16.wps
+++ b/wps/iCatcher.320x240x16.wps
@@ -70,4 +70,5 @@
 %xl|X|codec-aac-b.bmp|248|153|
 %xl|Y|codec-shorten-b.bmp|248|153|
 %xl|Z|codec-unknown-b.bmp|248|153|
-%?fc<%xdr|%xds|%xdt|%xdu|%xdv|%xdw|%xdx|%xdy|%xdz|%xdV|%xdW|%xdX|%xdY|%xdZ>
+%xl|Q|codec-ape-b.bmp|248|153|
+%?fc<%xdr|%xds|%xdt|%xdu|%xdv|%xdw|%xdx|%xdy|%xdz|%xdV|%xdW|%xdX|%xdY|%xdZ|%xdZ|%xdZ|%xdZ|%xdZ|%xdQ>
diff --git a/wps/iCatcher/batlevel.bmp b/wps/iCatcher/batlevel.bmp
deleted file mode 100644
index 9e23095..0000000
--- a/wps/iCatcher/batlevel.bmp
+++ /dev/null
diff --git a/wps/iCatcher/bg-138x110x2.bmp b/wps/iCatcher/bg-138x110x2.bmp
new file mode 100644
index 0000000..7a193df
--- /dev/null
+++ b/wps/iCatcher/bg-138x110x2.bmp
diff --git a/wps/iCatcher/bg-160x128x2.bmp b/wps/iCatcher/bg-160x128x2.bmp
new file mode 100644
index 0000000..b0d420b
--- /dev/null
+++ b/wps/iCatcher/bg-160x128x2.bmp
diff --git a/wps/iCatcher/bottomline-138.bmp b/wps/iCatcher/bottomline-138.bmp
deleted file mode 100644
index b668ba2..0000000
--- a/wps/iCatcher/bottomline-138.bmp
+++ /dev/null
diff --git a/wps/iCatcher/bottomline-160.bmp b/wps/iCatcher/bottomline-160.bmp
deleted file mode 100644
index d347add..0000000
--- a/wps/iCatcher/bottomline-160.bmp
+++ /dev/null
diff --git a/wps/iCatcher/codec-ape-b.bmp b/wps/iCatcher/codec-ape-b.bmp
new file mode 100644
index 0000000..4390e62
--- /dev/null
+++ b/wps/iCatcher/codec-ape-b.bmp
diff --git a/wps/iCatcher/codec-ape-g.bmp b/wps/iCatcher/codec-ape-g.bmp
new file mode 100644
index 0000000..b419d26
--- /dev/null
+++ b/wps/iCatcher/codec-ape-g.bmp
diff --git a/wps/iCatcher/codec-ape-sc.bmp b/wps/iCatcher/codec-ape-sc.bmp
new file mode 100644
index 0000000..b7989b8
--- /dev/null
+++ b/wps/iCatcher/codec-ape-sc.bmp
diff --git a/wps/iCatcher/codec-ape.bmp b/wps/iCatcher/codec-ape.bmp
new file mode 100644
index 0000000..b940b5d
--- /dev/null
+++ b/wps/iCatcher/codec-ape.bmp
diff --git a/wps/iCatcher/upbar-138.bmp b/wps/iCatcher/upbar-138.bmp
deleted file mode 100644
index 5d6ca1e..0000000
--- a/wps/iCatcher/upbar-138.bmp
+++ /dev/null
diff --git a/wps/iCatcher/upbar-160.bmp b/wps/iCatcher/upbar-160.bmp
deleted file mode 100644
index daaab2d..0000000
--- a/wps/iCatcher/upbar-160.bmp
+++ /dev/null