Cabbiev2 greyscale versions (138x110 and 160x128): new icons which are a bit more like the colour ones (size-wise and looking 3D) and already using the new bitmap strip feature. Also convert the line endings of the two .wps files to unix style.

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

43 files changed, 44 insertions, 95 deletions

diff --git a/wps/cabbiev2.138x110x2.wps b/wps/cabbiev2.138x110x2.wps
index 22b4f6f339..0112b479c7 100644
--- a/wps/cabbiev2.138x110x2.wps
+++ b/wps/cabbiev2.138x110x2.wps
@@ -5,38 +5,12 @@
 %wd
 %X|wpsbackdrop-138x110x2.bmp|
 %P|pb-138x110x2.bmp|
-%xl|A|lockclosed-160x128x2.bmp|2|96|
-%xl|B|lockopen-160x128x2.bmp|2|96|
-%xl|C|battpl-160x128x2.bmp|26|98|
-%xl|D|battch-160x128x2.bmp|26|98|
-%xl|E|batt00-160x128x2.bmp|26|98|
-%xl|F|batt01-160x128x2.bmp|26|98|
-%xl|G|batt02-160x128x2.bmp|26|98|
-%xl|H|batt03-160x128x2.bmp|26|98|
-%xl|I|batt04-160x128x2.bmp|26|98|
-%xl|J|batt05-160x128x2.bmp|26|98|
-%xl|K|batt06-160x128x2.bmp|26|98|
-%xl|L|batt07-160x128x2.bmp|26|98|
-%xl|M|vol0-160x128x2.bmp|54|98|
-%xl|N|vol1-160x128x2.bmp|54|98|
-%xl|O|vol2-160x128x2.bmp|54|98|
-%xl|P|vol3-160x128x2.bmp|54|98|
-%xl|p|vol4-160x128x2.bmp|54|98|
-%xl|q|vol5-160x128x2.bmp|54|98|
-%xl|r|vol6-160x128x2.bmp|54|98|
-%xl|s|vol7-160x128x2.bmp|54|98|
-%xl|t|vol8-160x128x2.bmp|54|98|
-%xl|u|vol9-160x128x2.bmp|54|98|
-%xl|Q|shuffle-160x128x2.bmp|86|97|
-%xl|R|repeatall-160x128x2.bmp|107|95|
-%xl|S|repeatone-160x128x2.bmp|107|95|
-%xl|T|repeatshuffle-160x128x2.bmp|107|95|
-%xl|U|repeatab-160x128x2.bmp|107|95|
-%xl|V|stop-160x128x2.bmp|124|97|
-%xl|W|play-160x128x2.bmp|124|97|
-%xl|X|pause-160x128x2.bmp|124|97|
-%xl|Y|ff-160x128x2.bmp|124|97|
-%xl|Z|rew-160x128x2.bmp|124|97|
+%xl|A|lock-160x128x2.bmp|4|98|2|
+%xl|B|battery-160x128x2.bmp|28|99|10|
+%xl|C|volume-160x128x2.bmp|53|98|10|
+%xl|D|shuffle-160x128x2.bmp|78|97|
+%xl|E|repeat-160x128x2.bmp|102|97|4|
+%xl|F|playmode-160x128x2.bmp|123|98|5|
 %Cl|5|15|s55|s55|
 %pb|6|2|136|75|
 %?C<%s%m|65|%al%?it<%it|%fn>|%s%ac%?it<%it|%fn>>
@@ -46,10 +20,10 @@
 %?C<%s%m|65|%al%?It<%It|%Fn>|%s%ac%?It<%It|%Fn>>
 
 %al %pc%ac%pp of %pe%ar%pr 
-%?mh<%xdA|%xdB>
-%?bp<%?bc<%xdD|%xdC>|%?bl<|%xdE|%xdF|%xdG|%xdH|%xdI|%xdJ|%xdK|%xdL>>
-%?pv<%xdM|%xdN|%xdO|%xdP|%xdp|%xdq|%xdr|%xds|%xdt|%xdu>
-%?ps<%xdQ>
-%?mm<|%xdR|%xdS|%xdT|%xdU>
-%?mp<%xdV|%xdW|%xdX|%xdY|%xdZ>
+%?mh<%xdAa|%xdAb>
+%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>>
+%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj>
+%?ps<%xdD>
+%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
+%?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe>
 %?C<%C>
