rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=d8878052087c78d9763ab2ca74a375185c7928de
commit d8878052087c78d9763ab2ca74a375185c7928de Author: Vyacheslav Reutskiy <v.reuts...@samsung.com> Date: Wed Jul 15 13:04:26 2015 +0300 Styles: add default entry tags Change-Id: I7abeb1e218f909a3fdaa7c576c39197a41c1caf3 --- data/macros.edc | 66 ++++++++++++++++++++++++++++++++++ data/themes/default/widgets/entry.edc | 2 +- data/themes/default/widgets/styles.edc | 2 ++ 3 files changed, 69 insertions(+), 1 deletion(-) diff --git a/data/macros.edc b/data/macros.edc index 067cdde..d0f509d 100644 --- a/data/macros.edc +++ b/data/macros.edc @@ -23,6 +23,72 @@ fonts { #define FN_I "PT-Italic" #define FN_BI "PT-BoldItalic" +#define TEXTBLOCK_TAGS_ENABLED \ + tag: "em" "+ font_style=Oblique"; \ + tag: "hilight" "+ font_weight=Bold style=glow glow_color=#0054a780"; \ + tag: "link" "+ color=#0054a7 underline=on underline_color=#0054a7"; \ + tag: "preedit" "+ underline=on underline_color=#3399ff"; \ + tag: "preedit_sel" "+ backing=on backing_color=#000000 color=#ffffff"; \ + tag: "title" "+ font_size=26"; \ + tag: "subtitle" "+ font_size=18"; \ + tag: "bigger" "+ font_size=12"; \ + tag: "big" "+ font_size=11"; \ + tag: "small" "+ font_size=8"; \ + tag: "smaller" "+ font_size=7"; \ + tag: "name" "+ color=#888888 font_weight=Bold"; \ + tag: "val" "+ color=#ffffff"; \ + tag: "info" "+ color=#0054a7 style=glow glow_color=#0054a730"; \ + tag: "success" "+ color=#00ff00 style=glow glow_color=#00ff0030"; \ + tag: "warning" "+ color=#ff7c00 style=glow glow_color=#ff7c0030"; \ + tag: "failure" "+ color=#ff0000 style=glow glow_color=#ff000030"; \ + tag: "code" "+ font=Mono style=plain color=#ffffff"; \ + tag: "comment" "+ color=#00B000"; \ + tag: "string" "+ color=#ff3a35"; \ + tag: "number" "+ color=#d4d42a font_weight=Bold"; \ + tag: "brace" "+ color=#656565"; \ + tag: "type" "+ color=#0054a7"; \ + tag: "class" "+ color=#72aad4 font_weight=Bold"; \ + tag: "function" "+ color=#72aad4 font_weight=Bold"; \ + tag: "param" "+ color=#ffffff"; \ + tag: "keyword" "+ color=#ff9900 font_weight=Bold"; \ + tag: "preprocessor" "+ color=#0054a7 font_weight=Bold"; \ + tag: "line_added" "+ color=#00B000"; \ + tag: "line_removed" "+ color=#ff3a35"; \ + tag: "line_changed" "+ color=#ff9900"; + +#define TEXTBLOCK_TAGS_DISABLED \ + tag: "em" "+ font_style=Oblique"; \ + tag: "hilight" "+ font_weight=Bold"; \ + tag: "link" "+ color=#151515 shadow_color=#ffffff19 underline=on underline_color=#1515"; \ + tag: "preedit" "+ underline=on underline_color=#151515"; \ + tag: "preedit_sel" "+ backing=on backing_color=#000000 color=#888888"; \ + tag: "title" "+ font_size=26"; \ + tag: "subtitle" "+ font_size=18"; \ + tag: "bigger" "+ font_size=12"; \ + tag: "big" "+ font_size=11"; \ + tag: "small" "+ font_size=8"; \ + tag: "smaller" "+ font_size=7"; \ + tag: "name" "+ color=#151515 font_weight=Bold shadow_color=#ffffff19"; \ + tag: "val" "+ color=#151515 shadow_color=#ffffff19"; \ + tag: "info" "+ color=#151515 shadow_color=#ffffff19"; \ + tag: "success" "+ color=#151515 shadow_color=#ffffff19"; \ + tag: "warning" "+ color=#151515 shadow_color=#ffffff19"; \ + tag: "failure" "+ color=#151515 shadow_color=#ffffff19"; \ + tag: "code" "+ style=shadow,bottom shadow_color=#ffffff19 font=Mono color=#151515"; \ + tag: "comment" "+ color=#151515 shadow_color=#ffffff19"; \ + tag: "string" "+ color=#151515 shadow_color=#ffffff19"; \ + tag: "number" "+ color=#151515 shadow_color=#ffffff19 font_weight=Bold"; \ + tag: "brace" "+ color=#151515 shadow_color=#ffffff19"; \ + tag: "type" "+ color=#151515 shadow_color=#ffffff19"; \ + tag: "class" "+ color=#151515 shadow_color=#ffffff19 font_weight=Bold"; \ + tag: "function" "+ color=#151515 shadow_color=#ffffff19 font_weight=Bold"; \ + tag: "param" "+ color=#151515 shadow_color=#ffffff19"; \ + tag: "keyword" "+ color=#151515 shadow_color=#ffffff19 font_weight=Bold"; \ + tag: "preprocessor" "+ color=#151515 shadow_color=#ffffff19 font_weight=Bold"; \ + tag: "line_added" "+ color=#151515 shadow_color=#ffffff19"; \ + tag: "line_removed" "+ color=#151515 shadow_color=#ffffff19"; \ + tag: "line_changed" "+ color=#151515 shadow_color=#ffffff19"; + color_classes { color_class { name: "main"; color: 214 214 214 255; diff --git a/data/themes/default/widgets/entry.edc b/data/themes/default/widgets/entry.edc index d7b7575..755d3c5 100644 --- a/data/themes/default/widgets/entry.edc +++ b/data/themes/default/widgets/entry.edc @@ -37,7 +37,7 @@ group { name: "elm/entry/base/default"; description { state: "disabled" 0.0; inherit: "default" 0.0; text { - style: "eflete_text_disabled_style"; + style: "main_text_disabled"; } } } diff --git a/data/themes/default/widgets/styles.edc b/data/themes/default/widgets/styles.edc index dd936f7..407c01b 100644 --- a/data/themes/default/widgets/styles.edc +++ b/data/themes/default/widgets/styles.edc @@ -1,9 +1,11 @@ styles { style { name: "main_text"; base: "font="FN" font_size=12 color=#d6d6d6 wrap=word text_class=entry ellipsis=1.0"; + TEXTBLOCK_TAGS_ENABLED } style { name: "main_text_disabled"; base: "font="FN" font_size=12 color=#767778 wrap=word text_class=entry ellipsis=1.0"; + TEXTBLOCK_TAGS_DISABLED } /* not refactored */ --