Cabbiev2/RaaA: Add volume slider pop to the WPS. · tsiry-sandratraina.com/rockbox-zig@f8578c0

A modern Music Player Daemon based on Rockbox open source high quality audio player

libadwaita audio rust zig deno mpris rockbox mpd

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

Thomas Martitz 14 years ago f8578c08 fabbeba5

+55 -18

10 changed files

expand all

unified split

wps

cabbiev2

sources

popup.xcf

volumebar-320x480x16.bmp

volumebar-480x800x16.bmp

volumebar-800x480x16.bmp

volumebar-backdrop-320x480x16.bmp

volumebar-backdrop-480x800x16.bmp

volumebar-backdrop-800x480x16.bmp

cabbiev2.320x480x16.wps

cabbiev2.480x800x16.wps

cabbiev2.800x480x16.wps

+19 -5

wps/cabbiev2.320x480x16.wps

··· 17 17 %xl(G,popup-320x480x16.bmp,0,0) 18 18 %xl(H,rew-320x480x16.bmp,0,8) 19 19 %xl(I,ff-320x480x16.bmp,45,8) 20 + %xl(vol,volumebar-320x480x16.bmp,0,0) 21 + %xl(volbd,volumebar-backdrop-320x480x16.bmp,0,0) 20 22 21 23 %Cl(0,0,180,180,c,c) 22 - 23 - %?C<%Vd(c)%?Tl(2.0)<%Vd(t)|%Vd(d)>|%Vd(a)%?Tl(2.0)<%Vd(t)|%Vd(b)>> 24 + %?C<%Vd(c)|%Vd(a)> 25 + %?vg(show_vol)<%?C<%Vd(d)|%Vd(b)>|%Vd(t)|%Vd(vol)> 24 26 25 27 # track & next track info - no AA 26 28 %Vl(a,0,60,-,110,-) ··· 45 47 %Cd 46 48 47 49 # current track info - AA 48 - %Vl(d,0,240,-,-,-) 50 + %Vl(d,0,240,-,-120,-) 49 51 %s%ac%?it<%it|%fn> 50 52 %s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>> 51 53 %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>> 52 54 53 55 # next track info - AA 54 - %Vl(d,0,338,-,-,-) 56 + %Vl(d,0,338,-,-120,-) 55 57 %?C<%s%ac%Sx(Next:) %?Ia<%Ia|%?D(2)<%D(2)|%(root%)>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>> 56 58 57 59 # playtime ··· 65 67 66 68 #%?mh<%xd(Aa)|%xd(Ab)> 67 69 #%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>> 70 + 68 71 # volume 69 72 %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)> 70 - %T(91,71,55,50,volume) 73 + %T(small_vol,91,71,55,50,none) 71 74 # 72 75 # shuffle 73 76 %?ps<%xd(D)> ··· 83 86 %T(273,66,45,50,stop, repeat_press) 84 87 85 88 # 89 + # volume slider 90 + # 91 + %Vl(vol,10,230,300,136,-) 92 + %pv(0,0,300,136,image,vol,backdrop,volbd) 93 + %T(0,0,300,136,volume) 94 + 95 + # 86 96 # popup osd menu 87 97 # 88 98 %Vl(t,10,230,300,136,-) ··· 100 110 %T(0,0,40,58,prev) 101 111 %T(50,0,40,58,ffwd, repeat_press) 102 112 %T(50,0,40,58,next) 113 + 114 + # needs to be at the end since touch regions need to be declared 115 + # before %Tl can be used 116 + %?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)>>>

+18 -5

wps/cabbiev2.480x800x16.wps

