From: Shinwoo Kim Date: Fri, 8 Apr 2011 01:12:43 +0000 (+0900) Subject: Merge "[ctxpopup] merge related job, mainly remove invalid indentation" X-Git-Tag: REL_I9200_20110603-1~203 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fa54887adecd7db8df2aaae8c0428395500d0925;hp=26e27c4c2745fe27bafbf572319fe1c71c539c09;p=framework%2Fuifw%2Felementary.git Merge "[ctxpopup] merge related job, mainly remove invalid indentation" --- diff --git a/data/themes/default.edc b/data/themes/default.edc index 1a1ae6c..67f01c7 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -8203,7 +8203,7 @@ collections { visible: 0; color: 255 255 255 0; } - } + } part { name: "sb_vbar_clip"; clip_to:"sb_vbar_clip_master"; type: RECT; @@ -8232,7 +8232,7 @@ collections { } part { name: "elm.dragable.vbar"; clip_to: "sb_vbar_clip"; - mouse_events: 0; + mouse_events: 0; scale: 1; dragable { x: 0 0 0; @@ -8283,7 +8283,7 @@ collections { visible: 0; color: 255 255 255 0; } - } + } part { name: "sb_hbar_clip"; clip_to: "sb_hbar_clip_master"; type: RECT; @@ -8302,17 +8302,17 @@ collections { type: RECT; mouse_events: 0; scale: 1; - description { state: "default" 0.0; + description { state: "default" 0.0; fixed: 1 1; visible: 0; align: 0.0 1.0; rel1 { to:"clipper"; relative: 0.0 1.0; } - rel2 { to:"clipper"; relative: 1.0 1.0; } + rel2 { to:"clipper"; relative: 1.0 1.0; } } } part { name: "elm.dragable.hbar"; clip_to: "sb_hbar_clip"; - mouse_events: 0; + mouse_events: 0; scale: 1; dragable { x: 1 1 0; @@ -8354,7 +8354,7 @@ collections { } } } - } + } programs { program { name: "load"; signal: "load"; @@ -8365,10 +8365,10 @@ collections { set_int(sbvis_v, 0); set_int(sbvis_h, 0); set_int(sbalways_v, 0); - set_int(sbalways_h, 0); + set_int(sbalways_h, 0); set_int(sbvis_timer, 0); } - } + } program { name: "vbar_show"; signal: "elm,action,show,vbar"; source: "elm"; @@ -8380,7 +8380,7 @@ collections { source: "elm"; action: STATE_SET "hidden" 0.0; target: "sb_vbar_clip_master"; - } + } program { name: "vbar_show_always"; signal: "elm,action,show_always,vbar"; source: "elm"; @@ -8410,7 +8410,7 @@ collections { } } } - } + } program { name: "sb_vbar_show"; signal: "do-show-vbar"; source: ""; @@ -8480,7 +8480,7 @@ collections { action: STATE_SET "hidden" 0.0; transition: LINEAR 1.0; target: "sb_hbar_clip"; - } + } program { name: "scroll"; signal: "elm,action,scroll"; source: "elm"; @@ -8518,8 +8518,8 @@ collections { transition: DECELERATE 0.3; target: "focus_highlight"; } - } - } + } + } /////////////////////////////////////////////////////////////////////////////// group { name: "elm/ctxpopup/bg/default"; parts { @@ -8552,7 +8552,7 @@ collections { source: "elm"; action: STATE_SET "default" 0.0; target: "ctxpopup_bg"; - } + } } } /////////////////////////////////////////////////////////////////////////////// @@ -8600,9 +8600,9 @@ collections { rel1 { to:"base"; offset: 4 4; }; rel2 { to:"base"; offset: -5 -5; }; } - } - } - } + } + } + } /////////////////////////////////////////////////////////////////////////////// group { name: "elm/ctxpopup/arrow/default"; images { @@ -8611,8 +8611,8 @@ collections { image: "icon_arrow_up.png" COMP; image: "icon_arrow_down.png" COMP; } - parts { - part { name: "ctxpopup_arrow"; + parts { + part { name: "ctxpopup_arrow"; type: IMAGE; scale: 1; description { @@ -8627,29 +8627,25 @@ collections { min: 40 40; fixed: 1 1; align: 0.0 0.5; - image { normal: "icon_arrow_left.png"; - } + image { normal: "icon_arrow_left.png"; } } description { state: "right" 0.0; min: 40 40; fixed: 1 1; align: 1.0 0.5; - image { normal: "icon_arrow_right.png"; - } + image { normal: "icon_arrow_right.png"; } } description { state: "top" 0.0; min: 40 40; fixed: 1 1; align: 0.5 0.0; - image { normal: "icon_arrow_up.png"; - } + image { normal: "icon_arrow_up.png"; } } description { state: "bottom" 0.0; min: 40 40; fixed: 1 1; align: 0.5 1.0; - image { normal: "icon_arrow_down.png"; - } + image { normal: "icon_arrow_down.png"; } } } } @@ -8681,10 +8677,10 @@ collections { } } /////////////////////////////////////////////////////////////////////////////// - group { + group { name: "elm/ctxpopup/icon_text_style_item/default"; - alias: "elm/ctxpopup/text_style_item/default"; - alias: "elm/ctxpopup/icon_style_item/default"; + alias: "elm/ctxpopup/text_style_item/default"; + alias: "elm/ctxpopup/icon_style_item/default"; images { image: "hoversel_entry_bg.png" COMP; } @@ -8706,7 +8702,7 @@ collections { color: 255 255 255 0; } description { state: "clicked" 0.0; - inherit: "default" 0.0; + inherit: "default" 0.0; color: 255 255 255 255; } } @@ -8715,13 +8711,13 @@ collections { scale: 1; description { state: "default" 0.0; min: 25 25; - max: 25 25; - align: 0 0.5; + max: 25 25; + align: 0 0.5; aspect: 1.0 1.0; rel1 { offset: 10 10; } - rel2 { offset: 0 -10; } + rel2 { offset: 0 -10; } } - } + } part { name: "elm.text"; type: TEXT; mouse_events: 0; @@ -8744,8 +8740,8 @@ collections { inherit: "default" 0.0; color: 0 0 0 255; } - } - part { name: "over1"; + } + part { name: "over1"; mouse_events: 1; repeat_events: 1; ignore_flags: ON_HOLD; @@ -8753,7 +8749,7 @@ collections { color: 255 255 255 0; } description { state: "clicked" 0.0; - inherit: "default" 0.0; + inherit: "default" 0.0; color: 255 255 255 255; } } @@ -8764,7 +8760,7 @@ collections { color: 255 255 255 0; } description { state: "clicked" 0.0; - inherit: "default" 0.0; + inherit: "default" 0.0; color: 255 255 255 255; } } @@ -8787,7 +8783,7 @@ collections { signal: "mouse,up,1"; source: "over1"; action: SIGNAL_EMIT "elm,action,click" ""; - } + } program { name: "disable"; signal: "elm,state,disabled"; source: "elm"; @@ -8807,17 +8803,17 @@ collections { set_state(PART:"elm.text", "clicked", 0.0); set_state(PART:"bg", "clicked", 0.0); } - } + } program { name: "item_unclick2"; signal: "mouse,up,1"; source: "over2"; - script { - set_state(PART:"elm.text", "default", 0.0); + script { + set_state(PART:"elm.text", "default", 0.0); set_state(PART:"bg", "default", 0.0); - } + } } - } - } + } + } /////////////////////////////////////////////////////////////////////////////// // emoticon images from: // Tanya - Latvia