hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=fc6f5d8d243c0ed34dcca88f2c109926d900fbfa
commit fc6f5d8d243c0ed34dcca88f2c109926d900fbfa Author: Hermet Park <her...@hermet.pe.kr> Date: Fri Nov 11 14:23:24 2016 +0900 templates: apply lazy edc scale: 1 -> scale; --- data/templates/Basic.edc | 4 +-- data/templates/CustomButton.edc | 4 +-- data/templates/Group.edc | 4 +-- data/templates/Listitem.edc | 28 ++++++++++---------- data/templates/Map.edc | 4 +-- data/templates/MobileLayout.edc | 58 ++++++++++++++++++++--------------------- data/templates/MouseEvent.edc | 6 ++--- data/templates/Spacer.edc | 6 ++--- data/templates/Text.edc | 4 +-- data/templates/Textblock.edc | 14 +++++----- data/templates/Watchface.edc | 18 ++++++------- data/templates/Watchface2.edc | 16 ++++++------ 12 files changed, 83 insertions(+), 83 deletions(-) diff --git a/data/templates/Basic.edc b/data/templates/Basic.edc index c357c45..51c62c0 100644 --- a/data/templates/Basic.edc +++ b/data/templates/Basic.edc @@ -29,7 +29,7 @@ collections { } } text { "text"; - scale: 1; + scale; effect: SOFT_OUTLINE; desc { "default"; rel1.relative: 0.0 0.5; @@ -68,4 +68,4 @@ collections { } */ } -} \ No newline at end of file +} diff --git a/data/templates/CustomButton.edc b/data/templates/CustomButton.edc index a138751..c3193c1 100644 --- a/data/templates/CustomButton.edc +++ b/data/templates/CustomButton.edc @@ -194,7 +194,7 @@ collections { } text { "sizer.content"; nomouse; - scale: 1; + scale; desc { "default"; visible: 0; text { @@ -228,7 +228,7 @@ collections { text { "elm.text"; nomouse; effect: SHADOW BOTTOM; - scale: 1; + scale; desc { "default"; rel1.offset: 0 5; rel1.relative: 1.0 0.0; diff --git a/data/templates/Group.edc b/data/templates/Group.edc index b3c8e0b..152d576 100644 --- a/data/templates/Group.edc +++ b/data/templates/Group.edc @@ -21,7 +21,7 @@ collections { group { "my_group"; parts { text { "text"; - scale: 1; + scale; effect: SOFT_OUTLINE; desc { "default"; color: 255 255 255 255; @@ -35,4 +35,4 @@ collections { } } } -} \ No newline at end of file +} diff --git a/data/templates/Listitem.edc b/data/templates/Listitem.edc index 854a40d..2da82a7 100644 --- a/data/templates/Listitem.edc +++ b/data/templates/Listitem.edc @@ -14,7 +14,7 @@ collections { } parts { rect { "bg"; - scale: 1; + scale; desc { "default"; color: 233 242 242 255; align: 0.5 0.5; @@ -26,7 +26,7 @@ collections { } } rect { "point_rect"; - scale: 1; + scale; desc { "default"; color: 0 176 137 255; align: 0.0 0.0; @@ -39,7 +39,7 @@ collections { } } spacer { "padding_left"; - scale: 1; + scale; desc { "default"; align: 0.0 0.5; rel1.to: "point_rect"; @@ -50,7 +50,7 @@ collections { } } image { "icon_status"; - scale: 1; + scale; desc { "default"; /* TODO: Please replace embedded image files to your application image files. */ image.normal: "ENVENTOR_EMBEDDED_ICON_ARROW.png"; @@ -65,7 +65,7 @@ collections { } } swallow { "icon_user"; - scale: 1; + scale; desc { "default"; align: 0.0 0.5; rel1.to: "icon_status"; @@ -76,7 +76,7 @@ collections { } } text { "user_name"; - scale: 1; + scale; desc { "default"; color: 130 130 130 255; text { @@ -95,7 +95,7 @@ collections { } } text { "message"; - scale: 1; + scale; desc { "default"; color: 145 145 145 255; text { @@ -116,7 +116,7 @@ collections { } } spacer { "padding_right"; - scale: 1; + scale; desc { "default"; align: 1.0 0.5; rel1.to: "bg"; @@ -127,7 +127,7 @@ collections { } } text { "date"; - scale: 1; + scale; desc { "default"; color: 135 135 135 255; text { @@ -148,7 +148,7 @@ collections { } } image { "icon_clip"; - scale: 1; + scale; desc { "default"; /* TODO: Please replace embedded image files to your application image files. */ image.normal: "ENVENTOR_EMBEDDED_ICON_CLIP.png"; @@ -167,7 +167,7 @@ collections { } } image { "icon_badge"; - scale: 1; + scale; desc { "default"; /* TODO: Please replace embedded image files to your application image files. */ image.normal: "ENVENTOR_EMBEDDED_ICON_BADGE.png"; @@ -185,7 +185,7 @@ collections { } } image { "icon_lock"; - scale: 1; + scale; desc { "default"; /* TODO: Please replace embedded image files to your application image files. */ image.normal: "ENVENTOR_EMBEDDED_ICON_LOCK.png"; @@ -204,7 +204,7 @@ collections { } } swallow { "icon_check"; - scale: 1; + scale; desc { "default"; align: 1.0 0.5; rel1.to: "padding_right"; @@ -217,7 +217,7 @@ collections { } } spacer { "padding_icon"; - scale: 1; + scale; desc { "default"; align: 1.0 0.5; rel1.to: "icon_check"; diff --git a/data/templates/Map.edc b/data/templates/Map.edc index 1b68dfd..198a46c 100644 --- a/data/templates/Map.edc +++ b/data/templates/Map.edc @@ -41,7 +41,7 @@ collections { } } text { "text"; - scale: 1; + scale; effect: SOFT_OUTLINE; desc { "default"; rel1.relative: 0.0 0.5; @@ -75,4 +75,4 @@ collections { } } } -} \ No newline at end of file +} diff --git a/data/templates/MobileLayout.edc b/data/templates/MobileLayout.edc index 314a878..8ff70ed 100644 --- a/data/templates/MobileLayout.edc +++ b/data/templates/MobileLayout.edc @@ -8,14 +8,14 @@ collections { } parts { rect { "base"; - scale: 1; + scale; desc { "default"; min: 200 300; } } /* Header */ rect { "header"; - scale: 1; + scale; desc { "default"; color: 200 0 0 255; align: 0.0 0.0; @@ -28,7 +28,7 @@ collections { } } spacer { "header_padding"; - scale: 1; + scale; desc { "default"; align: 0.0 0.5; rel1.to: "header"; @@ -38,7 +38,7 @@ collections { } } image { "header_button_panel_open"; - scale: 1; + scale; desc { "default"; /* TODO: Please replace embedded image files to your application image files. */ image.normal: "ENVENTOR_EMBEDDED_ICON_DOCK.png"; @@ -56,7 +56,7 @@ collections { } } image { "header_button_panel_close"; - scale: 1; + scale; desc { "default"; /* TODO: Please replace embedded image files to your application image files. */ image.normal: "ENVENTOR_EMBEDDED_ICON_DOCK_DOWN.png"; @@ -75,7 +75,7 @@ collections { } } text { "header_title"; - scale: 1; + scale; desc { "default"; text { size: 15; @@ -89,7 +89,7 @@ collections { } /* Content */ spacer { "content_padding_top"; - scale: 1; + scale; desc { "default"; align: 0.0 0.0; rel1.to: "header"; @@ -100,7 +100,7 @@ collections { } } rect { "content_main"; - scale: 1; + scale; desc { "default"; color: 30 46 93 255; align: 0.5 0.0; @@ -113,7 +113,7 @@ collections { } } text { "content_main_text"; - scale: 1; + scale; desc { "default"; text { size: 15; @@ -126,7 +126,7 @@ collections { } } spacer { "content_padding_middle"; - scale: 1; + scale; desc { "default"; align: 0.0 0.0; rel1.to: "base"; @@ -136,7 +136,7 @@ collections { } } rect { "content_sub_1"; - scale: 1; + scale; desc { "default"; color: 0 136 170 255; align: 0.0 0.0; @@ -148,7 +148,7 @@ collections { } } text { "content_sub_1_text"; - scale: 1; + scale; desc { "default"; text { size: 15; @@ -161,7 +161,7 @@ collections { } } rect { "content_sub_2"; - scale: 1; + scale; desc { "default"; color: 66 118 189 255; align: 0.0 0.5; @@ -175,7 +175,7 @@ collections { } } text { "content_sub_2_text"; - scale: 1; + scale; desc { "default"; text { size: 15; @@ -188,7 +188,7 @@ collections { } } rect { "content_sub_3"; - scale: 1; + scale; desc { "default"; color: 83 66 189 255; align: 0.0 0.5; @@ -201,7 +201,7 @@ collections { } } text { "content_sub_3_text"; - scale: 1; + scale; desc { "default"; text { size: 15; @@ -214,7 +214,7 @@ collections { } } rect { "content_bottom"; - scale: 1; + scale; desc { "default"; color: 95 95 95 255; rel1.to: "content_sub_1"; @@ -225,7 +225,7 @@ collections { } } text { "content_bottom_text"; - scale: 1; + scale; desc { "default"; text { size: 15; @@ -240,7 +240,7 @@ collections { } /* Mask */ rect { "mask"; - scale: 1; + scale; desc { "default"; color: 0 0 0 155; rel1.to: "header"; @@ -255,7 +255,7 @@ collections { } /* Panel */ rect { "panel_base"; - scale: 1; + scale; desc { "default"; align: 0.0 0.0; rel1.to: "header"; @@ -270,7 +270,7 @@ collections { } } rect { "panel_content_1"; - scale: 1; + scale; desc { "default"; color: 255 94 0 255; rel1.to: "panel_base"; @@ -286,7 +286,7 @@ collections { } } text { "panel_content_1_text"; - scale: 1; + scale; desc { "default"; color: 0 0 0 255; text { @@ -308,7 +308,7 @@ collections { } } rect { "panel_content_2"; - scale: 1; + scale; desc { "default"; color: 255 130 36 255; rel1.to: "panel_base"; @@ -325,7 +325,7 @@ collections { } } text { "panel_content_2_text"; - scale: 1; + scale; desc { "default"; color: 0 0 0 255; text { @@ -346,7 +346,7 @@ collections { } } rect { "panel_content_3"; - scale: 1; + scale; desc { "default"; color: 255 166 72 255; rel1.to: "panel_base"; @@ -363,7 +363,7 @@ collections { } } text { "panel_content_3_text"; - scale: 1; + scale; desc { "default"; color: 0 0 0 255; text { @@ -384,7 +384,7 @@ collections { } } rect { "panel_content_4"; - scale: 1; + scale; desc { "default"; color: 255 202 108 255; rel1.to: "panel_base"; @@ -401,7 +401,7 @@ collections { } } text { "panel_content_4_text"; - scale: 1; + scale; desc { "default"; color: 0 0 0 255; text { @@ -422,7 +422,7 @@ collections { } } swallow { "panel_swallow"; - scale: 1; + scale; desc { "default"; visible: 0; rel1.to: "panel_base"; diff --git a/data/templates/MouseEvent.edc b/data/templates/MouseEvent.edc index 31ddeaa..8c490ff 100644 --- a/data/templates/MouseEvent.edc +++ b/data/templates/MouseEvent.edc @@ -9,7 +9,7 @@ collections { } parts { rect { "button_shadow"; - scale: 1; + scale; desc { "default"; color: 0 0 0 155; rel1.to: "button_bg"; @@ -19,7 +19,7 @@ collections { } } image { "button_bg"; - scale: 1; + scale; desc { "default"; /* TODO: Please replace embedded image files to your application image files. */ image.normal: "ENVENTOR_EMBEDDED_BUTTON_BG.png"; @@ -37,7 +37,7 @@ collections { } } text { "button_text"; - scale: 1; + scale; nomouse; desc { "default"; color: 70 70 70 255; diff --git a/data/templates/Spacer.edc b/data/templates/Spacer.edc index e2a6366..469e787 100644 --- a/data/templates/Spacer.edc +++ b/data/templates/Spacer.edc @@ -3,7 +3,7 @@ collections { group { "main"; parts { spacer { "spacer1"; - scale: 1; + scale; desc { "default"; min: 50 50; fixed: 1 1; @@ -13,7 +13,7 @@ collections { } } spacer { "spacer2"; - scale: 1; + scale; desc { "default"; min: 50 50; fixed: 1 1; @@ -33,4 +33,4 @@ collections { } } } -} \ No newline at end of file +} diff --git a/data/templates/Text.edc b/data/templates/Text.edc index 4b7c917..f3cca00 100644 --- a/data/templates/Text.edc +++ b/data/templates/Text.edc @@ -3,7 +3,7 @@ collections { group { "main"; parts { text { "text"; - scale: 1; + scale; effect: SOFT_OUTLINE; desc { "default"; rel1.relative: 0.0 0.0; @@ -20,4 +20,4 @@ collections { } } } -} \ No newline at end of file +} diff --git a/data/templates/Textblock.edc b/data/templates/Textblock.edc index efd5d69..96c203b 100644 --- a/data/templates/Textblock.edc +++ b/data/templates/Textblock.edc @@ -26,7 +26,7 @@ collections { group { "main"; parts { textblock { "text_block"; - scale: 1; + scale; desc { "default"; text { style: "basic_style"; @@ -40,7 +40,7 @@ collections { } parts { textblock { "text_wrap_none"; - scale: 1; + scale; desc { "default"; rel1.to: "text_block"; rel1.relative: 0.0 1.0; @@ -54,7 +54,7 @@ collections { } parts { textblock { "text_wrap_char"; - scale: 1; + scale; desc { "default"; rel1.to: "text_wrap_none"; rel1.relative: 0.0 1.0; @@ -68,7 +68,7 @@ collections { } parts { textblock { "text_wrap_word"; - scale: 1; + scale; desc { "default"; rel1.to: "text_wrap_char"; rel1.relative: 0.0 1.0; @@ -82,7 +82,7 @@ collections { } parts { textblock { "text_wrap_mixed"; - scale: 1; + scale; desc { "default"; rel1.to: "text_wrap_word"; rel1.relative: 0.0 1.0; @@ -96,7 +96,7 @@ collections { } parts { textblock { "text_ellipsis_1"; - scale: 1; + scale; desc { "default"; rel1.to: "text_wrap_mixed"; rel1.relative: 0.0 1.0; @@ -110,7 +110,7 @@ collections { } parts { textblock { "text_ellipsis_0"; - scale: 1; + scale; desc { "default"; rel1.to: "text_ellipsis_1"; rel1.relative: 0.0 1.0; diff --git a/data/templates/Watchface.edc b/data/templates/Watchface.edc index 2ea5a6c..0ac3186 100644 --- a/data/templates/Watchface.edc +++ b/data/templates/Watchface.edc @@ -13,7 +13,7 @@ collections { } parts { image { "bg"; - scale: 1; + scale; desc { "default"; /* TODO: Please replace embedded image files to your application image files. */ image.normal: "ENVENTOR_EMBEDDED_WATCHFACE.png"; @@ -24,7 +24,7 @@ collections { } } image { "moonphase_moon"; - scale: 1; + scale; desc { "default"; /* TODO: Please replace embedded image files to your application image files. */ image.normal: "ENVENTOR_EMBEDDED_MOONPHASE_MOON.png"; @@ -40,7 +40,7 @@ collections { } } image { "moonphase_cover"; - scale: 1; + scale; desc { "default"; /* TODO: Please replace embedded image files to your application image files. */ image.normal: "ENVENTOR_EMBEDDED_MOONPHASE_COVER.png"; @@ -54,7 +54,7 @@ collections { } } image { "month_stroke"; - scale: 1; + scale; desc { "default"; /* TODO: Please replace embedded image files to your application image files. */ image.normal: "ENVENTOR_EMBEDDED_MONTH_STROKE.png"; @@ -110,7 +110,7 @@ collections { } } text { "date"; - scale: 1; + scale; desc { "default"; color: 0 0 0 255; fixed: 1 1; @@ -131,7 +131,7 @@ collections { } } image { "hour"; - scale: 1; + scale; nomouse; desc { "default"; rel1.to: "bg"; @@ -151,7 +151,7 @@ collections { } } image { "minute"; - scale: 1; + scale; nomouse; desc { "default"; rel1.to: "bg"; @@ -171,7 +171,7 @@ collections { } } image { "second"; - scale: 1; + scale; nomouse; desc { "default"; rel1.to: "bg"; @@ -179,7 +179,7 @@ collections { rel1.relative: 0.5 0.0; rel2.relative: 0.5 1.0; min: 25 0; - fixed: 1 0; + fixed: 1 0; /* TODO: Please replace embedded image files to your application image files. */ image.normal: "ENVENTOR_EMBEDDED_NEEDLE_SECOND.png"; map.on: 1; diff --git a/data/templates/Watchface2.edc b/data/templates/Watchface2.edc index 360b69f..07bea9f 100644 --- a/data/templates/Watchface2.edc +++ b/data/templates/Watchface2.edc @@ -10,7 +10,7 @@ collections { } parts { image { "bg"; - scale: 1; + scale; desc { "default"; visible: 1; /* TODO: Please replace embedded image files to your application image files. */ @@ -22,7 +22,7 @@ collections { } } text { "date"; - scale: 1; + scale; desc { "default"; color: 219 219 219 255; fixed: 1 1; @@ -43,7 +43,7 @@ collections { } } text { "meridiem"; - scale: 1; + scale; desc { "default"; color: 255 120 0 255; fixed: 1 1; @@ -62,7 +62,7 @@ collections { } } text { "time"; - scale: 1; + scale; desc { "default"; color: 250 250 250 255; fixed: 1 1; @@ -81,7 +81,7 @@ collections { } } image { "hour"; - scale: 1; + scale; nomouse; desc { "default"; rel1.to: "bg"; @@ -101,7 +101,7 @@ collections { } } image { "minute"; - scale: 1; + scale; nomouse; desc { "default"; rel1.to: "bg"; @@ -121,7 +121,7 @@ collections { } } image { "second"; - scale: 1; + scale; nomouse; desc { "default"; rel1.to: "bg"; @@ -129,7 +129,7 @@ collections { rel1.relative: 0.5 0.0; rel2.relative: 0.5 1.0; min: 30 0; - fixed: 1 0; + fixed: 1 0; /* TODO: Please replace embedded image files to your application image files. */ image.normal: "ENVENTOR_EMBEDDED_NEEDLE_SECOND_RECT.png"; map.on: 1; --