summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2021-02-21 13:32:15 +0000
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2021-02-21 13:32:15 +0000
commit895d1620772fbb339f6c66c0ea4e525eeb048f96 (patch)
tree00ca3a8aefe42c7ae93d05e48ca1976db69c1da1 /data
parentd25a58e1480579f76e794eccd3753d329bb7e0c1 (diff)
TH - efl.ui calendaer
Diffstat (limited to 'data')
-rw-r--r--data/elementary/themes/edc/efl/calendar.edc531
-rw-r--r--data/elementary/themes/edc/elm/calendar.edc1
2 files changed, 232 insertions, 300 deletions
diff --git a/data/elementary/themes/edc/efl/calendar.edc b/data/elementary/themes/edc/efl/calendar.edc
index 6afbeda728..79f81c218d 100644
--- a/data/elementary/themes/edc/efl/calendar.edc
+++ b/data/elementary/themes/edc/efl/calendar.edc
@@ -1,12 +1,21 @@
1#define CIT_STYLE\ 1#define CIT_STYLES\
2 style { name: "efl_ui_calendar_date_style";\ 2 style { name: "efl_ui_calendar_date_style";\
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";\ 3 base: "font="FN" font_size=10 color=#a0a0a0 align=center text_class=calendar_day_text";\
4 }\
5 style { name: "efl_ui_calendar_date_holiday_style";\
6 base: "font="FN" font_size=10 color=#3399ff align=center text_class=calendar_day_text_holiday";\
4 }\ 7 }\
5 style { name: "efl_ui_calendar_date_today_style";\ 8 style { name: "efl_ui_calendar_date_today_style";\
6 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";\ 9 base: "font="FN" font_size=10 color=#ffffff align=center text_class=calendar_day_text_today";\
7 }\ 10 }\
8 style { name: "efl_ui_calendar_date_disabled_style";\ 11 style { name: "efl_ui_calendar_date_disabled_style";\
9 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";\ 12 base: "font="FN" font_size=10 color=#282828 align=center text_class=calendar_day_text_disabled";\
13 }\
14 style { name: "efl_ui_calendar_date_weekend1_style";\
15 base: "font="FN" font_size=10 color=#3399ff align=center text_class=calendar_day_text_weekend1";\
16 }\
17 style { name: "efl_ui_calendar_date_weekend2_style";\
18 base: "font="FN" font_size=10 color=#3399ff align=center text_class=calendar_day_text_weekend2";\
10 }\ 19 }\
11 20
12#define CAL_SPIN(_sufix, _text, _relative)\ 21#define CAL_SPIN(_sufix, _text, _relative)\
@@ -21,8 +30,8 @@
21 offset: 0 -1;\ 30 offset: 0 -1;\
22 }\ 31 }\
23 align: 0.0 0.5;\ 32 align: 0.0 0.5;\
24 min: 15 15;\ 33 min: 25 25;\
25 max: 15 15;\ 34 max: 25 25;\
26 }\ 35 }\
27 }\ 36 }\
28 part { name: "right_bt"#_sufix; type: RECT;\ 37 part { name: "right_bt"#_sufix; type: RECT;\
@@ -36,139 +45,110 @@
36 offset: -1 -1;\ 45 offset: -1 -1;\
37 }\ 46 }\
38 align: 1.0 0.5;\ 47 align: 1.0 0.5;\
39 min: 15 15;\ 48 min: 25 25;\
40 max: 15 15;\ 49 max: 25 25;\
41 color: 0 0 0 0;\ 50 color: 0 0 0 0;\
42 }\ 51 }\
43 }\ 52 }\
44 part { name: "efl.calendar.button"#_sufix".left";\ 53 part { name: "efl.calendar.button"#_sufix".left"; type: SWALLOW;\
45 type: SWALLOW;\
46 scale: 1;\ 54 scale: 1;\
47 description { state: "default" 0.0;\ 55 description { state: "default" 0.0;\
48 fixed: 1 1;\ 56 fixed: 1 1;\
49 rel1.to: "left_bt"#_sufix;\ 57 rel.to: "left_bt"#_sufix;\
50 rel2.to: "left_bt"#_sufix;\ 58 min: 15 15;\
59 max: 15 15;\
51 }\ 60 }\
52 description { state: "rtl" 0.0;\ 61 description { state: "rtl" 0.0;\
53 inherit: "default" 0.0;\ 62 inherit: "default" 0.0;\
54 rel1.to: "right_bt"#_sufix;\ 63 rel.to: "right_bt"#_sufix;\
55 rel2.to: "right_bt"#_sufix;\
56 }\ 64 }\
57 }\ 65 }\
58 part { name: "efl.calendar.button"#_sufix".right";\ 66 part { name: "efl.calendar.button"#_sufix".right"; type: SWALLOW;\
59 type: SWALLOW;\
60 scale: 1;\ 67 scale: 1;\
61 description { state: "default" 0.0;\ 68 description { state: "default" 0.0;\
62 fixed: 1 1;\ 69 fixed: 1 1;\
63 rel1.to: "right_bt"#_sufix;\ 70 rel.to: "right_bt"#_sufix;\
64 rel2.to: "right_bt"#_sufix;\ 71 min: 15 15;\
72 max: 15 15;\
65 }\ 73 }\
66 description { state: "rtl" 0.0;\ 74 description { state: "rtl" 0.0;\
67 inherit: "default" 0.0;\ 75 inherit: "default" 0.0;\
68 rel1.to: "left_bt"#_sufix;\ 76 rel.to: "left_bt"#_sufix;\
69 rel2.to: "left_bt"#_sufix;\
70 }\ 77 }\
71 }\ 78 }\
72 part { name: #_text; type: TEXT; mouse_events: 0;\ 79 part { name: #_text; type: TEXT; mouse_events: 0;\
73 effect: SHADOW BOTTOM; \
74 scale: 1;\ 80 scale: 1;\
75 description { state: "default" 0.0;\ 81 description { state: "default" 0.0;\
76 fixed: 1 1;\ 82 fixed: 1 1;\
77 rel1 { relative: 1.0 0.0;\ 83 rel1 { relative: 1.0 0.0;\
78 to: "left_bt"#_sufix;\ 84 to: "left_bt"#_sufix;\
85 offset: 8 8;\
79 }\ 86 }\
80 rel2 { relative: 0.0 1.0;\ 87 rel2 { relative: 0.0 1.0;\
81 to: "right_bt"#_sufix;\ 88 to: "right_bt"#_sufix;\
89 offset: -9 -9;\
82 }\ 90 }\
91 offscale;\
83 text { font: FNBD; size: 10;\ 92 text { font: FNBD; size: 10;\
84 min: 0 1;\ 93 min: 0 1;\
85 text_class: "calendar_"#_text; \ 94 text_class: "calendar_"#_text; \
86 }\ 95 }\
87 color_class: "calendar_"#_text; \ 96 color: 160 160 160 255; \
88 }\ 97 }\
89 } 98 }
90 99
91#define CH(_pos) \ 100#define CH(_pos) \
92 part { name: "ch_"#_pos"_base"; type: SPACER; \ 101 part { name: "ch_"#_pos"_base"; type: SPACER; \
93 description { state: "default" 0.0; \ 102 description { state: "default" 0.0; \
94 rel1 { \ 103 rel.to: "header";\
95 relative: (_pos % 7 / 7) 0.0; \ 104 rel1.relative: (_pos % 7 / 7) 0.0; \
96 to: "header"; \ 105 rel2.relative: (_pos % 7 / 7 + 1 / 7) 1.0; \
97 } \
98 rel2 { \
99 relative: (_pos % 7 / 7 + 1 / 7) 1.0; \
100 to: "header"; \
101 } \
102 } \ 106 } \
103 } \ 107 } \
104 part { name: "efl.ch_"#_pos".text"; type: TEXT; mouse_events: 0; \ 108 part { name: "efl.ch_"#_pos".text"; type: TEXT; mouse_events: 0; \
105 effect: SHADOW BOTTOM; \
106 scale: 1; \ 109 scale: 1; \
107 clip_to: "ch_"#_pos"_clipper"; \ 110 clip_to: "ch_"#_pos"_clipper"; \
108 description { state: "default" 0.0; \ 111 description { state: "default" 0.0; \
109 rel1.to: "ch_"#_pos"_base"; \ 112 rel.to: "ch_"#_pos"_base"; \
110 rel2.to: "ch_"#_pos"_base"; \ 113 rel1.offset: 0 3; \
114 rel2.offset: -1 -4; \
115 offscale;\
111 text { font: FN; size: 8; \ 116 text { font: FN; size: 8; \
112 min: 1 1; \ 117 min: 1 1; \
113 ellipsis: -1; \ 118 ellipsis: -1; \
114 text_class: "calendar_weekday_text"; \ 119 text_class: "calendar_weekday_text"; \
115 } \ 120 } \
116 color_class: "calendar_weekday_text"; \ 121 color: 160 160 160 255; \
117 } \ 122 } \
118 } \ 123 } \
119 part { name: "ch_"#_pos"_clipper"; type: RECT; \ 124 part { name: "ch_"#_pos"_clipper"; type: RECT; \
120 description { state: "default" 0.0; \ 125 description { state: "default" 0.0; \
121 rel1.to: "ch_"#_pos"_base"; \ 126 rel.to: "ch_"#_pos"_base"; \
122 rel2.to: "ch_"#_pos"_base"; \
123 } \ 127 } \
124 } 128 }
125 129
126#define CIT(_pos) \ 130#define CIT(_pos) \
127 part { name: "cit_"#_pos"_rect"; type: SPACER; \ 131 part { name: "cit_"#_pos"_rect"; type: SPACER; \
128 description { state: "default" 0.0; \ 132 description { state: "default" 0.0; \
129 rel1 { \ 133 rel.to: "base"; \
130 relative: (_pos % 7 / 7) \ 134 rel1.relative: (_pos % 7 / 7) (_pos / 7 / 6 - _pos % 7 / 7 / 6); \
131 (_pos / 7 / 6 - _pos % 7 / 7 / 6); \ 135 rel2.relative: (_pos % 7 / 7 + 1 / 7) (_pos / 7 / 6 + 1 / 6 - _pos % 7 / 7 / 6); \
132 to: "base"; \
133 } \
134 rel2 { \
135 relative: (_pos % 7 / 7 + 1 / 7) \
136 (_pos / 7 / 6 + 1 / 6 - _pos % 7 / 7 / 6); \
137 to: "base"; \
138 } \
139 } \ 136 } \
140 } \ 137 } \
141 part { name: "cit_"#_pos"_event"; type: RECT; repeat_events: 1; \ 138 part { name: "cit_"#_pos"_event"; type: RECT; repeat_events: 1; \
142 description { state: "default" 0.0; \ 139 description { state: "default" 0.0; \
143 rel1.to: "cit_"#_pos"_rect"; \ 140 rel.to: "cit_"#_pos"_rect"; \
144 rel2.to: "cit_"#_pos"_rect"; \
145 color: 0 0 0 0; \ 141 color: 0 0 0 0; \
146 } \ 142 } \
147 } \ 143 description { state: "today" 0.0; \
148 part { name: "cit_"#_pos"_pat"; mouse_events: 0; \
149 description { state: "default" 0.0; \
150 rel1.to: "cit_"#_pos"_selected"; \
151 rel1.offset: 1 1; \
152 rel2.to: "cit_"#_pos"_selected"; \
153 rel2.offset: -2 -2; \
154 image.normal: "diagonal_stripes.png"; \
155 color: 51 153 255 25; \
156 TILED_PATTERN(240, 240) \
157 color_class: "calendar_day_selected"; \
158 visible: 0; \
159 } \
160 description { state: "selected" 0.0; \
161 inherit: "default" 0.0; \ 144 inherit: "default" 0.0; \
162 visible: 1; \ 145 color: 0 0 0 64; \
163 } \ 146 } \
164 } \ 147 } \
165 part { name: "cit_"#_pos"_selected"; mouse_events: 0; \ 148 part { name: "cit_"#_pos"_selected"; type: RECT; mouse_events: 0; \
166 description { state: "default" 0.0; \ 149 description { state: "default" 0.0; \
167 rel1.to: "cit_"#_pos"_rect"; \ 150 rel.to: "cit_"#_pos"_rect"; \
168 rel2.to: "cit_"#_pos"_rect"; \ 151 color: 51 153 255 128; \
169 image.normal: "outline.png"; \
170 image.border: 4 4 4 4; \
171 color: 51 153 255 255; \
172 visible: 0; \ 152 visible: 0; \
173 } \ 153 } \
174 description { state: "selected" 0.0; \ 154 description { state: "selected" 0.0; \
@@ -176,32 +156,13 @@
176 visible: 1; \ 156 visible: 1; \
177 } \ 157 } \
178 } \ 158 } \
179 part { name: "cit_"#_pos"_selected2"; mouse_events: 0; \ 159 part { name: "cit_"#_pos"_focus"; type: RECT; mouse_events: 0; \
180 description { state: "default" 0.0; \ 160 description { state: "default" 0.0; \
181 rel1.to: "cit_"#_pos"_rect"; \ 161 rel.to: "cit_"#_pos"_rect"; \
182 rel2.to: "cit_"#_pos"_rect"; \ 162 color: 255 153 51 128; \
183 image.normal: "outline.png"; \
184 image.border: 4 4 4 4; \
185 color: 51 153 255 255; \
186 color_class: "calendar_day_highlighted"; \
187 visible: 0; \ 163 visible: 0; \
188 } \ 164 } \
189 description { state: "highlighted" 0.0; \ 165 description { state: "selected" 0.0; \
190 inherit: "default" 0.0; \
191 visible: 1; \
192 } \
193 } \
194 part { name: "cit_"#_pos"_glow"; mouse_events: 0; \
195 description { state: "default" 0.0; \
196 rel1.to: "cit_"#_pos"_rect"; \
197 rel2.to: "cit_"#_pos"_rect"; \
198 image.normal: "box_glow.png"; \
199 image.border: 12 12 12 12; \
200 image.middle: 0; \
201 fill.smooth: 0; \
202 visible: 0; \
203 } \
204 description { state: "focused" 0.0; \
205 inherit: "default" 0.0; \ 166 inherit: "default" 0.0; \
206 visible: 1; \ 167 visible: 1; \
207 } \ 168 } \
@@ -209,11 +170,17 @@
209 part { name: "efl.cit_"#_pos".text"; type: TEXTBLOCK; mouse_events: 0; \ 170 part { name: "efl.cit_"#_pos".text"; type: TEXTBLOCK; mouse_events: 0; \
210 scale: 1; \ 171 scale: 1; \
211 description { state: "default" 0.0; \ 172 description { state: "default" 0.0; \
212 rel1.to: "cit_"#_pos"_rect"; \ 173 rel.to: "cit_"#_pos"_rect"; \
213 rel2.to: "cit_"#_pos"_rect"; \ 174 rel1.offset: 3 0; \
175 rel2.offset: -4 -1; \
214 text.style: "efl_ui_calendar_date_style"; \ 176 text.style: "efl_ui_calendar_date_style"; \
215 text.min: 1 1; \ 177 text.min: 1 1; \
216 text.ellipsis: -1; \ 178 text.ellipsis: -1; \
179 offscale; \
180 } \
181 description { state: "holiday" 0.0; \
182 inherit: "default" 0.0; \
183 text.style: "efl_ui_calendar_date_holiday_style"; \
217 } \ 184 } \
218 description { state: "today" 0.0; \ 185 description { state: "today" 0.0; \
219 inherit: "default" 0.0; \ 186 inherit: "default" 0.0; \
@@ -223,25 +190,26 @@
223 inherit: "default" 0.0; \ 190 inherit: "default" 0.0; \
224 text.style: "efl_ui_calendar_date_disabled_style"; \ 191 text.style: "efl_ui_calendar_date_disabled_style"; \
225 } \ 192 } \
193 description { state: "weekend/day1" 0.0; \
194 inherit: "default" 0.0; \
195 text.style: "efl_ui_calendar_date_weekend1_style"; \
196 } \
197 description { state: "weekend/day2" 0.0; \
198 inherit: "default" 0.0; \
199 text.style: "efl_ui_calendar_date_weekend2_style"; \
200 } \
226 } \ 201 } \
227 part { name: "cit_"#_pos"_check"; mouse_events: 0; \ 202 part { name: "cit_"#_pos"_check"; mouse_events: 0; \
228 scale: 1; \ 203 scale: 1; \
229 description { state: "default" 0.0; \ 204 description { state: "default" 0.0; \
230 fixed: 1 1; \ 205 fixed: 1 1; \
231 rel1 { \ 206 rel.to: "cit_"#_pos"_rect"; \
232 to: "cit_"#_pos"_rect"; \ 207 rel1.relative: 0.6 0.5; \
233 relative: 0.6 0.5; \ 208 min: 15 15; \
234 } \ 209 max: 15 15; \
235 rel2 { \
236 to: "cit_"#_pos"_rect"; \
237 relative: 0.6 0.5; \
238 } \
239 min: 16 16; \
240 max: 16 16; \
241 aspect: 1 1; \
242 align: 0.0 1.0;\ 210 align: 0.0 1.0;\
243 image.normal: "icon_border_remember.png"; \ 211 image.normal: "i-check"; \
244 color_class: "calendar_day_checked"; \ 212 color: 53 153 255 255; \
245 visible: 0; \ 213 visible: 0; \
246 } \ 214 } \
247 description { state: "visible" 0.0; \ 215 description { state: "visible" 0.0; \
@@ -251,8 +219,7 @@
251 } \ 219 } \
252 part { name: "efl.cit_"#_pos".access"; type: RECT; repeat_events: 1; \ 220 part { name: "efl.cit_"#_pos".access"; type: RECT; repeat_events: 1; \
253 description { state: "default" 0.0; \ 221 description { state: "default" 0.0; \
254 rel1.to: "cit_"#_pos"_event"; \ 222 rel.to: "cit_"#_pos"_event"; \
255 rel2.to: "cit_"#_pos"_event"; \
256 color: 0 0 0 0; \ 223 color: 0 0 0 0; \
257 } \ 224 } \
258 } \ 225 } \
@@ -262,7 +229,6 @@
262 signal: "cit_"#_pos",selected"; \ 229 signal: "cit_"#_pos",selected"; \
263 source: "efl"; \ 230 source: "efl"; \
264 action: STATE_SET "selected" 0.0; \ 231 action: STATE_SET "selected" 0.0; \
265 target: "cit_"#_pos"_pat"; \
266 target: "cit_"#_pos"_selected"; \ 232 target: "cit_"#_pos"_selected"; \
267 } \ 233 } \
268 program { \ 234 program { \
@@ -270,7 +236,6 @@
270 signal: "cit_"#_pos",unselected"; \ 236 signal: "cit_"#_pos",unselected"; \
271 source: "efl"; \ 237 source: "efl"; \
272 action: STATE_SET "default" 0.0; \ 238 action: STATE_SET "default" 0.0; \
273 target: "cit_"#_pos"_pat"; \
274 target: "cit_"#_pos"_selected"; \ 239 target: "cit_"#_pos"_selected"; \
275 } \ 240 } \
276 program { \ 241 program { \
@@ -281,7 +246,7 @@
281 set_int(item_focus_enabled, 1); \ 246 set_int(item_focus_enabled, 1); \
282 set_int(last_focused_item, _pos); \ 247 set_int(last_focused_item, _pos); \
283 if (get_int(win_focus_enabled) == 1) \ 248 if (get_int(win_focus_enabled) == 1) \
284 set_state(PART:"cit_"#_pos"_glow", "focused", 0.0); \ 249 set_state(PART:"cit_"#_pos"_focus", "selected", 0.0); \
285 } \ 250 } \
286 } \ 251 } \
287 program { \ 252 program { \
@@ -290,7 +255,7 @@
290 source: "efl"; \ 255 source: "efl"; \
291 script { \ 256 script { \
292 set_int(item_focus_enabled, 0); \ 257 set_int(item_focus_enabled, 0); \
293 set_state(PART:"cit_"#_pos"_glow", "default", 0.0); \ 258 set_state(PART:"cit_"#_pos"_focus", "default", 0.0); \
294 } \ 259 } \
295 } \ 260 } \
296 program { \ 261 program { \
@@ -299,6 +264,7 @@
299 source: "efl"; \ 264 source: "efl"; \
300 action: STATE_SET "today" 0.0; \ 265 action: STATE_SET "today" 0.0; \
301 target: "efl.cit_"#_pos".text"; \ 266 target: "efl.cit_"#_pos".text"; \
267 target: "cit_"#_pos"_event";\
302 } \ 268 } \
303 program { \ 269 program { \
304 name: "cit_"#_pos"_not_today"; \ 270 name: "cit_"#_pos"_not_today"; \
@@ -306,6 +272,7 @@
306 source: "efl"; \ 272 source: "efl"; \
307 action: STATE_SET "default" 0.0; \ 273 action: STATE_SET "default" 0.0; \
308 target: "efl.cit_"#_pos".text"; \ 274 target: "efl.cit_"#_pos".text"; \
275 target: "cit_"#_pos"_event";\
309 } \ 276 } \
310 program { \ 277 program { \
311 name: "cit_"#_pos"_enable"; \ 278 name: "cit_"#_pos"_enable"; \
@@ -330,15 +297,15 @@
330 source: "cit_"#_pos"_clicked"; \ 297 source: "cit_"#_pos"_clicked"; \
331 signal: "mouse,down,1"; \ 298 signal: "mouse,down,1"; \
332 source: "cit_"#_pos"_event"; \ 299 source: "cit_"#_pos"_event"; \
333 action: STATE_SET "highlighted" 0.0; \ 300 action: STATE_SET "selected" 0.0; \
334 target: "cit_"#_pos"_selected2"; \ 301 target: "cit_"#_pos"_selected"; \
335 } \ 302 } \
336 program { \ 303 program { \
337 source: "cit_"#_pos"_clicked"; \ 304 source: "cit_"#_pos"_clicked"; \
338 signal: "mouse,up,1"; \ 305 signal: "mouse,up,1"; \
339 source: "cit_"#_pos"_event"; \ 306 source: "cit_"#_pos"_event"; \
340 action: STATE_SET "default" 0.0; \ 307 action: STATE_SET "default" 0.0; \
341 target: "cit_"#_pos"_selected2"; \ 308 target: "cit_"#_pos"_selected"; \
342 } \ 309 } \
343 program { \ 310 program { \
344 source: "cit_"#_pos"_clicked"; \ 311 source: "cit_"#_pos"_clicked"; \
@@ -420,15 +387,8 @@
420 } \ 387 } \
421 } 388 }
422 389
423group { "efl/calendar"; data.item: "version" "123"; 390group { name: "efl/calendar";
424 images.image: "sym_left_light_normal.png" COMP; 391 data.item: "version" "123";
425 images.image: "sym_right_light_normal.png" COMP;
426 images.image: "sym_left_glow_normal.png" COMP;
427 images.image: "sym_right_glow_normal.png" COMP;
428 images.image: "icon_border_remember.png" COMP;
429 images.image: "outline.png" COMP;
430 images.image: "box_glow.png" COMP;
431 images.image: "diagonal_stripes.png" COMP;
432 data.item: "focus_highlight" "on"; 392 data.item: "focus_highlight" "on";
433 script { 393 script {
434 public rtl; 394 public rtl;
@@ -437,32 +397,34 @@ group { "efl/calendar"; data.item: "version" "123";
437 public last_focused_item; 397 public last_focused_item;
438 } 398 }
439 styles { 399 styles {
440 CIT_STYLE 400 CIT_STYLES
441 } 401 }
442 parts { 402 parts {
443 part { name: "bg"; type: SPACER; 403 part { name: "bg"; type: SPACER;
404 scale: 1;
444 description { state: "default" 0.0; 405 description { state: "default" 0.0;
445 rel1.offset: 1 1; 406 rel1.offset: 8 8;
446 rel2.offset: -2 -2; 407 rel2.offset: -9 -9;
408 offscale;
447 } 409 }
448 } 410 }
449 part { name: "efl.background"; type: SWALLOW; 411 part { name: "efl.background"; type: SWALLOW;
450 description { state: "default" 0.0; 412 description { state: "default" 0.0;
451 rel1.to: "bg"; 413 rel.to: "bg";
452 rel2.to: "bg";
453 } 414 }
454 } 415 }
455 part { name: "spinner-base1"; type: SPACER; 416 part { name: "spinner-base1"; type: SPACER;
417 scale: 1;
456 description { state: "default" 0.0; 418 description { state: "default" 0.0;
457 min: 24 16; 419 min: 24 16;
458 max: 999999 16; 420 max: 999999 16;
459 rel1.to: "bg"; 421 rel.to: "bg";
460 rel2.to: "bg";
461 rel2.relative: 1.0 (1/8); 422 rel2.relative: 1.0 (1/8);
462 align: 0.5 0.0; 423 align: 0.5 0.0;
463 } 424 }
464 } 425 }
465 part { name: "table-base"; type: SPACER; 426 part { name: "table-base"; type: SPACER;
427 scale: 1;
466 description { state: "default" 0.0; 428 description { state: "default" 0.0;
467 min: 70 60; 429 min: 70 60;
468 rel1.to_x: "bg"; 430 rel1.to_x: "bg";
@@ -471,29 +433,31 @@ group { "efl/calendar"; data.item: "version" "123";
471 rel1.relative: 0.0 1.0; 433 rel1.relative: 0.0 1.0;
472 rel2.to: "bg"; 434 rel2.to: "bg";
473 rel2.offset: -4 -4; 435 rel2.offset: -4 -4;
436 offscale;
474 } 437 }
475 } 438 }
476 part { name: "header"; type: SPACER; 439 part { name: "header"; type: SPACER;
477 description { state: "default" 0.0; 440 description { state: "default" 0.0;
478 rel1.to: "table-base"; 441 rel.to: "table-base";
479 rel2.to: "table-base";
480 rel2.relative: 1.0 (1/7); 442 rel2.relative: 1.0 (1/7);
481 align: 0.5 0.0; 443 align: 0.5 0.0;
482 min: 0 16; 444 min: 0 25;
483 } 445 }
484 } 446 }
485 part { name: "header_separator"; mouse_events: 0; 447 part { name: "header_separator"; type: RECT; mouse_events: 0;
448 scale: 1;
486 description { state: "default" 0.0; 449 description { state: "default" 0.0;
487 fixed: 1 1; 450 fixed: 1 1;
488 rel1.to: "header"; 451 rel.to: "header";
489 rel1.relative: 0.0 1.0; 452 rel1.relative: 0.0 1.0;
490 rel1.offset: 0 -2; 453 rel1.offset: 8 -1;
491 rel2.to: "header"; 454 rel2.offset: -9 -1;
492 image.normal: "separator_horiz.png"; 455 color: 80 80 80 255;
493 fill.smooth: 0; 456 offscale;
494 } 457 }
495 } 458 }
496 part { name: "base"; type: SPACER; 459 part { name: "base"; type: SPACER;
460 scale: 1;
497 description { state: "default" 0.0; 461 description { state: "default" 0.0;
498 rel1.to_x: "table-base"; 462 rel1.to_x: "table-base";
499 rel1.to_y: "header"; 463 rel1.to_y: "header";
@@ -501,6 +465,7 @@ group { "efl/calendar"; data.item: "version" "123";
501 rel1.offset: 3 0; 465 rel1.offset: 3 0;
502 rel2.to: "table-base"; 466 rel2.to: "table-base";
503 rel2.offset: -3 0; 467 rel2.offset: -3 0;
468 offscale;
504 } 469 }
505 } 470 }
506 471
@@ -537,182 +502,148 @@ group { "efl/calendar"; data.item: "version" "123";
537 } 502 }
538} 503}
539 504
540#undef CAL_SPIN 505group { name: "efl/calendar/inc_button";
541#undef CIT 506 data.item: "version" "123";
542#undef CH 507 script {
543 508 public mouse_down = 0;
544 group { name: "efl/calendar/inc_button"; data.item: "version" "123"; 509 public multi_down = 0;
545 images.image: "sym_right_light_normal.png" COMP; 510 }
546 images.image: "sym_right_glow_normal.png" COMP; 511 parts {
547 images.image: "sym_right_dark_normal.png" COMP; 512 part { name: "arrow.image";
548 script { 513 scale: 1;
549 public mouse_down = 0; 514 description { state: "default" 0.0;
550 public multi_down = 0; 515 min: 15 15; max: 15 15;
551 } 516 color: 160 160 160 255;
552 parts { 517 image.normal: "i-arrow-r";
553 part { name: "arrow.image";
554 scale: 1;
555 description { state: "default" 0.0;
556 min: 15 15;
557 max: 15 15;
558 color_class: "F032L1";
559 image.normal: "sym_right_light_normal.png";
560 }
561 description { state: "pressed" 0.0;
562 inherit: "default" 0.0;
563 image.normal: "sym_right_glow_normal.png";
564 }
565 description { state: "disabled" 0.0;
566 inherit: "default" 0.0;
567 image.normal: "sym_right_dark_normal.png";
568 }
569 } 518 }
570 part { name: "over"; 519 description { state: "pressed" 0.0;
571 type: RECT; 520 inherit: "default" 0.0;
572 repeat_events: 1; 521 color: 255 255 255 255;
573 description { state: "default" 0.0;
574 color: 0 0 0 0;
575 }
576 } 522 }
577 part { name: "disabler"; 523 description { state: "disabled" 0.0;
578 type: RECT; 524 inherit: "default" 0.0;
579 description { state: "default" 0.0; 525 color: 96 96 96 255;
580 color: 0 0 0 0;
581 visible: 0;
582 }
583 description { state: "disabled" 0.0;
584 inherit: "default" 0.0;
585 visible: 1;
586 }
587 } 526 }
588 } 527 }
589 programs { 528 part { name: "over"; type: RECT;
590 program { name: "button_press"; 529 repeat_events: 1;
591 signal: "mouse,down,1"; 530 description { state: "default" 0.0;
592 source: "over"; 531 color: 0 0 0 0;
593 script {
594 if ((get_int(multi_down) == 0) &&
595 (get_int(mouse_down) == 0)) {
596 set_int(mouse_down, 1);
597 run_program(PROGRAM:"button_press2");
598 }
599 }
600 } 532 }
601 program { name: "button_press2"; 533 }
602 action: SIGNAL_EMIT "efl,action,press" ""; 534 part { name: "disabler"; type: RECT;
603 after: "button_press_anim"; 535 description { state: "default" 0.0;
536 color: 0 0 0 0;
537 visible: 0;
604 } 538 }
605 program { name: "button_press_anim"; 539 description { state: "disabled" 0.0;
606 action: STATE_SET "pressed" 0.0; 540 inherit: "default" 0.0;
607 target: "arrow.image"; 541 visible: 1;
608 } 542 }
609 program { name: "button_unpress"; 543 }
610 signal: "mouse,up,1"; 544 }
611 source: "over"; 545 programs {
612 script { 546 program { signal: "mouse,down,1"; source: "over";
613 if (get_int(mouse_down) == 1) { 547 script {
614 set_int(mouse_down, 0); 548 if ((get_int(multi_down) == 0) &&
615 run_program(PROGRAM:"button_unpress2"); 549 (get_int(mouse_down) == 0)) {
616 run_program(PROGRAM:"button_unpress_anim"); 550 set_int(mouse_down, 1);
617 } 551 run_program(PROGRAM:"button_press2");
618 } 552 }
619 } 553 }
620 program { name: "button_unpress2"; 554 }
621 action: SIGNAL_EMIT "efl,action,unpress" ""; 555 program { name: "button_press2";
622 } 556 action: SIGNAL_EMIT "efl,action,press" "";
623 program { name: "button_unpress_anim"; 557 after: "button_press_anim";
624 action: STATE_SET "default" 0.0; 558 }
625 target: "arrow.image"; 559 program { name: "button_press_anim";
626 } 560 action: STATE_SET "pressed" 0.0;
627 program { name: "button_click"; 561 target: "arrow.image";
628 signal: "mouse,clicked,1"; 562 }
629 source: "over"; 563 program { signal: "mouse,up,1"; source: "over";
630 script { 564 script {
631 if (get_int(multi_down) == 0) { 565 if (get_int(mouse_down) == 1) {
632 run_program(PROGRAM:"button_click2"); 566 set_int(mouse_down, 0);
633 } 567 run_program(PROGRAM:"button_unpress2");
568 run_program(PROGRAM:"button_unpress_anim");
634 } 569 }
635 } 570 }
636 program { name: "action_unpressed"; 571 }
637 signal: "efl,action,unpressed"; 572 program { name: "button_unpress2";
638 source: "efl"; 573 action: SIGNAL_EMIT "efl,action,unpress" "";
639 after: "button_unpress_anim"; 574 }
640 } 575 program { name: "button_unpress_anim";
641 program { name: "action_pressed"; 576 action: STATE_SET "default" 0.0;
642 signal: "efl,action,pressed"; 577 target: "arrow.image";
643 source: "efl"; 578 }
644 after: "button_press_anim"; 579 program { signal: "mouse,clicked,1"; source: "over";
645 } 580 script {
646 program { name: "button_click2"; 581 if (get_int(multi_down) == 0) {
647 action: SIGNAL_EMIT "efl,action,click" ""; 582 run_program(PROGRAM:"button_click2");
648 }
649 program { name: "access_pressed";
650 signal: "efl,state,animation,activated";
651 source: "efl";
652 action: STATE_SET "pressed" 0.0;
653 target: "arrow.image";
654 after: "access_pressed_anim";
655 }
656 program { name: "access_pressed_anim";
657 action: STATE_SET "default" 0.0;
658 transition: DECELERATE 0.1;
659 target: "arrow.image";
660 }
661 program { name: "disable";
662 signal: "efl,state,disabled";
663 source: "efl";
664 action: STATE_SET "disabled" 0.0;
665 target: "arrow.image";
666 target: "disabler";
667 }
668 program { name: "enable";
669 signal: "efl,state,enabled";
670 source: "efl";
671 action: STATE_SET "default" 0.0;
672 target: "arrow.image";
673 target: "disabler";
674 }
675 program {
676 name: "multi_down";
677 signal: "efl,action,multi,down";
678 source: "efl";
679 script {
680 set_int(multi_down, 1);
681 } 583 }
682 } 584 }
683 program { 585 }
684 name: "multi_up"; 586 program { signal: "efl,action,unpressed"; source: "efl";
685 signal: "efl,action,multi,up"; 587 after: "button_unpress_anim";
686 source: "efl"; 588 }
687 script { 589 program { signal: "efl,action,pressed"; source: "efl";
688 set_int(multi_down, 0); 590 after: "button_press_anim";
689 } 591 }
592 program { name: "button_click2";
593 action: SIGNAL_EMIT "efl,action,click" "";
594 }
595 program { signal: "efl,state,animation,activated"; source: "efl";
596 action: STATE_SET "pressed" 0.0;
597 target: "arrow.image";
598 after: "access_pressed_anim";
599 }
600 program { name: "access_pressed_anim";
601 action: STATE_SET "default" 0.0;
602 transition: DECELERATE 0.1;
603 target: "arrow.image";
604 }
605 program { signal: "efl,state,disabled"; source: "efl";
606 action: STATE_SET "disabled" 0.0;
607 target: "arrow.image";
608 target: "disabler";
609 }
610 program { signal: "efl,state,enabled"; source: "efl";
611 action: STATE_SET "default" 0.0;
612 target: "arrow.image";
613 target: "disabler";
614 }
615 program { signal: "efl,action,multi,down"; source: "efl";
616 script {
617 set_int(multi_down, 1);
618 }
619 }
620 program { signal: "efl,action,multi,up"; source: "efl";
621 script {
622 set_int(multi_down, 0);
690 } 623 }
691 } 624 }
692 } 625 }
626}
693 627
694 group { name: "efl/calendar/dec_button"; 628group { name: "efl/calendar/dec_button";
695 inherit: "efl/calendar/inc_button"; 629 inherit: "efl/calendar/inc_button";
696 data.item: "version" "123"; 630 data.item: "version" "123";
697 images.image: "sym_left_light_normal.png" COMP; 631 parts {
698 images.image: "sym_left_glow_normal.png" COMP; 632 part { name: "arrow.image";
699 images.image: "sym_left_dark_normal.png" COMP; 633 scale: 1;
700 parts { 634 description { state: "default" 0.0;
701 part { name: "arrow.image"; 635 image.normal: "i-arrow-l";
702 scale: 1; 636 }
703 description { state: "default" 0.0; 637 description { state: "pressed" 0.0;
704 min: 15 15; 638 image.normal: "i-arrow-l";
705 max: 15 15; 639 }
706 image.normal: "sym_left_light_normal.png"; 640 description { state: "disabled" 0.0;
707 } 641 image.normal: "i-arrow-l";
708 description { state: "pressed" 0.0;
709 inherit: "default" 0.0;
710 image.normal: "sym_left_glow_normal.png";
711 }
712 description { state: "disabled" 0.0;
713 inherit: "default" 0.0;
714 image.normal: "sym_left_dark_normal.png";
715 }
716 } 642 }
717 } 643 }
718 } 644 }
645}
646#undef CIT_STYLES
647#undef CAL_SPIN
648#undef CIT
649#undef CH
diff --git a/data/elementary/themes/edc/elm/calendar.edc b/data/elementary/themes/edc/elm/calendar.edc
index 9a9a4901a4..73bad621be 100644
--- a/data/elementary/themes/edc/elm/calendar.edc
+++ b/data/elementary/themes/edc/elm/calendar.edc
@@ -537,6 +537,7 @@ group { name: "elm/calendar/base/double_spinners";
537 } 537 }
538} 538}
539 539
540#undef CIT_STYLES
540#undef CAL_SPIN 541#undef CAL_SPIN
541#undef CIT 542#undef CIT
542#undef CH 543#undef CH