··· 17 17 %xl(G,popup-480x800x16.bmp,0,0) 18 18 %xl(H,rew-480x800x16.bmp,0,5) 19 19 %xl(I,ff-480x800x16.bmp,70,5) 20 + %xl(vol,volumebar-480x800x16.bmp,0,0) 21 + %xl(volbd,volumebar-backdrop-480x800x16.bmp,0,0) 20 22 21 23 %Cl(0,0,275,275,c,c) 22 - 23 - %?C<%Vd(c)%?Tl(2.0)<%Vd(t)|%Vd(d)>|%Vd(a)%?Tl(2.0)<%Vd(t)|%Vd(b)>> 24 + %?C<%Vd(c)|%Vd(a)> 25 + %?vg(show_vol)<%?C<%Vd(d)|%Vd(b)>|%Vd(t)|%Vd(vol)> 24 26 25 27 # track & next track info - no AA 26 28 %Vl(a,0,102,-,180,-) ··· 46 48 %Cd 47 49 48 50 # current track info - AA 49 - %Vl(d,0,370,-,-,-) 51 + %Vl(d,0,370,-,-200,-) 50 52 %s%ac%?it<%it|%fn> 51 53 %s%ac%?ia<%ia|%?d(2)<%d(2)|%(root%)>> 52 54 %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>> 53 55 54 56 # next track info - AA 55 - %Vl(d,0,550,-,-,-) 57 + %Vl(d,0,550,-,-200,-) 56 58 %?C<%s%ac%Sx(Next:) %?Ia<%Ia|%?D(2)<%D(2)|%(root%)>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>> 57 59 58 60 # playtime ··· 68 70 #%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>> 69 71 # volume 70 72 %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)> 71 - %T(145,125,88,60,volume) 73 + %T(small_vol,145,125,88,60,none) 72 74 # 73 75 # shuffle 74 76 %?ps<%xd(D)> ··· 84 86 %T(400,119,70,75,stop, repeat_press) 85 87 86 88 # 89 + # volume slider 90 + # 91 + %Vl(vol,14,375,452,205,-) 92 + %pv(0,0,452,205,image,vol,backdrop,volbd) 93 + %T(0,0,452,205,volume) 94 + 95 + # 87 96 # popup osd menu 88 97 # 89 98 %Vl(t,14,375,452,205,-) ··· 101 110 %T(0,0,70,75,prev) 102 111 %T(70,0,70,75,ffwd, repeat_press) 103 112 %T(70,0,70,75,next) 113 + 114 + # needs to be at the end since touch regions need to be declared 115 + # before %Tl can be used 116 + %?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)>>>

+18 -8

wps/cabbiev2.800x480x16.wps

··· 8 8 %wd 9 9 %X(wpsbackdrop-800x480x16.bmp) 10 10 11 - #%xl(A,lock-240x320x16.bmp,11,0,2) 12 - #%xl(B,battery-240x320x16.bmp,46,0,10) 13 - 14 11 %Cl(0,0,225,225,c,c) 15 12 16 - %?C<%Vd(c)%?Tl(2.0)<%Vd(t)|%Vd(d)>|%Vd(a)%?Tl(2.0)<%Vd(t)|%Vd(b)>> 13 + %?C<%Vd(c)|%Vd(a)> 14 + %?vg(show_vol)<%?C<%Vd(d)|%Vd(b)>|%Vd(t)|%Vd(vol)> 17 15 18 16 # track & next track info - no AA 19 17 %Vl(a,0,79,-,225,-) ··· 53 51 %pb(25,0,750,-,pb-800x480x16.bmp) 54 52 %T(25,0,750,50,progressbar) 55 53 56 - #%?mh<%xd(Aa)|%xd(Ab)> 57 - #%?bp<%?bc<%xd(Ba)|%xd(Bb)>|%?bl<|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)|%xd(Bg)|%xd(Bh)|%xd(Bi)|%xd(Bj)>> 58 54 # volume 59 - %xl(C,volume-800x480x16.bmp,340,78,10) 55 + %V(344,400,108,60,-) 56 + %xl(C,volume-800x480x16.bmp,10,0,10) 60 57 %?pv<%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)|%xd(Ce)|%xd(Cf)|%xd(Cg)|%xd(Ch)|%xd(Ci)|%xd(Cj)> 61 - %T(340,78,88,60,volume) 58 + %T(small_vol,0,0,108,60,none) 62 59 63 60 # shuffle 64 61 %V(468,415,92,43,-) ··· 80 77 %T(0,0,70,70,stop, repeat_press) 81 78 82 79 # 80 + # volume slider 81 + # 82 + %Vl(vol,308,83,-,205,-) 83 + %xl(vol,volumebar-480x800x16.bmp,0,0) 84 + %xl(volbd,volumebar-backdrop-480x800x16.bmp,0,0) 85 + %pv(0,0,452,205,image,vol,backdrop,volbd) 86 + %T(0,0,452,205,volume) 87 + 88 + # 83 89 # popup osd menu 84 90 # 85 91 %Vl(t,308,83,-,205,-) ··· 100 106 %T(0,0,70,75,prev) 101 107 %T(80,0,70,75,ffwd, repeat_press) 102 108 %T(80,0,70,75,next) 109 + 110 + # needs to be at the end since touch regions need to be declared 111 + # before %Tl can be used 112 + %?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)>>>

wps/cabbiev2/volumebar-320x480x16.bmp