From b32afb8c55d89d51b2a2603b8f70a7f182dc39e1 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Fri, 15 Aug 2014 21:27:23 +0900 Subject: [PATCH] make theme a bit nicer for video mode and file list --- TODO | 4 +- data/themes/default.edc | 87 +++++++++++++------- data/themes/images/Makefile.mk | 3 +- data/themes/images/vgrad-dark-inv-trans.png | Bin 0 -> 4246 bytes 4 files changed, 60 insertions(+), 34 deletions(-) create mode 100644 data/themes/images/vgrad-dark-inv-trans.png diff --git a/TODO b/TODO index 944721a..93104dd 100644 --- a/TODO +++ b/TODO @@ -10,6 +10,6 @@ * add subtitle file cmdline * loop all option * show busy anim until opened cb or failure -* add button/control top-left next to audio to do fullscreen/normal toggle -* detect letterboxing and auto-crop * thumbnail picker show all thumbs for video in a grid to select position +* fix initial sizing in audio mode to account for scaling +* add title/album/artis/file display inside window in music mode (at pos?) diff --git a/data/themes/default.edc b/data/themes/default.edc index bdf2ab8..f1a3a65 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -35,6 +35,7 @@ collections { images.image: "bg_glint.png" COMP; images.image: "vgrad-dark-inv.png" COMP; + images.image: "vgrad-dark-inv-trans.png" COMP; images.image: "posglow.png" COMP; images.image: "speaker-base.png" COMP; @@ -237,8 +238,16 @@ collections { description { state: "default" 0.0; } } - part { name: "controlbar_shadow"; mouse_events: 0; + + part { name: "controlbar_shadow_clip"; type: RECT; clip_to: "controlbar_clip"; + description { state: "default" 0.0; + rel2.relative: 1.0 0.0; + rel2.to_y: "controlbar"; + } + } + part { name: "controlbar_shadow"; mouse_events: 0; + clip_to: "controlbar_shadow_clip"; description { state: "default" 0.0; fixed: 1 1; rel1.to: "controlbar"; @@ -466,6 +475,37 @@ collections { } } + part { name: "rage.list"; type: SWALLOW; + description { state: "default" 0.0; + align: 0.0 0.5; + rel1.relative: 1.0 0.0; + rel2.relative: 1.0 0.0; + rel2.to_y: "controlbar"; + fixed: 1 1; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + align: 1.0 0.5; + visible: 1; + } + } + program { + signal: "list,state,visible"; source: "rage"; + action: STATE_SET "visible" 0.0; + transition: DECELERATE 0.3; + target: "rage.list"; + } + program { + signal: "list,state,hidden"; source: "rage"; + action: STATE_SET "default" 0.0; + transition: ACCELERATE 0.5; + target: "rage.list"; + after: "list_hidden"; + } + program { name: "list_hidden"; + action: SIGNAL_EMIT "list,state,hidden,finished" "rage"; + } + part { name: "controlbar_clip"; type: RECT; description { state: "default" 0.0; color: 255 255 255 0; @@ -479,7 +519,7 @@ collections { part { name: "controlbar"; mouse_events: 0; clip_to: "controlbar_clip"; description { state: "default" 0.0; - image.normal: "vgrad-dark-inv.png"; + image.normal: "vgrad-dark-inv-trans.png"; fill { smooth: 0; size.relative: 0.0 1.0; @@ -487,6 +527,20 @@ collections { } rel1.to: "rage.pos.prev.swallow"; } + description { state: "novideo" 0.0; + inherit: "default" 0.0; + image.normal: "vgrad-dark-inv.png"; + } + } + program { + signal: "state,novideo"; source: "rage"; + action: STATE_SET "novideo" 0.0; + target: "controlbar"; + } + program { + signal: "state,video"; source: "rage"; + action: STATE_SET "default" 0.0; + target: "controlbar"; } part { name: "posclip"; type: RECT; @@ -963,35 +1017,6 @@ collections { } } - part { name: "rage.list"; type: SWALLOW; - description { state: "default" 0.0; - align: 0.0 0.5; - rel1.relative: 1.0 0.0; - fixed: 1 1; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - align: 1.0 0.5; - visible: 1; - } - } - program { - signal: "list,state,visible"; source: "rage"; - action: STATE_SET "visible" 0.0; - transition: DECELERATE 0.3; - target: "rage.list"; - } - program { - signal: "list,state,hidden"; source: "rage"; - action: STATE_SET "default" 0.0; - transition: ACCELERATE 0.5; - target: "rage.list"; - after: "list_hidden"; - } - program { name: "list_hidden"; - action: SIGNAL_EMIT "list,state,hidden,finished" "rage"; - } - #define STATE_FADE_PROG(_name) \ program { \ signal: "action,"_name; source: "rage"; \ diff --git a/data/themes/images/Makefile.mk b/data/themes/images/Makefile.mk index 8af6326..f29153e 100644 --- a/data/themes/images/Makefile.mk +++ b/data/themes/images/Makefile.mk @@ -47,6 +47,7 @@ data/themes/images/speaker-bevel-hi.png \ data/themes/images/speaker-bevel-lo.png \ data/themes/images/speaker-over.png \ data/themes/images/speaker-shadow.png \ -data/themes/images/vgrad-dark-inv.png +data/themes/images/vgrad-dark-inv.png \ +data/themes/images/vgrad-dark-inv-trans.png EXTRA_DIST += $(THEME_IMGS) diff --git a/data/themes/images/vgrad-dark-inv-trans.png b/data/themes/images/vgrad-dark-inv-trans.png new file mode 100644 index 0000000000000000000000000000000000000000..571e7c3051a4e5b0b302c50997af9d65cee46e99 GIT binary patch literal 4246 zcmV;H5NYp;P)001Zm1^@s6c`Wgm000nONklvG#V5`>2U36Y5(;=Js>^2VkJa{mZ9txr92&epE0Qn7U*fWh3lXMpLizyA7HL|hRu z#sB|D$N6u@{JTBYFa$jQR%O?9>exdT7Yw7ym`xP>{zk^*rzHwiA*b^(M>V85 z+3!q=#$38lf9vd|TT(Lom2>lcV z8Q(b}B>sNLW>q7!`gleY0nWzYE^Nw}&m`--8Ur^RDvVFpT4|o+i&Yu-B8wMCG9K-(_AioEnW~8Adx6xXK5q zPzSuzB1$pIcf%-e7YiPX5AjH2Vq??P3NHxBS@>x@sVY-}Quo9guk!k0l=2coUF3V} zRVqHa$Q%y&{0!yW#R%1tZ7`Zy_9K$HjrIPJHC!_9kg>-;&Z5AJc=e$`3sL}0HPoqW znBPr|#Cg?O6(M9pKSW?%HvDEL;DmC)V%0tCcp3s$vC!c)n{4p-+}(J)Vc|oehajs7 zw^f9BiBVJ-V3oBDPpR{*SXUK~u$j;|OGpZM3L1(&_a>XH^BkLd7lU17{X@YDqT7Xa z6;VQl;0+ER zsT#vCqY!s7lvOtUfWo=tyFxKH39bB`diEQG0sf0fA};`$fky_yIsWd2p2*JT|u#&@A$PErUR^TKm3$wy}>Tfw}k2p#fWjl7Al zJKo>0u^V#lO$@bS&x*{ciRa>cS9z9xryy-B@Ul!{7K}HZea@mJ6**gx*PDssDv%B@ zQW6BcLn#-NKMn=^#AkL9hHjuz4ITL_>5>k`a0cT3t`OiZfA849Fk%1x*qBYg3Q=J} zURa@U^wu3l*v&lj^8{s0=B@y$n%wR#O4p$eC!WEz9|>ZPh*)O{4a2Q=35gZSW{2kr zLmgBD7&;Q^X1=EaxgK-c-z4RV4!Jpws-Pj%#5?o(8`j*hu4bOw@Lo%(s+v$j1PUh% z&n5LW$v@wX+Y-91CeQB%KrMK^16*$MxtH8|7R6BXdm*u=;5n%!$sId9#fs-UuQ(e8 zu7uQ#&Uq-dS4Te(;pBM(^7cdhcNPBpq12PHhYk)i-MT+tF zoK!}1t_6U#7$YCDy3dkB9RM3Uc%T{9rkqijyhyzbDU2pab21737l`i}No_Sqd^X^L zpg}oFBE>H#Q2?Q;&_BRUDub{9HP1=ah2%FCf0L9%5pf5CZL*HjRF9Y!4$$}|`&Y!F zr~&N>{pNU7Rk}Sf$OU^kI|RsZxrO?24iFE-Y%@l&P&X)+I!5Df{&ROO63ySSf z?Fnz*k{okJg+P_&G>LVUajO9^s+`r#YeD+37;0=7%qFG3L)JQgTLA@i%2*BFcSE{W z3_z<`J833Gz$27zC?zUA^Q05AiOn4oy}|M-Hs?ZqrMct{p5lgjtt!nALmc-6)Rd$~ ztfiyNkk4b|CXCVH>339D8jMVpS#!;g#8?6{qAVgo@fDS$E^@TwLN#7y#|Ctei4^t*FIu6XOtv=&lBg;3Ak`?m z^Efp@>JB+($Wr;UMF{2&GImf5tLZ|ihN_wnwzdQewQpz;ef|obk3Sk3PmIr!Ye{(D ziu!wnV%CH!&i3$$hRGDFC&I`CR!vCcMl^$Zd$MU6S2i1iQRQ!mGIZovH6h9ad1ggo z9YB}P%n6 z^lymoL*{k?G*IpZ8#)`xD)3oXimc#RPvncrFlep1z}wO>C>j4HrOxh(7PCq2HD_uN z#xGO;YN-3}i6Cmcwp(f8dijRnE|_Nl@>I_4Zjf9xv<>?on<#|Vvm@~?9USN)YpPJ1 zK+YHFMhO625RZ>;?vj%s&n28Odc9-wogkY|w8KIi++%X?lotX{mK7pL3l7;cm>|0Y=u=QU_ z@=HRfhNeU2xri5G1?GmNeysloUJp~7S2~9UfXe{2D^bECJl-X1(GHjiQ8Hj4-2ky6 z^PA8wPhN61C7lLnUQvOVKwk_Fh~%|)+Dx!UCbcKRR577qF^b}f>LgViS`3-{g3Z5- zT<)koXgE8BdeX6efOor)++S}{Cp(JTH+AWr7)&H&IMaxd` zWue#2__#1>0#PG*TlX_3gmOh^O2xlD{MnfR(N4tgxXG3{78lm{`3+g=xG=UU{laGo zyv<~a-Th5s?{c0y3gjJmNj14^7;2?~P9aG=8Kqwl+G@OZ&a`h7ir#5YxXRsZW&zOY z@!CD)kZqV$q5(7psu}!#OW1^Fsz%v)lUPX_wfB^VHyWI&~iYK zO4CN@)57yJ3NgSNv%HP_W1v&+t3`wt^y%?{~u9{!q4sY??az$^tLTL{ZDef?$ z6lA-O+?u&?@V@A?3d?=<#@foPdGyM4@YxE%DrL z$EMNU5YsN#jHC`-;<+96*A% zc)h-(7)5o*DA$Dl3RGh5GT%K>s0nkYLQgQ>MYym_zQ2km)Mn2!DGh3y)dbIXf~nx< zldnBt7}^ZmlS)=W$+V!fsa1{*5#tUA^*f@>@}Tmj4y+BDJk?cEx>-yT&JKzTX!(>e zPEqPG)sU>Z;WlgnQ936)B2$KeyqBc>HcNP^22r!uZ!wBQuRq0e%e>N8Y>Qj)cXn`J z6{?A2+2Xk=RnLEH1|)`|ZX)~z1QD-y&nOVm3fO&)yv0h9&tVX2yrDiEs&$F#Eujj| zq>NKdsqF$PCAgX3#Y5(k(FF@~)NVqT>nI5*UweZJhv)k+)W>APYDva-VYR;jWBQ#> zG+uPm@e&41?%|JMD$S!ng}m->g`Fesr8`Btmp9(gG4kDXw(v7syxtDwpn5aN(@_o` zIn!OL9W4=Lf3uFwc*O=jbTKGzNt!k4n=vcGo$;zv z?3mw^&YF(y8OIS0-gTKxl3SBRy#s}vMoIK~jJtW}-OxEo4;&`61}LAF@Mblc^M~Yf zn^>T`-^Ce%OZFEi9J#?WUfb9z(05PJJ*zvLF)pXLD^ekn@mZwnK*Kydr0a8MpcmkU zCi+2eqP+6&ZkQ%O;L~h~9;P|qjhr%7L+%!X40$zLc86TV>lu!BO_tgN_Yu!6?|~BI zh7=(TC32ZYfu1Dg&d~JwwI$v+msSw$-Bd5`$k`_#bQ1XiTI5VXhO!{8$M6IZzs2j# zTME!3o=?_w%(*HE*I^y-BpaVG+ukTPU ziX?hXHm4aN;STW76HoEnxLFJp!%$2Pu_wv>$bTn93SM*+i6AniK4K^Ta#Kn+wKDlh&m?S{~H|6M5m>E9FZH(i)y&(3Ag4vR^Zt@Jgp1)DY@eU zPjQ+$DRZ`le9c|=af|0GaL4+;pcogpJk8Ha_$JLAio#H*vYm~xD5yD1J~vAhgdOY= z`F)2v=7#yG0S&{O4M|-v2SxL|)`j`Ka>nWu=2;+qm@*cx&UFA~H(e4_JYUnmTSXNu z65$qvZY4{@c+-liN;j5$#Os-2TDJ0)tKlx$?aZraPt;8Ho)>o>|fm*2vQM