From d4af779c0ef6fa0a783794db45a552ccfb1ad690 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Thu, 13 Dec 2012 05:44:54 +0000 Subject: [PATCH] finish up XXX in fileman theme to show current op with icon. SVN revision: 80796 --- data/themes/Makefile.am | 3 + data/themes/edc/fileman.edc | 81 ++++++++++++++++++++++++--- data/themes/img/sym_icon_op_ask.png | Bin 0 -> 1356 bytes data/themes/img/sym_icon_op_copy.png | Bin 0 -> 1670 bytes data/themes/img/sym_icon_op_move.png | Bin 0 -> 1635 bytes 5 files changed, 76 insertions(+), 8 deletions(-) create mode 100644 data/themes/img/sym_icon_op_ask.png create mode 100644 data/themes/img/sym_icon_op_copy.png create mode 100644 data/themes/img/sym_icon_op_move.png diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am index c9d7d57be..510b27cf1 100644 --- a/data/themes/Makefile.am +++ b/data/themes/Makefile.am @@ -329,6 +329,9 @@ img/sym_down_light_normal.png \ img/sym_down_light_selected.png \ img/sym_heart_glow_normal.png \ img/sym_heart_light_normal.png \ +img/sym_icon_op_ask.png \ +img/sym_icon_op_move.png \ +img/sym_icon_op_copy.png \ img/sym_left_glow_normal.png \ img/sym_left_light_normal.png \ img/sym_radio_alum.png \ diff --git a/data/themes/edc/fileman.edc b/data/themes/edc/fileman.edc index 08387e311..a2b994011 100644 --- a/data/themes/edc/fileman.edc +++ b/data/themes/edc/fileman.edc @@ -11,6 +11,9 @@ group { name: "e/fileman/default/list/variable"; images.image: "shadow_square_tiny.png" COMP; images.image: "ball_small_glow.png" COMP; images.image: "ball_small_glow_intense.png" COMP; + images.image: "sym_icon_op_ask.png" COMP; + images.image: "sym_icon_op_copy.png" COMP; + images.image: "sym_icon_op_move.png" COMP; script { public longpressed; } @@ -229,6 +232,33 @@ group { name: "e/fileman/default/list/variable"; visible: 1; } } + part { name: "op"; + description { state: "default" 0.0; + align: 1.0 0.5; + aspect: 1.0 1.0; aspect_preference: VERTICAL; + rel1.relative: 1.0 0.0; + rel1.offset: -5 4; + rel2.offset: -5 -5; + image.normal: "sym_icon_op_ask.png"; + max: 32 32; + visible: 0; + } + description { state: "ask" 0.0; + inherit: "default" 0.0; + image.normal: "sym_icon_op_ask.png"; + visible: 1; + } + description { state: "copy" 0.0; + inherit: "default" 0.0; + image.normal: "sym_icon_op_copy.png"; + visible: 1; + } + description { state: "move" 0.0; + inherit: "default" 0.0; + image.normal: "sym_icon_op_move.png"; + visible: 1; + } + } ////////////////////////// part { name: "sel_shine"; mouse_events: 0; description { state: "default" 0.0; @@ -336,19 +366,21 @@ group { name: "e/fileman/default/list/variable"; transition: SPRING 0.7 2.0 4; target: "icon"; } - - /* XXX: need imagery to show a copy will happen, a move or an "ask" program { signal: "e,state,ask"; source: "e"; + action: STATE_SET "ask" 0.0; + target: "op"; } program { signal: "e,state,move"; source: "e"; + action: STATE_SET "move" 0.0; + target: "op"; } program { signal: "e,state,copy"; source: "e"; + action: STATE_SET "copy" 0.0; + target: "op"; } - */ - program { signal: "e,state,volume,off"; source: "e"; action: STATE_SET "default" 0.0; @@ -400,6 +432,9 @@ group { name: "e/fileman/default/icon/fixed"; images.image: "shine.png" COMP; images.image: "glow_small.png" COMP; images.image: "shadow_square_tiny.png" COMP; + images.image: "sym_icon_op_ask.png" COMP; + images.image: "sym_icon_op_copy.png" COMP; + images.image: "sym_icon_op_move.png" COMP; styles { style { name: "fileman_icon_name"; base: "font=Sans font_size=10 text_class=fileman_icon align=center color=#ffffffff wrap=mixed style=shadow,bottom shadow_color=#00000080 align=center ellipsis=1.0"; @@ -616,6 +651,34 @@ group { name: "e/fileman/default/icon/fixed"; visible: 1; } } + part { name: "op"; + description { state: "default" 0.0; + align: 1.0 0.0; + aspect: 1.0 1.0; aspect_preference: VERTICAL; + rel1.relative: 0.5 0.0; + rel1.offset: 0 4; + rel2.relative: 1.0 0.5; + rel2.offset: -5 -1; + image.normal: "sym_icon_op_ask.png"; + max: 32 32; + visible: 0; + } + description { state: "ask" 0.0; + inherit: "default" 0.0; + image.normal: "sym_icon_op_ask.png"; + visible: 1; + } + description { state: "copy" 0.0; + inherit: "default" 0.0; + image.normal: "sym_icon_op_copy.png"; + visible: 1; + } + description { state: "move" 0.0; + inherit: "default" 0.0; + image.normal: "sym_icon_op_move.png"; + visible: 1; + } + } ////////////////////////////// part { name: "sel_shine"; mouse_events: 0; description { state: "default" 0.0; @@ -732,19 +795,21 @@ group { name: "e/fileman/default/icon/fixed"; transition: SPRING 0.7 2.0 4; target: "icon"; } - - /* XXX: need imagery to show a copy will happen, a move or an "ask" program { signal: "e,state,ask"; source: "e"; + action: STATE_SET "ask" 0.0; + target: "op"; } program { signal: "e,state,move"; source: "e"; + action: STATE_SET "move" 0.0; + target: "op"; } program { signal: "e,state,copy"; source: "e"; + action: STATE_SET "copy" 0.0; + target: "op"; } - */ - program { signal: "e,state,volume,off"; source: "e"; action: STATE_SET "default" 0.0; diff --git a/data/themes/img/sym_icon_op_ask.png b/data/themes/img/sym_icon_op_ask.png new file mode 100644 index 0000000000000000000000000000000000000000..4e51b9abf01a6d0a2b152bcc321896ba8c2320a7 GIT binary patch literal 1356 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 Q^#A|>07*qoM6N<$f_sr3LI3~& literal 0 HcmV?d00001 diff --git a/data/themes/img/sym_icon_op_move.png b/data/themes/img/sym_icon_op_move.png new file mode 100644 index 0000000000000000000000000000000000000000..3831cfd918b48fc63f3df8559e061c9c2fc0fc50 GIT binary patch literal 1635 zcmV-p2AuhcP)i|UK~z|U?U%c5UB?xMznR(Bb0u|jEQ*q4ONs?VY!V28fuzt; z9wC6=AV7+AsS}87k}6#)cS#vN1kVG+fE%UA#fc@#x=!Z;q{4W61NhUm2SRKn{gk$+% z!Msy}!{Q3iKl(KMH<2KQq%a~6dpxH!?x3|@Jy#3A= zo(7-+10>6@?qtwQP+jA66q@K|LzI7Xw|n{aPe0CkNhhnTcJ{@7ZgY~I9g+=*Mq8LA z$e96-_5MhKEQ3~pioqmt6t(kKvR9DrmC}wr_~FIw@cTa|Wgwwmjb9Z#dgLqblk&kr z5w=c-I7tC@xTk|cr5crZbjx6JC25p(I(hk|pBK+o<9hd^idxrV!ZoM-dQf556!mK5 ziq31ulGSgAIPD%#Q3PoQaf()2Vl7Rslu4(D7Ao)HM;gt)#qV?ZNe?nOw0| zJ&234J9|l%%#T65<%!eo0hM}`w`i0z!P=w@WxJdfgICej-z_bgC}_1;v6JWA?3Q0W z+^v42UH-(ilu1IRO0^nR62b_=I3V0Ry8-|Ng$gKB+bW&Ee%+f+Uk#UgiGfZ6og|Q} zioyEz^+EIa_hKhE-1K0*k*04ba{GdK7c^U6yH8FBa1jLWlyy$qqDabe)~=?L0YI#w z9WMa7Ng$`<#T>e~?yl(Rv)_6NkJ=IH1EF40RXB7rIe_qcG`It zIk8!;Ac+=dT=xM~kO;4J z@J`YGW}$B=aO`dOfYnh_nWR-j?as_3otZXi6_mElgY{55s2t3iMOJRHW<59$A^0H3 zi3**hfM?PACeHh1-0u^&*0gH%r$p%tLL~tj2bBS%7sX)Frphh$BtUS^Ym9f&gme!1 z2H~tG^nmSLx}l={YH$~>n3&EC!_;VK@*?>5sGpVqif1J_+ zIBG)x+orty!~ z_?m@JRAA|a;qZ3YNju_9-RS+QlzKjsYBpJ(Yh)pRboeRGFU+?LH{YM)UEzIV%L{W^ z-9ID1G9LW-6F=G-%ihe`mug!2;$Y&N>5E5y`uQKd)*opT541@#rHugyUc^gNd9kmw z_kSmfcSYQ^8l>e#@$SYde)l{80K<_TEdRkJ~95y-!lOOZ}zGRcAMax0#G^%&3uk-1&PRPmeA}}k$bs;uz5ecJu93z8J!fzhL*Rd hrFX^A1a;E%^dD8OBa))_sQv%|002ovPDHLkV1hjGAvFL1 literal 0 HcmV?d00001