Bitmap strips for the iAmp theme with the necessary chanes to the .wps files. Add the missing codec icons and one small repeat icon, give 2 bitmaps an a little bit saner name ('l.bmp' > 'line.bmp' and 'i.bmp' > 'iAmp.bmp') and a little bit of code rearrangement for better readability. Proper mime-type for all and hopefully on first try this time. * Delete the iAmp directory on your player if you want to get rid of unused files.

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

73 files changed, 31 insertions, 90 deletions

diff --git a/wps/iAmp.128x64x1.wps b/wps/iAmp.128x64x1.wps
index 85fc5b5..a0f172a 100644
--- a/wps/iAmp.128x64x1.wps
+++ b/wps/iAmp.128x64x1.wps
@@ -1,51 +1,20 @@
+%x|a|iAmp.bmp|100|0|
+%x|b|line.bmp|0|11|
+%x|c|pb.bmp|96|40|
 %wd
 
 %s%?ia<%ia|%d1>
 %s%?it<%?in<%in. >%it|%fn>
 %pb
-%xl|H|a5.bmp|102|48|
-%xl|o|m1.bmp|102|48|
-%xl|p|m2.bmp|102|48|
-%xl|q|m3.bmp|102|48|
-%xl|r|ai.bmp|102|48|
-%xl|s|w.bmp|102|48|
-%xl|t|o.bmp|102|48|
-%xl|u|f.bmp|102|48|
-%xl|w|mc.bmp|102|48|
-%pc/%pt %ar%pp of %pe%t5;%pc/%pt%?fc<%xdo|%xdp|%xdq|%xdr|%xds|%xdt|%xdu|%xdH|%xdw|>%t3;%pc/%pt %ar%?fv<[VBR]|%fbkbps>%t3
-%x|a|i.bmp|100|0|
-%xl|c|b1.bmp|0|0|
-%xl|d|b2.bmp|0|0|
-%xl|e|b3.bmp|0|0|
-%xl|f|b4.bmp|0|0|
-%xl|g|b5.bmp|0|0|
-%xl|h|b.bmp|0|0|
-%?bp<%xdh|%?bl<%xdc|%xdd|%xde|%xdf|%xdg>>
-%xl|i|v1.bmp|24|0|
-%xl|j|v2.bmp|24|0|
-%xl|k|v3.bmp|24|0|
-%xl|l|v4.bmp|24|0|
-%xl|m|v5.bmp|24|0|
-%xl|D|v6.bmp|24|0|
-%xl|E|v7.bmp|24|0|
-%xl|F|v8.bmp|24|0|
-%xl|G|v9.bmp|24|0|
-%?pv<%xdi|%xdi|%xdj|%xdk|%xdl|%xdm|%xdD|%xdE|%xdF|%xdG>
-%xl|n|s.bmp|54|1|
-%xl|K|k.bmp|54|1|
-%xl|I|g.bmp|54|1|
-%xl|L|a.bmp|54|1|
-%xl|J|j.bmp|54|1|
-%?mm<%?ps<%xdn>|%?ps<%xdJ|%xdI>|%xdL|%?ps<%xdK|%xdI>|>
-%xl|x|d.bmp|79|0|
-%xl|y|e.bmp|79|0|
-%xl|b|c.bmp|79|0|
-%?mh<%?mr<%xdb|%xdx>>
-%?mr<%?mh<%xdb|%xdy>>
-%x|z|l.bmp|0|11|
-%xl|A|x.bmp|74|48|
-%xl|B|y.bmp|74|48|
-%xl|C|z.bmp|74|48|
-%?mp<||%xdA|%xdB|%xdC>
-%x|v|pb.bmp|96|40|
-# letters to use: b, M-Z
+%xl|A|codec.bmp|102|48|21|
+%pc/%pt %ar%pp of %pe%t5;%pc/%pt%?fc<%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAf|%xdAg|%xdAh|%xdAi|%xdAj|%xdAk|%xdAl|%xdAm|%xdAn|%xdAo|%xdAp|%xdAq|%xdAr|%xdAs|%xdAt|%xdAu>%t3;%pc/%pt %ar%?fv<[VBR]|%fbkbps>%t3
+%xl|B|battery-small.bmp|0|0|6|
+%?bp<%xdBa|%?bl<%xdBb|%xdBc|%xdBd|%xdBe|%xdBf>>
+%xl|C|volume.bmp|24|0|9|
+%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi>
+%xl|D|repeatshuffle-small.bmp|54|1|6|
+%?mm<%?ps<%xdDa>|%?ps<%xdDb|%xdDc>|%xdDd|%?ps<%xdDe|%xdDc>|%xdDf>
+%xl|E|lock-small.bmp|79|0|3|
+%?mh<%?mr<%xdEa|%xdx>|%?mr<%xdy|>>
+%xl|F|playmode-small.bmp|74|48|3|
+%?mp<||%xdFa|%xdFb|%xdFc>
diff --git a/wps/iAmp.160x128x1.wps b/wps/iAmp.160x128x1.wps
index 0df5b16..ca2122d 100644
--- a/wps/iAmp.160x128x1.wps
+++ b/wps/iAmp.160x128x1.wps
@@ -1,3 +1,7 @@
+%x|a|pb.bmp|128|100|
+%x|b|vl.bmp|27|1|
+%x|c|iAmp.bmp|129|3|
+%x|d|line.bmp|0|14|
 %wd
             %pv
 
