summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorHermet Park <chuneon.park@samsung.com>2021-03-09 10:33:50 +0900
committerHermet Park <chuneon.park@samsung.com>2021-03-09 10:33:50 +0900
commit7a20b084fb61c3072dcd9706032c23453dfea108 (patch)
tree8b1735cf012d37d97a902dd70237f7568bec636b /data
parent59453a5ab986539b68fdea9fff73ac7676f194ce (diff)
parent8fffd59dd1595d02f328075339ac6e149421c51c (diff)
Merge branch 'feature/themes/flat' into devs/hermet/lottie
Diffstat (limited to 'data')
-rw-r--r--data/elementary/themes/edc/efl/check.edc1
-rw-r--r--data/elementary/themes/edc/efl/list.edc328
-rw-r--r--data/elementary/themes/edc/elm/check.edc1
-rw-r--r--data/elementary/themes/img/about-flat-bg.svg5
4 files changed, 56 insertions, 279 deletions
diff --git a/data/elementary/themes/edc/efl/check.edc b/data/elementary/themes/edc/efl/check.edc
index c07594520f..f002899af9 100644
--- a/data/elementary/themes/edc/efl/check.edc
+++ b/data/elementary/themes/edc/efl/check.edc
@@ -255,7 +255,6 @@ group { name: "efl/check";
255 get_state(PART:"ck_check", buf, 32, val); 255 get_state(PART:"ck_check", buf, 32, val);
256 if (!strcmp(buf, "default")) { run_program(PROGRAM:"snd-check-on"); } 256 if (!strcmp(buf, "default")) { run_program(PROGRAM:"snd-check-on"); }
257 else { run_program(PROGRAM:"snd-check-off"); } 257 else { run_program(PROGRAM:"snd-check-off"); }
258 echo(buf);
259 } 258 }
260 } 259 }
261 program { signal: "efl,state,selected"; source: "efl"; 260 program { signal: "efl,state,selected"; source: "efl";
diff --git a/data/elementary/themes/edc/efl/list.edc b/data/elementary/themes/edc/efl/list.edc
index debbd77944..6bc0521fde 100644
--- a/data/elementary/themes/edc/efl/list.edc
+++ b/data/elementary/themes/edc/efl/list.edc
@@ -56,47 +56,22 @@ group { "efl/list_view";
56 data.item: "version" "123"; 56 data.item: "version" "123";
57} 57}
58 58
59group { "efl/list_item"; data.item: "version" "124"; 59group { "efl/list_item";
60 data.item: "version" "124";
60 data.item: "selectraise" "on"; 61 data.item: "selectraise" "on";
61 data.item: "focusraise" "on"; 62 data.item: "focusraise" "on";
62 images.image: "bevel_curved_horiz_out.png" COMP;
63 images.image: "shadow_rounded_horiz.png" COMP;
64 images.image: "vgrad_med_dark.png" COMP;
65 images.image: "bevel_horiz_out.png" COMP;
66 images.image: "shine.png" COMP;
67 parts { 63 parts {
68 rect { "base"; nomouse; 64 rect { "base"; nomouse;
69 desc { "default"; 65 desc { "default";
70 color: 64 64 64 255; 66 color: 64 64 64 255;
71 color_class: "list_item_base";
72 } 67 }
73 desc { "odd"; 68 desc { "odd";
74 color: 56 56 56 255; 69 color: 56 56 56 255;
75 color_class: "list_item_base_odd";
76 } 70 }
77 } 71 }
78 72 rect { "sel_base"; nomouse;
79 image { "bevel"; nomouse;
80 desc { "default";
81 image.normal: "bevel_curved_horiz_out.png";
82 image.border: 0 0 2 2;
83 image.middle: 0;
84 fill.smooth: 0;
85 }
86 }
87 swallow { "efl.background";
88 desc { "default";
89 rel.to: "base";
90 vis;
91 }
92 }
93 image { "sel_shadow"; nomouse;
94 desc { "default"; 73 desc { "default";
95 image.normal: "shadow_rounded_horiz.png"; 74 color: 51 153 255 255;
96 image.border: 0 0 9 9;
97 rel1.offset: 0 -4;
98 rel2.offset: -1 5;
99 fill.smooth: 0;
100 hid; 75 hid;
101 } 76 }
102 desc { "selected"; 77 desc { "selected";
@@ -104,109 +79,38 @@ group { "efl/list_item"; data.item: "version" "124";
104 vis; 79 vis;
105 } 80 }
106 } 81 }
107 image { "sel_base"; nomouse; 82 swallow { "efl.background";
108 desc { "default";
109 image.normal: "vgrad_med_dark.png";
110 fill.smooth: 0;
111 hid;
112 TILED_HORIZ(120)
113 }
114 desc { "selected";
115 inherit: "default";
116 vis;
117 }
118 }
119 image { "sel_bevel"; nomouse;
120 desc { "default"; 83 desc { "default";
121 image.normal: "bevel_horiz_out.png"; 84 rel.to: "base";
122 image.border: 0 0 2 2;
123 image.middle: 0;
124 fill.smooth: 0;
125 hid;
126 }
127 desc { "selected";
128 inherit: "default";
129 vis; 85 vis;
130 } 86 }
131 } 87 }
132
133 //##// 88 //##//
134 text { "efl.text"; nomouse; 89 text { "efl.text"; nomouse;
135 effect: SHADOW BOTTOM;
136 scale: 1; 90 scale: 1;
137 desc { "default"; 91 desc { "default";
138 rel1.offset: 2 3; 92 rel1.offset: 4 4;
139 rel1.relative: 1.0 0.0; 93 rel1.relative: 1.0 0.0;
140 rel1.to_x: "efl.icon"; 94 rel1.to_x: "efl.icon";
141 rel2.offset: -3 -3; 95 rel2.offset: -5 -5;
142 rel2.relative: 0.0 1.0; 96 rel2.relative: 0.0 1.0;
143 rel2.to_x: "efl.extra"; 97 rel2.to_x: "efl.extra";
144 color: FN_COL_DEFAULT; 98 color: 160 160 160 255;
145 color_class: "list_item";
146 text { font: FN; size: 10; 99 text { font: FN; size: 10;
147 min: 1 1; 100 min: 1 1;
148 ellipsis: -1; 101 ellipsis: -1;
149 align: 0.0 0.5; 102 align: 0.0 0.5;
150 text_class: "list_item"; 103 text_class: "list_item";
151 } 104 }
105 offscale;
152 } 106 }
153 desc { "selected"; 107 desc { "selected";
154 inherit: "default"; 108 inherit: "default";
155 hid; 109 color: 255 255 255 255;
156 }
157 desc { "disabled";
158 inherit: "default";
159 hid;
160 }
161 }
162 text { "label2"; nomouse;
163 effect: SHADOW BOTTOM;
164 scale: 1;
165 desc { "default";
166 rel1.to: "efl.text";
167 rel2.to: "efl.text";
168 color: FN_COL_DISABLE;
169 color_class: "list_item_disabled";
170 text { font: FN; size: 10;
171 text_source: "efl.text";
172 align: 0.0 0.5;
173 text_class: "list_item";
174 }
175 hid;
176 }
177 desc { "selected";
178 inherit: "default";
179 hid;
180 }
181 desc { "disabled";
182 inherit: "default";
183 vis;
184 }
185 }
186 text { "label3"; nomouse;
187 effect: GLOW;
188 scale: 1;
189 desc { "default";
190 rel1.offset: -2 -3;
191 rel1.to: "efl.text";
192 rel2.offset: 1 1;
193 rel2.to: "efl.text";
194 color: FN_COL_HIGHLIGHT;
195 color_class: "list_item_selected";
196 text { font: FN; size: 10;
197 text_source: "efl.text";
198 align: 0.0 0.5;
199 text_class: "list_item";
200 }
201 hid;
202 }
203 desc { "selected";
204 inherit: "default";
205 vis;
206 } 110 }
207 desc { "disabled"; 111 desc { "disabled";
208 inherit: "default"; 112 inherit: "default";
209 hid; 113 color: 80 80 80 255;
210 } 114 }
211 } 115 }
212 rect { "event"; 116 rect { "event";
@@ -220,40 +124,27 @@ group { "efl/list_item"; data.item: "version" "124";
220 } 124 }
221 //##// 125 //##//
222 swallow { "efl.icon"; 126 swallow { "efl.icon";
127 scale: 1;
223 desc { "default"; 128 desc { "default";
224 fixed: 1 0; 129 fixed: 1 0;
225 align: 0.0 0.5; 130 align: 0.0 0.5;
226 aspect: 1.0 1.0; 131 rel1.offset: 4 4;
227 rel1.offset: 2 2;
228 rel2.relative: 0.0 1.0; 132 rel2.relative: 0.0 1.0;
229 rel2.offset: 2 -3; 133 rel2.offset: 4 -5;
134 min: ICMIN ICMIN;
135 offscale;
230 } 136 }
231 } 137 }
232 swallow { "efl.extra"; 138 swallow { "efl.extra";
139 scale: 1;
233 desc { "default"; 140 desc { "default";
234 fixed: 1 0; 141 fixed: 1 0;
235 align: 1.0 0.5; 142 align: 1.0 0.5;
236 aspect: 1.0 1.0; 143 rel1.offset: -5 4;
237 rel1.offset: -3 2;
238 rel1.relative: 1.0 0.0; 144 rel1.relative: 1.0 0.0;
239 rel2.offset: -3 -3; 145 rel2.offset: -5 -5;
240 } 146 min: ICMIN ICMIN;
241 } 147 offscale;
242 //##//
243 image { "sel_shine"; nomouse;
244 desc { "default";
245 image.normal: "shine.png";
246 rel1.offset: 0 -2;
247 rel1.to: "sel_base";
248 rel2.relative: 1.0 0.0;
249 rel2.offset: -1 2;
250 rel2.to: "sel_base";
251 hid;
252 FIXED_SIZE(69, 5)
253 }
254 desc { "selected";
255 inherit: "default";
256 vis;
257 } 148 }
258 } 149 }
259 rect { "event_block"; 150 rect { "event_block";
@@ -269,154 +160,77 @@ group { "efl/list_item"; data.item: "version" "124";
269 } 160 }
270 programs { 161 programs {
271 EFL_UI_CLICKABLE_PART_BIND("event") 162 EFL_UI_CLICKABLE_PART_BIND("event")
272 program { 163 program { signal: "efl,state,odd"; source: "efl";
273 signal: "efl,state,odd"; source: "efl";
274 action: STATE_SET "odd"; 164 action: STATE_SET "odd";
275 target: "base"; 165 target: "base";
276 } 166 }
277 program { 167 program { signal: "efl,state,even"; source: "efl";
278 signal: "efl,state,even"; source: "efl";
279 action: STATE_SET "default"; 168 action: STATE_SET "default";
280 target: "base"; 169 target: "base";
281 } 170 }
282 program { 171 program { signal: "efl,state,pressed"; source: "efl";
283 signal: "efl,state,pressed"; source: "efl";
284 action: STATE_SET "selected"; 172 action: STATE_SET "selected";
285 target: "sel_shadow";
286 target: "sel_base"; 173 target: "sel_base";
287 target: "sel_bevel";
288 target: "efl.text"; 174 target: "efl.text";
289 target: "label2";
290 target: "label3";
291 target: "sel_shine";
292 } 175 }
293 program { 176 program { signal: "efl,state,unpressed"; source: "efl";
294 signal: "efl,state,unpressed"; source: "efl";
295 action: STATE_SET "default"; 177 action: STATE_SET "default";
296 target: "sel_shadow";
297 target: "sel_base"; 178 target: "sel_base";
298 target: "sel_bevel";
299 target: "efl.text"; 179 target: "efl.text";
300 target: "label2";
301 target: "label3";
302 target: "sel_shine";
303 } 180 }
304 program { 181 program { signal: "efl,state,selected"; source: "efl";
305 signal: "efl,state,selected"; source: "efl";
306 action: STATE_SET "selected"; 182 action: STATE_SET "selected";
307 target: "sel_shadow";
308 target: "sel_base"; 183 target: "sel_base";
309 target: "sel_bevel";
310 target: "efl.text"; 184 target: "efl.text";
311 target: "label2";
312 target: "label3";
313 target: "sel_shine";
314 } 185 }
315 program { 186 program { signal: "efl,state,unselected"; source: "efl";
316 signal: "efl,state,unselected"; source: "efl";
317 action: STATE_SET "default"; 187 action: STATE_SET "default";
318 target: "sel_shadow";
319 target: "sel_base"; 188 target: "sel_base";
320 target: "sel_bevel";
321 target: "efl.text"; 189 target: "efl.text";
322 target: "label2";
323 target: "label3";
324 target: "sel_shine";
325 } 190 }
326 program { 191 program { signal: "efl,state,disabled"; source: "efl";
327 signal: "efl,state,disabled"; source: "efl";
328 action: STATE_SET "disabled"; 192 action: STATE_SET "disabled";
329 target: "event"; 193 target: "event";
330 target: "efl.text"; 194 target: "efl.text";
331 target: "label2";
332 target: "label3";
333 target: "event_block";
334 } 195 }
335 program { 196 program { signal: "efl,state,enabled"; source: "efl";
336 signal: "efl,state,enabled"; source: "efl";
337 action: STATE_SET "default"; 197 action: STATE_SET "default";
338 target: "event"; 198 target: "event";
339 target: "efl.text"; 199 target: "efl.text";
340 target: "label2";
341 target: "label3";
342 target: "event_block";
343 } 200 }
344 } 201 }
345} 202}
346 203
347group { "efl/list_item:placeholder"; data.item: "version" "124"; 204group { "efl/list_item:placeholder";
205 data.item: "version" "124";
348 data.item: "selectraise" "on"; 206 data.item: "selectraise" "on";
349 data.item: "focusraise" "on"; 207 data.item: "focusraise" "on";
350 images.image: "bevel_curved_horiz_out.png" COMP;
351 images.image: "shadow_rounded_horiz.png" COMP;
352 images.image: "vgrad_med_dark.png" COMP;
353 images.image: "bevel_horiz_out.png" COMP;
354 images.image: "shine.png" COMP;
355 parts { 208 parts {
356 rect { "base"; nomouse; 209 rect { "base"; nomouse;
357 desc { "default"; 210 desc { "default";
358 color: 64 64 64 255; 211 color: 64 64 64 255;
359 color_class: "list_item_base";
360 } 212 }
361 desc { "odd"; 213 desc { "odd";
362 color: 56 56 56 255; 214 color: 56 56 56 255;
363 color_class: "list_item_base_odd";
364 }
365 }
366
367 image { "bevel"; nomouse;
368 desc { "default";
369 image.normal: "bevel_curved_horiz_out.png";
370 image.border: 0 0 2 2;
371 image.middle: 0;
372 fill.smooth: 0;
373 }
374 }
375 swallow { "efl.background";
376 desc { "default";
377 rel.to: "base";
378 vis;
379 }
380 }
381 image { "sel_shadow"; nomouse;
382 desc { "default";
383 image.normal: "shadow_rounded_horiz.png";
384 image.border: 0 0 9 9;
385 rel1.offset: 0 -4;
386 rel2.offset: -1 5;
387 fill.smooth: 0;
388 hid;
389 }
390 desc { "selected";
391 inherit: "default";
392 vis;
393 } 215 }
394 } 216 }
395 image { "sel_base"; nomouse; 217 rect { "sel_base"; nomouse;
396 desc { "default"; 218 desc { "default";
397 image.normal: "vgrad_med_dark.png"; 219 color: 51 153 255 255;
398 fill.smooth: 0;
399 hid; 220 hid;
400 TILED_HORIZ(120)
401 } 221 }
402 desc { "selected"; 222 desc { "selected";
403 inherit: "default"; 223 inherit: "default";
404 vis; 224 vis;
405 } 225 }
406 } 226 }
407 image { "sel_bevel"; nomouse; 227 swallow { "efl.background";
408 desc { "default"; 228 desc { "default";
409 image.normal: "bevel_horiz_out.png"; 229 rel.to: "base";
410 image.border: 0 0 2 2;
411 image.middle: 0;
412 fill.smooth: 0;
413 hid;
414 }
415 desc { "selected";
416 inherit: "default";
417 vis; 230 vis;
418 } 231 }
419 } 232 }
233 //##//
420 rect { "event"; 234 rect { "event";
421 desc { "default"; 235 desc { "default";
422 color: 0 0 0 0; 236 color: 0 0 0 0;
@@ -427,32 +241,16 @@ group { "efl/list_item:placeholder"; data.item: "version" "124";
427 } 241 }
428 } 242 }
429 //##// 243 //##//
430 swallow { "efl.content"; mouse; 244 swallow { "efl.content";
431 scale; 245 scale: 1;
432 desc { "default"; 246 desc { "default";
433 min: 19 19; 247 rel1.offset: 4 4;
434 rel1.offset: -1 2; 248 rel2.offset: -5 -5;
435 rel2.offset: -3 -3; 249 min: ICMIN ICMIN;
250 offscale;
436 } 251 }
437 } 252 }
438 //##// 253 rect { "event_block";
439 image { "sel_shine";
440 desc { "default";
441 image.normal: "shine.png";
442 rel1.offset: 0 -2;
443 rel1.to: "sel_base";
444 rel2.relative: 1.0 0.0;
445 rel2.offset: -1 2;
446 rel2.to: "sel_base";
447 hid;
448 FIXED_SIZE(69, 5)
449 }
450 desc { "selected";
451 inherit: "default";
452 vis;
453 }
454 }
455 rect { "event_block"; mouse;
456 desc { "default"; 254 desc { "default";
457 color: 0 0 0 0; 255 color: 0 0 0 0;
458 hid; 256 hid;
@@ -465,59 +263,37 @@ group { "efl/list_item:placeholder"; data.item: "version" "124";
465 } 263 }
466 programs { 264 programs {
467 EFL_UI_CLICKABLE_PART_BIND("event") 265 EFL_UI_CLICKABLE_PART_BIND("event")
468 program { 266 program { signal: "efl,state,odd"; source: "efl";
469 signal: "efl,state,odd"; source: "efl";
470 action: STATE_SET "odd"; 267 action: STATE_SET "odd";
471 target: "base"; 268 target: "base";
472 } 269 }
473 program { 270 program { signal: "efl,state,even"; source: "efl";
474 signal: "efl,state,even"; source: "efl";
475 action: STATE_SET "default"; 271 action: STATE_SET "default";
476 target: "base"; 272 target: "base";
477 } 273 }
478 program { 274 program { signal: "efl,state,pressed"; source: "efl";
479 signal: "efl,state,pressed"; source: "efl";
480 action: STATE_SET "selected"; 275 action: STATE_SET "selected";
481 target: "sel_shadow";
482 target: "sel_base"; 276 target: "sel_base";
483 target: "sel_bevel";
484 target: "sel_shine";
485 } 277 }
486 program { 278 program { signal: "efl,state,unpressed"; source: "efl";
487 signal: "efl,state,unpressed"; source: "efl";
488 action: STATE_SET "default"; 279 action: STATE_SET "default";
489 target: "sel_shadow";
490 target: "sel_base"; 280 target: "sel_base";
491 target: "sel_bevel";
492 target: "sel_shine";
493 } 281 }
494 program { 282 program { signal: "efl,state,selected"; source: "efl";
495 signal: "efl,state,selected"; source: "efl";
496 action: STATE_SET "selected"; 283 action: STATE_SET "selected";
497 target: "sel_shadow";
498 target: "sel_base"; 284 target: "sel_base";
499 target: "sel_bevel";
500 target: "sel_shine";
501 } 285 }
502 program { 286 program { signal: "efl,state,unselected"; source: "efl";
503 signal: "efl,state,unselected"; source: "efl";
504 action: STATE_SET "default"; 287 action: STATE_SET "default";
505 target: "sel_shadow";
506 target: "sel_base"; 288 target: "sel_base";
507 target: "sel_bevel";
508 target: "sel_shine";
509 } 289 }
510 program { 290 program { signal: "efl,state,disabled"; source: "efl";
511 signal: "efl,state,disabled"; source: "efl";
512 action: STATE_SET "disabled"; 291 action: STATE_SET "disabled";
513 target: "event"; 292 target: "event";
514 target: "event_block";
515 } 293 }
516 program { 294 program { signal: "efl,state,enabled"; source: "efl";
517 signal: "efl,state,enabled"; source: "efl";
518 action: STATE_SET "default"; 295 action: STATE_SET "default";
519 target: "event"; 296 target: "event";
520 target: "event_block";
521 } 297 }
522 } 298 }
523} 299}
diff --git a/data/elementary/themes/edc/elm/check.edc b/data/elementary/themes/edc/elm/check.edc
index 635c94052b..30ae5f2584 100644
--- a/data/elementary/themes/edc/elm/check.edc
+++ b/data/elementary/themes/edc/elm/check.edc
@@ -220,7 +220,6 @@ group { name: "elm/check/base/default";
220 get_state(PART:"ck_check", buf, 32, val); 220 get_state(PART:"ck_check", buf, 32, val);
221 if (!strcmp(buf, "default")) { run_program(PROGRAM:"snd-check-on"); } 221 if (!strcmp(buf, "default")) { run_program(PROGRAM:"snd-check-on"); }
222 else { run_program(PROGRAM:"snd-check-off"); } 222 else { run_program(PROGRAM:"snd-check-off"); }
223 echo(buf);
224 } 223 }
225 } 224 }
226 program { signal: "elm,state,check,on"; source: "elm"; 225 program { signal: "elm,state,check,on"; source: "elm";
diff --git a/data/elementary/themes/img/about-flat-bg.svg b/data/elementary/themes/img/about-flat-bg.svg
index 8c1c5b5e1f..4c0bdb0c00 100644
--- a/data/elementary/themes/img/about-flat-bg.svg
+++ b/data/elementary/themes/img/about-flat-bg.svg
@@ -13,7 +13,10 @@
13 version="1.1" 13 version="1.1"
14 id="svg8" 14 id="svg8"
15 inkscape:version="1.0.2 (e86c870879, 2021-01-15)" 15 inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
16 sodipodi:docname="about-flat-bg.svg"> 16 sodipodi:docname="about-flat-bg.svg"
17 inkscape:export-filename="/home/raster/C/th-efl/th/img/about-flat-bg.png"
18 inkscape:export-xdpi="1920"
19 inkscape:export-ydpi="1920">
17 <defs 20 <defs
18 id="defs2"> 21 id="defs2">
19 <filter 22 <filter