From f51a36575392bf3c5bbd843789a83112186eb96a Mon Sep 17 00:00:00 2001 From: titan Date: Thu, 1 Oct 2009 04:54:38 +0000 Subject: [PATCH] Updates to theme. SVN revision: 42826 --- data/themes/default/ephoto.edc | 207 +++++++++++++++++----- data/themes/default/images/Makefile.am | 3 +- data/themes/default/images/left_arrow.png | Bin 0 -> 1802 bytes 3 files changed, 167 insertions(+), 43 deletions(-) create mode 100644 data/themes/default/images/left_arrow.png diff --git a/data/themes/default/ephoto.edc b/data/themes/default/ephoto.edc index 67d9f72..f9a95bd 100644 --- a/data/themes/default/ephoto.edc +++ b/data/themes/default/ephoto.edc @@ -11,7 +11,8 @@ collections image: "move_left.png" COMP; image: "move_right.png" COMP; image: "thumb_shadow.png" COMP; - image: "selected.png" COMP; + image: "left_arrow.png" COMP; + //image: "thumb_shadow_selected.png" COMP; } group { @@ -91,13 +92,14 @@ collections description { state: "default" 0.0; + visible: 1; rel1.relative: 0.0 0.0; rel1.offset: 27 0; rel2.relative: 1.0 1.0; rel2.offset: -27 -1; color: 255 255 255 255; } - } + } part { name: "ephoto.text.object"; @@ -135,7 +137,15 @@ collections rel2.to: "thumb_area"; rel2.relative: 1.0 1.0; rel2.offset: -1 -1; + color: 255 255 255 255; } + description + { + state: "hidden" 0.0; + inherit: "default" 0.0; + visible: 0; + color: 255 255 255 0; + } } part { @@ -172,6 +182,24 @@ collections } } } + programs { + program { + name: "hidden"; + signal: "ephoto.browser.hidden"; + source: "ephoto"; + action: STATE_SET "hidden" 0.0; + transition: LINEAR 0.6; + target: "ephoto.swallow.content"; + } + program { + name: "visible"; + signal: "ephoto.browser.visible"; + source: "ephoto"; + action: STATE_SET "default" 0.0; + transition: LINEAR 0.6; + target: "ephoto.swallow.content"; + } + } } group { name: "/ephoto/thumb/shadow"; @@ -190,17 +218,22 @@ collections rel2.relative: 1.0 1.0; color: 255 255 255 255; } + description { + state: "selected" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } description { state: "hidden" 0.0; inherit: "default" 0.0; - visible: 0; color: 255 255 255 0; + visible: 0; } } part { name: "background"; type: IMAGE; - mouse_events: 0; + mouse_events: 1; description { state: "default" 0.0; visible: 1; @@ -217,6 +250,8 @@ collections state: "selected" 0.0; inherit: "default" 0.0; color: 255 255 255 255; + //image.normal: "thumb_shadow_selected.png"; + //image.border: 12 12 7 13; } description { state: "hidden" 0.0; @@ -248,16 +283,18 @@ collections signal: "ephoto.thumb.hidden"; source: "ephoto"; action: STATE_SET "hidden" 0.0; - transition: LINEAR 0.6; + transition: DECELERATE 0.3; target: "background"; + target: "ephoto.swallow.content"; } program { name: "visible"; signal: "ephoto.thumb.visible"; source: "ephoto"; action: STATE_SET "default" 0.0; - transition: LINEAR 0.6; - target: "background"; + transition: DECELERATE 0.3; + target: "background"; + target: "ephoto.swallow.content"; } } } @@ -306,23 +343,6 @@ collections color: 255 255 255 0; } } - part { - name: "selected"; - type: IMAGE; - description { - state: "default" 0.0; - visible: 0; - min: 10 10; - rel1.to: "clipper"; - rel2.to: "clipper"; - image.normal: "selected.png"; - } - description { - state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } part { name: "event_area"; type: RECT; @@ -341,28 +361,12 @@ collections } } programs { - program { - name: "selected"; - signal: "ephoto.thumb.selected"; - source: "ephoto"; - action: STATE_SET "selected" 0.0; - transition: LINEAR 0.3; - target: "selected"; - } - program { - name: "deselected"; - signal: "ephoto.thumb.deselected"; - source: "ephoto"; - action: STATE_SET "default" 0.0; - transition: LINEAR 0.3; - target: "selected"; - } program { name: "hidden"; signal: "ephoto.thumb.hidden"; source: "ephoto"; action: STATE_SET "hidden" 0.0; - transition: LINEAR 0.6; + transition: DECELERATE 0.3; target: "ephoto.swallow.content"; target: "clipper"; } @@ -371,11 +375,130 @@ collections signal: "ephoto.thumb.visible"; source: "ephoto"; action: STATE_SET "default" 0.0; - transition: LINEAR 0.6; + transition: LINEAR 0.3; target: "ephoto.swallow.content"; target: "clipper"; } } } + group + { + name: "/ephoto/flow/view"; + parts + { + part + { + name: "back"; + type: IMAGE; + mouse_events: 1; + description + { + state: "default" 0.0; + visible: 1; + min: 32 32; + max: 32 32; + rel1.relative: 0.0 0.0; + rel1.offset: 50 50; + rel2.relative: 0.0 0.0; + rel2.offset: -1 -1; + color: 255 255 255 255; + image.normal: "left_arrow.png"; + } + } + part + { + name: "image_area"; + type: RECT; + mouse_events: 1; + description + { + state: "default" 0.0; + visible: 1; + rel1.relative: 0.0 0.0; + rel1.offset: 27 0; + rel2.relative: 1.0 1.0; + rel2.offset: -27 -1; + color: 255 255 255 255; + } + } + part + { + name: "ephoto.swallow.content"; + type: SWALLOW; + clip_to: "image_area"; + mouse_events: 1; + description + { + state: "default" 0.0; + rel1.to: "image_area"; + rel1.relative: 0.5 0.5; + rel1.offset: 0 0; + rel2.to: "image_area"; + rel2.relative: 0.5 0.5; + rel2.offset: 0 0; + color: 255 255 255 255; + } + description + { + state: "hidden" 0.0; + inherit: "default" 0.0; + visible: 0; + color: 255 255 255 0; + } + } + part + { + name: "move_left"; + type: IMAGE; + mouse_events: 1; + description + { + state: "default" 0.0; + min: 27 42; + max: 27 42; + rel1.relative: 0.0 0.5; + rel1.offset: 30 0; + rel2.relative: 0.0 0.5; + rel2.offset: -1 -1; + image.normal: "move_left.png"; + } + } + part + { + name: "move_right"; + type: IMAGE; + mouse_events: 1; + description + { + state: "default" 0.0; + min: 27 42; + max: 27 42; + rel1.relative: 1.0 0.5; + rel1.offset: 0 0; + rel2.relative: 1.0 0.5; + rel2.offset: -30 -1; + image.normal: "move_right.png"; + } + } + } + programs { + program { + name: "hidden"; + signal: "ephoto.browser.hidden"; + source: "ephoto"; + action: STATE_SET "hidden" 0.0; + transition: LINEAR 0.6; + target: "ephoto.swallow.content"; + } + program { + name: "visible"; + signal: "ephoto.browser.visible"; + source: "ephoto"; + action: STATE_SET "default" 0.0; + transition: LINEAR 0.6; + target: "ephoto.swallow.content"; + } + } + } } diff --git a/data/themes/default/images/Makefile.am b/data/themes/default/images/Makefile.am index 0f6573c..88c8f74 100644 --- a/data/themes/default/images/Makefile.am +++ b/data/themes/default/images/Makefile.am @@ -17,4 +17,5 @@ sb_runnerv.png \ move_left.png \ move_right.png \ selected.png \ -thumb_shadow.png +thumb_shadow.png \ +left_arrow.png diff --git a/data/themes/default/images/left_arrow.png b/data/themes/default/images/left_arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..cf56fe145b76c1a3fbbce4b7948d1ecb749d10b0 GIT binary patch literal 1802 zcmV+l2le=gP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2iXb% z1RpvFw&!yI00xRlL_t(|+U=WNOcYlX$Ny&*K^EGEDzj)~t+8!X*j5eE*w{oPDJseK z!7K%;lvpZF&_E>cU}DioB4T2{e1J58#`MG3ho%X&#t@@PQ>+!kLTj7yQj06>#{eq= z?(ELoK5#MHjf*?X>^eqHav%01v-kfy=iHBT?-FASPqPVl%55INJb-xs^8lV|OEF`o zh=?Lzvjoo7DJB$7JTj@Xvomw)(xoXxBykSLgJ6uAqH)m{0BHcMhYlTD5(3 z!i5VW2vPUp*$latpNH(8eZ+S}Wg0Z26(f?33;0I&jBTv%9` z8wdn$uqX=#gZ-yZpI&Y>1T%@x-nw<`>!YKiy)1?$0)lD8Z`rbC?a0W8i#@`OhF}`; zk|g!9I4u|q_P4dQy~xK6;fVq;SI7 z1BfBMPpf!IlJ0EZzTFAnRRCFh-5{76K#ZL4S5=j1X+uLpQht7ZJ%9oZ;Ca&nh!$T^ zP_Rytq~8@qVOpBo?H;w;?actn0K5U>NvIt5~g|3jj5m|p`T{Th0w#qOOm8nyxZ-L7QZe^yv1}&;TYool4Y4`X>PYWV7J?6 z6K}rFP_%f5!;vpZ(%->gkZEbj6weqlrY6WMITk)BWjGv;E?!p(@X%kt2fZwx&)22Z^HWn(^0sZ;zUb}ky$Rr70PbXppK}UC zct3^j$)D}&>N>Bgs;17Sr>Cc$IC0`N07C$V0Z0JGlO2kT=<6fTx5Cjkgkd%uHdZ$5(0AZ=CtLr^=>eN-O5LT{S`Sz__w>|=( z^7cfW4Km)@F!$ONfT_mDMpsKqi%V5iO&(mdXwkdF!^5A>9DtY_06(H)T>O0=z9Rs9 z0Q^l&O+6=1p6t^a2^kp~yFDIHD<51f(PxBaI~$zw{uBq`;~h@{ARIe(tVa+8I(YD) zU5k+P^z_{xkH=!O*(w3ZM5LJVaFj8|h)4k-^O0MKXaGP*j~?wIBC4&e%@YJc3xray z*Gr-(zMp6adQXQV(}1Gh2LK#7a^yM@p{AxLPfH}ErKOd4yNQ#-0RUuK{=sImmGLph zFbHI1M8yl?`0?W#s;a8iXr1PQ!C+@jPR=_GQ zY!n1a#O$I0!p6$V$~9WoJBp(GB#PoL03p2)C{b&Scph$<>7R>up0h*%&H7~uU66VaS+kR|k*T)YtK>+7!yf`Ib! z^40M?cVJ-P>rICS|QZc)m;TZd-m*EHCrTfcXwZOI2>n;+BGKSqND~0 z-4=@lWo2cn9`^a=%a^;0i;KVIGeFpg+CkE8ipC3}wzjsLh)`Nu`acMlE?w#=DJeP2 zx7~O7(pxu#q+XSM1caHmXEil7KU*vo#p!hB0>G6kS8kM)lzfBfim?~K7zYpnpz4_h zlYUqD5fEkyE%N^T`!8Cp*2%1_ETOo#_$y3TjH65Dx@(8T9@C$uVyqJuWBTHQ$X^Qp zCb;NfUUV7b@9ACyJ(dWVB@!s2zA%aD3lPLZeT?URfPZF)_{Rz$Mm<4|0I-lpfXqF9 zkAu>k_ohgJ80lc)b;VTf9O8={nF|jaxfM1IfCvZ_Ra=}%3x!9AYIH@&GytMN%uI_j s09c}mqNW3oY@7ev+&qAJ08h952lC%+;e(@cumAu607*qoM6N<$f+NO7!~g&Q literal 0 HcmV?d00001