summaryrefslogtreecommitdiffstats
path: root/wps/cabbiev2.320x480x16.wps
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2011-11-26 14:34:04 +0000
committerThomas Martitz <kugel@rockbox.org>2011-11-26 14:34:04 +0000
commitf8578c089ab85d8f48ffd3d2b175523788f7f71f (patch)
tree7505f5ce5338a9e34fb995ea8296b7b19cc5ddb9 /wps/cabbiev2.320x480x16.wps
parentfabbeba59ad1de226f5710cf5dfc216850181972 (diff)
downloadrockbox-f8578c089ab85d8f48ffd3d2b175523788f7f71f.tar.gz
rockbox-f8578c089ab85d8f48ffd3d2b175523788f7f71f.tar.bz2
rockbox-f8578c089ab85d8f48ffd3d2b175523788f7f71f.zip
Cabbiev2/RaaA: Add volume slider pop to the WPS.
It's as big as the usual popup and makes it easier to control the volume. Also makes our fine-grained volume changes more visible. popup.xcf is updated to contain the volume layers. Idea and some skin code taken from FS#12254. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31056 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'wps/cabbiev2.320x480x16.wps')
-rw-r--r--wps/cabbiev2.320x480x16.wps24
1 files changed, 19 insertions, 5 deletions
diff --git a/wps/cabbiev2.320x480x16.wps b/wps/cabbiev2.320x480x16.wps
index ea89bf4bac..31957a2293 100644
--- a/wps/cabbiev2.320x480x16.wps
+++ b/wps/cabbiev2.320x480x16.wps
@@ -17,10 +17,12 @@
%xl(G,popup-320x480x16.bmp,0,0)
%xl(H,rew-320x480x16.bmp,0,8)
%xl(I,ff-320x480x16.bmp,45,8)
+%xl(vol,volumebar-320x480x16.bmp,0,0)
+%xl(volbd,volumebar-backdrop-320x480x16.bmp,0,0)
%Cl(0,0,180,180,c,c)
-
-%?C<%Vd(c)%?Tl(2.0)<%Vd(t)|%Vd(d)>|%Vd(a)%?Tl(2.0)<%Vd(t)|%Vd(b)>>
+%?C<%Vd(c)|%Vd(a)>
+%?vg(show_vol)<%?C<%Vd(d)|%Vd(b)>|%Vd(t)|%Vd(vol)>
# track & next track info - no AA
%Vl(a,0,60,-,110,-)
@@ -45,13 +47,13 @@
%Cd
# current track info - AA
-%Vl(d,0,240,-,-,-)
+%Vl(d,0,240,-,-120,-)
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>>
%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
# next track info - AA
-%Vl(d,0,338,-,-,-)
+%Vl(d,0,338,-,-120,-)
%?C<%s%ac%Sx(Next:) %?Ia<%Ia|%?D(2)<%D(2)|%(root%)>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>>
# playtime
@@ -65,9 +67,10 @@
#%?mh<%xd(Aa)|%xd(Ab)>
#%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>>
+
# volume
%?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)>
-%T(91,71,55,50,volume)
+%T(small_vol,91,71,55,50,none)
#
# shuffle
%?ps<%xd(D)>
@@ -83,6 +86,13 @@
%T(273,66,45,50,stop, repeat_press)
#
+# volume slider
+#
+%Vl(vol,10,230,300,136,-)
+%pv(0,0,300,136,image,vol,backdrop,volbd)
+%T(0,0,300,136,volume)
+
+#
# popup osd menu
#
%Vl(t,10,230,300,136,-)
@@ -100,3 +110,7 @@
%T(0,0,40,58,prev)
%T(50,0,40,58,ffwd, repeat_press)
%T(50,0,40,58,next)
+
+# needs to be at the end since touch regions need to be declared
+# before %Tl can be used
+%?Tl(small_vol,2.0)<%vs(show_vol,set,3)|%?mv(2.0)<%vs(show_vol,set,3)|%?Tl<%vs(show_vol,set,2)|%vs(show_vol,set,1)>>>