summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwoochan lee <wc0917.lee@samsung.com>2016-01-04 14:35:09 -0800
committerCedric BAIL <cedric@osg.samsung.com>2016-01-04 14:37:51 -0800
commit66a3262f34aa4dbc4945c7b88e5392db9167a698 (patch)
treef595244e5f187c6f223702590ff80ed60ea98802
parentfd142aa2fbd8b9f5a09c571ca91772142de1190e (diff)
datetime: add color classes and text classes.
Summary: The following new color classes and text classes for datetime widget are added. "datetime_bg", "Datetime Background" "datetime_separator_text", "Datetime Separator Text" "datetime_separator_text_disabled", "Datetime Separator Disabled Text" @feature Reviewers: raster, cedric, kimcinoo, Hermet, woohyun Subscribers: SanghyeonLee, eagleeye, id213sin Differential Revision: https://phab.enlightenment.org/D3485 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
-rw-r--r--data/themes/colorclasses.edc12
-rw-r--r--data/themes/edc/elm/datetime.edc15
-rw-r--r--src/lib/elm_config.c5
3 files changed, 26 insertions, 6 deletions
diff --git a/data/themes/colorclasses.edc b/data/themes/colorclasses.edc
index 3d61f8ad8..5f92a14cb 100644
--- a/data/themes/colorclasses.edc
+++ b/data/themes/colorclasses.edc
@@ -166,6 +166,18 @@ color_classes {
166 color: FN_COL_DISABLE; 166 color: FN_COL_DISABLE;
167 desc: "Text of a disabled checkbox's label when checked"; 167 desc: "Text of a disabled checkbox's label when checked";
168 } 168 }
169 color_class { name: "datetime_bg";
170 color: 0 0 0 0;
171 desc: "Background of a datetime widget";
172 }
173 color_class { name: "datetime_separator_text";
174 color: FN_COL_DEFAULT;
175 desc: "Text in a datetime separator area";
176 }
177 color_class { name: "datetime_separator_text_disabled";
178 color: FN_COL_DISABLE;
179 desc: "Text in a disabled datetime separator area";
180 }
169 color_class { name: "entry_text"; 181 color_class { name: "entry_text";
170 color: FN_COL_DEFAULT_BASIC; 182 color: FN_COL_DEFAULT_BASIC;
171 desc: "Text in an entry box"; 183 desc: "Text in an entry box";
diff --git a/data/themes/edc/elm/datetime.edc b/data/themes/edc/elm/datetime.edc
index a628a760a..18ecf75d2 100644
--- a/data/themes/edc/elm/datetime.edc
+++ b/data/themes/edc/elm/datetime.edc
@@ -50,14 +50,13 @@
50 relative: 1.0 1.0; \ 50 relative: 1.0 1.0; \
51 to: "field"#_after; \ 51 to: "field"#_after; \
52 } \ 52 } \
53 color: FN_COL_DEFAULT; \ 53 color_class: "datetime_separator_text"; \
54 color_class: "datetime_text"; \
55 text { \ 54 text { \
56 font: "Sans"; size: 10; \ 55 font: "Sans"; size: 10; \
57 min: 1 0; \ 56 min: 1 0; \
58 ellipsis: -1; \ 57 ellipsis: -1; \
59 align: 0.5 0.5; \ 58 align: 0.5 0.5; \
60 text_class: "datetime_text"; \ 59 text_class: "datetime_separator_text"; \
61 } \ 60 } \
62 } \ 61 } \
63 description { state: "enable" 0.0; \ 62 description { state: "enable" 0.0; \
@@ -75,12 +74,11 @@
75 visible: 0; \ 74 visible: 0; \
76 rel1.to: "separator"#_pos; \ 75 rel1.to: "separator"#_pos; \
77 rel2.to: "separator"#_pos; \ 76 rel2.to: "separator"#_pos; \
78 color: FN_COL_DISABLE; \ 77 color_class: "datetime_separator_text_disabled"; \
79 color_class: "datetime_text"; \
80 text { \ 78 text { \
81 text_source: "separator"#_pos; \ 79 text_source: "separator"#_pos; \
82 font: "Sans"; size: 10; \ 80 font: "Sans"; size: 10; \
83 text_class: "datetime_text"; \ 81 text_class: "datetime_separator_text_disabled"; \
84 } \ 82 } \
85 } \ 83 } \
86 description { state: "enable" 0.0; \ 84 description { state: "enable" 0.0; \
@@ -104,6 +102,11 @@
104 } 102 }
105group { name: "elm/datetime/base/default"; 103group { name: "elm/datetime/base/default";
106 parts { 104 parts {
105 part { name: "bg"; type: RECT;
106 description { state: "default" 0.0;
107 color_class: "datetime_bg";
108 }
109 }
107 part { name: "clip"; type: RECT; 110 part { name: "clip"; type: RECT;
108 description { state: "default" 0.0; 111 description { state: "default" 0.0;
109 rel1.to: "separator0"; 112 rel1.to: "separator0";
diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index beb144c13..2618277d3 100644
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -64,6 +64,8 @@ static const Elm_Text_Class _elm_text_classes[] = {
64 {"calendar_day_text_holiday", "Holiday Text"}, 64 {"calendar_day_text_holiday", "Holiday Text"},
65 {"calendar_day_text_today", "Today Text"}, 65 {"calendar_day_text_today", "Today Text"},
66 {"calendar_day_text_disabled", "Disabled Day Text"}, 66 {"calendar_day_text_disabled", "Disabled Day Text"},
67 {"datetime_separator_text", "Datetime Separator Text"},
68 {"datetime_separator_text_disabled", "Datetime Separator Disabled Text"},
67 {"label", "Label"}, 69 {"label", "Label"},
68 {"entry", "Entry"}, 70 {"entry", "Entry"},
69 {"title_bar", "Title Bar"}, 71 {"title_bar", "Title Bar"},
@@ -91,6 +93,9 @@ static const Elm_Color_Class _elm_color_classes[] = {
91 {"calendar_day_selected", "Selected Day Effect"}, 93 {"calendar_day_selected", "Selected Day Effect"},
92 {"calendar_day_highlighted", "Highlighted Day Effect"}, 94 {"calendar_day_highlighted", "Highlighted Day Effect"},
93 {"calendar_day_checked", "Checked Day Effect"}, 95 {"calendar_day_checked", "Checked Day Effect"},
96 {"datetime_bg", "Datetime Background"},
97 {"datetime_separator_text", "Datetime Separator Text"},
98 {"datetime_separator_text_disabled", "Datetime Separator Disabled Text"},
94 {"hoversel_item_active", "Hoversel Item Text"}, 99 {"hoversel_item_active", "Hoversel Item Text"},
95 {"hoversel_text_disabled", "Hoversel Item Disabled Text"}, 100 {"hoversel_text_disabled", "Hoversel Item Disabled Text"},
96 {"radio_text", "Radio Text"}, 101 {"radio_text", "Radio Text"},