diff --git a/wps/cabbiev2.160x128x2.wps b/wps/cabbiev2.160x128x2.wps
index e57675c5d7..6307129407 100644
--- a/wps/cabbiev2.160x128x2.wps
+++ b/wps/cabbiev2.160x128x2.wps
@@ -1,57 +1,32 @@
-# cabbie 2.0 default

-# 160*128 greyscale port by Mark Fawcus (yapper)

-# works with 64*64 album art if present

-# (C) 2007, Johannes Voggenthaler (Zinc Alloy)

-# derived from "cabbie" (C) Yohann Misquitta

-%wd

-%X|wpsbackdrop-160x128x2.bmp|

-%P|pb-160x128x2.bmp|

-%xl|A|lockclosed-160x128x2.bmp|56|114|

-%xl|B|lockopen-160x128x2.bmp|56|114|

-%xl|C|battpl-160x128x2.bmp|74|115|

-%xl|D|battch-160x128x2.bmp|74|115|

-%xl|E|batt00-160x128x2.bmp|74|115|

-%xl|F|batt01-160x128x2.bmp|74|115|

-%xl|G|batt02-160x128x2.bmp|74|115|

-%xl|H|batt03-160x128x2.bmp|74|115|

-%xl|I|batt04-160x128x2.bmp|74|115|

-%xl|J|batt05-160x128x2.bmp|74|115|

-%xl|K|batt06-160x128x2.bmp|74|115|

-%xl|L|batt07-160x128x2.bmp|74|115|

-%xl|M|vol0-160x128x2.bmp|95|115|

-%xl|N|vol1-160x128x2.bmp|95|115|

-%xl|O|vol2-160x128x2.bmp|95|115|

-%xl|P|vol3-160x128x2.bmp|95|115|

-%xl|p|vol4-160x128x2.bmp|95|115|

-%xl|q|vol5-160x128x2.bmp|95|115|

-%xl|r|vol6-160x128x2.bmp|95|115|

-%xl|s|vol7-160x128x2.bmp|95|115|

-%xl|t|vol8-160x128x2.bmp|95|115|

-%xl|u|vol9-160x128x2.bmp|95|115|

-%xl|Q|shuffle-160x128x2.bmp|117|115|

-%xl|R|repeatall-160x128x2.bmp|131|113|

-%xl|S|repeatone-160x128x2.bmp|131|113|

-%xl|T|repeatshuffle-160x128x2.bmp|131|113|

-%xl|U|repeatab-160x128x2.bmp|131|114|

-%xl|V|stop-160x128x2.bmp|145|114|

-%xl|W|play-160x128x2.bmp|145|114|

-%xl|X|pause-160x128x2.bmp|145|114|

-%xl|Y|ff-160x128x2.bmp|145|114|

-%xl|Z|rew-160x128x2.bmp|145|114|

-%Cl|2|16|s64|s64|

-%pb|8|1|159|86|

-%?C<%s%m|70|%al%?it<%it|%fn>|%s%ac%?it<%it|%fn>>

-%?C<%s%m|70|%al%?ia<%ia|%?d2<%d2|(root)>>|%s%ac%?ia<%ia|%?d2<%d2|(root)>>>

-%?C<%s%m|70|%al%?id<%id|%?d1<%d1|(root)>>|%s%ac%?id<%id|%?d1<%d1|(root)>>>

-

-%?C<%s%m|70|%alNext Track:|%s%acNext Track:>

-%?C<%s%m|70|%al%?It<%It|%Fn>|%s%ac%?It<%It|%Fn>>

-

-%al %pc%ac%pp of %pe%ar%pr 

-%?mh<%xdA|%xdB>

-%?bp<%?bc<%xdD|%xdC>|%?bl<|%xdE|%xdF|%xdG|%xdH|%xdI|%xdJ|%xdK|%xdL>>

