hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=e94c7bdc12c3283692954d8f69cc935840968c9e

commit e94c7bdc12c3283692954d8f69cc935840968c9e
Author: Hermet Park <her...@hermet.pe.kr>
Date:   Fri Apr 15 16:37:25 2016 +0900

    update text & textblock template code
---
 data/templates/basic.edc          |  9 ++++-----
 data/templates/group.edc          |  7 +++----
 data/templates/map.edc            |  9 ++++-----
 data/templates/text.edc           |  7 +++----
 data/templates/textblock.edc      |  2 +-
 data/themes/default/live_edit.edc |  9 ++++-----
 src/lib/template_code.h           | 11 +++++------
 7 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/data/templates/basic.edc b/data/templates/basic.edc
index 8e08446..f95ea95 100644
--- a/data/templates/basic.edc
+++ b/data/templates/basic.edc
@@ -30,17 +30,16 @@ collections {
          }
          text { "text";
             scale: 1;
-            effect: FAR_SOFT_SHADOW;
+            effect: SOFT_OUTLINE;
             desc { "default";
                rel1.relative: 0.0 0.5;
                rel2.relative: 0.5 1.0;
-               color: 0 136 170 255;
-               color2: 0 136 170 50;
-               color3: 0 136 170 25;
+               color: 255 255 255 255;
+               color2: 0 136 170 100;
                text {
                   size: 25;
                   font: "Sans";
-                  text: "Enventor";
+                  text: "enventor";
                   align: 0.5 0.5;
                }
             }
diff --git a/data/templates/group.edc b/data/templates/group.edc
index d2279aa..e3a4546 100644
--- a/data/templates/group.edc
+++ b/data/templates/group.edc
@@ -22,11 +22,10 @@ collections {
       parts {
          text { "text";
             scale: 1;
-            effect: FAR_SOFT_SHADOW;
+            effect: SOFT_OUTLINE;
             desc { "default";
-               color: 0 136 170 255;
-               color2: 0 136 170 50;
-               color3: 0 136 170 25;
+               color: 255 255 255 255;
+               color2: 0 136 170 100;
                text {
                   size: 30;
                   font: "Sans";
diff --git a/data/templates/map.edc b/data/templates/map.edc
index 8f34012..cdd9f3d 100644
--- a/data/templates/map.edc
+++ b/data/templates/map.edc
@@ -42,17 +42,16 @@ collections {
          }
          text { "text";
             scale: 1;
-            effect: FAR_SOFT_SHADOW;
+            effect: SOFT_OUTLINE;
             desc { "default";
                rel1.relative: 0.0 0.5;
                rel2.relative: 0.5 1.0;
-               color: 0 136 170 255;
-               color2: 0 136 170 50;
-               color3: 0 136 170 25;
+               color: 255 255 255 255;
+               color2: 0 136 170 100;
                text {
                   size: 25;
                   font: "Sans";
-                  text: "Enventor";
+                  text: "enventor";
                   align: 0.5 0.5;
                }
                map {
diff --git a/data/templates/text.edc b/data/templates/text.edc
index 168948a..80bd60b 100644
--- a/data/templates/text.edc
+++ b/data/templates/text.edc
@@ -4,13 +4,12 @@ collections {
       parts {
          text { "text";
             scale: 1;
-            effect: FAR_SOFT_SHADOW;
+            effect: SOFT_OUTLINE;
             desc { "default";
                rel1.relative: 0.0 0.0;
                rel2.relative: 1.0 1.0;
-               color: 0 136 170 255;
-               color2: 0 136 170 50;
-               color3: 0 136 170 25;
+               color: 255 255 255 255;
+               color2: 0 136 170 100;
                text {
                   size: 50;
                   font: "Sans";
diff --git a/data/templates/textblock.edc b/data/templates/textblock.edc
index db2f6a1..3cc13dd 100644
--- a/data/templates/textblock.edc
+++ b/data/templates/textblock.edc
@@ -2,7 +2,7 @@ collections {
    base_scale: 1.0;
    styles {
       style { "text_style";
-         base: "font="Sans" font_size=30 text_class=entry color=#0088AA 
style=shadow,bottom shadow_color=#00000080 valign=0.5 ellipsis=1.0 wrap=none 
align=center";
+         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 { "main";
diff --git a/data/themes/default/live_edit.edc 
b/data/themes/default/live_edit.edc
index f25202b..134118d 100644
--- a/data/themes/default/live_edit.edc
+++ b/data/themes/default/live_edit.edc
@@ -7,7 +7,7 @@ images {
 
 styles {
    style { name: "default_style";
-      base: "font="Sans" font_size=30 text_class=entry color=#0088AA 
style=shadow,bottom shadow_color=#00000080 valign=0.5 ellipsis=1.0 wrap=none 
align=center";
+      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";
    }
 }
 
@@ -33,11 +33,10 @@ group { "Text_bg";
    parts {
       text { name: "text";
          scale: 1;
-         effect: FAR_SOFT_SHADOW;
+         effect: SOFT_OUTLINE;
          desc {
-            color: 0 136 170 255;
-            color2: 0 136 170 50;
-            color3: 0 136 170 25;
+            color: 255 255 255 255;
+            color2: 0 136 170 100;
             text {
                size: 50;
                font: FN;
diff --git a/src/lib/template_code.h b/src/lib/template_code.h
index c0f1a7b..23e2d00 100644
--- a/src/lib/template_code.h
+++ b/src/lib/template_code.h
@@ -93,19 +93,18 @@ const char 
*TEMPLATE_PART_SPACER[TEMPLATE_PART_SPACER_LINE_CNT] =
    "      min: 0 0;<br/>"
 };
 
-#define TEMPLATE_PART_TEXT_LINE_CNT 17
+#define TEMPLATE_PART_TEXT_LINE_CNT 16
 
 const char *TEMPLATE_PART_TEXT[TEMPLATE_PART_TEXT_LINE_CNT] =
 {
    "   scale: 1;<br/>",
-   "   effect: FAR_SOFT_SHADOW;<br/>",
+   "   effect: SOFT_OUTLINE;<br/>",
    "   desc { \"default\";<br/>",
    "      align: 0.5 0.5;<br/>",
    "      fixed: 0 0;<br/>",
    "      min: 0 0;<br/>",
-   "      color: 0 136 170 255;<br/>",
-   "      color2: 0 136 170 50;<br/>",
-   "      color3: 0 136 170 25;<br/>",
+   "      color: 255 255 255 255;<br/>",
+   "      color2: 0 136 170 100;<br/>",
    "      visible: 1;<br/>",
    "      text {<br/>",
    "         size: 50;<br/>",
@@ -192,7 +191,7 @@ const char 
*TEMPLATE_TEXTBLOCK_STYLE_BLOCK[TEMPLATE_TEXTBLOCK_STYLE_LINE_CNT] =
 {
    "styles {<br/>",
    "   style { \"%s\";<br/>",
-   "      base: \"font=\"Sans\" font_size=30 text_class=entry color=#0088AA 
style=shadow,bottom shadow_color=#00000080 valign=0.5 ellipsis=1.0 wrap=none 
align=center\";<br/>",
+   "      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\";<br/>",
    "   }<br/>",
    "}<br/>"
 };

-- 


Reply via email to