From 4af32a0d16402b71dcdd4ec08b59a457bbd2dd05 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sat, 23 Jun 2012 16:23:25 +0000 Subject: [PATCH] and spice up bell gfx a bit. it *IS* meant to get your attention. it IS a bell... fixes sizing too. SVN revision: 72719 --- data/themes/default.edc | 90 +++++++++++++++++++++++++-- data/themes/images/Makefile.am | 2 + data/themes/images/bg_led.png | Bin 1310 -> 1010 bytes data/themes/images/bg_led_base.png | Bin 0 -> 529 bytes data/themes/images/bg_led_strobe.png | Bin 0 -> 1277 bytes 5 files changed, 86 insertions(+), 6 deletions(-) create mode 100644 data/themes/images/bg_led_base.png create mode 100644 data/themes/images/bg_led_strobe.png diff --git a/data/themes/default.edc b/data/themes/default.edc index 95e5cec5..d091c4b5 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -6,7 +6,9 @@ collections { image: "bg_shine.png" COMP; image: "bg_glint.png" COMP; image: "bg_shadow.png" COMP; + image: "bg_led_base.png" COMP; image: "bg_led.png" COMP; + image: "bg_led_strobe.png" COMP; } parts { part { name: "shadow"; @@ -109,15 +111,32 @@ collections { aspect_preference: HORIZONTAL; } } - part { name: "bell"; + part { name: "bell_base"; mouse_events: 0; description { state: "default" 0.0; + fixed: 1 1; visible: 0; color: 255 255 255 0; min: 32 32; max: 32 32; - rel2.offset: -5 -5; + rel2.offset: -1 -1; align: 1.0 1.0; + image.normal: "bg_led_base.png"; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + color: 255 255 255 255; + } + } + part { name: "bell"; + mouse_events: 0; + description { state: "default" 0.0; + fixed: 1 1; + visible: 0; + color: 255 255 255 0; + rel1.to: "bell_base"; + rel2.to: "bell_base"; image.normal: "bg_led.png"; } description { state: "visible" 0.0; @@ -126,6 +145,34 @@ collections { color: 255 255 255 255; } } + part { name: "bell_strobe"; + mouse_events: 0; + description { state: "default" 0.0; + fixed: 1 1; + visible: 0; + color: 255 255 255 0; + rel1.to: "bell"; + rel2.to: "bell"; + image.normal: "bg_led_strobe.png"; + map { + on: 1; + smooth: 1; + rotation.center: "bell"; + } + } + description { state: "spin" 0.0; + inherit: "default" 0.0; + visible: 1; + color: 255 255 255 255; + map.rotation.z: 36.0; + } + description { state: "spin_done" 0.0; + inherit: "default" 0.0; + visible: 0; + color: 255 255 255 0; + map.rotation.z: 684.0; + } + } part { name: "terminology.options"; type: SWALLOW; scale: 1; description { state: "default" 0.0; @@ -187,17 +234,48 @@ collections { target: "shadow"; target: "fade"; } - program { name: "bell"; + program { name: "bell0"; signal: "bell"; source: "terminology"; - action: STATE_SET "visible" 0.0; + action: STATE_SET "default" 0.0; + target: "bell_base"; target: "bell"; + target: "bell_strobe"; + after: "bell"; + } + program { name: "bell"; + action: STATE_SET "visible" 0.0; + target: "bell_base"; after: "bell2"; } program { name: "bell2"; - action: STATE_SET "default" 0.0; - transition: BOUNCE 1.0 1.0 3.0; + action: STATE_SET "visible" 0.0; + transition: DECELERATE 0.1; target: "bell"; + after: "bell3"; + } + program { name: "bell3"; + action: STATE_SET "spin" 0.0; + transition: LINEAR 0.1; + target: "bell_strobe"; + after: "bell4.0"; + after: "bell4.1"; + after: "bell4.2"; + } + program { name: "bell4.0"; + action: STATE_SET "default" 0.0; + transition: ACCELERATE 1.2; + target: "bell"; + } + program { name: "bell4.1"; + action: STATE_SET "default" 0.0; + transition: ACCELERATE 1.6; + target: "bell_base"; + } + program { name: "bell4.2"; + action: STATE_SET "spin_done" 0.0; + transition: LINEAR 0.9; + target: "bell_strobe"; } // program { name: "focus_in"; // signal: "focus,in"; diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am index 1497cdc0..e87ac298 100644 --- a/data/themes/images/Makefile.am +++ b/data/themes/images/Makefile.am @@ -4,6 +4,8 @@ bg_bevel.png \ bg_shine.png \ bg_glint.png \ bg_led.png \ +bg_led_base.png \ +bg_led_strobe.png \ bg_shadow.png \ cr_fill.png \ cr_key.png \ diff --git a/data/themes/images/bg_led.png b/data/themes/images/bg_led.png index 45557cf25a80fe7e728147d15c3ac87487b8fd84..1d99430241ae272dbf7cbb7b535096a4fcc5fb70 100644 GIT binary patch delta 890 zcmV-=1BLva3i1b#VFnL54Clydk!L7>15HUpK~z}7#g{#E6EP5mAKl4z?3e)g8Ztux zsYnw#NSmP~p(XqwYJLXLl9WIT1qB5pGf?so2Vyuov3<@-qQHq2S-Nuq3^%i*o4J$T zSMRQNSMZ-7ah^$LIM1DL1ekw9U;yef=eMB=(0@$80*(eYE&+W!<`EGE;1Q#LHVy%8 zjVI=Fk1PO>8IC>`>`fSJvimcHVIb& zV}VCDuua$|Aw2;XF)F`H#Ek=2ep>+*2vX%!AOs$AMTmgTaghOx83d&a?A}Kt=CM2|zTJdSFx^L5k1` zA0ORk;o2K!=Dt$Ba73x9C{M=xfQ=mBQxkOB3e^H_)dH8mNH&y#M#5K0Z9hhVro`kB(7qN;TD~x52&{9?upJwDlKyD806z@G^PXcOMKUC%>ZvCeUYqNpkL zkZ`*lx8n`D$ZgFv1bInBK~z}7#g|QJ6lWO6fA7rf?#ymXV!n)# zO(K#6Z7kS`c(5KyV`9M`f?z#Lpnoq69L+$67WW_DBC(t(F}U_So;=i_~z{|o=~C0^tswfUWY`MnaL z{u2TX&?qxr+cW|49~01kt%hxvfLvdj5fLrGEwIy*QhAyPAF~F z354tKD+o;zP783IfDUdoiJojcmm1M^5||{M7T{3?bP{F+lm>3;z&c@_gcDJ47F)w_ z5;5z*48IQ; zL}BBp!={;0u=m5&Ubr=tNZc729lh-J^tg$PhYWoD{1ZwGIVy{b)yMFj?|Dx?ID2-1 zD_8!|JT}(=2yHF=c1+IgNqDOQW0UaZXg2$KroZ3q+&93Ey}NNcJ?xZ1P@`TfIj$eP zUJQb(rIC^0v8gGaTent!HSaO+^{pf#8jJu$4yFfSuFtlQ+m7R=I+M8FZ5;XdGt#?u zkm>bE_ohhqCUH{2?S@yE9z6;cDNqCZE#>R!I{QP{GzP`~W1Oyu7n4*!s^J{<3*C`8n#Fy(@-lGsTZDt zdbYt8JnYJ5JuJ&>^=~I?j$;grF1Wh{-9F6Oz8tA87qCQypqM1#f(*bf1=K4cp)c`a z?!bu?S%P3C?w@9V4a9aVKpli1O3;yq@0FzL7X$pK0hJ}6^5Z&{iC5azZh0m z;O4>U>7(Rww+&zwAzGg6g0a2eJRFta4MVC2K23PSO}07MNr4R2GtXDUYChz`YqPWa zj+{C*!NkPd=Ds)Yokry~QumyQ(5IR_2X}vko%5;Gp5J|c|6KQ)I+j|iPg#Ot1rMu= zxfQti#_a4XM`mW;LR<6NjDQW;)%NzJJ2TUFtz3S2X<6eK9zoi?t8b)?xhrD=kkVA*Y*tKhnwze#` zou*b>A(y*<&FRzEG$j-_h{E+@B#f%Fn-GXnMsa#TY9wR~flz>SBIJ}XlngPNFOEPI z3EiZwlpUiDDiy6{Ovxp-K|tw%5fT!Ba00000NkvXX Hu0mjfi$GDI diff --git a/data/themes/images/bg_led_base.png b/data/themes/images/bg_led_base.png new file mode 100644 index 0000000000000000000000000000000000000000..75fe30d0bdbb4f378175e882d39c2771066c42a1 GIT binary patch literal 529 zcmV+s0`C2ZP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyi1 z4>>9|#qT2k000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0004ONklc6axFY4D@BIDU;9Vmw>D;18v#o%9P9H4d6qUfjc>5)JLV`9LUM2#Xt|ZQi&9x zTCErv;yP|!?*~;F#1irR;wKX=R%0bS(m2gFc7$|J8m|cPu*_!ER)G( zgCK}}-;WE0!m@4KoArAA)Nz~$sHli9{2Rt`yeoUW2k)qac^iI T9wTpD00000NkvXXu0mjfl(^J% literal 0 HcmV?d00001 diff --git a/data/themes/images/bg_led_strobe.png b/data/themes/images/bg_led_strobe.png new file mode 100644 index 0000000000000000000000000000000000000000..a6ae8ed22f550a634c7bf860e88b7c9a25c58cc4 GIT binary patch literal 1277 zcmVPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyi1 z4>|#|R7Icw000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}000D7Nkl7*_!V5bk$eL` zgObezA?QMgZp38i%jm@J>6w11_gi&u)pgOQ+S{G#HeL>zwERe_qc2d3e5_ zum901i8g(Yt~no-|2|NDPSB`=QwDqGO$4Hn*!hMPR?kW#fXApI37`d*RT9xP;I*)0 zERlzctIq`95}8SmqKSF{pJRbyZL79{b%F-km5WnNv$Cs*j&3GVep6&1ajfZBM`1hI zoMRF^UxnYYcBLNT0NTPfwoq!B*mY*#r2LvZdSJN`{D&fAHQSn6dK&r;?8+^1QcXj7 zUJt9IPwX4&ds_b3EPD5HB+8$PWD;WyZGEYGVqdki<+^s?N{RLiL; z#vv6M@^Ve!O2wuj^nFeHUT{axU46IRtM@eWJG%aE%fY4i_e3&Hsn;cbWaX|xA@kVK z)X1*FF-F1349jW_tn{%A_Hq?%G~uXkf#?`H8r8Au*($J7GBzm^qkK zHyqF2_HdHQ%DLQJF1L^e5h^NJWxN4=iG`(^xw)Clu$=m2p3C)Q?wd(J<;qlIvbyK5 zgLi!Jk5@g)CT22IGgEUjv-SI5i_lt#s^DvtIv0((QzMUzjXYe8{QBq*()@S28;Wpb zW$wgy^}fM;VdzCew~ZCX#-=7gh_Xr~R#hEX6Ig_U$1(@bjNEdl=_3#G1AT{9icjVL z2Ug{~PE9;;=3}S6?__vZwrcw!|tHu2bjx)X_^l|}Tk zYdYc+OA`a97EX*jb?V5M4Wu{>1mFc+?$`GrH# nO(XQ@nTVfdGJd}Pzt_J2ZD!bT_#{lz00000NkvXXu0mjffn{Si literal 0 HcmV?d00001