summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2018-08-13 07:03:39 -0400
committerMike Blumenkrantz <zmike@samsung.com>2018-08-13 07:03:39 -0400
commit26bedebc18c263b8dc2f5407484b771c19f8532f (patch)
treef687481d39c9d465eeeeb491bd51fe33f55d7822 /data
parenta8421fc0c00238db476eaabd6115836adf1078d5 (diff)
elm: bring back elm/uiclock
Summary: It turns out elm/uiclock (which was removed in 89675c3219) is actually used, at least by the datetime legacy widget. Removing this widget broke the datetime_example test. This commit reverts 89675c3219 and fixes the elm/uiclock part names: - Part names are prefixed with 'elm.' - efl_ui_clock.c (which is used for both the new efl and the legacy elm widgets) now looks for part names with 'efl.' and 'elm.' prefixes, and without any prefix, for compatibility with older themes. Fixes T6928 Test Plan: the Datetime elementary_test (and all other clock-related tests) now work. Reviewers: zmike, jsuya, CHAN, devilhorns, Jaehyun_Cho Reviewed By: zmike, jsuya, CHAN Subscribers: #reviewers, Jaehyun, Hermet, cedric, #committers Tags: #efl Maniphest Tasks: T6928 Differential Revision: https://phab.enlightenment.org/D6577
Diffstat (limited to 'data')
-rw-r--r--data/elementary/themes/Makefile.am1
-rw-r--r--data/elementary/themes/default.edc1
-rw-r--r--data/elementary/themes/edc/elm/uiclock.edc207
3 files changed, 209 insertions, 0 deletions
diff --git a/data/elementary/themes/Makefile.am b/data/elementary/themes/Makefile.am
index e677747..1cf4e6e 100644
--- a/data/elementary/themes/Makefile.am
+++ b/data/elementary/themes/Makefile.am
@@ -149,6 +149,7 @@ elementary/themes/edc/elm/textpath.edc \
149elementary/themes/edc/elm/thumb.edc \ 149elementary/themes/edc/elm/thumb.edc \
150elementary/themes/edc/elm/toolbar.edc \ 150elementary/themes/edc/elm/toolbar.edc \
151elementary/themes/edc/elm/tooltip.edc \ 151elementary/themes/edc/elm/tooltip.edc \
152elementary/themes/edc/elm/uiclock.edc \
152elementary/themes/edc/elm/video.edc \ 153elementary/themes/edc/elm/video.edc \
153elementary/themes/edc/elm/win.edc \ 154elementary/themes/edc/elm/win.edc \
154\ 155\
diff --git a/data/elementary/themes/default.edc b/data/elementary/themes/default.edc
index b48a26b..40d1920 100644
--- a/data/elementary/themes/default.edc
+++ b/data/elementary/themes/default.edc
@@ -36,6 +36,7 @@ collections {
36#include "edc/elm/access.edc" 36#include "edc/elm/access.edc"
37#include "edc/elm/photo.edc" 37#include "edc/elm/photo.edc"
38#include "edc/elm/focus.edc" 38#include "edc/elm/focus.edc"
39#include "edc/elm/uiclock.edc"
39#include "edc/elm/player.edc" 40#include "edc/elm/player.edc"
40#include "edc/elm/thumb.edc" 41#include "edc/elm/thumb.edc"
41#include "edc/elm/pointer.edc" 42#include "edc/elm/pointer.edc"
diff --git a/data/elementary/themes/edc/elm/uiclock.edc b/data/elementary/themes/edc/elm/uiclock.edc
new file mode 100644
index 0000000..db444fd
--- /dev/null
+++ b/data/elementary/themes/edc/elm/uiclock.edc
@@ -0,0 +1,207 @@
1#define DATETIME_FIELD(_pos) \
2 part { \
3 name: "elm.field"#_pos; type: SWALLOW; \
4 scale: 1; \
5 clip_to: "clip"; \
6 description { state: "default" 0.0; \
7 visible: 0; \
8 min: 0 0; \
9 align: 0.0 0.5; \
10 fixed: 1 1; \
11 rel1.relative: 1.0 0.0; \
12 rel1.to: "elm.separator"#_pos; \
13 rel2.relative: 1.0 1.0; \
14 rel2.to: "elm.separator"#_pos; \
15 } \
16 description { state: "enable" 0.0; \
17 inherit: "default" 0.0; \
18 visible: 1; \
19 min: 8 10; \
20 } \
21 } \
22 programs{ \
23 program { name: "field_"#_pos"enabled"; \
24 signal: "field"#_pos",enable"; source: "elm"; \
25 action: STATE_SET "enable" 0.0; \
26 target: "elm.field"#_pos; \
27 } \
28 program { name: "field_"#_pos"disabled"; \
29 signal: "field"#_pos",disable"; source: "elm"; \
30 action: STATE_SET "default" 0.0; \
31 target: "elm.field"#_pos; \
32 } \
33 }
34#define DATETIME_SEPARATOR(_pos, _after) \
35 part { \
36 name: "elm.separator"#_pos; type: TEXT; \
37 scale: 1; \
38 effect: SHADOW BOTTOM; \
39 clip_to: "disclip"; \
40 description { state: "default" 0.0; \
41 visible: 0; \
42 min: 0 0; \
43 align: 0.0 0.5; \
44 fixed: 1 0; \
45 rel1 { \
46 relative: 1.0 0.0; \
47 to: "elm.field"#_after; \
48 } \
49 rel2 { \
50 relative: 1.0 1.0; \
51 to: "elm.field"#_after; \
52 } \
53 color_class: "datetime_separator_text"; \
54 text { \
55 font: "Sans"; size: 10; \
56 min: 1 0; \
57 ellipsis: -1; \
58 align: 0.5 0.5; \
59 text_class: "datetime_separator_text"; \
60 } \
61 } \
62 description { state: "enable" 0.0; \
63 inherit: "default" 0.0; \
64 visible: 1; \
65 min: 8 10; \
66 } \
67 } \
68 part { \
69 name: "separator"#_pos"d"; type: TEXT; \
70 scale: 1; \
71 effect: SHADOW BOTTOM; \
72 clip_to: "disclip2"; \
73 description { state: "default" 0.0; \
74 visible: 0; \
75 rel1.to: "elm.separator"#_pos; \
76 rel2.to: "elm.separator"#_pos; \
77 color_class: "datetime_separator_text_disabled"; \
78 text { \
79 text_source: "elm.separator"#_pos; \
80 font: "Sans"; size: 10; \
81 text_class: "datetime_separator_text_disabled"; \
82 } \
83 } \
84 description { state: "enable" 0.0; \
85 inherit: "default" 0.0; \
86 visible: 1; \
87 } \
88 } \
89 programs { \
90 program { \
91 signal: "field"#_after",enable"; source: "elm"; \
92 action: STATE_SET "enable" 0.0; \
93 target: "elm.separator"#_pos; \
94 target: "separator"#_pos"d"; \
95 } \
96 program { \
97 signal: "field"#_after",disable"; source: "elm"; \
98 action: STATE_SET "default" 0.0; \
99 target: "elm.separator"#_pos; \
100 target: "separator"#_pos"d"; \
101 } \
102 }
103group { name: "elm/uiclock/base/default";
104 parts {
105 part { name: "bg"; type: RECT;
106 description { state: "default" 0.0;
107 color_class: "datetime_bg";
108 }
109 }
110 part { name: "clip"; type: RECT;
111 description { state: "default" 0.0;
112 rel1.to: "elm.separator0";
113 rel2.to: "elm.separator7";
114 }
115 }
116 part { name: "disclip"; type: RECT;
117 clip_to: "clip";
118 description { state: "default" 0.0;
119 rel1.to: "elm.separator0";
120 rel2.to: "elm.separator7";
121 }
122 description { state: "disabled" 0.0;
123 inherit: "default" 0.0;
124 visible: 0;
125 }
126 }
127 part { name: "disclip2"; type: RECT;
128 clip_to: "clip";
129 description { state: "default" 0.0;
130 rel1.to: "elm.separator0";
131 rel2.to: "elm.separator7";
132 visible: 0;
133 }
134 description { state: "disabled" 0.0;
135 inherit: "default" 0.0;
136 visible: 1;
137 }
138 }
139 part { name: "elm.separator0"; type: SPACER;
140 scale: 1;
141 description { state: "default" 0.0;
142 min: 8 10;
143 align: 0.0 0.5;
144 fixed: 1 0;
145 rel2.relative: 0.0 1.0;
146 }
147 }
148 DATETIME_FIELD(0)
149 DATETIME_SEPARATOR(1,0)
150 DATETIME_FIELD(1)
151 DATETIME_SEPARATOR(2,1)
152 DATETIME_FIELD(2)
153 DATETIME_SEPARATOR(3,2)
154 DATETIME_FIELD(3)
155 DATETIME_SEPARATOR(4,3)
156 DATETIME_FIELD(4)
157 DATETIME_SEPARATOR(5,4)
158 DATETIME_FIELD(5)
159 DATETIME_SEPARATOR(6,5)
160 DATETIME_FIELD(6)
161 DATETIME_SEPARATOR(7,6)
162 DATETIME_FIELD(7)
163 DATETIME_SEPARATOR(8,7)
164 part { name: "elm.separator9"; type: SPACER;
165 description { state: "default" 0.0;
166 rel1.to: "elm.separator7";
167 rel1.relative: 1.0 0.0;
168 min: 8 10;
169 }
170 }
171 part { name: "discover"; type: RECT;
172 description { state: "default" 0.0;
173 rel1.to: "elm.separator0";
174 rel2.to: "elm.separator7";
175 visible: 0;
176 color: 0 0 0 0;
177 }
178 description { state: "disabled" 0.0;
179 inherit: "default" 0.0;
180 visible: 1;
181 }
182 }
183 part { name: "elm.access"; type: RECT; repeat_events: 1;
184 description { state: "default" 0.0;
185 color: 0 0 0 0;
186 }
187 }
188 }
189 programs {
190 program {
191 signal: "elm,state,disabled"; source: "elm";
192 action: STATE_SET "disabled" 0.0;
193 target: "disclip";
194 target: "disclip2";
195 target: "discover";
196 }
197 program {
198 signal: "elm,state,enabled"; source: "elm";
199 action: STATE_SET "default" 0.0;
200 target: "disclip";
201 target: "disclip2";
202 target: "discover";
203 }
204 }
205}
206#undef DATETIME_SEPARATOR
207#undef DATETIME_FIELD