diff --git a/.rockbox/themes/Broadway.cfg b/.rockbox/themes/Broadway.cfg index 99027f5..c4e2201 100644 --- a/.rockbox/themes/Broadway.cfg +++ b/.rockbox/themes/Broadway.cfg @@ -1,7 +1,7 @@ # Theme: Broadway # Author: Walter Purcaro # Platform: SanDisk Sansa Clip Zip -# Version: 4.3 +# Version: 5.0 # Licence: CC BY-SA 3.0 diff --git a/.rockbox/wps/Broadway.fms b/.rockbox/wps/Broadway.fms index 9a6e7f5..d4ed525 100644 --- a/.rockbox/wps/Broadway.fms +++ b/.rockbox/wps/Broadway.fms @@ -1,11 +1,11 @@ # Theme: Broadway # Author: Walter Purcaro # Platform: SanDisk Sansa Clip Zip -# Version: 4.3 +# Version: 5.0 # Licence: CC BY-SA 3.0 -#### Display onscreen +#### Display on screen # Show sbs status bar %we @@ -24,8 +24,9 @@ #### Preload images -%xl(M,mic.bmp,0,0,3) -%xl(K,speaker.bmp,0,0,2) +%xl(K,channels.bmp,0,0,2) +%xl(P,pause.bmp) +%xl(R,rec.bmp) #### Preload screen viewport @@ -33,40 +34,47 @@ # Background fix %Vl(f,0,0,-,82,-) %VB %Vb(!P000!) +# Recording image +%Vl(f,6,9,12,11,-) +%Vf(!P035!) +%?Rr<%t(.5)%xd(R);%t(.5)> + # Current frequency -%Vl(f,0,0,-,30,2) %Vf(!P022!) +%Vl(f,19,0,58,30,2) %Vf(!P022!) %?mp<|||||||%Vf(!P022!)|%Vf(!S022!)> %ac%tf +# Pause image +%Vl(f,78,9,12,11,-) +%Vf(!P036!) +%?mp<||||||||%xd(P)> + # RDS name %Vl(f,0,30,-,20,3) %Vf(!P023!) -%s%?Rr< -%?Sr<:%Sx(Recording)|%Sx(Recording):>| -%ac%?tt< -%?ty<%ty|%?Tn<%Tn|%(N/D%)>>| -%t(3)%?Sr< -%Sx(Loading...)| -%?if(%ss(0,10,%Sx(Loading...)),=,%Sx(Loading...))< -%Sx(Loading...)| -%ss(0,7,%Sx(Loading...))...>>;%t(.5);>> +%s%ac%?Rr<%Rh:%Rn:%Rs| +%?tt<%?ty<%ty|%?Tn<%Tn|N/D>>| +%t(3)%Sx(Loading...);%t(.5)>> # RDS text %Vl(f,0,50,-,16,4) %Vf(!P024!) -%s%ac%?Rr<%Rh:%Rn:%Rs| -%?tx<%?tz<%tz|%t(1)...;%t(.5);%t(.5).;%t(.5)..;>>> +%s%ac%?tz<%tz| +%?Rr<%?ty<%ty|%Sx(Recording)>| +%t(1)...;%t(.5);%t(.5).;%t(.5)..>> # Scan/preset text -%Vl(f,1,70,38,12,6) +%Vl(f,1,70,39,12,6) %?tm<%Vf(!S025!)|%Vf(!P025!)> -%?tm<%Sx(Scan)| -%s%aL%?Ti<%Ti|??>/%Tc> +%aL%?tm<%Sx(Scan)| +%s%?Ti<%Ti|??>/%Tc> -# Speaker/Mic image -%Vl(f,42,70,12,10,-) -%?tm<%Vf(!S026!)|%Vf(!P026!)> -%t(4)%xd(K,%ts);%?Rr<%t(4)%xd(M,%Rm,1)|%t(0)>; +# Channels image +%Vl(f,41,70,14,10,-) +%?tm<%Vf(!S026!)|%?Rr<%Vf(!P035!)|%?St(force fm mono)<%Vf(!S026!)|%Vf(!P026!)>>> +%?tm<%t(1)%xd(K,%ts);%?St(force fm mono)<%t(.5)|%t(0)>| +%?Rr<%xd(K,%Rm)| +%t(1)%xd(K,%ts);%?St(force fm mono)<%t(.5)|%t(0)>>> # Signal strength -%Vl(f,57,70,38,12,6) -%?tm<%Vf(!S026!)|%Vf(!P026!)> +%Vl(f,56,70,-,12,6) +%?tm<%Vf(!S034!)|%Vf(!P034!)> %aR%?tr<0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46|47|48|49|50|51|52|53|54|55|56|57|58|59|60|61|62|63|64|65|66|67|68|69|70|71|72|73|74|75|76|77|78|79|80|81|82|83|84|85|86|87|88|89|90|91|92|93|94|95|96|97|98|99|100|100>%% diff --git a/.rockbox/wps/Broadway.sbs b/.rockbox/wps/Broadway.sbs index 5695ad0..633fa65 100644 --- a/.rockbox/wps/Broadway.sbs +++ b/.rockbox/wps/Broadway.sbs @@ -1,7 +1,7 @@ # Theme: Broadway # Author: Walter Purcaro # Platform: SanDisk Sansa Clip Zip -# Version: 4.3 +# Version: 5.0 # Licence: CC BY-SA 3.0 @@ -16,12 +16,13 @@ %Vi(time,2,0,92,84,6) %Vf(!P030!) %Vb(!P000!) %Vi(usb,0,0,-,84,6) %Vf(!P031!) %Vb(!P000!) -#### Display onscreen + +#### Display on screen # Hide inbuilt status bar %wd -#@NOTE: +# NOTE: # %?cs< # 1 Menus | # 2 WPS | @@ -43,8 +44,7 @@ # 18 Bookmark browser | # 19 Shortcuts menu | # 20 Track Info screen (NOT WORKING) | -# 21 USB screen -# > +# 21 USB screen > # Set current screen ui and list viewports (un-grouped) #%?cs< @@ -85,25 +85,25 @@ # Show current screen viewports (un-grouped) #%?cs< -#%Vd(x)%Vd(p)%?mv<%Vd(v)|%?mp<%Vd(s)|%?or(%pS(16),%pE(8))<%Vd(t)|%Vd(s)>>>| +#%Vd(x)%Vd(p)%?mv<%Vd(v)|%?mp<%Vd(s)|%?or(%pS(8),%if(%LT,=,%Sx(Now Playing)),%if(%LT,=,%Sx(FM Radio)),%if(%LT,=,%Sx(Recording)))<%Vd(i)|%Vd(s)>>>| #%Vd(p)%?mv<%Vd(v)|%Vd(s)>| #%Vd(x)%Vd(s)| #%Vd(p)%?mv<%Vd(v)|%Vd(s)>| -#%Vd(x)%Vd(p)%?mv<%Vd(v)|%?mp<%Vd(s)|%?or(%pS(16),%pE(8))<%Vd(t)|%Vd(s)>>>| -#%Vd(x)%Vd(p)%?mv<%Vd(v)|%?mp<%Vd(s)|%?or(%pS(16),%pE(8))<%Vd(t)|%Vd(s)>>>| -#%Vd(x)%Vd(p)%?mv<%Vd(v)|%?mp<%Vd(s)|%?or(%pS(16),%pE(8))<%Vd(t)|%Vd(s)>>>| -#%Vd(x)%Vd(p)%?mv<%Vd(v)|%?mp<%Vd(s)|%?or(%pS(16),%pE(8))<%Vd(t)|%Vd(s)>>>| -#%Vd(x)%Vd(p)%?mv<%Vd(v)|%?mp<%Vd(s)|%?or(%pS(16),%pE(8))<%Vd(t)|%Vd(s)>>>| +#%Vd(x)%Vd(p)%?mv<%Vd(v)|%?mp<%Vd(s)|%?pS(8)<%Vd(i)|%Vd(s)>>>| +#%Vd(x)%Vd(p)%?mv<%Vd(v)|%?mp<%Vd(s)|%?pS(8)<%Vd(i)|%Vd(s)>>>| +#%Vd(x)%Vd(p)%?mv<%Vd(v)|%?mp<%Vd(s)|%?pS(8)<%Vd(i)|%Vd(s)>>>| +#%Vd(x)%Vd(p)%?mv<%Vd(v)|%?mp<%Vd(s)|%?pS(8)<%Vd(i)|%Vd(s)>>>| +#%Vd(x)%Vd(p)%?mv<%Vd(v)|%?mp<%Vd(s)|%?pS(8)<%Vd(i)|%Vd(s)>>>| #%Vd(x)| #%Vd(x)| #%Vd(x)%?mv<%Vd(v)|%Vd(s)>| -#%Vd(x)%Vd(p)%?mv<%Vd(v)|%?mp<%Vd(s)|%?or(%pS(16),%pE(8))<%Vd(t)|%Vd(s)>>>| +#%Vd(x)%Vd(p)%?mv<%Vd(v)|%?mp<%Vd(s)|%?pS(8)<%Vd(i)|%Vd(s)>>>| #%Vd(x)%?mv<%Vd(v)|%Vd(s)>| #%Vd(x)%?mv<%Vd(v)|%Vd(s)>| -#%Vd(x)%Vd(p)%?mv<%Vd(v)|%?mp<%Vd(s)|%?or(%pS(16),%pE(8))<%Vd(t)|%Vd(s)>>>| +#%Vd(x)%Vd(p)%?mv<%Vd(v)|%?mp<%Vd(s)|%?pS(8)<%Vd(i)|%Vd(s)>>>| #%Vd(x)%?mv<%Vd(v)|%Vd(s)>| -#%Vd(x)%Vd(p)%?mv<%Vd(v)|%?mp<%Vd(s)|%?or(%pS(16),%pE(8))<%Vd(t)|%Vd(s)>>>| -#%Vd(x)%Vd(p)%?mv<%Vd(v)|%?mp<%Vd(s)|%?or(%pS(16),%pE(8))<%Vd(t)|%Vd(s)>>>| +#%Vd(x)%Vd(p)%?mv<%Vd(v)|%?mp<%Vd(s)|%?pS(8)<%Vd(i)|%Vd(s)>>>| +#%Vd(x)%Vd(p)%?mv<%Vd(v)|%?mp<%Vd(s)|%?pS(8)<%Vd(i)|%Vd(s)>>>| #%Vd(x)%?mv<%Vd(v)|%Vd(s)>| #%Vd(x)%?or(%bc,%and(%bp,%if(%bl,=,100)))<%Vd(b)>%Vd(s)> @@ -113,7 +113,7 @@ %?or(%if(%cs,=,2),%if(%cs,=,4))<%Vd(p)%?mv<%Vd(v)|%Vd(s)>| %?or(%if(%cs,=,10),%if(%cs,=,11))<%Vd(x)| %?or(%if(%cs,=,12),%if(%cs,=,14),%if(%cs,=,15),%if(%cs,=,17),%if(%cs,=,20),%if(%cs,>,21))<%Vd(x)%?mv<%Vd(v)|%Vd(s)>| -%Vd(x)%Vd(p)%?mv<%Vd(v)|%?mp<%Vd(s)|%?or(%pS(16),%pE(8))<%Vd(t)|%Vd(s)>>>>>>>> +%Vd(x)%Vd(p)%?mv<%Vd(v)|%?mp<%Vd(s)|%?or(%pS(8),%if(%LT,=,%Sx(Now Playing)),%if(%LT,=,%Sx(FM Radio)),%if(%LT,=,%Sx(Recording)))<%Vd(i)|%Vd(s)>>>>>>>> #### Preload fonts @@ -128,7 +128,7 @@ %xl(B,battery.bmp,0,0,6) %xl(C,charger.bmp,0,0,2) %xl(L,lock.bmp) -%xl(M,mic.bmp,0,0,3) +%xl(M,mic.bmp) %xl(P,bar.bmp) @@ -155,21 +155,19 @@ # Battery image %Vl(b,0,0,-,70,-) %?bl<%Vf(!P033!)|%Vf(!P032!)|%Vf(!P033!)> -%?bc< -%?bl< -%t(.2)%xd(B,1);%t(.1)%xd(B,2);%t(.1)%xd(B,3);%t(.1)%xd(B,4);%t(.1)%xd(B,5);%t(.1)%xd(B,6);| -%t(.2)%xd(B,1);%t(.1)%xd(B,2);%t(.1)%xd(B,3);%t(.1)%xd(B,4);%t(.1)%xd(B,5);%t(.1)%xd(B,6);| -%t(.2)%xd(B,2);%t(.1)%xd(B,3);%t(.1)%xd(B,4);%t(.1)%xd(B,5);%t(.1)%xd(B,6);| -%t(.2)%xd(B,3);%t(.1)%xd(B,4);%t(.1)%xd(B,5);%t(.1)%xd(B,6);| -%t(.2)%xd(B,4);%t(.1)%xd(B,5);%t(.1)%xd(B,6);| -%t(.2)%xd(B,5);%t(.1)%xd(B,6);| +%?bc<%?bl<%t(.2)%xd(B,1);%t(.1)%xd(B,2);%t(.1)%xd(B,3);%t(.1)%xd(B,4);%t(.1)%xd(B,5);%t(.1)%xd(B,6)| +%t(.2)%xd(B,1);%t(.1)%xd(B,2);%t(.1)%xd(B,3);%t(.1)%xd(B,4);%t(.1)%xd(B,5);%t(.1)%xd(B,6)| +%t(.2)%xd(B,2);%t(.1)%xd(B,3);%t(.1)%xd(B,4);%t(.1)%xd(B,5);%t(.1)%xd(B,6)| +%t(.2)%xd(B,3);%t(.1)%xd(B,4);%t(.1)%xd(B,5);%t(.1)%xd(B,6)| +%t(.2)%xd(B,4);%t(.1)%xd(B,5);%t(.1)%xd(B,6)| +%t(.2)%xd(B,5);%t(.1)%xd(B,6)| %xd(B,6)>| %xd(B,%bl)> # Battery text %Vl(b,0,70,-,12,6) %?bl<%Vf(!P033!)|%Vf(!P032!)|%Vf(!P033!)> -%?if(%bt,=,?h ?m)<|%ac%bt> +%s%ac%?if(%bt,=,?h ?m)<|%bt> #### Preload progress bar viewport @@ -179,7 +177,7 @@ # Progress bar %Vl(p,0,82,-,2,-) -%?if(%mp,>,6)<%?Rr<%Vf(!S027!)|%Vf(!P027!)>|%Vf(!P020!)> +%?if(%mp,>,7)<%Vf(!P027!)|%Vf(!P020!)> %?mp<|%pb(0,0,-,-,P)> @@ -192,9 +190,9 @@ # Volume text %Vl(v,0,86,-,-,6) %?pv<%Vf(!P007!)|%Vf(!P008!)|%Vf(!P009!)> -%?pv<%aL Mute| -%aL %Sx(Volume) %aR%?pv<0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46|47|48|49|50|51|52|53|54|55|56|57|58|59|60|61|62|63|64|65|66|67|68|69|70|71|72|73|74|75|76|77|78|79|80|81|82|83|84|85|86|87|88|89|90|91|92|93|94|95|96|97|98|99|100|100>%% | -%aL %Sx(Gain) %aR%pv dB > +%aL %?pv<%?Sr<%Sx(Off) %Sx(Volume)|%Sx(Volume) %Sx(Off)>| +%Sx(Volume) %aR%?pv<0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46|47|48|49|50|51|52|53|54|55|56|57|58|59|60|61|62|63|64|65|66|67|68|69|70|71|72|73|74|75|76|77|78|79|80|81|82|83|84|85|86|87|88|89|90|91|92|93|94|95|96|97|98|99|100|100>%% | +%Sx(Gain) %aR%pv dB > #### Preload status bar viewport @@ -209,8 +207,8 @@ %?or(%bc,%if(%bl,>,20))<%Vf(!P002!)|%Vf(!P003!)>| %?bp<%Vf(!P004!)|%Vf(!P002!)>> %?bc<%xd(C,2)| -%?bp<%?bl<%t(.5)%xd(C,2);%t(.4);|%xd(C,2)>| -%?if(%bl,>,5)<%xd(C,1)|%t(.5)%xd(C,1);%t(.4);>>> +%?bp<%?bl<%t(.5)%xd(C,2);%t(.4)|%xd(C,2)>| +%?if(%bl,>,5)<%xd(C,1)|%t(.5)%xd(C,1);%t(.4)>>> # Battery text %Vl(s,9,86,33,-,6) @@ -218,25 +216,25 @@ %?or(%bc,%if(%bl,>,20))<%Vf(!P002!)|%Vf(!P003!)>| %?bp<%Vf(!P004!)|%Vf(!P002!)>> %aL%?bl,10),%if(%bt,=,?h ?m))<%bl%%|%t(3)%bl%%;%t(2)%bt;>> +%?or(%bc,%if(%bl,>,10),%if(%bt,=,?h ?m))<%bl%%|%t(3)%bl%%;%t(2)%bt>> # Lock/Mic image -%Vl(s,43,86,12,-,-) -%?if(%mp,=,6)<%Vf(!P005!)|%Vf(!P002!)> -%?mp<%xd(L,%mh)|%xd(L,%mh)|%xd(L,%mh)|%xd(L,%mh)|%xd(L,%mh)|%xd(M,1)|%t(.5)%xd(M,1);%t(.5);|%xd(L,%mh)> +%Vl(s,43,86,9,-,-) +%?and(%Rr,%if(%mp,<,8))<%Vf(!P005!)|%Vf(!P002!)> +%?and(%Rr,%if(%mp,<,8))<%xd(M)|%xd(L,%mh)> # Time text -%Vl(s,56,86,39,-,6) %Vf(!P002!) +%Vl(s,53,86,42,-,6) %Vf(!P002!) %aR%?cf<%cH:%cM|%cl:%cM%cp> -#### Preload Song bar viewport +#### Preload info bar viewport # Background fix -%Vl(t,0,84,-,1,-) %VB %Vb(!P000!) +%Vl(i,0,84,-,1,-) %VB %Vb(!P000!) -# Song bar -%Vl(t,0,85,-,-,6) %Vf(!P010!) -%s%?if(%mp,>,6)< -%?tz<%tz|%?ty<%ty|%?Tn<%Tn|%tf MHz>>>| -%?it<%it|%fn>> +# Info bar +%Vl(i,0,85,-,-,6) %Vf(!P010!) +%s%?if(%LT,=,%Sx(FM Radio))<%?if(%mp,>,7)<%?Sr<%?tz<%tz :>%?ty<%ty >%tf|%tf%?ty< %ty>%?tz<: %tz>>|%aL%Sx(Off)>| +%?if(%LT,=,%Sx(Recording))<%aL%?Rr<%Sx(On)|%Sx(Off)> %aR%Rh:%Rn:%Rs| +%?it<%it|%fn>>> diff --git a/.rockbox/wps/Broadway.wps b/.rockbox/wps/Broadway.wps index cce2feb..7ae7fd0 100644 --- a/.rockbox/wps/Broadway.wps +++ b/.rockbox/wps/Broadway.wps @@ -1,11 +1,11 @@ # Theme: Broadway # Author: Walter Purcaro # Platform: SanDisk Sansa Clip Zip -# Version: 4.3 +# Version: 5.0 # Licence: CC BY-SA 3.0 -#### Display onscreen +#### Display on screen # Show sbs status bar %we @@ -24,12 +24,12 @@ #### Preload images -%xl(D,dithering.bmp) %xl(E,equalizer.bmp) %xl(G,replaygain.bmp) %xl(R,repeat.bmp,0,0,4) %xl(S,shuffle.bmp) -%xl(X,crossfade.bmp,0,0,5) +%xl(T,trackskip.bmp) +%xl(X,crossfade.bmp) #### Preload screen viewport @@ -41,7 +41,7 @@ %Vl(w,0,0,-,30,2) %Vf(!P015!) %s%?it<%it|%fn> -#@NOTE: +# NOTE: # %?mp< # 0 Stop | # 1 Play | @@ -51,33 +51,26 @@ # 5 Recording | # 6 Recording paused | # 7 FM Radio playing | -# 8 FM Radio paused (muted) -# > +# 8 FM Radio paused (muted) > # Song artist -#@NOTE: `if` statement doesn't work with `%mp` in wps and fms! +# NOTE: `if` statement doesn't work with `%mp` in wps and fms! %Vl(w,0,30,-,20,3) %Vf(!P016!) -%s%?and(%Fp,%if(%px,>,90))< -%Sx(Next:)| +%s%?and(%Fp,%if(%px,>,90))<%Sx(Next:)| %?mp<| -%?ia<%ia|%?iA<%iA|%?d(2)<%?and(%d(3),%or(%if(%d(2),=,%Sx(Album)),%if(%d(2),=,ALBUM),%if(%d(2),=,Album),%if(%d(2),=,album),%if(%d(2),=,EP),%if(%d(2),=,ep)))<%d(3)|%d(2)>|%?d(1)<%d(1)|%(N/D%)>>>>| -%?ia<%ia|%?iA<%iA|%?d(2)<%?and(%d(3),%or(%if(%d(2),=,%Sx(Album)),%if(%d(2),=,ALBUM),%if(%d(2),=,Album),%if(%d(2),=,album),%if(%d(2),=,EP),%if(%d(2),=,ep)))<%d(3)|%d(2)>|%?d(1)<%d(1)|%(N/D%)>>>>| -%?and(%Fp,%if(%px,>,50))< -%Sx(Next:)| -%?ia<%ia|%?iA<%iA|%?d(2)<%?and(%d(3),%or(%if(%d(2),=,%Sx(Album)),%if(%d(2),=,ALBUM),%if(%d(2),=,Album),%if(%d(2),=,album),%if(%d(2),=,EP),%if(%d(2),=,ep)))<%d(3)|%d(2)>|%?d(1)<%d(1)|%(N/D%)>>>>>| -%?ia<%ia|%?iA<%iA|%?d(2)<%?and(%d(3),%or(%if(%d(2),=,%Sx(Album)),%if(%d(2),=,ALBUM),%if(%d(2),=,Album),%if(%d(2),=,album),%if(%d(2),=,EP),%if(%d(2),=,ep)))<%d(3)|%d(2)>|%?d(1)<%d(1)|%(N/D%)>>>>>> +%?ia<%ia|%?iA<%iA|%?d(3)<%?or(%if(%ss(1,4,%d(3)),=,lbum),%if(%ss(1,-,%d(3)),=,%ss(1,-,%Sx(Album))),%if(%ss(1,6,%d(3)),=,ingles),%if(%ss(1,6,%d(3)),=,ollabs),%if(%d(3),=,Ep),%if(%d(3),=,ep))|%?d(2)<%?or(%if(%ss(1,4,%d(2)),=,lbum),%if(%ss(1,-,%d(2)),=,%ss(1,-,%Sx(Album))),%if(%ss(1,6,%d(2)),=,ingles),%if(%ss(1,6,%d(2)),=,ollabs),%if(%d(2),=,Ep),%if(%d(2),=,ep))|%?and(%d(1),%if(%ss(1,4,%d(1)),!=,lbum),%if(%ss(1,-,%d(1)),!=,%ss(1,-,%Sx(Album))),%if(%ss(1,6,%d(1)),!=,ingles),%if(%ss(1,6,%d(1)),!=,ollabs),%if(%d(1),!=,Ep),%if(%d(1),!=,ep))<%d(1)|N/D>>>>>| +%?ia<%ia|%?iA<%iA|%?d(3)<%?or(%if(%ss(1,4,%d(3)),=,lbum),%if(%ss(1,-,%d(3)),=,%ss(1,-,%Sx(Album))),%if(%ss(1,6,%d(3)),=,ingles),%if(%ss(1,6,%d(3)),=,ollabs),%if(%d(3),=,Ep),%if(%d(3),=,ep))|%?d(2)<%?or(%if(%ss(1,4,%d(2)),=,lbum),%if(%ss(1,-,%d(2)),=,%ss(1,-,%Sx(Album))),%if(%ss(1,6,%d(2)),=,ingles),%if(%ss(1,6,%d(2)),=,ollabs),%if(%d(2),=,Ep),%if(%d(2),=,ep))|%?and(%d(1),%if(%ss(1,4,%d(1)),!=,lbum),%if(%ss(1,-,%d(1)),!=,%ss(1,-,%Sx(Album))),%if(%ss(1,6,%d(1)),!=,ingles),%if(%ss(1,6,%d(1)),!=,ollabs),%if(%d(1),!=,Ep),%if(%d(1),!=,ep))<%d(1)|N/D>>>>>| +%?Fp<%Sx(Next:)|%Sx(End of Song List)>| +%?ia<%ia|%?iA<%iA|%?d(3)<%?or(%if(%ss(1,4,%d(3)),=,lbum),%if(%ss(1,-,%d(3)),=,%ss(1,-,%Sx(Album))),%if(%ss(1,6,%d(3)),=,ingles),%if(%ss(1,6,%d(3)),=,ollabs),%if(%d(3),=,Ep),%if(%d(3),=,ep))|%?d(2)<%?or(%if(%ss(1,4,%d(2)),=,lbum),%if(%ss(1,-,%d(2)),=,%ss(1,-,%Sx(Album))),%if(%ss(1,6,%d(2)),=,ingles),%if(%ss(1,6,%d(2)),=,ollabs),%if(%d(2),=,Ep),%if(%d(2),=,ep))|%?and(%d(1),%if(%ss(1,4,%d(1)),!=,lbum),%if(%ss(1,-,%d(1)),!=,%ss(1,-,%Sx(Album))),%if(%ss(1,6,%d(1)),!=,ingles),%if(%ss(1,6,%d(1)),!=,ollabs),%if(%d(1),!=,Ep),%if(%d(1),!=,ep))<%d(1)|N/D>>>>>>> # Album title %Vl(w,0,50,-,16,4) %Vf(!P017!) -%s%?and(%Fp,%if(%px,>,90))< -%?It<%It|%Fn>| +%s%?and(%Fp,%if(%px,>,90))<%?It<%It|%Fn>| %?mp<| -%?id<%t(8)%id|%?and(%d(1),%d(2))<%t(8)%d(1)|%t(0)>>;%?iy<%t(3)%iy|%?in<%t(3)%#%in|%t(0)>>;%?ig<%t(3)%ig|%?iG<%t(3)%iG|%t(0)>>;| -%?id<%t(8)%id|%?and(%d(1),%d(2))<%t(8)%d(1)|%t(0)>>;%?iy<%t(3)%iy|%?in<%t(3)%#%in|%t(0)>>;%?ig<%t(3)%ig|%?iG<%t(3)%iG|%t(0)>>;| -%?and(%Fp,%if(%px,>,50))< -%?It<%It|%Fn>| -%?id<%t(8)%id|%?and(%d(1),%d(2))<%t(8)%d(1)|%t(0)>>;%?iy<%t(3)%iy|%?in<%t(3)%#%in|%t(0)>>;%?ig<%t(3)%ig|%?iG<%t(3)%iG|%t(0)>>;>| -%?id<%t(8)%id|%?and(%d(1),%d(2))<%t(8)%d(1)|%t(0)>>;%?iy<%t(3)%iy|%?in<%t(3)%#%in|%t(0)>>;%?ig<%t(3)%ig|%?iG<%t(3)%iG|%t(0)>>;>> +%?id<%t(8)%id|%?d(2)<%?and(%d(1),%if(%ss(1,4,%d(1)),!=,lbum),%if(%ss(1,-,%d(1)),!=,%ss(1,-,%Sx(Album))),%if(%ss(1,6,%d(1)),!=,ingles),%if(%ss(1,6,%d(1)),!=,ollabs),%if(%d(1),!=,Ep),%if(%d(1),!=,ep))<%t(8)%d(1)|%t(0)>|%t(0)>>;%?iy<%t(3)%iy|%?in<%t(3)%#%in|%t(0)>>;%?ig<%t(3)%ig|%?iG<%t(3)%iG|%t(0)>>| +%?id<%t(8)%id|%?d(2)<%?and(%d(1),%if(%ss(1,4,%d(1)),!=,lbum),%if(%ss(1,-,%d(1)),!=,%ss(1,-,%Sx(Album))),%if(%ss(1,6,%d(1)),!=,ingles),%if(%ss(1,6,%d(1)),!=,ollabs),%if(%d(1),!=,Ep),%if(%d(1),!=,ep))<%t(8)%d(1)|%t(0)>|%t(0)>>;%?iy<%t(3)%iy|%?in<%t(3)%#%in|%t(0)>>;%?ig<%t(3)%ig|%?iG<%t(3)%iG|%t(0)>>| +%?Fp<%?It<%It|%Fn>>| +%?id<%t(8)%id|%?d(2)<%?and(%d(1),%if(%ss(1,4,%d(1)),!=,lbum),%if(%ss(1,-,%d(1)),!=,%ss(1,-,%Sx(Album))),%if(%ss(1,6,%d(1)),!=,ingles),%if(%ss(1,6,%d(1)),!=,ollabs),%if(%d(1),!=,Ep),%if(%d(1),!=,ep))<%t(8)%d(1)|%t(0)>|%t(0)>>;%?iy<%t(3)%iy|%?in<%t(3)%#%in|%t(0)>>;%?ig<%t(3)%ig|%?iG<%t(3)%iG|%t(0)>>>> # Playlist status %Vl(w,1,70,60,12,6) @@ -89,23 +82,19 @@ %?pS(4)<%Vf(!P018!)|%Vf(!S018!)>> %s%aL%?mp<| %?pS(4)<%pp/%pe|%pc/%pt>| -%t(.5)%pc/%pt;%t(.5);| +%t(1)%pc/%pt;%t(.5)| %pc/%pt| %pc/%pt| %?pS(4)<%pp/%pe|%pc/%pt>> # Equalizer/Crossfade image -%Vl(w,64,70,14,10,-) %Vf(!P019!) -%t(8)%?mm<|%?ps<%xd(E,%St(eq enabled))>>;%?xf<%t(0)|%t(4)%xd(X,%xf,-1)>; +%Vl(w,64,70,10,10,-) %Vf(!P019!) +%t(6)%?mm<|%?ps<%xd(E,%St(eq enabled))>>;%?St(prevent track skip)<%t(6)%?rg<|%?xf<|%xd(X)>>|%?rg<%t(0)|%t(6)>> -# Shuffle image -%Vl(w,74,70,10,10,-) %Vf(!P019!) -%t(8)%?ps<%?mm<%xd(E,%St(eq enabled))|%xd(S,%ps)>|%?mm<|%xd(E,%St(eq enabled))>>;%?xf<%t(0)|%t(4)>; - -# Dithering image -%Vl(w,78,70,6,10,-) %Vf(!P019!) -%t(8);%?St(dithering enabled)<%t(4)%xd(D,%St(dithering enabled))|%t(0)>; +# Shuffle/Prevent Track Skip image +%Vl(w,74,70,10,10,-) %Vf(!P037!) +%t(6)%?mm<%?ps<%xd(E,%St(eq enabled))>|%?ps<%xd(S)|%xd(E,%St(eq enabled))>>;%?St(prevent track skip)<%t(6)%?rg<%?xf<|%xd(X)>|%t(6)%xd(T)>|%?rg<%?xf<%t(0)|%t(6)>|%t(6)%?xf<|%xd(X)>>> # Repeat/ReplayGain image -%Vl(w,84,70,11,10,-) %Vf(!P019!) -%t(8)%?mm<%?ps<%xd(S,%ps)|%xd(E,%St(eq enabled))>|%xd(R,%mm,-1)>;%?rg<%t(0)|%t(4)%xd(G)>; +%Vl(w,84,70,11,10,-) %Vf(!P038!) +%t(6)%?mm<%?ps<%xd(S)|%xd(E,%St(eq enabled))>|%xd(R,%mm,-1)>;%?St(prevent track skip)<%t(6)%?rg<%xd(T)|%xd(G)>|%?rg<%?xf<%t(0)|%t(6)%xd(X)>|%t(6)%xd(G)>> diff --git a/.rockbox/wps/Broadway/channels.bmp b/.rockbox/wps/Broadway/channels.bmp new file mode 100644 index 0000000..3094dfe Binary files /dev/null and b/.rockbox/wps/Broadway/channels.bmp differ diff --git a/.rockbox/wps/Broadway/crossfade.bmp b/.rockbox/wps/Broadway/crossfade.bmp index 90611ce..c2b1bd5 100644 Binary files a/.rockbox/wps/Broadway/crossfade.bmp and b/.rockbox/wps/Broadway/crossfade.bmp differ diff --git a/.rockbox/wps/Broadway/crossfeed.bmp b/.rockbox/wps/Broadway/crossfeed.bmp new file mode 100644 index 0000000..13bbc88 Binary files /dev/null and b/.rockbox/wps/Broadway/crossfeed.bmp differ diff --git a/.rockbox/wps/Broadway/dithering.bmp b/.rockbox/wps/Broadway/dithering.bmp index 5b243bb..fb33bff 100644 Binary files a/.rockbox/wps/Broadway/dithering.bmp and b/.rockbox/wps/Broadway/dithering.bmp differ diff --git a/.rockbox/wps/Broadway/lock.bmp b/.rockbox/wps/Broadway/lock.bmp index 0caec42..e3b7f7d 100644 Binary files a/.rockbox/wps/Broadway/lock.bmp and b/.rockbox/wps/Broadway/lock.bmp differ diff --git a/.rockbox/wps/Broadway/mic.bmp b/.rockbox/wps/Broadway/mic.bmp index 19f8d56..434f6d5 100644 Binary files a/.rockbox/wps/Broadway/mic.bmp and b/.rockbox/wps/Broadway/mic.bmp differ diff --git a/.rockbox/wps/Broadway/pause.bmp b/.rockbox/wps/Broadway/pause.bmp new file mode 100644 index 0000000..6aa1495 Binary files /dev/null and b/.rockbox/wps/Broadway/pause.bmp differ diff --git a/.rockbox/wps/Broadway/rec.bmp b/.rockbox/wps/Broadway/rec.bmp new file mode 100644 index 0000000..4c51bcf Binary files /dev/null and b/.rockbox/wps/Broadway/rec.bmp differ diff --git a/.rockbox/wps/Broadway/replaygain.bmp b/.rockbox/wps/Broadway/replaygain.bmp index 2173dca..8f223f2 100644 Binary files a/.rockbox/wps/Broadway/replaygain.bmp and b/.rockbox/wps/Broadway/replaygain.bmp differ diff --git a/.rockbox/wps/Broadway/shuffle.bmp b/.rockbox/wps/Broadway/shuffle.bmp index 7680a6d..69b778f 100644 Binary files a/.rockbox/wps/Broadway/shuffle.bmp and b/.rockbox/wps/Broadway/shuffle.bmp differ diff --git a/.rockbox/wps/Broadway/speaker.bmp b/.rockbox/wps/Broadway/speaker.bmp deleted file mode 100644 index c38c3e1..0000000 Binary files a/.rockbox/wps/Broadway/speaker.bmp and /dev/null differ diff --git a/.rockbox/wps/Broadway/trackskip.bmp b/.rockbox/wps/Broadway/trackskip.bmp new file mode 100644 index 0000000..92ff7a0 Binary files /dev/null and b/.rockbox/wps/Broadway/trackskip.bmp differ diff --git a/README.md b/README.md index f0573b2..796ed7e 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Broadway ======== -[![Rockbox](https://img.shields.io/badge/Rockbox-3.13-ff69b4.svg?style=flat-square)](http://www.rockbox.org/) +[![Rockbox](https://img.shields.io/badge/Rockbox-3.14-ff69b4.svg?style=flat-square)](http://www.rockbox.org/) [![Rockbox checkwps](https://img.shields.io/badge/build-passing-brightgreen.svg?style=flat-square)](http://themes.rockbox.org/index.php?themeid=2500&target=sansaclipzip) [![GitHub release](https://img.shields.io/github/release/vuolter/Broadway.svg?style=flat-square)](https://github.com/vuolter/Broadway/releases/latest) [![GitHub releases](https://img.shields.io/github/downloads/vuolter/Broadway/latest/total.svg?style=flat-square)](https://github.com/vuolter/Broadway/releases/latest) @@ -19,8 +19,8 @@ Broadway [![Twitter](https://img.shields.io/twitter/url/https/twitter.com/WalterPurcaro.svg?style=social)](https://twitter.com/intent/tweet?text=Wow:&url=%5Bobject%20Object%5D) An impressive theme for [Rockbox](http://www.rockbox.org/), -designed for the **SanDisk Sansa Clip Zip**, like [Ekaran] -(http://themes.rockbox.org/index.php?themeid=1762&target=sansaclipzip), +designed for the **SanDisk Sansa Clip Zip**, like +[Ekaran](http://themes.rockbox.org/index.php?themeid=1762&target=sansaclipzip), but with *few* **extra**... - Clean and neat source-code rewritten according the latest Rockbox @@ -28,7 +28,7 @@ specifications - Improved FM Radio Screen and While Playing Screen - Fully customizationd theme skin featuring brand new menu screens *(menu, recording screen, time & date screen)* -- New multi-tool status bar +- New "swiss army status bar" - New big volume bar with audio level and gain indicator - New song bar with current *Now Playing* track title - Volume level **in percentage** @@ -40,15 +40,17 @@ playback mode** left indicator - New equalizer indicator in While Playing Screen - New repeat mode indicator in While Playing Screen +- New shuffle indicator in While Playing Screen - New crossfade indicator in While Playing Screen -- New dithering indicator in While Playing Screen -- New replaygain indicator in While Playing Screen +- New ReplayGain indicator in While Playing Screen +- New track skip indicator in While Playing Screen - New audio channels indicator in FM Radio Screen -- New audio recording indicator in FM Radio Screen +- New pause indicator in FM Radio Screen +- New recording indicator in FM Radio Screen - New signal strength indicator in FM Radio Screen - New charge indicator in status bar - New lock indicator in status bar -- New sound recording indicator in status bar +- New recording indicator in status bar - Time clock supports now the 12 hour format - Charge indicator blinks if connected charger is not charging and warns if low battery, reporting estimated time left @@ -59,8 +61,8 @@ info. next track title)* - **Custom color support** *(see to the [Customization section](#customization))* - Fully text translated - Right-To-Left languages support -- No more bulky title on screen -- **A lot of theme issues now fixed!** +- No more fatty headers on screen +- **Lots of skin bugs now fixed!** Table of contents @@ -79,12 +81,12 @@ Installation Take the *Blue pill* or take the *Red pill*: -- **Blue pill:** Use the official [Rockbox Utility] -(http://www.rockbox.org/wiki/RockboxUtility#Download) to automatically download -& install the theme, the story ends. -- **Red pill:** Manually download the [latest released package] -(https://github.com/vuolter/Broadway/releases), unzip it to the root directory -of your device and see how deep the rabbit hole +- **Blue pill:** Use the official +[Rockbox Utility](http://www.rockbox.org/wiki/RockboxUtility#Download) +to automatically download & install the theme, the story ends. +- **Red pill:** Manually download the +[latest released package](https://github.com/vuolter/Broadway/releases), +unzip it to the root directory of your device and see how deep the rabbit hole goes. > **Note:** @@ -148,15 +150,20 @@ WPS song title | !P015! WPS song artist | !P016! WPS album title | !P017! WPS playlist status [position][time] | !P018! !S018! -WPS indicators | !P019! +WPS equalizer image | !P019! +WPS shuffle image | !P037! +WPS repeat image | !P038! WPS progress bar | !P020! Recording screen foreground | !P021! +FMS recording image | !P035! FMS current frequency [playing][muted] | !P022! !S022! +FMS pause image | !P036! FMS RDS name | !P023! FMS RDS text | !P024! FMS scan/preset text [preset][scan] | !P025! !S025! -FMS indicators | !P026! !S026! -FMS progress bar [regular][recording] | !P027! !S027! +FMS channels image | !P026! !S026! +FMS signal strength | !P034! !S034! +FMS progress bar | !P027! Quick screen foreground | !P028! Pitch screen foreground | !P029! Time and Date screen foreground | !P030! @@ -188,7 +195,7 @@ Volume mute | FFE708 | *!P007!* Volume level | FFE708 | *!P008!* Volume gain | 0CF2F7 | *!P009!* Song bar | 0CF2F7 | *!P010!* -Browser screens foreground | 08E3E7 | *!P011!* +Browser screens foreground | FFE708 | *!P011!* Context screens foreground | FFE708 | *!P012!* Menu items [selected][unselected] | FFE708 08E3E7 | *!P013! !S013!* Sub-menu items [selected][unselected] | FFE708 08E3E7 | *!P014! !S014!* @@ -196,15 +203,20 @@ WPS song title | FFE708 | *!P015!* WPS song artist | 08E3E7 | *!P016!* WPS album title | 0CF2F7 | *!P017!* WPS playlist status [position][time] | FFE708 08E3E7 | *!P018! !S018!* -WPS indicators | 08E3E7 | *!P019!* +WPS equalizer image | 08E3E7 | *!P019!* +WPS shuffle image | 08E3E7 | *!P037!* +WPS repeat image | 08E3E7 | *!P038!* WPS progress bar | FFE708 | *!P020!* Recording screen foreground | FFE708 | *!P021!* +FMS recording image | FF0820 | *!P035!* FMS current frequency [playing][muted] | FFE708 08E3E7 | *!P022! !S022!* +FMS pause image | FFE708 | *!P036!* FMS RDS name | 08E3E7 | *!P023!* FMS RDS text | 0CF2F7 | *!P024!* FMS scan/preset text [preset][scan] | FFE708 08E3E7 | *!P025! !S025!* -FMS indicators | 08E3E7 FFE708 | *!P026! !S026!* -FMS progress bar [regular][recording] | 08E3E7 FF0820 | *!P027! !S027!* +FMS channels image | 08E3E7 FFE708 | *!P026! !S026!* +FMS signal strength | 08E3E7 FFE708 | *!P034! !S034!* +FMS progress bar | 08E3E7 | *!P027!* Quick screen foreground | FFE708 | *!P028!* Pitch screen foreground | FFE708 | *!P029!* Time and Date screen foreground | FFE708 | *!P030!* @@ -217,9 +229,8 @@ Licensing --------- Please refer to the -[![Creative Commons Attribution-ShareAlike 3.0 Unported License] -(https://licensebuttons.net/l/by-sa/3.0/80x15.png)](/LICENSE.md) for the -extended license. +[![Creative Commons Attribution-ShareAlike 3.0 Unported License](https://licensebuttons.net/l/by-sa/3.0/80x15.png)](/LICENSE.md) +for the extended license. ---------------------------------