hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=d9f7d5d0d61cbf4d09bccfa39cd65805d6908f10
commit d9f7d5d0d61cbf4d09bccfa39cd65805d6908f10 Author: Hermet Park <[email protected]> Date: Sat Jul 2 15:58:57 2016 +0900 theme: apply lazy edc style. --- data/themes/default/content.edc | 21 ++-- data/themes/default/images.edc | 4 +- data/themes/default/layout_setting.edc | 188 ++++++++++++++------------------- data/themes/default/live_edit.edc | 15 ++- 4 files changed, 101 insertions(+), 127 deletions(-) diff --git a/data/themes/default/content.edc b/data/themes/default/content.edc index 51408f3..63eab9f 100644 --- a/data/themes/default/content.edc +++ b/data/themes/default/content.edc @@ -29,32 +29,31 @@ group { "spacer"; } } -group { name: "part_highlight"; +group { "part_highlight"; parts { - part { name: "base"; - type: IMAGE; - mouse_events: 0; - description { state: "default" 0.0; + image { "base"; + nomouse; + desc { "default"; image.normal: "part_highlight.png"; image.border: 2 2 2 2; image.border_scale: 1; } - description { state: "transparent" 0.0; - inherit: "default" 0.0; + desc { "transparent"; + inherit: "default"; color: 255 255 255 0; } } } programs { - program { name: "load"; + program { "load"; signal: "load"; - action: STATE_SET "transparent" 0.0; + action: STATE_SET "transparent"; target: "base"; transition: LINEAR 0.65; after: "anim"; } - program { name: "anim"; - action: STATE_SET "default" 0.0; + program { "anim"; + action: STATE_SET "default"; target: "base"; transition: LINEAR 0.65; after: "load"; diff --git a/data/themes/default/images.edc b/data/themes/default/images.edc index 0a14ec9..bff6de8 100644 --- a/data/themes/default/images.edc +++ b/data/themes/default/images.edc @@ -51,9 +51,9 @@ images { } #define ICON_GROUP(_group_name, _image_path) \ - group { name: _group_name; \ + group { _group_name; \ parts { \ - part { name: "img"; \ + image { "img"; \ desc { \ image.normal: _image_path; \ } \ diff --git a/data/themes/default/layout_setting.edc b/data/themes/default/layout_setting.edc index e50062a..a140249 100644 --- a/data/themes/default/layout_setting.edc +++ b/data/themes/default/layout_setting.edc @@ -4,29 +4,26 @@ images { image: "folder.png" COMP; } -group { name: "setting_layout"; +group { "setting_layout"; parts { - part { name: "clipper"; - type: RECT; - description { state: "default" 0.0; + rect { "clipper"; + desc { state: "default"; color: 127 127 127 127; } - description { state: "show" 0.0; + desc { state: "show"; color: 255 255 255 255; } } - part { name: "bg"; - type: RECT; + rect { "bg"; clip_to: "clipper"; - description { state: "default" 0.0; + desc { state: "default"; color: 0 0 0 175; } } - part { name: "base_frame_img"; - type: IMAGE; + image { "base_frame_img"; scale: 1; clip_to: "clipper"; - description { + desc { min: 600 435; max: 600 435; fixed: 1 1; @@ -35,11 +32,10 @@ group { name: "setting_layout"; image.border_scale: 1; } } - part { name: "shine_img"; - type: IMAGE; + image { "shine_img"; scale: 1; clip_to: "clipper"; - description { + desc { rel1 { to: "base_frame_img"; relative: 0 0; } rel2 { to: "base_frame_img"; relative: 1 0; } align: 0.5 0; @@ -48,31 +44,28 @@ group { name: "setting_layout"; image.normal: "shine.png"; } } - part { name: "base_frame"; - type: SPACER; - description { + spacer { "base_frame"; + desc { rel1 {to: "base_frame_img"; offset: 10 10;} rel2 {to: "base_frame_img"; offset: -11 -11;} } } - part { name: "title_frame"; - type: RECT; + rect { "title_frame"; clip_to: "clipper"; scale: 1; - description { - rel1 {to: "base_frame"; relative: 0 0;} - rel2 {to: "base_frame"; relative: 1 0;} + desc { + rel1 { to: "base_frame"; relative: 0 0; } + rel2 { to: "base_frame"; relative: 1 0; } align: 0.5 0; min: 0 23; fixed: 0 1; color: 0 0 0 255; } } - part { name: "title_icon"; - type: IMAGE; + image { "title_icon"; scale: 1; clip_to: "clipper"; - description { + desc { align: 0 0.5; min: 20 20; max: 20 20; @@ -82,12 +75,11 @@ group { name: "setting_layout"; image.normal: "setting_icon.png"; } } - part { name: "title_name"; - type: TEXT; + text { "title_name"; scale: 1; clip_to: "clipper"; effect: GLOW; - description { + desc { rel1.to: "title_frame"; rel2.to: "title_frame"; align: 0.5 0.5; @@ -103,11 +95,10 @@ group { name: "setting_layout"; color: COL_HI; } } - part { name: "elm.swallow.toolbar"; - type: SWALLOW; + swallow { "elm.swallow.toolbar"; scale: 1; clip_to: "clipper"; - description { state: "default" 0.0; + desc { state: "default"; min: 0 25; max: -1 25; align: 0.5 0.0; @@ -116,11 +107,10 @@ group { name: "setting_layout"; rel2.to: "title_frame"; } } - part { name: "elm.swallow.content"; - type: SWALLOW; + swallow { "elm.swallow.content"; scale: 1; clip_to: "clipper"; - description { state: "default" 0.0; + desc { state: "default"; rel1 { to: "elm.swallow.toolbar"; relative: 0.0 1.0; @@ -133,10 +123,9 @@ group { name: "setting_layout"; } } } - part { name: "elm.swallow.apply_btn"; - type: SWALLOW; + swallow { "elm.swallow.apply_btn"; scale: 1; - description { + desc { align: 1 0.5; min: 50 25; fixed: 1 1; @@ -146,10 +135,9 @@ group { name: "setting_layout"; rel2.relative: 0 1; } } - part { name: "elm.swallow.reset_btn"; - type: SWALLOW; + swallow { "elm.swallow.reset_btn"; scale: 1; - description { + desc { align: 0.5 1; min: 50 25; fixed: 1 1; @@ -159,10 +147,9 @@ group { name: "setting_layout"; rel2.relative: 0.5 1; } } - part { name: "elm.swallow.cancel_btn"; - type: SWALLOW; + swallow { "elm.swallow.cancel_btn"; scale: 1; - description { + desc { align: 0 0.5; min: 50 25; fixed: 1 1; @@ -172,53 +159,50 @@ group { name: "setting_layout"; rel2.relative: 1 1; } } - part { name: "event_blocker"; - type: RECT; - description { state: "default" 0.0; + rect { "event_blocker"; + desc { state: "default"; color: 0 0 0 0; visible: 1; } - description { state: "hide" 0.0; - inherit: "default" 0.0; + desc { state: "hide"; + inherit: "default"; visible: 0; } } - part { name: "over_img"; - type: IMAGE; + image { "over_img"; scale: 1; clip_to: "clipper"; - mouse_events: 0; - description { - rel1 { to: "base_frame_img"; relative: 0 0; } - rel2 { to: "base_frame_img"; relative: 1 1; } + nomouse; + desc { + rel1 { to: "base_frame_img"; } + rel2 { to: "base_frame_img"; } image.normal: "bub_over_bot.png"; } } } programs { - program { name: "load"; + program { "load"; signal: "load"; - action: STATE_SET "show" 0.0; + action: STATE_SET "show"; transition: "DECELERATE" 1.0; target: "clipper"; after: "event_blocker_hide"; } - program { name: "dismiss"; + program { "dismiss"; signal: "elm,state,dismiss"; source: ""; - action: STATE_SET "default" 0.0; -// transition: "DECELERATE" 0.125; + action: STATE_SET "default"; target: "clipper"; target: "event_blocker"; after: "dismiss_done"; } - program { name: "event_blocker_hide"; + program { "event_blocker_hide"; signal: "elm,state,event_blocker,hide"; source: ""; - action: STATE_SET "hide" 0.0; + action: STATE_SET "hide"; target: "event_blocker"; } - program { name: "dismiss_done"; + program { "dismiss_done"; action: SIGNAL_EMIT "elm,state,dismiss,done" ""; } } @@ -228,8 +212,8 @@ group { "build_setting_layout"; parts { spacer { "img_path_frame"; desc { - rel1 { relative: 0 0;} - rel2 { relative: 1 0;} + rel1 { relative: 0 0; } + rel2 { relative: 1 0; } align: 0.5 0; min: 0 30; fixed: 0 1; @@ -238,8 +222,8 @@ group { "build_setting_layout"; spacer { "snd_path_frame"; scale: 1; desc { - rel1 {to: "img_path_frame"; relative: 0 1;} - rel2 {to: "img_path_frame"; relative: 1 1;} + rel1 { to: "img_path_frame"; relative: 0 1; } + rel2 { to: "img_path_frame"; relative: 1 1; } align: 0.5 0; min: 0 30; fixed: 0 1; @@ -248,8 +232,8 @@ group { "build_setting_layout"; spacer { "fnt_path_frame"; scale: 1; desc { - rel1 {to: "snd_path_frame"; relative: 0 1;} - rel2 {to: "snd_path_frame"; relative: 1 1;} + rel1 { to: "snd_path_frame"; relative: 0 1; } + rel2 { to: "snd_path_frame"; relative: 1 1; } align: 0.5 0; min: 0 30; fixed: 0 1; @@ -258,8 +242,8 @@ group { "build_setting_layout"; spacer { "dat_path_frame"; scale: 1; desc { - rel1 {to: "fnt_path_frame"; relative: 0 1;} - rel2 {to: "fnt_path_frame"; relative: 1 1;} + rel1 { to: "fnt_path_frame"; relative: 0 1; } + rel2 { to: "fnt_path_frame"; relative: 1 1; } align: 0.5 0; min: 0 30; fixed: 0 1; @@ -268,8 +252,8 @@ group { "build_setting_layout"; spacer { "preference_frame"; scale: 1; desc { - rel1 {to: "dat_path_frame"; relative: 0 1; offset: 0 5;} - rel2 {to: "dat_path_frame"; relative: 1 1;} + rel1 { to: "dat_path_frame"; relative: 0 1; offset: 0 5; } + rel2 { to: "dat_path_frame"; relative: 1 1; } align: 0.5 0; min: 0 140; fixed: 0 1; @@ -291,8 +275,8 @@ group { "build_setting_layout"; scale: 1; effect: SHADOW BOTTOM; desc { - rel1 {to: "img_path_icon"; relative: 1 0; offset: 5 1;} - rel2 {to: "img_path_icon"; relative: 1 1;} + rel1 { to: "img_path_icon"; relative: 1 0; offset: 5 1; } + rel2 { to: "img_path_icon"; relative: 1 1; } color: COL_NM; align: 0 0.5; fixed: 1 1; @@ -342,8 +326,8 @@ group { "build_setting_layout"; effect: SHADOW BOTTOM; scale: 1; desc { - rel1 {to: "snd_path_icon"; relative: 1 0; offset: 5 1;} - rel2 {to: "snd_path_icon"; relative: 1 1;} + rel1 { to: "snd_path_icon"; relative: 1 0; offset: 5 1; } + rel2 { to: "snd_path_icon"; relative: 1 1; } color: COL_NM; align: 0 0.5; fixed: 1 1; @@ -393,8 +377,8 @@ group { "build_setting_layout"; effect: SHADOW BOTTOM; scale: 1; desc { - rel1 {to: "fnt_path_icon"; relative: 1 0; offset: 5 1;} - rel2 {to: "fnt_path_icon"; relative: 1 1;} + rel1 { to: "fnt_path_icon"; relative: 1 0; offset: 5 1; } + rel2 { to: "fnt_path_icon"; relative: 1 1; } color: COL_NM; align: 0 0.5; fixed: 1 1; @@ -444,8 +428,8 @@ group { "build_setting_layout"; effect: SHADOW BOTTOM; scale: 1; desc { - rel1 {to: "dat_path_icon"; relative: 1 0; offset: 5 1;} - rel2 {to: "dat_path_icon"; relative: 1 1;} + rel1 { to: "dat_path_icon"; relative: 1 0; offset: 5 1; } + rel2 { to: "dat_path_icon"; relative: 1 1; } color: COL_NM; align: 0 0.5; fixed: 1 1; @@ -482,12 +466,11 @@ group { "build_setting_layout"; } } -group { name: "text_setting_layout"; +group { "text_setting_layout"; parts { - part { name: "preference_frame"; - type: SPACER; + spacer { "preference_frame"; scale: 1; - description { + desc { rel1.relative: 0 0; rel2.relative: 1 0; rel1.offset: 0 3; @@ -496,10 +479,9 @@ group { name: "text_setting_layout"; fixed: 0 1; } } - part { name: text_font_size; - type: TEXT; + text { "text_font_size"; scale: 1; - description { + desc { rel1.to: "preference_frame"; rel2 { to: "preference_frame"; relative: 0.0 1.0; } rel1.offset: 2 0; @@ -515,10 +497,9 @@ group { name: "text_setting_layout"; } } } - part { name: "elm.swallow.font_size"; - type: SWALLOW; + swallow { "elm.swallow.font_size"; scale: 1; - description { + desc { align: 0.0 0.5; rel1 { to: "text_font_size"; relative: 1.0 0.0; } rel2 { to_x: "preference_frame"; to_y: "text_font_size"; } @@ -533,11 +514,10 @@ group { name: "text_setting_layout"; fixed: 0 1; } } - part { name: "text_setting_guide"; - type: TEXT; + text { "text_setting_guide"; scale: 1; effect: SHADOW BOTTOM; - description { + desc { rel1 { to: "padding1"; relative: 0 1; offset: 2 0; } rel2 { to: "padding1"; relative: 0.65 1; } color: COL_NM; @@ -554,18 +534,16 @@ group { name: "text_setting_layout"; } } } - part { name: "text_setting_frame"; - type: SPACER; + spacer { "text_setting_frame"; scale: 1; - description { + desc { rel1 { to_y: "text_setting_guide"; relative: 0 1; } rel2 { to_x: "text_setting_guide"; } } } - part { name: "elm.swallow.text_setting"; - type: SWALLOW; + swallow { "elm.swallow.text_setting"; scale: 1; - description { state: "default" 0.0; + desc { state: "default"; fixed: 0 1; rel1.to: "text_setting_frame"; rel2.to: "text_setting_frame"; @@ -580,17 +558,15 @@ group { name: "text_setting_layout"; fixed: 1 0; } } - part { name: "font_frame"; - type: SPACER; + spacer { "font_frame"; scale: 1; - description { - rel1 {to: "padding2"; relative: 1 0;} + desc { + rel1 { to: "padding2"; relative: 1 0; } } } - part { name: "elm.swallow.font"; - type: SWALLOW; + swallow { "elm.swallow.font"; scale: 1; - description { + desc { rel1.to: "font_frame"; rel2.to: "font_frame"; } diff --git a/data/themes/default/live_edit.edc b/data/themes/default/live_edit.edc index ce5ea04..99ec4ea 100644 --- a/data/themes/default/live_edit.edc +++ b/data/themes/default/live_edit.edc @@ -2,18 +2,17 @@ images { image: "live_spacer.png" COMP; image: "swallow.png" COMP; image: "image.png" COMP; - } styles { - style { name: "default_style"; + style { "default_style"; base: "font="Sans" font_size=30 text_class=entry color=#FFFFFF style=soft_outline outline_color=#0088AA64 valign=0.5 ellipsis=1.0 wrap=none align=center"; } } group { "Image_bg"; parts { - image { name: "img"; + image { "img"; desc { image.normal: "image.png"; } @@ -22,7 +21,7 @@ group { "Image_bg"; } group { "Rect_bg"; parts { - rect { name: "rect"; + rect { "rect"; desc { color: 0 136 170 255; } @@ -31,7 +30,7 @@ group { "Rect_bg"; } group { "Text_bg"; parts { - text { name: "text"; + text { "text"; scale: 1; effect: SOFT_OUTLINE; desc { @@ -48,7 +47,7 @@ group { "Text_bg"; } group { "Textblock_bg"; parts { - textblock { name: "textblock"; + textblock { "textblock"; scale: 1; desc { text { @@ -61,7 +60,7 @@ group { "Textblock_bg"; } } } -group { name: "Swallow_bg"; +group { "Swallow_bg"; parts { image { "img"; repeat_events: 1; @@ -75,7 +74,7 @@ group { name: "Swallow_bg"; } group { "Spacer_bg"; parts { - image { name: "img"; + image { "img"; desc { image.normal: "live_spacer.png"; image.border: 3 3 2 4; --
