3 files changed, 115 insertions, 22 deletions

diff --git a/tools/buildzip.pl b/tools/buildzip.pl
index 1a25802369..d07372e500 100755
--- a/tools/buildzip.pl
+++ b/tools/buildzip.pl
@@ -433,12 +433,20 @@ STOP
     mkdir "$rbdir/wps/classic_statusbar", 0777;
     glob_copy("$ROOT/wps/classic_statusbar/*.bmp", "$rbdir/wps/classic_statusbar");
     if ($swcodec) {
-        copy("$ROOT/wps/classic_statusbar.sbs", "$rbdir/wps");
+                if ($depth > 1) {
+                        copy("$ROOT/wps/classic_statusbar.sbs", "$rbdir/wps");
+                } else {
+                        copy("$ROOT/wps/classic_statusbar.mono.sbs", "$rbdir/wps");
+                }
     } else {
-        copy("$ROOT/wps/classic_statusbar-hwcodec.sbs", "$rbdir/wps/classic_statusbar.sbs");
+        copy("$ROOT/wps/classic_statusbar.112x64x1.sbs", "$rbdir/wps/classic_statusbar.sbs");
     }
     system("touch $rbdir/wps/rockbox_none.sbs");
-    copy("$rbdir/wps/classic_statusbar.sbs", "$rbdir/wps/classic_statusbar.rsbs");
+    if ($remote_depth != $depth) {
+                copy("$ROOT/wps/classic_statusbar.mono.sbs", "$rbdir/wps/classic_statusbar.rsbs");
+        } else {
+                copy("$rbdir/wps/classic_statusbar.sbs", "$rbdir/wps/classic_statusbar.rsbs");
+        }
     copy("$rbdir/wps/rockbox_none.sbs", "$rbdir/wps/rockbox_none.rsbs");
 
     # and the info file
diff --git a/wps/classic_statusbar.112x64x1.sbs b/wps/classic_statusbar.112x64x1.sbs
index 53a5dda33e..c5c0ba8042 100644
--- a/wps/classic_statusbar.112x64x1.sbs
+++ b/wps/classic_statusbar.112x64x1.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: 
@@ -27,58 +27,57 @@
 # 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|S|status.bmp|0|0|16|
 
 # Enable the correct viewports
 %?cs<%Vdc%Vdp%Vdr%Vds|%Vdc%Vdp%Vdr%Vds|%Vdz|%Vdc%Vdp%Vdr%Vds>
 
 # Battery area, Icons
-%Vl|a|0|0|16|8|0|-|-| 
+%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|-|-| 
+%Vl|a|16|0|8|8|0|
 %?bc<%xdSa|>
 
 # battery area, no icons
-%Vl|b|0|0|-|8|0|-|-| 
+%Vl|b|0|0|-|8|0|
 %bl%bc
 
 # Volume area
-%Vl|c|27|0|-|8|0|-|-| 
+%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|-|-| 
+%Vl|d|27|0|-|8|0|
 %pv
 
 # Icons, all in the same bmp strip, so need to use multiple viewports
 # Playback mode
-%Vl|p|46|0|-|8|0|-|-| 
+%Vl|p|46|0|-|8|0|
 %?mp<%xdSc|%xdSb|%xdSd|%xdSe|%xdSf|%xdSg|%xdSh|%xdSi|%xdSj>
 
 # Repeat mode
-%Vl|r|54|0|-|8|0|-|-| 
+%Vl|r|54|0|-|8|0|
 %?mm<|%xdSi|%xdSj|%xdSk|%xdSl>
 
 # Shuffle mode
-%Vl|s|64|0|-|8|0|-|-| 
+%Vl|s|64|0|-|8|0|
 %?ps<%xdSk|>
 
 
 # Recording section
-%Vl|z|27|0|6|8|0|-|-|
+%Vl|z|27|0|6|8|0|
 
-%Vl|z|33|0|18|8|0|-|-|
+%Vl|z|33|0|18|8|0|
 %?Rp<Q%Rb>
 # status icon
-%Vl|z|46|0|8|8|0|-|-|
+%Vl|z|46|0|8|8|0|
 %?mp<%xdSc|%xdSb|%xdSd|%xdSe|%xdSf|%xdSg|%xdSh|%xdSi|%xdSj>
-# frequency
-%Vl|z|54|0|-|8|0|-|-|
-%?Rp<%?Rf<??|44|48|32|22|24|16>>
+# frequency and stereo/mono
+%Vl|z|54|0|-|8|0|
+%?Rp<%?Rf<??|44|48|32|22|24|16>%?Rm<%xdSm|%xdSn>>
 
 # 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|-36|0|-6|8|0| # align on the right with room for 6 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
+%V|-6|0|-|8|0| # align on the right with room for 1 SYSFONT digit
 %?lh<*|>
-
diff --git a/wps/classic_statusbar.mono.sbs b/wps/classic_statusbar.mono.sbs
new file mode 100644
index 0000000000..6344726d15
--- /dev/null
+++ b/wps/classic_statusbar.mono.sbs
@@ -0,0 +1,86 @@
+#
+# Classic statusbar adapted to skin engine
+#
+# Bar at the top.. very easy to change to the bottom (change the y positions from 0 to -8
+#
+
+# specify the UI area viewport... everything but a bar 8 pixels high at the top
+%Vi|0|8|-|-|1|-|-|
+
+##############################################################
+# Options: 
+# you can use icons or text for the volume and battery display
+# Just comment out the line for the one you dont want!
+
+# comment out the next line if you dont want battery icons
+ %Vda
+# 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
+# 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|m|rec_mpegbitrates.bmp|0|0|18|
+%xl|f|rec_frequencies.bmp|0|0|12|
+%xl|e|rec_encoders.bmp|0|0|4|
+
+# Enable the correct viewports
+%?cs<%Vdc%Vdp%Vdr%Vds|%Vdc%Vdp%Vdr%Vds|%Vdz|%Vdc%Vdp%Vdr%Vds>
+
+# 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|>
+
+# battery area, no icons
+%Vl|b|0|0|-|8|0|
+%bl%bc
+
+# 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
+
+# Icons, all in the same bmp strip, so need to use multiple viewports
+# Playback mode
+%Vl|p|46|0|-|8|0|
+%?mp<%xdSc|%xdSb|%xdSd|%xdSe|%xdSf|%xdSg|%xdSh|%xdSi|%xdSj>
+
+# Repeat mode
+%Vl|r|54|0|-|8|0|
+%?mm<|%xdSk|%xdSl|%xdSm|%xdSn>
+
+# Shuffle mode
+%Vl|s|64|0|-|8|0|
+%?ps<%xdSm|>
+
+
+# Recording section
+# encoder/mpeg bitrate
+%Vl|z|27|0|18|8|0|
+%?Rp<%?Rh<Q%Rb|%?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|
+%?mp<%xdSc|%xdSb|%xdSd|%xdSe|%xdSf|%xdSg|%xdSh|%xdSi|%xdSj>
+# frequency
+%Vl|z|54|0|-|8|0|
+%?Rp<%?Rf<%xdfa|%xdfb|%xdfc|%xdfd|%xdfe|%xdff|%xdfg|%xdfh|%xdfi|%xdfj|%xdfk|%xdfl>>
+
+# Clock on RTC able targets, and disk access
+%V|-36|0|-6|8|0| # align on the right with room for 6 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<*|>