-%?pv<%xdM|%xdN|%xdO|%xdP|%xdp|%xdq|%xdr|%xds|%xdt|%xdu>

-%?ps<%xdQ>

-%?mm<|%xdR|%xdS|%xdT|%xdU>

-%?mp<%xdV|%xdW|%xdX|%xdY|%xdZ>

-%?C<%C>

+# cabbie 2.0 default
+# 160*128 greyscale port by Mark Fawcus (yapper)
+# works with 64*64 album art if present
+# (C) 2007, Johannes Voggenthaler (Zinc Alloy)
+# derived from "cabbie" (C) Yohann Misquitta
+%wd
+%X|wpsbackdrop-160x128x2.bmp|
+%P|pb-160x128x2.bmp|
+%xl|A|lock-160x128x2.bmp|48|114|2|
+%xl|B|battery-160x128x2.bmp|66|115|10|
+%xl|C|volume-160x128x2.bmp|87|114|10|
+%xl|D|shuffle-160x128x2.bmp|107|115|
+%xl|E|repeat-160x128x2.bmp|127|113|4|
+%xl|F|playmode-160x128x2.bmp|145|114|5|
+%Cl|2|16|s64|s64|
+%pb|8|1|159|86|
+%?C<%s%m|70|%al%?it<%it|%fn>|%s%ac%?it<%it|%fn>>
+%?C<%s%m|70|%al%?ia<%ia|%?d2<%d2|(root)>>|%s%ac%?ia<%ia|%?d2<%d2|(root)>>>
+%?C<%s%m|70|%al%?id<%id|%?d1<%d1|(root)>>|%s%ac%?id<%id|%?d1<%d1|(root)>>>
+
+%?C<%s%m|70|%alNext Track:|%s%acNext Track:>
+%?C<%s%m|70|%al%?It<%It|%Fn>|%s%ac%?It<%It|%Fn>>
+
+%al %pc%ac%pp of %pe%ar%pr 
+%?mh<%xdAa|%xdAb>
+%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>>
+%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj>
+%?ps<%xdD>
+%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
+%?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe>
+%?C<%C>
+
diff --git a/wps/cabbiev2/batt00-160x128x2.bmp b/wps/cabbiev2/batt00-160x128x2.bmp
deleted file mode 100644
index 7d72718726..0000000000
--- a/wps/cabbiev2/batt00-160x128x2.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt01-160x128x2.bmp b/wps/cabbiev2/batt01-160x128x2.bmp
deleted file mode 100644
index a24325e868..0000000000
--- a/wps/cabbiev2/batt01-160x128x2.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt02-160x128x2.bmp b/wps/cabbiev2/batt02-160x128x2.bmp
deleted file mode 100644
index 63d13f6f08..0000000000
--- a/wps/cabbiev2/batt02-160x128x2.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt03-160x128x2.bmp b/wps/cabbiev2/batt03-160x128x2.bmp
deleted file mode 100644
index 5f6aceffa6..0000000000
--- a/wps/cabbiev2/batt03-160x128x2.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt04-160x128x2.bmp b/wps/cabbiev2/batt04-160x128x2.bmp
deleted file mode 100644
index 0074d42a15..0000000000
--- a/wps/cabbiev2/batt04-160x128x2.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt05-160x128x2.bmp b/wps/cabbiev2/batt05-160x128x2.bmp
deleted file mode 100644
index 37ca3c9286..0000000000
--- a/wps/cabbiev2/batt05-160x128x2.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt06-160x128x2.bmp b/wps/cabbiev2/batt06-160x128x2.bmp
deleted file mode 100644
index 803ceaf942..0000000000
--- a/wps/cabbiev2/batt06-160x128x2.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/batt07-160x128x2.bmp b/wps/cabbiev2/batt07-160x128x2.bmp
deleted file mode 100644
index c7b369d7eb..0000000000
--- a/wps/cabbiev2/batt07-160x128x2.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/battch-160x128x2.bmp b/wps/cabbiev2/battch-160x128x2.bmp
deleted file mode 100644
index 429ee2d1d5..0000000000
--- a/wps/cabbiev2/battch-160x128x2.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/battery-160x128x2.bmp b/wps/cabbiev2/battery-160x128x2.bmp
new file mode 100644
index 0000000000..7cc6f9972a
--- /dev/null
+++ b/wps/cabbiev2/battery-160x128x2.bmp
diff --git a/wps/cabbiev2/battpl-160x128x2.bmp b/wps/cabbiev2/battpl-160x128x2.bmp
deleted file mode 100644
index d32b50cb0b..0000000000
--- a/wps/cabbiev2/battpl-160x128x2.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/ff-160x128x2.bmp b/wps/cabbiev2/ff-160x128x2.bmp
deleted file mode 100644
index b99b635e4c..0000000000
--- a/wps/cabbiev2/ff-160x128x2.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/lock-160x128x2.bmp b/wps/cabbiev2/lock-160x128x2.bmp
new file mode 100644
index 0000000000..d02c84c0b2
--- /dev/null
+++ b/wps/cabbiev2/lock-160x128x2.bmp
diff --git a/wps/cabbiev2/lockclosed-160x128x2.bmp b/wps/cabbiev2/lockclosed-160x128x2.bmp
deleted file mode 100644
index 6af64f246c..0000000000
--- a/wps/cabbiev2/lockclosed-160x128x2.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/lockopen-160x128x2.bmp b/wps/cabbiev2/lockopen-160x128x2.bmp
deleted file mode 100644
index b458a25c68..0000000000
--- a/wps/cabbiev2/lockopen-160x128x2.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/pause-160x128x2.bmp b/wps/cabbiev2/pause-160x128x2.bmp
deleted file mode 100644
index a2f15be0e4..0000000000
--- a/wps/cabbiev2/pause-160x128x2.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/pb-138x110x2.bmp b/wps/cabbiev2/pb-138x110x2.bmp
index c6e0812eef..8382d6e046 100644
--- a/wps/cabbiev2/pb-138x110x2.bmp
+++ b/wps/cabbiev2/pb-138x110x2.bmp
diff --git a/wps/cabbiev2/pb-160x128x2.bmp b/wps/cabbiev2/pb-160x128x2.bmp
index 60e6592077..e8bf45ac49 100644
--- a/wps/cabbiev2/pb-160x128x2.bmp
+++ b/wps/cabbiev2/pb-160x128x2.bmp
diff --git a/wps/cabbiev2/play-160x128x2.bmp b/wps/cabbiev2/play-160x128x2.bmp
deleted file mode 100644
index 761890801d..0000000000
--- a/wps/cabbiev2/play-160x128x2.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/playmode-160x128x2.bmp b/wps/cabbiev2/playmode-160x128x2.bmp
new file mode 100644
index 0000000000..fad2ab3fbc
--- /dev/null
+++ b/wps/cabbiev2/playmode-160x128x2.bmp
diff --git a/wps/cabbiev2/repeat-160x128x2.bmp b/wps/cabbiev2/repeat-160x128x2.bmp
new file mode 100644
index 0000000000..dfe4de2251
--- /dev/null
+++ b/wps/cabbiev2/repeat-160x128x2.bmp
diff --git a/wps/cabbiev2/repeatab-160x128x2.bmp b/wps/cabbiev2/repeatab-160x128x2.bmp
deleted file mode 100644
index e6864909bc..0000000000
--- a/wps/cabbiev2/repeatab-160x128x2.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatall-160x128x2.bmp b/wps/cabbiev2/repeatall-160x128x2.bmp
deleted file mode 100644
index e900bdc69e..0000000000
--- a/wps/cabbiev2/repeatall-160x128x2.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatone-160x128x2.bmp b/wps/cabbiev2/repeatone-160x128x2.bmp
deleted file mode 100644
index 80c091e5f1..0000000000
--- a/wps/cabbiev2/repeatone-160x128x2.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/repeatshuffle-160x128x2.bmp b/wps/cabbiev2/repeatshuffle-160x128x2.bmp
deleted file mode 100644
index 8cd497df94..0000000000
--- a/wps/cabbiev2/repeatshuffle-160x128x2.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/rew-160x128x2.bmp b/wps/cabbiev2/rew-160x128x2.bmp
deleted file mode 100644
index e3fa8384fe..0000000000
--- a/wps/cabbiev2/rew-160x128x2.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/shuffle-160x128x2.bmp b/wps/cabbiev2/shuffle-160x128x2.bmp
index b9a8ca06aa..30181e1f24 100644
--- a/wps/cabbiev2/shuffle-160x128x2.bmp
+++ b/wps/cabbiev2/shuffle-160x128x2.bmp
diff --git a/wps/cabbiev2/stop-160x128x2.bmp b/wps/cabbiev2/stop-160x128x2.bmp
deleted file mode 100644
index 4f21cb273c..0000000000
--- a/wps/cabbiev2/stop-160x128x2.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol0-160x128x2.bmp b/wps/cabbiev2/vol0-160x128x2.bmp
deleted file mode 100644
index 3ce5fbdc6b..0000000000
--- a/wps/cabbiev2/vol0-160x128x2.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol1-160x128x2.bmp b/wps/cabbiev2/vol1-160x128x2.bmp
deleted file mode 100644
index 5ae018cf1b..0000000000
--- a/wps/cabbiev2/vol1-160x128x2.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol2-160x128x2.bmp b/wps/cabbiev2/vol2-160x128x2.bmp
deleted file mode 100644
index 113515ae23..0000000000
--- a/wps/cabbiev2/vol2-160x128x2.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol3-160x128x2.bmp b/wps/cabbiev2/vol3-160x128x2.bmp
deleted file mode 100644
index ee0ba1ed4b..0000000000
--- a/wps/cabbiev2/vol3-160x128x2.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol4-160x128x2.bmp b/wps/cabbiev2/vol4-160x128x2.bmp
deleted file mode 100644
index 70d0089d99..0000000000
--- a/wps/cabbiev2/vol4-160x128x2.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol5-160x128x2.bmp b/wps/cabbiev2/vol5-160x128x2.bmp
deleted file mode 100644
index 1bdf439fc3..0000000000
--- a/wps/cabbiev2/vol5-160x128x2.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol6-160x128x2.bmp b/wps/cabbiev2/vol6-160x128x2.bmp
deleted file mode 100644
index a49abf0d79..0000000000
--- a/wps/cabbiev2/vol6-160x128x2.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol7-160x128x2.bmp b/wps/cabbiev2/vol7-160x128x2.bmp
deleted file mode 100644
index 96d6a83b0c..0000000000
--- a/wps/cabbiev2/vol7-160x128x2.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol8-160x128x2.bmp b/wps/cabbiev2/vol8-160x128x2.bmp
deleted file mode 100644
index 70812b4d45..0000000000
--- a/wps/cabbiev2/vol8-160x128x2.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/vol9-160x128x2.bmp b/wps/cabbiev2/vol9-160x128x2.bmp
deleted file mode 100644
index b2579560c5..0000000000
--- a/wps/cabbiev2/vol9-160x128x2.bmp
+++ /dev/null
diff --git a/wps/cabbiev2/volume-160x128x2.bmp b/wps/cabbiev2/volume-160x128x2.bmp
new file mode 100644
index 0000000000..c33da0179b
--- /dev/null
+++ b/wps/cabbiev2/volume-160x128x2.bmp
diff --git a/wps/cabbiev2/wpsbackdrop-138x110x2.bmp b/wps/cabbiev2/wpsbackdrop-138x110x2.bmp
index f0c9dcef49..ca29a9441a 100644
--- a/wps/cabbiev2/wpsbackdrop-138x110x2.bmp
+++ b/wps/cabbiev2/wpsbackdrop-138x110x2.bmp
diff --git a/wps/cabbiev2/wpsbackdrop-160x128x2.bmp b/wps/cabbiev2/wpsbackdrop-160x128x2.bmp
index f82b45cd23..8692f3fdd7 100644
--- a/wps/cabbiev2/wpsbackdrop-160x128x2.bmp
+++ b/wps/cabbiev2/wpsbackdrop-160x128x2.bmp