Cleanup the next WPS bitmap directory by using bitmap strips for the 'ipodVOL' theme which is only made for targets with a 160x128 screen... This also adds a missing repeat icon, integrates the statically displayed vol.bmp into the already full screen sized background picture so it's not needed anymore, deletes an unnecessary bitmap (blank.bmp) and simplifies the code a little bit. * Again: delete the 'ipodVOL' directory before updating the build keeps it clean.

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

21 files changed, 10 insertions, 23 deletions

diff --git a/wps/ipodVOL.160x128x1.wps b/wps/ipodVOL.160x128x1.wps
index aac676c615..626dd9b404 100644
--- a/wps/ipodVOL.160x128x1.wps
+++ b/wps/ipodVOL.160x128x1.wps
@@ -1,23 +1,10 @@
-%xl|y|play.bmp|0|2|
-%xl|p|pause.bmp|0|2|
-%xl|f|ffwd.bmp|0|2|
-%xl|v|rev.bmp|0|2|
-%xl|h|hold.bmp|20|2|
-%xl|b|blank.bmp|20|2|
-%xl|r|rep.bmp|141|18|
-%xl|s|reps.bmp|141|18|
-%xl|t|rep1.bmp|141|18|
-%xl|x|repb.bmp|141|18|
-%xl|A|be.bmp|136|2|
-%xl|B|bqe.bmp|136|2|
-%xl|C|bh.bmp|136|2|
-%xl|D|bqf.bmp|136|2|
-%xl|E|bf.bmp|136|2|
-%xl|F|bfp.bmp|136|2|
-%x|V|vol.bmp|60|109|
-%x|g|bg.bmp|0|0|
+%xl|A|playmode.bmp|0|2|4|
+%xl|B|hold.bmp|20|2|
+%xl|C|repeat.bmp|141|18|4|
+%xl|D|battery.bmp|136|2|6|
+%x|a|bg.bmp|0|0|
 %wd
-%ac%?mp<Now Stopped|Now Playing %?ps<(S)|>|Now Paused %?ps<(S)|>|Now Playing %?ps<(S)|>|Now Playing %?ps<(S)|>>
+%ac%?mp<Now Stopped|Now Playing|Now Paused|Now Playing|Now Playing>%?mp<|%?ps< (S)|>>
 
 %al%pp of %pe 
 
@@ -27,7 +14,7 @@
 
 %pb
 %al%pc %ac      %pv %ar-%pr
