summaryrefslogtreecommitdiffstats
path: root/wps
diff options
context:
space:
mode:
authorMarianne Arnold <pixelma@rockbox.org>2009-11-28 16:37:33 +0000
committerMarianne Arnold <pixelma@rockbox.org>2009-11-28 16:37:33 +0000
commitc074c76211621ab15518649a4a835aeb5798bf29 (patch)
treec26d66052423a51a68703d12ae0cd59db20d0546 /wps
parent3e5d7b40a9b6dc93912ba56a3293c992dd565f0e (diff)
downloadrockbox-c074c76211621ab15518649a4a835aeb5798bf29.tar.gz
rockbox-c074c76211621ab15518649a4a835aeb5798bf29.tar.bz2
rockbox-c074c76211621ab15518649a4a835aeb5798bf29.zip
Make the classic_statusbar.sbs more classic. Icons, position of numbers, charging animation (only tested on a colour display so far), volume as before but gets a 'clipping' icon on targets that allow more than 0dB, add channels indicator in the rec screen. The only difference on swcodec should be the disk activity indicator on flash targets (for now). On hwcodec there are small differences in the recording screen - quality display is simply using the system font (no wasting another bitmap on a slightly less taller Q), frequency uses icons now (keeping the differences between the sbs files smaller and with the small 'k' it's easier to understand, but debateable). Since the animation makes use of the viewport colour (shades) parameters, a classic_statusbar.grey.sbs was needed - reusing the colour one didn't work correctly anyways. The difference between Recorders (RTC) and Ondios (disk activity) is achieved through the 112x64x1.sbs file itself.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23775 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'wps')
-rw-r--r--wps/classic_statusbar.112x64x1.sbs92
-rw-r--r--wps/classic_statusbar.grey.sbs (renamed from wps/classic_statusbar.rsbs)78
-rw-r--r--wps/classic_statusbar.mono.sbs78
-rw-r--r--wps/classic_statusbar.sbs76
-rw-r--r--wps/classic_statusbar/access_disk.bmpbin0 -> 90 bytes
-rw-r--r--wps/classic_statusbar/access_flash.bmpbin0 -> 90 bytes
-rw-r--r--wps/classic_statusbar/batter-y.bmpbin0 -> 90 bytes
-rw-r--r--wps/classic_statusbar/battery.bmpbin384 -> 510 bytes
-rw-r--r--wps/classic_statusbar/rec_channels.bmpbin0 -> 118 bytes
-rw-r--r--[-rwxr-xr-x]wps/classic_statusbar/rec_encoders.bmpbin192 -> 158 bytes
-rw-r--r--[-rwxr-xr-x]wps/classic_statusbar/rec_frequencies.bmpbin448 -> 446 bytes
-rw-r--r--[-rwxr-xr-x]wps/classic_statusbar/rec_mpegbitrates.bmpbin640 -> 638 bytes
-rw-r--r--wps/classic_statusbar/status.bmpbin516 -> 542 bytes
-rw-r--r--wps/classic_statusbar/volume.bmpbin384 -> 538 bytes
14 files changed, 201 insertions, 123 deletions
diff --git a/wps/classic_statusbar.112x64x1.sbs b/wps/classic_statusbar.112x64x1.sbs
index c5c0ba8042..739b345a48 100644
--- a/wps/classic_statusbar.112x64x1.sbs
+++ b/wps/classic_statusbar.112x64x1.sbs
@@ -13,71 +13,95 @@
# Just comment out the line for the one you dont want!
# comment out the next line if you dont want battery icons
- %Vda
+%Vda%Vde
+
# comment out the next line if you dont want battery number as text
# %Vdb
# comment out the next line if you dont want volume icons
-# %Vdc
+%Vdc
# comment out the next line if you dont want volume number as text
# %Vdd
################################################################
# Load some bitmaps
-%xl|B|battery.bmp|0|0|10|
-%xl|V|volume.bmp|0|0|10|
-%xl|S|status.bmp|0|0|16|
+%xl|B|battery.bmp|0|0|16|
+%xl|V|volume.bmp|1|0|17|
+%xl|S|status.bmp|0|0|15|
+%xl|D|access_flash.bmp|0|0|
+%xl|y|batter-y.bmp|0|0|
+
+# %xl|m|rec_mpegbitrates.bmp|1|0|18|
+%xl|f|rec_frequencies.bmp|0|0|12|
+# %xl|e|rec_encoders.bmp|0|0|3|
+%xl|c|rec_channels.bmp|13|0|2|
# Enable the correct viewports
%?cs<%Vdc%Vdp%Vdr%Vds|%Vdc%Vdp%Vdr%Vds|%Vdz|%Vdc%Vdp%Vdr%Vds>
+# Charging animation viewports
+%t2%?bc<%Vdx|%Vda>;%t2%Vda
+
+# Either RTC (Recorders) or virtual LED (Ondios) viewport
+%?cc<%Vdt|%Vdl>
+
# Battery area, Icons
-%Vl|a|0|0|16|8|0|
-%?bl<%xdBa|%xdBa|%xdBb|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>
-# charging icon
-%Vl|a|16|0|8|8|0|
-%?bc<%xdSa|>
+%Vl|a|0|0|17|7|0|
+%?bl<%xdBa|%xdBb|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj|%xdBk|%xdBl|%xdBm|%xdBn|%xdBo>
+
+# Battery area, viewport with full battery icon for charging animation
+%Vl|x|0|0|17|7|0|
+%xdBo
+
+# end of battery symbol (to exclude it from animation)
+%Vl|e|17|0|3|7|0|
+%xdy
+
+# usb power or charger icon
+%V|20|0|8|8|0|
+%?bu<%xdSa|%?bc<%xdSa|%?bp<%xdSo>>>
# battery area, no icons
-%Vl|b|0|0|-|8|0|
-%bl%bc
+%Vl|b|0|0|18|8|0|
+%ar%bl
# Volume area
-%Vl|c|27|0|-|8|0|
-%?mv<%pv|%?pv<%xdVa|%xdVb|%xdVc|%xdVd|%xdVe|%xdVf|%xdVg|%xdVh|%xdVi|%xdVj>>
-%Vl|d|27|0|-|8|0|
-%pv
+%Vl|c|28|0|19|8|0|
+%?mv<%ac%?pv<%xdVa|%pv| %pv| %pv>|%?pv<%xdVa|%xdVb|%xdVc|%xdVd|%xdVe|%xdVf|%xdVg|%xdVh|%xdVi|%xdVj|%xdVk|%xdVl|%xdVm|%xdVn|%xdVo|%xdVp|%xdVq>>
+%Vl|d|28|0|19|8|0|
+%ac%?pv<%xdVa|%pv| %pv| %pv>
# Icons, all in the same bmp strip, so need to use multiple viewports
# Playback mode
-%Vl|p|46|0|-|8|0|
+%Vl|p|47|0|9|8|0|
%?mp<%xdSc|%xdSb|%xdSd|%xdSe|%xdSf|%xdSg|%xdSh|%xdSi|%xdSj>
# Repeat mode
-%Vl|r|54|0|-|8|0|
-%?mm<|%xdSi|%xdSj|%xdSk|%xdSl>
+%Vl|r|56|0|9|8|0|
+%?mm<|%xdSk|%xdSl|%xdSm|%xdSn>
# Shuffle mode
-%Vl|s|64|0|-|8|0|
-%?ps<%xdSk|>
+%Vl|s|65|0|-|8|0|
+%?ps<%xdSm|>
# Recording section
-%Vl|z|27|0|6|8|0|
-
-%Vl|z|33|0|18|8|0|
-%?Rp<Q%Rb>
+# encoder/mpeg bitrate
+%Vl|z|28|0|19|8|0|
+%?Rp<%acQ%Rb>
# status icon
-%Vl|z|46|0|8|8|0|
+%Vl|z|47|0|8|8|0|
%?mp<%xdSc|%xdSb|%xdSd|%xdSe|%xdSf|%xdSg|%xdSh|%xdSi|%xdSj>
-# frequency and stereo/mono
-%Vl|z|54|0|-|8|0|
-%?Rp<%?Rf<??|44|48|32|22|24|16>%?Rm<%xdSm|%xdSn>>
+# frequency and channels
+%Vl|z|55|0|-|8|0|
+%?Rp<%?Rf<%xdfa|%xdfb|%xdfc|%xdfd|%xdfe|%xdff|%xdfg|%xdfh|%xdfi|%xdfj|%xdfk|%xdfl>>
+%?Rm<%xdca|%xdcb>
-# Clock on RTC able targets, and disk access
-%V|-36|0|-6|8|0| # align on the right with room for 6 SYSFONT digits
+# Clock on Recorders
+%Vl|t|-30|0|30|8|0| # align on the right with room for 5 SYSFONT digits
%?cc<%?ca<%?St|time format|<%cH|%cI>:%cM|--:-->|>
-# disk access "icon"
-%V|-6|0|-|8|0| # align on the right with room for 1 SYSFONT digit
-%?lh<*|>
+
+# Disk access on Ondios
+%Vl|l|-12|0|-|8|0|
+%?lh<%xdD|>
diff --git a/wps/classic_statusbar.rsbs b/wps/classic_statusbar.grey.sbs
index 413f98239e..21c2c88b62 100644
--- a/wps/classic_statusbar.rsbs
+++ b/wps/classic_statusbar.grey.sbs
@@ -5,7 +5,7 @@
#
# specify the UI area viewport... everything but a bar 8 pixels high at the top
-%Vi|0|8|-|-|1|
+%Vi|0|8|-|-|1|0|3|
##############################################################
# Options:
@@ -13,74 +13,92 @@
# Just comment out the line for the one you dont want!
# comment out the next line if you dont want battery icons
- %Vda
+%Vda%Vde
+
# comment out the next line if you dont want battery number as text
# %Vdb
# comment out the next line if you dont want volume icons
-# %Vdc
+%Vdc
# comment out the next line if you dont want volume number as text
# %Vdd
################################################################
# Load some bitmaps
-%xl|B|battery.bmp|0|0|10|
-%xl|V|volume.bmp|0|0|10|
-%xl|S|status.bmp|0|0|14|
+%xl|B|battery.bmp|0|0|16|
+%xl|V|volume.bmp|1|0|17|
+%xl|S|status.bmp|0|0|15|
+%xl|D|access_disk.bmp|0|0|
+%xl|y|batter-y.bmp|0|0|
-%xl|m|rec_mpegbitrates.bmp|0|0|18|
+%xl|m|rec_mpegbitrates.bmp|1|0|18|
%xl|f|rec_frequencies.bmp|0|0|12|
-%xl|e|rec_encoders.bmp|0|0|4|
+%xl|e|rec_encoders.bmp|0|0|3|
+%xl|c|rec_channels.bmp|13|0|2|
# Enable the correct viewports
%?cs<%Vdc%Vdp%Vdr%Vds|%Vdc%Vdp%Vdr%Vds|%Vdz|%Vdc%Vdp%Vdr%Vds>
+# Charging animation viewports
+%t2%?bc<%Vdx|%Vda>;%t2%Vda
+
# Battery area, Icons
-%Vl|a|0|0|16|8|0|
-%?bl<%xdBa|%xdBa|%xdBb|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>
-# charging icon
-%Vl|a|16|0|8|8|0|
-%?bc<%xdSa|>
+%Vl|a|0|0|17|7|0|0|3|
+%?bl<%xdBa|%xdBb|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj|%xdBk|%xdBl|%xdBm|%xdBn|%xdBo>
+
+# Battery area, grey background viewport for charging animation
+%Vl|x|0|0|17|7|0|0|1|
+%?bl<%xdBa|%xdBb|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj|%xdBk|%xdBl|%xdBm|%xdBn|%xdBo>
+
+# end of battery symbol (to exclude it from animation)
+%Vl|e|17|0|3|7|0|0|3|
+%xdy
+
+# usb power or charger icon
+%V|20|0|8|8|0|0|3|
+%?bu<%xdSa|%?bc<%xdSa|%?bp<%xdSo>>>
# battery area, no icons
-%Vl|b|0|0|-|8|0|
-%bl%bc
+%Vl|b|0|0|18|8|0|0|3|
+%ar%bl
# Volume area
-%Vl|c|27|0|-|8|0|
-%?mv<%pv|%?pv<%xdVa|%xdVb|%xdVc|%xdVd|%xdVe|%xdVf|%xdVg|%xdVh|%xdVi|%xdVj>>
-%Vl|d|27|0|-|8|0|
-%pv
+%Vl|c|28|0|19|8|0|0|3|
+%?mv<%ac%?pv<%pv|%pv| %pv| %pv>|%?pv<%xdVa|%xdVb|%xdVc|%xdVd|%xdVe|%xdVf|%xdVg|%xdVh|%xdVi|%xdVj|%xdVk|%xdVl|%xdVm|%xdVn|%xdVo|%xdVp|%xdVq>>
+%Vl|d|28|0|19|8|0|0|3|
+%ac%?pv<%pv|%pv| %pv| %pv>
# Icons, all in the same bmp strip, so need to use multiple viewports
# Playback mode
-%Vl|p|46|0|-|8|0|
+%Vl|p|47|0|9|8|0|0|3|
%?mp<%xdSc|%xdSb|%xdSd|%xdSe|%xdSf|%xdSg|%xdSh|%xdSi|%xdSj>
# Repeat mode
-%Vl|r|54|0|-|8|0|
+%Vl|r|56|0|9|8|0|0|3|
%?mm<|%xdSk|%xdSl|%xdSm|%xdSn>
# Shuffle mode
-%Vl|s|64|0|-|8|0|
+%Vl|s|65|0|-|8|0|0|3|
%?ps<%xdSm|>
# Recording section
# encoder/mpeg bitrate
-%Vl|z|27|0|18|8|0|
+%Vl|z|28|0|19|8|0|0|3|
%?Rp<%?Re<%xdea|%xdeb|%xdec|%?Rb<%xdma|%xdmb|%xdmc|%xdmd|%xdme|%xdmf|%xdmg|%xdmh|%xdmi|%xdmj|%xdmk|%xdml|%xdmm|%xdmn|%xdmo|%xdmp|%xdmq|%xdmr>>>
# status icon
-%Vl|z|46|0|8|8|0|
+%Vl|z|47|0|8|8|0|0|3|
%?mp<%xdSc|%xdSb|%xdSd|%xdSe|%xdSf|%xdSg|%xdSh|%xdSi|%xdSj>
-# frequency
-%Vl|z|54|0|-|8|0|
+# frequency and channels
+%Vl|z|55|0|-|8|0|0|3|
%?Rp<%?Rf<%xdfa|%xdfb|%xdfc|%xdfd|%xdfe|%xdff|%xdfg|%xdfh|%xdfi|%xdfj|%xdfk|%xdfl>>
+%?Rm<%xdca|%xdcb>
# Clock on RTC able targets, and disk access
-%V|-36|0|-6|8|0| # align on the right with room for 6 SYSFONT digits
+%V|-43|0|31|8|0|0|3| # align on the right with room for 5 SYSFONT digits
%?cc<%?ca<%?St|time format|<%cH|%cI>:%cM|--:-->|>
-# disk access "icon"
-%V|-6|0|-|8|0| # align on the right with room for 1 SYSFONT digit
-%?lh<*|>
+
+# disk access icon
+%V|-12|0|-|8|0|0|3|
+%?lh<%xdD|>
diff --git a/wps/classic_statusbar.mono.sbs b/wps/classic_statusbar.mono.sbs
index b20043d51d..268c6976a8 100644
--- a/wps/classic_statusbar.mono.sbs
+++ b/wps/classic_statusbar.mono.sbs
@@ -5,7 +5,7 @@
#
# specify the UI area viewport... everything but a bar 8 pixels high at the top
-%Vi|0|8|-|-|1|-|-|
+%Vi|0|8|-|-|1|
##############################################################
# Options:
@@ -13,74 +13,92 @@
# Just comment out the line for the one you dont want!
# comment out the next line if you dont want battery icons
- %Vda
+%Vda%Vde
+
# comment out the next line if you dont want battery number as text
# %Vdb
# comment out the next line if you dont want volume icons
-# %Vdc
+%Vdc
# comment out the next line if you dont want volume number as text
# %Vdd
################################################################
# Load some bitmaps
-%xl|B|battery.bmp|0|0|10|
-%xl|V|volume.bmp|0|0|10|
-%xl|S|status.bmp|0|0|14|
+%xl|B|battery.bmp|0|0|16|
+%xl|V|volume.bmp|1|0|17|
+%xl|S|status.bmp|0|0|15|
+%xl|D|access_disk.bmp|0|0|
+%xl|y|batter-y.bmp|0|0|
-%xl|m|rec_mpegbitrates.bmp|0|0|18|
+%xl|m|rec_mpegbitrates.bmp|1|0|18|
%xl|f|rec_frequencies.bmp|0|0|12|
-%xl|e|rec_encoders.bmp|0|0|4|
+%xl|e|rec_encoders.bmp|0|0|3|
+%xl|c|rec_channels.bmp|13|0|2|
# Enable the correct viewports
%?cs<%Vdc%Vdp%Vdr%Vds|%Vdc%Vdp%Vdr%Vds|%Vdz|%Vdc%Vdp%Vdr%Vds>
+# Charging animation viewports
+%t2%?bc<%Vdx|%Vda>;%t2%Vda
+
# Battery area, Icons
-%Vl|a|0|0|16|8|0|
-%?bl<%xdBa|%xdBa|%xdBb|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>
-# charging icon
-%Vl|a|16|0|8|8|0|
-%?bc<%xdSa|>
+%Vl|a|0|0|17|7|0|
+%?bl<%xdBa|%xdBb|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj|%xdBk|%xdBl|%xdBm|%xdBn|%xdBo>
+
+# Battery area, viewport with full battery icon for charging animation
+%Vl|x|0|0|17|7|0|
+%xdBo
+
+# end of battery symbol (to exclude it from animation)
+%Vl|e|17|0|3|7|0|
+%xdy
+
+# usb power or charger icon
+%V|20|0|8|8|0|
+%?bu<%xdSa|%?bc<%xdSa|%?bp<%xdSo>>>
# battery area, no icons
-%Vl|b|0|0|-|8|0|
-%bl%bc
+%Vl|b|0|0|18|8|0|
+%ar%bl
# Volume area
-%Vl|c|27|0|-|8|0|
-%?mv<%pv|%?pv<%xdVa|%xdVb|%xdVc|%xdVd|%xdVe|%xdVf|%xdVg|%xdVh|%xdVi|%xdVj>>
-%Vl|d|27|0|-|8|0|
-%pv
+%Vl|c|28|0|19|8|0|
+%?mv<%ac%?pv<%pv|%pv| %pv| %pv>|%?pv<%xdVa|%xdVb|%xdVc|%xdVd|%xdVe|%xdVf|%xdVg|%xdVh|%xdVi|%xdVj|%xdVk|%xdVl|%xdVm|%xdVn|%xdVo|%xdVp|%xdVq>>
+%Vl|d|28|0|19|8|0|
+%ac%?pv<%pv|%pv| %pv| %pv>
# Icons, all in the same bmp strip, so need to use multiple viewports
# Playback mode
-%Vl|p|46|0|-|8|0|
+%Vl|p|47|0|9|8|0|
%?mp<%xdSc|%xdSb|%xdSd|%xdSe|%xdSf|%xdSg|%xdSh|%xdSi|%xdSj>
# Repeat mode
-%Vl|r|54|0|-|8|0|
+%Vl|r|56|0|9|8|0|
%?mm<|%xdSk|%xdSl|%xdSm|%xdSn>
# Shuffle mode
-%Vl|s|64|0|-|8|0|
+%Vl|s|65|0|-|8|0|
%?ps<%xdSm|>
# Recording section
# encoder/mpeg bitrate
-%Vl|z|27|0|18|8|0|
+%Vl|z|28|0|19|8|0|
%?Rp<%?Re<%xdea|%xdeb|%xdec|%?Rb<%xdma|%xdmb|%xdmc|%xdmd|%xdme|%xdmf|%xdmg|%xdmh|%xdmi|%xdmj|%xdmk|%xdml|%xdmm|%xdmn|%xdmo|%xdmp|%xdmq|%xdmr>>>
# status icon
-%Vl|z|46|0|8|8|0|
+%Vl|z|47|0|8|8|0|
%?mp<%xdSc|%xdSb|%xdSd|%xdSe|%xdSf|%xdSg|%xdSh|%xdSi|%xdSj>
-# frequency
-%Vl|z|54|0|-|8|0|
+# frequency and channels
+%Vl|z|55|0|-|8|0|
%?Rp<%?Rf<%xdfa|%xdfb|%xdfc|%xdfd|%xdfe|%xdff|%xdfg|%xdfh|%xdfi|%xdfj|%xdfk|%xdfl>>
+%?Rm<%xdca|%xdcb>
# Clock on RTC able targets, and disk access
-%V|-36|0|-6|8|0| # align on the right with room for 6 SYSFONT digits
+%V|-43|0|31|8|0| # align on the right with room for 5 SYSFONT digits
%?cc<%?ca<%?St|time format|<%cH|%cI>:%cM|--:-->|>
-# disk access "icon"
-%V|-6|0|-|8|0| # align on the right with room for 1 SYSFONT digit
-%?lh<*|>
+
+# disk access icon
+%V|-12|0|-|8|0|
+%?lh<%xdD|>
diff --git a/wps/classic_statusbar.sbs b/wps/classic_statusbar.sbs
index 01beced4ca..86214dbe2d 100644
--- a/wps/classic_statusbar.sbs
+++ b/wps/classic_statusbar.sbs
@@ -13,74 +13,92 @@
# Just comment out the line for the one you dont want!
# comment out the next line if you dont want battery icons
- %Vda
+%Vda%Vde
+
# comment out the next line if you dont want battery number as text
# %Vdb
# comment out the next line if you dont want volume icons
-# %Vdc
+%Vdc
# comment out the next line if you dont want volume number as text
# %Vdd
################################################################
# Load some bitmaps
-%xl|B|battery.bmp|0|0|10|
-%xl|V|volume.bmp|0|0|10|
-%xl|S|status.bmp|0|0|14|
+%xl|B|battery.bmp|0|0|16|
+%xl|V|volume.bmp|1|0|17|
+%xl|S|status.bmp|0|0|15|
+%xl|D|access_disk.bmp|0|0|
+%xl|y|batter-y.bmp|0|0|
-%xl|m|rec_mpegbitrates.bmp|0|0|18|
+%xl|m|rec_mpegbitrates.bmp|1|0|18|
%xl|f|rec_frequencies.bmp|0|0|12|
-%xl|e|rec_encoders.bmp|0|0|4|
+%xl|e|rec_encoders.bmp|0|0|3|
+%xl|c|rec_channels.bmp|13|0|2|
# Enable the correct viewports
%?cs<%Vdc%Vdp%Vdr%Vds|%Vdc%Vdp%Vdr%Vds|%Vdz|%Vdc%Vdp%Vdr%Vds>
+# Charging animation viewports
+%t2%?bc<%Vdx|%Vda>;%t2%Vda
+
# Battery area, Icons
-%Vl|a|0|0|16|8|0|-|-|
-%?bl<%xdBa|%xdBa|%xdBb|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>
-# charging icon
-%Vl|a|16|0|8|8|0|-|-|
-%?bc<%xdSa|>
+%Vl|a|0|0|17|7|0|-|-|
+%?bl<%xdBa|%xdBb|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj|%xdBk|%xdBl|%xdBm|%xdBn|%xdBo>
+
+# Battery area, grey background viewport for charging animation
+%Vl|x|0|0|17|7|0|-|555555|
+%?bl<%xdBa|%xdBb|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj|%xdBk|%xdBl|%xdBm|%xdBn|%xdBo>
+
+# end of battery symbol (to exclude it from animation)
+%Vl|e|17|0|3|7|0|-|-|
+%xdy
+
+# usb power or charger icon
+%V|20|0|8|8|0|-|-|
+%?bu<%xdSa|%?bc<%xdSa|%?bp<%xdSo>>>
# battery area, no icons
-%Vl|b|0|0|-|8|0|-|-|
-%bl%bc
+%Vl|b|0|0|18|8|0|-|-|
+%ar%bl
# Volume area
-%Vl|c|27|0|-|8|0|-|-|
-%?mv<%pv|%?pv<%xdVa|%xdVb|%xdVc|%xdVd|%xdVe|%xdVf|%xdVg|%xdVh|%xdVi|%xdVj>>
-%Vl|d|27|0|-|8|0|-|-|
-%pv
+%Vl|c|28|0|19|8|0|-|-|
+%?mv<%ac%?pv<%pv|%pv| %pv| %pv>|%?pv<%xdVa|%xdVb|%xdVc|%xdVd|%xdVe|%xdVf|%xdVg|%xdVh|%xdVi|%xdVj|%xdVk|%xdVl|%xdVm|%xdVn|%xdVo|%xdVp|%xdVq>>
+%Vl|d|28|0|19|8|0|-|-|
+%ac%?pv<%pv|%pv| %pv| %pv>
# Icons, all in the same bmp strip, so need to use multiple viewports
# Playback mode
-%Vl|p|46|0|-|8|0|-|-|
+%Vl|p|47|0|9|8|0|-|-|
%?mp<%xdSc|%xdSb|%xdSd|%xdSe|%xdSf|%xdSg|%xdSh|%xdSi|%xdSj>
# Repeat mode
-%Vl|r|54|0|-|8|0|-|-|
+%Vl|r|56|0|9|8|0|-|-|
%?mm<|%xdSk|%xdSl|%xdSm|%xdSn>
# Shuffle mode
-%Vl|s|64|0|-|8|0|-|-|
+%Vl|s|65|0|-|8|0|-|-|
%?ps<%xdSm|>
# Recording section
# encoder/mpeg bitrate
-%Vl|z|27|0|18|8|0|-|-|
+%Vl|z|28|0|19|8|0|-|-|
%?Rp<%?Re<%xdea|%xdeb|%xdec|%?Rb<%xdma|%xdmb|%xdmc|%xdmd|%xdme|%xdmf|%xdmg|%xdmh|%xdmi|%xdmj|%xdmk|%xdml|%xdmm|%xdmn|%xdmo|%xdmp|%xdmq|%xdmr>>>
# status icon
-%Vl|z|46|0|8|8|0|-|-|
+%Vl|z|47|0|8|8|0|-|-|
%?mp<%xdSc|%xdSb|%xdSd|%xdSe|%xdSf|%xdSg|%xdSh|%xdSi|%xdSj>
-# frequency
-%Vl|z|54|0|-|8|0|-|-|
+# frequency and channels
+%Vl|z|55|0|-|8|0|-|-|
%?Rp<%?Rf<%xdfa|%xdfb|%xdfc|%xdfd|%xdfe|%xdff|%xdfg|%xdfh|%xdfi|%xdfj|%xdfk|%xdfl>>
+%?Rm<%xdca|%xdcb>
# Clock on RTC able targets, and disk access
-%V|-36|0|-6|8|0|-|-| # align on the right with room for 6 SYSFONT digits
+%V|-43|0|31|8|0|-|-| # align on the right with room for 5 SYSFONT digits
%?cc<%?ca<%?St|time format|<%cH|%cI>:%cM|--:-->|>
-# disk access "icon"
-%V|-6|0|-|8|0|-|-| # align on the right with room for 1 SYSFONT digit
-%?lh<*|>
+
+# disk access icon
+%V|-12|0|-|8|0|-|-|
+%?lh<%xdD|>
diff --git a/wps/classic_statusbar/access_disk.bmp b/wps/classic_statusbar/access_disk.bmp
new file mode 100644
index 0000000000..7586b0f3ef
--- /dev/null
+++ b/wps/classic_statusbar/access_disk.bmp
Binary files differ
diff --git a/wps/classic_statusbar/access_flash.bmp b/wps/classic_statusbar/access_flash.bmp
new file mode 100644
index 0000000000..4e9935ace2
--- /dev/null
+++ b/wps/classic_statusbar/access_flash.bmp
Binary files differ
diff --git a/wps/classic_statusbar/batter-y.bmp b/wps/classic_statusbar/batter-y.bmp
new file mode 100644
index 0000000000..b1e9f7acff
--- /dev/null
+++ b/wps/classic_statusbar/batter-y.bmp
Binary files differ
diff --git a/wps/classic_statusbar/battery.bmp b/wps/classic_statusbar/battery.bmp
index 86718be7c6..f3b3d69bbd 100644
--- a/wps/classic_statusbar/battery.bmp
+++ b/wps/classic_statusbar/battery.bmp
Binary files differ
diff --git a/wps/classic_statusbar/rec_channels.bmp b/wps/classic_statusbar/rec_channels.bmp
new file mode 100644
index 0000000000..5465f39c42
--- /dev/null
+++ b/wps/classic_statusbar/rec_channels.bmp
Binary files differ
diff --git a/wps/classic_statusbar/rec_encoders.bmp b/wps/classic_statusbar/rec_encoders.bmp
index 6ef2a37d99..a97701fb29 100755..100644
--- a/wps/classic_statusbar/rec_encoders.bmp
+++ b/wps/classic_statusbar/rec_encoders.bmp
Binary files differ
diff --git a/wps/classic_statusbar/rec_frequencies.bmp b/wps/classic_statusbar/rec_frequencies.bmp
index ae29a92fe8..8b977c9dfb 100755..100644
--- a/wps/classic_statusbar/rec_frequencies.bmp
+++ b/wps/classic_statusbar/rec_frequencies.bmp
Binary files differ
diff --git a/wps/classic_statusbar/rec_mpegbitrates.bmp b/wps/classic_statusbar/rec_mpegbitrates.bmp
index ce5576daf9..06f460b68c 100755..100644
--- a/wps/classic_statusbar/rec_mpegbitrates.bmp
+++ b/wps/classic_statusbar/rec_mpegbitrates.bmp
Binary files differ
diff --git a/wps/classic_statusbar/status.bmp b/wps/classic_statusbar/status.bmp
index 6749b1ea9b..87910fe49c 100644
--- a/wps/classic_statusbar/status.bmp
+++ b/wps/classic_statusbar/status.bmp
Binary files differ
diff --git a/wps/classic_statusbar/volume.bmp b/wps/classic_statusbar/volume.bmp
index eb51f39491..fad6afeaaf 100644
--- a/wps/classic_statusbar/volume.bmp
+++ b/wps/classic_statusbar/volume.bmp
Binary files differ