@@ -9,47 +13,15 @@
 
 %pb
 %pc/%pt %ar%pp of %pe
-%xl|a|hm.bmp|114|1|
-%xl|z|hr.bmp|114|1|
-%xl|w|h.bmp|114|1|
-%?mh<%?mr<%xdw|%xda>>
-%?mr<%?mh<%xdw|%xdz>>
-%x|L|pb.bmp|128|100|
-%xl|x|w.bmp|68|87|
-%xl|y|ai.bmp|68|87|
-%xl|f|f.bmp|68|87|
-%xl|h|m1.bmp|68|87|
-%xl|i|m2.bmp|68|87|
-%xl|j|m3.bmp|68|87|
-%xl|k|mc.bmp|68|87|
-%xl|l|o.bmp|68|87|
-%xl|H|a5.bmp|68|87|
-%?fc<%xdh|%xdi|%xdj|%xdy|%xdx|%xdl|%xdf|%xdk|%xdH|>
-%xl|e|ff.bmp|76|1|
-%xl|m|pa.bmp|76|1|
-%xl|n|pl.bmp|76|1|
-%xl|t|rw.bmp|76|1|
-%xl|v|st.bmp|76|1|
-%xl|I|ff2.bmp|0|120|
-%xl|J|pa2.bmp|0|120|
-%xl|K|rw2.bmp|0|120|
-%?mp<|%xdn|%xdm|%xde|%xdt>
-%?mp<|%xdn|%xdJ|%xdI|%xdK>
-%xl|u|sh.bmp|90|1|
-%xl|o|re+sh.bmp|90|1|
-%xl|p|re.bmp|90|1|
-%xl|r|re1.bmp|90|1|
-%xl|s|resh.bmp|90|1|
-%xl|c|ab.bmp|90|1|
-%?mm<%?ps<%xdu>|%?ps<%xds|%xdp>|%xdr|%?ps<%xdo|%xdp>|%xdc>
-%x|d|vl.bmp|27|1|
-%x|g|i.bmp|129|3|
-%xl|A|bt1.bmp|1|1|
-%xl|B|bt2.bmp|1|1|
-%xl|C|bt3.bmp|1|1|
-%xl|D|bt4.bmp|1|1|
-%xl|E|bt5.bmp|1|1|
-%x|F|l.bmp|0|14|
-%xl|G|bp.bmp|1|1|
-%?bp<%xdG|%?bl<%xdA|%xdB|%xdC|%xdD|%xdE>>
-# letters to use: b, q, M-Z
+%xl|A|codec.bmp|68|87|21|
+%?fc<%xdAa|%xdAb|%xdAc|%xdAd|%xdAe|%xdAf|%xdAg|%xdAh|%xdAi|%xdAj|%xdAk|%xdAl|%xdAm|%xdAn|%xdAo|%xdAp|%xdAq|%xdAr|%xdAs|%xdAt|%xdAu>
+%xl|B|battery.bmp|1|1|6|
+%?bp<%xdBa|%?bl<%xdBb|%xdBc|%xdBd|%xdBe|%xdBf>>
+%xl|C|lock.bmp|114|1|3|
+%?mh<%?mr<%xdCa|%xdCb>|%?mr<%xdCc|>>
+%xl|D|repeatshuffle.bmp|90|1|6|
+%?mm<%?ps<%xdDa>|%?ps<%xdDb|%xdDc>|%xdDd|%?ps<%xdDe|%xdDc>|%xdDf>
+%xl|E|playmode-bar.bmp|0|120|3|
+%xl|F|playmode.bmp|76|1|5|
+%?mp<||%xdEa|%xdEb|%xdEc>
+%?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe>
diff --git a/wps/iAmp/a.bmp b/wps/iAmp/a.bmp
deleted file mode 100644
index ffad09d..0000000
--- a/wps/iAmp/a.bmp
+++ /dev/null
diff --git a/wps/iAmp/a5.bmp b/wps/iAmp/a5.bmp
deleted file mode 100644
index d8dfc2c..0000000
--- a/wps/iAmp/a5.bmp
+++ /dev/null
diff --git a/wps/iAmp/ab.bmp b/wps/iAmp/ab.bmp
deleted file mode 100644
index 5fdf194..0000000
--- a/wps/iAmp/ab.bmp
+++ /dev/null
diff --git a/wps/iAmp/ai.bmp b/wps/iAmp/ai.bmp
deleted file mode 100644
index 8f00308..0000000
--- a/wps/iAmp/ai.bmp
+++ /dev/null
diff --git a/wps/iAmp/b.bmp b/wps/iAmp/b.bmp
deleted file mode 100644
index 1c42a69..0000000
--- a/wps/iAmp/b.bmp
+++ /dev/null
diff --git a/wps/iAmp/b1.bmp b/wps/iAmp/b1.bmp
deleted file mode 100644
index ee6465f..0000000
--- a/wps/iAmp/b1.bmp
+++ /dev/null
diff --git a/wps/iAmp/b2.bmp b/wps/iAmp/b2.bmp
deleted file mode 100644
index 3f2a6c8..0000000
--- a/wps/iAmp/b2.bmp
+++ /dev/null
diff --git a/wps/iAmp/b3.bmp b/wps/iAmp/b3.bmp
deleted file mode 100644
index 6dba718..0000000
--- a/wps/iAmp/b3.bmp
+++ /dev/null
diff --git a/wps/iAmp/b4.bmp b/wps/iAmp/b4.bmp
deleted file mode 100644
index 6bccbc4..0000000
--- a/wps/iAmp/b4.bmp
+++ /dev/null
diff --git a/wps/iAmp/b5.bmp b/wps/iAmp/b5.bmp
deleted file mode 100644
index e522572..0000000
--- a/wps/iAmp/b5.bmp
+++ /dev/null
diff --git a/wps/iAmp/battery-small.bmp b/wps/iAmp/battery-small.bmp
new file mode 100644
index 0000000..63257b1
--- /dev/null
+++ b/wps/iAmp/battery-small.bmp
diff --git a/wps/iAmp/battery.bmp b/wps/iAmp/battery.bmp
new file mode 100644
index 0000000..97a8c4e
--- /dev/null
+++ b/wps/iAmp/battery.bmp
diff --git a/wps/iAmp/bp.bmp b/wps/iAmp/bp.bmp
deleted file mode 100644
index 99f75f9..0000000
--- a/wps/iAmp/bp.bmp
+++ /dev/null
diff --git a/wps/iAmp/bt1.bmp b/wps/iAmp/bt1.bmp
deleted file mode 100644
index 7ebd919..0000000
--- a/wps/iAmp/bt1.bmp
+++ /dev/null
diff --git a/wps/iAmp/bt2.bmp b/wps/iAmp/bt2.bmp
deleted file mode 100644
index 93eddc8..0000000
--- a/wps/iAmp/bt2.bmp
+++ /dev/null
diff --git a/wps/iAmp/bt3.bmp b/wps/iAmp/bt3.bmp
deleted file mode 100644
index c457829..0000000
--- a/wps/iAmp/bt3.bmp
+++ /dev/null
diff --git a/wps/iAmp/bt4.bmp b/wps/iAmp/bt4.bmp
deleted file mode 100644
index 7a4f83b..0000000
--- a/wps/iAmp/bt4.bmp
+++ /dev/null
diff --git a/wps/iAmp/bt5.bmp b/wps/iAmp/bt5.bmp
deleted file mode 100644
index 503ad94..0000000
--- a/wps/iAmp/bt5.bmp
+++ /dev/null
diff --git a/wps/iAmp/c.bmp b/wps/iAmp/c.bmp
deleted file mode 100644
index 564df1e..0000000
--- a/wps/iAmp/c.bmp
+++ /dev/null
diff --git a/wps/iAmp/codec.bmp b/wps/iAmp/codec.bmp
new file mode 100644
index 0000000..6813a8b
--- /dev/null
+++ b/wps/iAmp/codec.bmp
diff --git a/wps/iAmp/d.bmp b/wps/iAmp/d.bmp
deleted file mode 100644
index a8b5695..0000000
--- a/wps/iAmp/d.bmp
+++ /dev/null
diff --git a/wps/iAmp/e.bmp b/wps/iAmp/e.bmp
deleted file mode 100644
index 35c22a3..0000000
--- a/wps/iAmp/e.bmp
+++ /dev/null
diff --git a/wps/iAmp/f.bmp b/wps/iAmp/f.bmp
deleted file mode 100644
index 680d56c..0000000
--- a/wps/iAmp/f.bmp
+++ /dev/null
diff --git a/wps/iAmp/ff.bmp b/wps/iAmp/ff.bmp
deleted file mode 100644
index 47685e0..0000000
--- a/wps/iAmp/ff.bmp
+++ /dev/null
diff --git a/wps/iAmp/ff2.bmp b/wps/iAmp/ff2.bmp
deleted file mode 100644
index 707bf39..0000000
--- a/wps/iAmp/ff2.bmp
+++ /dev/null
diff --git a/wps/iAmp/g.bmp b/wps/iAmp/g.bmp
deleted file mode 100644
index 2cd1037..0000000
--- a/wps/iAmp/g.bmp
+++ /dev/null
diff --git a/wps/iAmp/h.bmp b/wps/iAmp/h.bmp
deleted file mode 100644
index 689f101..0000000
--- a/wps/iAmp/h.bmp
+++ /dev/null
diff --git a/wps/iAmp/hm.bmp b/wps/iAmp/hm.bmp
deleted file mode 100644
index 870f927..0000000
--- a/wps/iAmp/hm.bmp
+++ /dev/null
diff --git a/wps/iAmp/hr.bmp b/wps/iAmp/hr.bmp
deleted file mode 100644
index b6f7e66..0000000
--- a/wps/iAmp/hr.bmp
+++ /dev/null
diff --git a/wps/iAmp/i.bmp b/wps/iAmp/iAmp.bmp
index 53fa4d5..53fa4d5 100644
--- a/wps/iAmp/i.bmp
+++ b/wps/iAmp/iAmp.bmp
diff --git a/wps/iAmp/j.bmp b/wps/iAmp/j.bmp
deleted file mode 100644
index e1e90b7..0000000
--- a/wps/iAmp/j.bmp
+++ /dev/null
diff --git a/wps/iAmp/k.bmp b/wps/iAmp/k.bmp
deleted file mode 100644
index 8ac7db8..0000000
--- a/wps/iAmp/k.bmp
+++ /dev/null
diff --git a/wps/iAmp/l.bmp b/wps/iAmp/line.bmp
index 7f22a15..7f22a15 100644
--- a/wps/iAmp/l.bmp
+++ b/wps/iAmp/line.bmp
diff --git a/wps/iAmp/lock-small.bmp b/wps/iAmp/lock-small.bmp
new file mode 100644
index 0000000..5675376
--- /dev/null
+++ b/wps/iAmp/lock-small.bmp
diff --git a/wps/iAmp/lock.bmp b/wps/iAmp/lock.bmp
new file mode 100644
index 0000000..7d74b0d
--- /dev/null
+++ b/wps/iAmp/lock.bmp
diff --git a/wps/iAmp/m1.bmp b/wps/iAmp/m1.bmp
deleted file mode 100644
index 31e843a..0000000
--- a/wps/iAmp/m1.bmp
+++ /dev/null
diff --git a/wps/iAmp/m2.bmp b/wps/iAmp/m2.bmp
deleted file mode 100644
index 989d365..0000000
--- a/wps/iAmp/m2.bmp
+++ /dev/null
diff --git a/wps/iAmp/m3.bmp b/wps/iAmp/m3.bmp
deleted file mode 100644
index 5563172..0000000
--- a/wps/iAmp/m3.bmp
+++ /dev/null
diff --git a/wps/iAmp/mc.bmp b/wps/iAmp/mc.bmp
deleted file mode 100644
index 52143c9..0000000
--- a/wps/iAmp/mc.bmp
+++ /dev/null
diff --git a/wps/iAmp/o.bmp b/wps/iAmp/o.bmp
deleted file mode 100644
index 6e69320..0000000
--- a/wps/iAmp/o.bmp
+++ /dev/null
diff --git a/wps/iAmp/pa.bmp b/wps/iAmp/pa.bmp
deleted file mode 100644
index cf74eb8..0000000
--- a/wps/iAmp/pa.bmp
+++ /dev/null
diff --git a/wps/iAmp/pa2.bmp b/wps/iAmp/pa2.bmp
deleted file mode 100644
index 1399540..0000000
--- a/wps/iAmp/pa2.bmp
+++ /dev/null
diff --git a/wps/iAmp/pl.bmp b/wps/iAmp/pl.bmp
deleted file mode 100644
index 9e8223b..0000000
--- a/wps/iAmp/pl.bmp
+++ /dev/null
diff --git a/wps/iAmp/playmode-bar.bmp b/wps/iAmp/playmode-bar.bmp
new file mode 100644
index 0000000..d242b71
--- /dev/null
+++ b/wps/iAmp/playmode-bar.bmp
diff --git a/wps/iAmp/playmode-small.bmp b/wps/iAmp/playmode-small.bmp
new file mode 100644
index 0000000..f2b30d8
--- /dev/null
+++ b/wps/iAmp/playmode-small.bmp
diff --git a/wps/iAmp/playmode.bmp b/wps/iAmp/playmode.bmp
new file mode 100644
index 0000000..a922cf1
--- /dev/null
+++ b/wps/iAmp/playmode.bmp
diff --git a/wps/iAmp/re+sh.bmp b/wps/iAmp/re+sh.bmp
deleted file mode 100644
index bb1f47f..0000000
--- a/wps/iAmp/re+sh.bmp
+++ /dev/null
diff --git a/wps/iAmp/re.bmp b/wps/iAmp/re.bmp
deleted file mode 100644
index 2ef284e..0000000
--- a/wps/iAmp/re.bmp
+++ /dev/null
diff --git a/wps/iAmp/re1.bmp b/wps/iAmp/re1.bmp
deleted file mode 100644
index a12f955..0000000
--- a/wps/iAmp/re1.bmp
+++ /dev/null
diff --git a/wps/iAmp/repeatshuffle-small.bmp b/wps/iAmp/repeatshuffle-small.bmp
new file mode 100644
index 0000000..ac4591b
--- /dev/null
+++ b/wps/iAmp/repeatshuffle-small.bmp
diff --git a/wps/iAmp/repeatshuffle.bmp b/wps/iAmp/repeatshuffle.bmp
new file mode 100644
index 0000000..7013c56
--- /dev/null
+++ b/wps/iAmp/repeatshuffle.bmp
diff --git a/wps/iAmp/resh.bmp b/wps/iAmp/resh.bmp
deleted file mode 100644
index 992401d..0000000
--- a/wps/iAmp/resh.bmp
+++ /dev/null
diff --git a/wps/iAmp/rw.bmp b/wps/iAmp/rw.bmp
deleted file mode 100644
index ee31123..0000000
--- a/wps/iAmp/rw.bmp
+++ /dev/null
diff --git a/wps/iAmp/rw2.bmp b/wps/iAmp/rw2.bmp
deleted file mode 100644
index 1132428..0000000
--- a/wps/iAmp/rw2.bmp
+++ /dev/null
diff --git a/wps/iAmp/s.bmp b/wps/iAmp/s.bmp
deleted file mode 100644
index cfb0099..0000000
--- a/wps/iAmp/s.bmp
+++ /dev/null
diff --git a/wps/iAmp/sh.bmp b/wps/iAmp/sh.bmp
deleted file mode 100644
index 3ad7914..0000000
--- a/wps/iAmp/sh.bmp
+++ /dev/null
diff --git a/wps/iAmp/st.bmp b/wps/iAmp/st.bmp
deleted file mode 100644
index ac632bf..0000000
--- a/wps/iAmp/st.bmp
+++ /dev/null
diff --git a/wps/iAmp/v1.bmp b/wps/iAmp/v1.bmp
deleted file mode 100644
index 122d67b..0000000
--- a/wps/iAmp/v1.bmp
+++ /dev/null
diff --git a/wps/iAmp/v2.bmp b/wps/iAmp/v2.bmp
deleted file mode 100644
index 110daca..0000000
--- a/wps/iAmp/v2.bmp
+++ /dev/null
diff --git a/wps/iAmp/v3.bmp b/wps/iAmp/v3.bmp
deleted file mode 100644
index 7821b8d..0000000
--- a/wps/iAmp/v3.bmp
+++ /dev/null
diff --git a/wps/iAmp/v4.bmp b/wps/iAmp/v4.bmp
deleted file mode 100644
index 3390474..0000000
--- a/wps/iAmp/v4.bmp
+++ /dev/null
diff --git a/wps/iAmp/v5.bmp b/wps/iAmp/v5.bmp
deleted file mode 100644
index b7aa31a..0000000
--- a/wps/iAmp/v5.bmp
+++ /dev/null
diff --git a/wps/iAmp/v6.bmp b/wps/iAmp/v6.bmp
deleted file mode 100644
index 989adca..0000000
--- a/wps/iAmp/v6.bmp
+++ /dev/null
diff --git a/wps/iAmp/v7.bmp b/wps/iAmp/v7.bmp
deleted file mode 100644
index b98ad52..0000000
--- a/wps/iAmp/v7.bmp
+++ /dev/null
diff --git a/wps/iAmp/v8.bmp b/wps/iAmp/v8.bmp
deleted file mode 100644
index fa0afec..0000000
--- a/wps/iAmp/v8.bmp
+++ /dev/null
diff --git a/wps/iAmp/v9.bmp b/wps/iAmp/v9.bmp
deleted file mode 100644
index ad7cbed..0000000
--- a/wps/iAmp/v9.bmp
+++ /dev/null
diff --git a/wps/iAmp/volume.bmp b/wps/iAmp/volume.bmp
new file mode 100644
index 0000000..d558e91
--- /dev/null
+++ b/wps/iAmp/volume.bmp
diff --git a/wps/iAmp/w.bmp b/wps/iAmp/w.bmp
deleted file mode 100644
index b18dde5..0000000
--- a/wps/iAmp/w.bmp
+++ /dev/null
diff --git a/wps/iAmp/x.bmp b/wps/iAmp/x.bmp
deleted file mode 100644
index 3f73557..0000000
--- a/wps/iAmp/x.bmp
+++ /dev/null
diff --git a/wps/iAmp/y.bmp b/wps/iAmp/y.bmp
deleted file mode 100644
index 9e03ae1..0000000
--- a/wps/iAmp/y.bmp
+++ /dev/null
diff --git a/wps/iAmp/z.bmp b/wps/iAmp/z.bmp
deleted file mode 100644
index db5dc63..0000000
--- a/wps/iAmp/z.bmp
+++ /dev/null