-%?mp<|%xdy|%xdp|%xdf|%xdv>
-%?mh<%xdh|%xdb>
-%?bp<%xdF|%?bl<%xdA|%xdB|%xdC|%xdD|%xdE>>
-%?mm<%xdx|%xdr|%xdt|%xds>
+%?mp<|%xdAa|%xdAb|%xdAc|%xdAd>
+%?mh<%xdB|>
+%?bp<%xdDa|%?bl<%xdDb|%xdDc|%xdDd|%xdDe|%xdDf>>
+%?mm<|%xdCa|%xdCb|%xdCc|%xdCd>
diff --git a/wps/ipodVOL/battery.bmp b/wps/ipodVOL/battery.bmp
new file mode 100644
index 0000000000..e3ae1136eb
--- /dev/null
+++ b/wps/ipodVOL/battery.bmp
diff --git a/wps/ipodVOL/be.bmp b/wps/ipodVOL/be.bmp
deleted file mode 100644
index 2c4cb60615..0000000000
--- a/wps/ipodVOL/be.bmp
+++ /dev/null
diff --git a/wps/ipodVOL/bf.bmp b/wps/ipodVOL/bf.bmp
deleted file mode 100644
index d42c65b1ab..0000000000
--- a/wps/ipodVOL/bf.bmp
+++ /dev/null
diff --git a/wps/ipodVOL/bfp.bmp b/wps/ipodVOL/bfp.bmp
deleted file mode 100644
index 2f921aa998..0000000000
--- a/wps/ipodVOL/bfp.bmp
+++ /dev/null
diff --git a/wps/ipodVOL/bg.bmp b/wps/ipodVOL/bg.bmp
index d3dd4219da..6592ecd6dc 100644
--- a/wps/ipodVOL/bg.bmp
+++ b/wps/ipodVOL/bg.bmp
diff --git a/wps/ipodVOL/bh.bmp b/wps/ipodVOL/bh.bmp
deleted file mode 100644
index ddc9d4162f..0000000000
--- a/wps/ipodVOL/bh.bmp
+++ /dev/null
diff --git a/wps/ipodVOL/blank.bmp b/wps/ipodVOL/blank.bmp
deleted file mode 100644
index dbc2327a3e..0000000000
--- a/wps/ipodVOL/blank.bmp
+++ /dev/null
diff --git a/wps/ipodVOL/bqe.bmp b/wps/ipodVOL/bqe.bmp
deleted file mode 100644
index 29c23938af..0000000000
--- a/wps/ipodVOL/bqe.bmp
+++ /dev/null
diff --git a/wps/ipodVOL/bqf.bmp b/wps/ipodVOL/bqf.bmp
deleted file mode 100644
index 261da3f8f9..0000000000
--- a/wps/ipodVOL/bqf.bmp
+++ /dev/null
diff --git a/wps/ipodVOL/ffwd.bmp b/wps/ipodVOL/ffwd.bmp
deleted file mode 100644
index e53bdfc84a..0000000000
--- a/wps/ipodVOL/ffwd.bmp
+++ /dev/null
diff --git a/wps/ipodVOL/pause.bmp b/wps/ipodVOL/pause.bmp
deleted file mode 100644
index 06425a7f39..0000000000
--- a/wps/ipodVOL/pause.bmp
+++ /dev/null
diff --git a/wps/ipodVOL/play.bmp b/wps/ipodVOL/play.bmp
deleted file mode 100644
index 687bc14758..0000000000
--- a/wps/ipodVOL/play.bmp
+++ /dev/null
diff --git a/wps/ipodVOL/playmode.bmp b/wps/ipodVOL/playmode.bmp
new file mode 100644
index 0000000000..fb9fef7a30
--- /dev/null
+++ b/wps/ipodVOL/playmode.bmp
diff --git a/wps/ipodVOL/rep.bmp b/wps/ipodVOL/rep.bmp
deleted file mode 100644
index 0338aec238..0000000000
--- a/wps/ipodVOL/rep.bmp
+++ /dev/null
diff --git a/wps/ipodVOL/rep1.bmp b/wps/ipodVOL/rep1.bmp
deleted file mode 100644
index 98a9868d2a..0000000000
--- a/wps/ipodVOL/rep1.bmp
+++ /dev/null
diff --git a/wps/ipodVOL/repb.bmp b/wps/ipodVOL/repb.bmp
deleted file mode 100644
index c94f2aba19..0000000000
--- a/wps/ipodVOL/repb.bmp
+++ /dev/null
diff --git a/wps/ipodVOL/repeat.bmp b/wps/ipodVOL/repeat.bmp
new file mode 100644
index 0000000000..02e6a85e47
--- /dev/null
+++ b/wps/ipodVOL/repeat.bmp
diff --git a/wps/ipodVOL/reps.bmp b/wps/ipodVOL/reps.bmp
deleted file mode 100644
index 0445e25fe2..0000000000
--- a/wps/ipodVOL/reps.bmp
+++ /dev/null
diff --git a/wps/ipodVOL/rev.bmp b/wps/ipodVOL/rev.bmp
deleted file mode 100644
index 2f880a643f..0000000000
--- a/wps/ipodVOL/rev.bmp
+++ /dev/null
diff --git a/wps/ipodVOL/vol.bmp b/wps/ipodVOL/vol.bmp
deleted file mode 100644
index 862c7d02c5..0000000000
--- a/wps/ipodVOL/vol.bmp
+++ /dev/null