diff options
author | Thomas Martitz <kugel@rockbox.org> | 2011-11-26 14:34:04 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2011-11-26 14:34:04 +0000 |
commit | f8578c089ab85d8f48ffd3d2b175523788f7f71f (patch) | |
tree | 7505f5ce5338a9e34fb995ea8296b7b19cc5ddb9 /wps | |
parent | fabbeba59ad1de226f5710cf5dfc216850181972 (diff) | |
download | rockbox-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')
-rw-r--r-- | wps/cabbiev2.320x480x16.wps | 24 | ||||
-rw-r--r-- | wps/cabbiev2.480x800x16.wps | 23 | ||||
-rw-r--r-- | wps/cabbiev2.800x480x16.wps | 26 | ||||
-rw-r--r-- | wps/cabbiev2/sources/popup.xcf | bin | 671903 -> 817309 bytes | |||
-rw-r--r-- | wps/cabbiev2/volumebar-320x480x16.bmp | bin | 0 -> 163254 bytes | |||
-rw-r--r-- | wps/cabbiev2/volumebar-480x800x16.bmp | bin | 0 -> 370694 bytes | |||
-rw-r--r-- | wps/cabbiev2/volumebar-800x480x16.bmp | bin | 0 -> 370694 bytes | |||
-rw-r--r-- | wps/cabbiev2/volumebar-backdrop-320x480x16.bmp | bin | 0 -> 163254 bytes | |||
-rw-r--r-- | wps/cabbiev2/volumebar-backdrop-480x800x16.bmp | bin | 0 -> 370694 bytes | |||
-rw-r--r-- | wps/cabbiev2/volumebar-backdrop-800x480x16.bmp | bin | 0 -> 370694 bytes |
10 files changed, 55 insertions, 18 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)>>> diff --git a/wps/cabbiev2.480x800x16.wps b/wps/cabbiev2.480x800x16.wps index 264043ee37..3d81b723ac 100644 --- a/wps/cabbiev2.480x800x16.wps +++ b/wps/cabbiev2.480x800x16.wps @@ -17,10 +17,12 @@ %xl(G,popup-480x800x16.bmp,0,0) %xl(H,rew-480x800x16.bmp,0,5) %xl(I,ff-480x800x16.bmp,70,5) +%xl(vol,volumebar-480x800x16.bmp,0,0) +%xl(volbd,volumebar-backdrop-480x800x16.bmp,0,0) %Cl(0,0,275,275,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,102,-,180,-) @@ -46,13 +48,13 @@ %Cd # current track info - AA -%Vl(d,0,370,-,-,-) +%Vl(d,0,370,-,-200,-) %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,550,-,-,-) +%Vl(d,0,550,-,-200,-) %?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 @@ -68,7 +70,7 @@ #%?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(145,125,88,60,volume) +%T(small_vol,145,125,88,60,none) # # shuffle %?ps<%xd(D)> @@ -84,6 +86,13 @@ %T(400,119,70,75,stop, repeat_press) # +# volume slider +# +%Vl(vol,14,375,452,205,-) +%pv(0,0,452,205,image,vol,backdrop,volbd) +%T(0,0,452,205,volume) + +# # popup osd menu # %Vl(t,14,375,452,205,-) @@ -101,3 +110,7 @@ %T(0,0,70,75,prev) %T(70,0,70,75,ffwd, repeat_press) %T(70,0,70,75,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)>>> diff --git a/wps/cabbiev2.800x480x16.wps b/wps/cabbiev2.800x480x16.wps index 81c459415c..07420da616 100644 --- a/wps/cabbiev2.800x480x16.wps +++ b/wps/cabbiev2.800x480x16.wps @@ -8,12 +8,10 @@ %wd %X(wpsbackdrop-800x480x16.bmp) -#%xl(A,lock-240x320x16.bmp,11,0,2) -#%xl(B,battery-240x320x16.bmp,46,0,10) - %Cl(0,0,225,225,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,79,-,225,-) @@ -53,12 +51,11 @@ %pb(25,0,750,-,pb-800x480x16.bmp) %T(25,0,750,50,progressbar) -#%?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 -%xl(C,volume-800x480x16.bmp,340,78,10) +%V(344,400,108,60,-) +%xl(C,volume-800x480x16.bmp,10,0,10) %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)> -%T(340,78,88,60,volume) +%T(small_vol,0,0,108,60,none) # shuffle %V(468,415,92,43,-) @@ -80,6 +77,15 @@ %T(0,0,70,70,stop, repeat_press) # +# volume slider +# +%Vl(vol,308,83,-,205,-) +%xl(vol,volumebar-480x800x16.bmp,0,0) +%xl(volbd,volumebar-backdrop-480x800x16.bmp,0,0) +%pv(0,0,452,205,image,vol,backdrop,volbd) +%T(0,0,452,205,volume) + +# # popup osd menu # %Vl(t,308,83,-,205,-) @@ -100,3 +106,7 @@ %T(0,0,70,75,prev) %T(80,0,70,75,ffwd, repeat_press) %T(80,0,70,75,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)>>> diff --git a/wps/cabbiev2/sources/popup.xcf b/wps/cabbiev2/sources/popup.xcf Binary files differindex 57019b77ee..c2f1d82348 100644 --- a/wps/cabbiev2/sources/popup.xcf +++ b/wps/cabbiev2/sources/popup.xcf diff --git a/wps/cabbiev2/volumebar-320x480x16.bmp b/wps/cabbiev2/volumebar-320x480x16.bmp Binary files differnew file mode 100644 index 0000000000..d012c12def --- /dev/null +++ b/wps/cabbiev2/volumebar-320x480x16.bmp diff --git a/wps/cabbiev2/volumebar-480x800x16.bmp b/wps/cabbiev2/volumebar-480x800x16.bmp Binary files differnew file mode 100644 index 0000000000..98a17b9f0f --- /dev/null +++ b/wps/cabbiev2/volumebar-480x800x16.bmp diff --git a/wps/cabbiev2/volumebar-800x480x16.bmp b/wps/cabbiev2/volumebar-800x480x16.bmp Binary files differnew file mode 100644 index 0000000000..98a17b9f0f --- /dev/null +++ b/wps/cabbiev2/volumebar-800x480x16.bmp diff --git a/wps/cabbiev2/volumebar-backdrop-320x480x16.bmp b/wps/cabbiev2/volumebar-backdrop-320x480x16.bmp Binary files differnew file mode 100644 index 0000000000..2ef838c5c9 --- /dev/null +++ b/wps/cabbiev2/volumebar-backdrop-320x480x16.bmp diff --git a/wps/cabbiev2/volumebar-backdrop-480x800x16.bmp b/wps/cabbiev2/volumebar-backdrop-480x800x16.bmp Binary files differnew file mode 100644 index 0000000000..f4bb9b37d6 --- /dev/null +++ b/wps/cabbiev2/volumebar-backdrop-480x800x16.bmp diff --git a/wps/cabbiev2/volumebar-backdrop-800x480x16.bmp b/wps/cabbiev2/volumebar-backdrop-800x480x16.bmp Binary files differnew file mode 100644 index 0000000000..f4bb9b37d6 --- /dev/null +++ b/wps/cabbiev2/volumebar-backdrop-800x480x16.bmp |