summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYoungbok Shin <youngb.shin@samsung.com>2016-01-04 14:34:06 -0800
committerCedric BAIL <cedric@osg.samsung.com>2016-01-04 14:34:10 -0800
commitfd142aa2fbd8b9f5a09c571ca91772142de1190e (patch)
treeb50ebe1268b3c063273584a8d94936fe5f23e3e1
parentc83ec8ed97d0833a4202e73e229799c6bdf248cd (diff)
calendar: add color classes and text classes.
Summary: The following new color classes and text classes for calendar widget are added. "calendar_year_text" - Year Text in Title Area "calendar_month_text" - Month Text in Title Area "calendar_weekday_text" - Weekday Text "calendar_day_text" - Day Text "calendar_day_text_holiday" - Holiday Text "calendar_day_text_today" - Today Text "calendar_day_text_disabled" - Disabled Day Text "calendar_day_selected" - Selected Day Effect "calendar_day_highlighted" - Highlighted Day Effect "calendar_day_checked" - Checked Day Effect @feature Test Plan: N/A Reviewers: woohyun, raster, cedric, kimcinoo, jaehwan Subscribers: CHAN Differential Revision: https://phab.enlightenment.org/D3482 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
-rw-r--r--data/themes/colorclasses.edc32
-rw-r--r--data/themes/edc/elm/calendar.edc24
-rw-r--r--src/lib/elm_config.c17
3 files changed, 64 insertions, 9 deletions
diff --git a/data/themes/colorclasses.edc b/data/themes/colorclasses.edc
index 9cc9b9b62..3d61f8ad8 100644
--- a/data/themes/colorclasses.edc
+++ b/data/themes/colorclasses.edc
@@ -110,6 +110,38 @@ color_classes {
110 color: FN_COL_HIGHLIGHT_DISABLE; 110 color: FN_COL_HIGHLIGHT_DISABLE;
111 desc: "Text of a disabled anchor link"; 111 desc: "Text of a disabled anchor link";
112 } 112 }
113 color_class { name: "calendar_year_text";
114 color: FN_COL_DEFAULT;
115 desc: "Year Text in Title Area";
116 }
117 color_class { name: "calendar_month_text";
118 color: FN_COL_DEFAULT;
119 desc: "Month Text in Title Area";
120 }
121 color_class { name: "calendar_weekday_text";
122 color: FN_COL_DISABLE;
123 desc: "Weekday Text";
124 }
125 color_class { name: "calendar_day_text";
126 color: 255 255 255 255;
127 color3: 0 0 0 128;
128 desc: "Day Text";
129 }
130 color_class { name: "calendar_day_text_holiday";
131 color: 128 128 128 255;
132 color3: 0 0 0 128;
133 desc: "Holiday Text";
134 }
135 color_class { name: "calendar_day_text_today";
136 color: 51 153 255 255;
137 color2: 51 153 255 24;
138 desc: "Today Text";
139 }
140 color_class { name: "calendar_day_text_disabled";
141 color: 21 21 21 255;
142 color3: 255 255 255 192;
143 desc: "Disabled Day Text";
144 }
113 color_class { name: "check_text"; 145 color_class { name: "check_text";
114 color: FN_COL_DEFAULT; 146 color: FN_COL_DEFAULT;
115 desc: "Text of a checkbox's label"; 147 desc: "Text of a checkbox's label";
diff --git a/data/themes/edc/elm/calendar.edc b/data/themes/edc/elm/calendar.edc
index b706a82e3..5ba602a31 100644
--- a/data/themes/edc/elm/calendar.edc
+++ b/data/themes/edc/elm/calendar.edc
@@ -1,15 +1,15 @@
1#define CIT_STYLES\ 1#define CIT_STYLES\
2 style { name: "calendar_date_style";\ 2 style { name: "calendar_date_style";\
3 base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 align=center";\ 3 base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 align=center text_class=calendar_day_text color_class=calendar_day_text";\
4 }\ 4 }\
5 style { name: "calendar_date_holiday_style";\ 5 style { name: "calendar_date_holiday_style";\
6 base: "font="FN" font_size=10 color=#808080 style=shadow,bottom shadow_color=#00000080 align=center";\ 6 base: "font="FN" font_size=10 color=#808080 style=shadow,bottom shadow_color=#00000080 align=center text_class=calendar_day_text_holiday color_class=calendar_day_text_holiday";\
7 }\ 7 }\
8 style { name: "calendar_date_today_style";\ 8 style { name: "calendar_date_today_style";\
9 base: "font="FN" font_size=10 color=#3399ff style=glow glow_color=#3399ff18 align=center";\ 9 base: "font="FN" font_size=10 color=#3399ff style=glow glow_color=#3399ff18 align=center text_class=calendar_day_text_today color_class=calendar_day_text_today";\
10 }\ 10 }\
11 style { name: "calendar_date_disabled_style";\ 11 style { name: "calendar_date_disabled_style";\
12 base: "font="FN" font_size=10 color=#151515 style=shadow_bottom shadow_color=#ffffffc0 align=center";\ 12 base: "font="FN" font_size=10 color=#151515 style=shadow_bottom shadow_color=#ffffffc0 align=center text_class=calendar_day_text_disabled text_class=calendar_day_text_disabled";\
13 }\ 13 }\
14 14
15#define CAL_SPIN(_sufix, _text, _relative)\ 15#define CAL_SPIN(_sufix, _text, _relative)\
@@ -83,10 +83,11 @@
83 rel2 { relative: 0.0 1.0;\ 83 rel2 { relative: 0.0 1.0;\
84 to: "right_bt"#_sufix;\ 84 to: "right_bt"#_sufix;\
85 }\ 85 }\
86 color: FN_COL_DEFAULT;\
87 text { font: FNBD; size: 10;\ 86 text { font: FNBD; size: 10;\
88 min: 0 1;\ 87 min: 0 1;\
88 text_class: "calendar_"#_text; \
89 }\ 89 }\
90 color_class: "calendar_"#_text; \
90 }\ 91 }\
91 } 92 }
92 93
@@ -110,11 +111,12 @@
110 description { state: "default" 0.0; \ 111 description { state: "default" 0.0; \
111 rel1.to: "ch_"#_pos".base"; \ 112 rel1.to: "ch_"#_pos".base"; \
112 rel2.to: "ch_"#_pos".base"; \ 113 rel2.to: "ch_"#_pos".base"; \
113 color: FN_COL_DISABLE;\
114 text { font: FN; size: 8; \ 114 text { font: FN; size: 8; \
115 min: 1 1; \ 115 min: 1 1; \
116 ellipsis: -1; \ 116 ellipsis: -1; \
117 text_class: "calendar_weekday_text"; \
117 } \ 118 } \
119 color_class: "calendar_weekday_text"; \
118 } \ 120 } \
119 } \ 121 } \
120 part { name: "ch_"#_pos".clipper"; type: RECT; \ 122 part { name: "ch_"#_pos".clipper"; type: RECT; \
@@ -155,6 +157,7 @@
155 image.normal: "diagonal_stripes.png"; \ 157 image.normal: "diagonal_stripes.png"; \
156 color: 255 255 255 25; \ 158 color: 255 255 255 25; \
157 TILED_PATTERN(240, 240) \ 159 TILED_PATTERN(240, 240) \
160 color_class: "calendar_day_selected"; \
158 visible: 0; \ 161 visible: 0; \
159 } \ 162 } \
160 description { state: "selected" 0.0; \ 163 description { state: "selected" 0.0; \
@@ -168,6 +171,7 @@
168 rel2.to: "cit_"#_pos".rect"; \ 171 rel2.to: "cit_"#_pos".rect"; \
169 image.normal: "outline_glow.png"; \ 172 image.normal: "outline_glow.png"; \
170 image.border: 4 4 4 4; \ 173 image.border: 4 4 4 4; \
174 color_class: "calendar_day_selected"; \
171 visible: 0; \ 175 visible: 0; \
172 } \ 176 } \
173 description { state: "selected" 0.0; \ 177 description { state: "selected" 0.0; \
@@ -181,11 +185,12 @@
181 rel2.to: "cit_"#_pos".rect"; \ 185 rel2.to: "cit_"#_pos".rect"; \
182 image.normal: "outline_glow.png"; \ 186 image.normal: "outline_glow.png"; \
183 image.border: 4 4 4 4; \ 187 image.border: 4 4 4 4; \
188 color: 255 255 255 128; \
189 color_class: "calendar_day_highlighted"; \
184 visible: 0; \ 190 visible: 0; \
185 } \ 191 } \
186 description { state: "hilighted" 0.0; \ 192 description { state: "highlighted" 0.0; \
187 inherit: "default" 0.0; \ 193 inherit: "default" 0.0; \
188 color: 255 255 255 128; \
189 visible: 1; \ 194 visible: 1; \
190 } \ 195 } \
191 } \ 196 } \
@@ -228,6 +233,7 @@
228 aspect: 1 1; \ 233 aspect: 1 1; \
229 align: 0.0 1.0;\ 234 align: 0.0 1.0;\
230 image.normal: "icon_border_remember.png"; \ 235 image.normal: "icon_border_remember.png"; \
236 color_class: "calendar_day_checked"; \
231 visible: 0; \ 237 visible: 0; \
232 } \ 238 } \
233 description { state: "visible" 0.0; \ 239 description { state: "visible" 0.0; \
@@ -296,7 +302,7 @@
296 source: "cit_"#_pos".clicked"; \ 302 source: "cit_"#_pos".clicked"; \
297 signal: "mouse,down,1"; \ 303 signal: "mouse,down,1"; \
298 source: "cit_"#_pos".event"; \ 304 source: "cit_"#_pos".event"; \
299 action: STATE_SET "hilighted" 0.0; \ 305 action: STATE_SET "highlighted" 0.0; \
300 target: "cit_"#_pos".selected2"; \ 306 target: "cit_"#_pos".selected2"; \
301 } \ 307 } \
302 program { \ 308 program { \
diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index 7cbc2c7b2..beb144c13 100644
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -57,6 +57,13 @@ const char *_elm_engines[] = {
57 declare it both here and in the (default) theme */ 57 declare it both here and in the (default) theme */
58static const Elm_Text_Class _elm_text_classes[] = { 58static const Elm_Text_Class _elm_text_classes[] = {
59 {"button", "Button"}, 59 {"button", "Button"},
60 {"calendar_year_text", "Year Text in Title Area"},
61 {"calendar_month_text", "Month Text in Title Area"},
62 {"calendar_weekday_text", "Weekday Text"},
63 {"calendar_day_text", "Day Text"},
64 {"calendar_day_text_holiday", "Holiday Text"},
65 {"calendar_day_text_today", "Today Text"},
66 {"calendar_day_text_disabled", "Disabled Day Text"},
60 {"label", "Label"}, 67 {"label", "Label"},
61 {"entry", "Entry"}, 68 {"entry", "Entry"},
62 {"title_bar", "Title Bar"}, 69 {"title_bar", "Title Bar"},
@@ -74,6 +81,16 @@ static const Elm_Color_Class _elm_color_classes[] = {
74 {"button_text_disabled", "Button Disabled Text"}, 81 {"button_text_disabled", "Button Disabled Text"},
75 {"button_text_anchor", "Anchor Button Text"}, 82 {"button_text_anchor", "Anchor Button Text"},
76 {"button_text_anchor_disabled", "Anchor Button Disabled Text"}, 83 {"button_text_anchor_disabled", "Anchor Button Disabled Text"},
84 {"calendar_year_text", "Year Text in Title Area"},
85 {"calendar_month_text", "Month Text in Title Area"},
86 {"calendar_weekday_text", "Weekday Text"},
87 {"calendar_day_text", "Day Text"},
88 {"calendar_day_text_holiday", "Holiday Text"},
89 {"calendar_day_text_today", "Today Text"},
90 {"calendar_day_text_disabled", "Disabled Day Text"},
91 {"calendar_day_selected", "Selected Day Effect"},
92 {"calendar_day_highlighted", "Highlighted Day Effect"},
93 {"calendar_day_checked", "Checked Day Effect"},
77 {"hoversel_item_active", "Hoversel Item Text"}, 94 {"hoversel_item_active", "Hoversel Item Text"},
78 {"hoversel_text_disabled", "Hoversel Item Disabled Text"}, 95 {"hoversel_text_disabled", "Hoversel Item Disabled Text"},
79 {"radio_text", "Radio Text"}, 96 {"radio_text", "Radio Text"},