summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTaehyub Kim <taehyub.kim@samsung.com>2018-04-25 17:13:10 +0900
committerJaehyun Cho <jae_hyun.cho@samsung.com>2018-04-26 00:15:45 +0900
commit1765f1ed530b39ae7928c9105e132a38f3fcaad7 (patch)
tree95f1382826ee17e7443c906c0ea4e66f09d57a79
parentef2e6afd1f7c890297900937fa1f12f0f4f76980 (diff)
efl_part: remove the elm legacy name of efl ui theme
Summary: efl_part: remove the elm legacy name of efl ui theme Test Plan: run elementary_test Reviewers: Jaehyun_Cho, woohyun, cedric, raster, jpeg Differential Revision: https://phab.enlightenment.org/D5934
-rw-r--r--data/elementary/themes/edc/efl/bg.edc14
-rw-r--r--data/elementary/themes/edc/efl/border.edc283
-rw-r--r--data/elementary/themes/edc/efl/button.edc114
-rw-r--r--data/elementary/themes/edc/efl/calendar.edc6
-rw-r--r--data/elementary/themes/edc/efl/check.edc140
-rw-r--r--data/elementary/themes/edc/efl/cursor.edc18
-rw-r--r--data/elementary/themes/edc/efl/frame.edc36
-rw-r--r--data/elementary/themes/edc/efl/navigation_bar.edc20
-rw-r--r--data/elementary/themes/edc/efl/navigation_layout.edc6
-rw-r--r--data/elementary/themes/edc/efl/panes.edc236
-rw-r--r--data/elementary/themes/edc/efl/pointer.edc4
-rw-r--r--data/elementary/themes/edc/efl/popup.edc64
-rw-r--r--data/elementary/themes/edc/efl/progress.edc180
-rw-r--r--data/elementary/themes/edc/efl/radio.edc50
-rw-r--r--data/elementary/themes/edc/efl/scroller.edc126
-rw-r--r--data/elementary/themes/edc/efl/spin.edc2
-rw-r--r--data/elementary/themes/edc/efl/spin_button.edc570
-rw-r--r--data/elementary/themes/edc/efl/text.edc91
-rw-r--r--data/elementary/themes/edc/efl/textpath.edc2
-rw-r--r--data/elementary/themes/edc/efl/tooltip.edc26
-rw-r--r--data/elementary/themes/edc/efl/uiclock.edc2
-rw-r--r--data/elementary/themes/edc/efl/video.edc2
-rw-r--r--data/elementary/themes/edc/efl/win.edc8
-rw-r--r--src/lib/elementary/efl_ui_bg_widget.c25
-rw-r--r--src/lib/elementary/efl_ui_button.c16
-rw-r--r--src/lib/elementary/efl_ui_calendar.c8
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.c361
-rw-r--r--src/lib/elementary/efl_ui_layout_object.c69
-rw-r--r--src/lib/elementary/efl_ui_navigation_bar.c20
-rw-r--r--src/lib/elementary/efl_ui_navigation_layout.c4
-rw-r--r--src/lib/elementary/efl_ui_panes.c47
-rw-r--r--src/lib/elementary/efl_ui_popup.c10
-rw-r--r--src/lib/elementary/efl_ui_popup_alert.c18
-rw-r--r--src/lib/elementary/efl_ui_popup_alert_scroll.c8
-rw-r--r--src/lib/elementary/efl_ui_popup_alert_text.c10
-rw-r--r--src/lib/elementary/efl_ui_progressbar.c79
-rw-r--r--src/lib/elementary/efl_ui_scroller.c62
-rw-r--r--src/lib/elementary/efl_ui_spin.c5
-rw-r--r--src/lib/elementary/efl_ui_spin_button.c10
-rw-r--r--src/lib/elementary/efl_ui_text.c226
-rw-r--r--src/lib/elementary/efl_ui_textpath.c10
-rw-r--r--src/lib/elementary/efl_ui_video.c5
-rw-r--r--src/lib/elementary/efl_ui_win.c225
-rw-r--r--src/lib/elementary/elm_interface_scrollable.c31
-rw-r--r--src/lib/elementary/els_cursor.c31
45 files changed, 1858 insertions, 1422 deletions
diff --git a/data/elementary/themes/edc/efl/bg.edc b/data/elementary/themes/edc/efl/bg.edc
index 3c57ac8..98c449d 100644
--- a/data/elementary/themes/edc/efl/bg.edc
+++ b/data/elementary/themes/edc/efl/bg.edc
@@ -1,12 +1,12 @@
1/* bg widget style information 1/* bg widget style information
2 2
3 [SWALLOW] 3 [SWALLOW]
4 elm.swallow.rectangle: Used for elm_bg_color_set() 4 efl.rectangle: Used for elm_bg_color_set()
5 elm.swallow.background: Used for elm_bg_file_set() 5 efl.background: Used for elm_bg_file_set()
6 elm.swallow.content: Used for elm_layout_part_content_set(bg, "overlay", content). 6 efl.content: Used for elm_layout_part_content_set(bg, "overlay", content).
7*/ 7*/
8 8
9group { name: "efl/bg"; 9group { "efl/bg";
10 data.item: "version" "119"; 10 data.item: "version" "119";
11 images.image: "bevel_dark_out.png" COMP; 11 images.image: "bevel_dark_out.png" COMP;
12 parts { 12 parts {
@@ -20,11 +20,11 @@ group { name: "efl/bg";
20 color: 64 64 64 255; 20 color: 64 64 64 255;
21 } 21 }
22 } 22 }
23 part { name: "elm.swallow.rectangle"; type: SWALLOW; 23 part { name: "efl.rectangle"; type: SWALLOW;
24 description { state: "default" 0.0; 24 description { state: "default" 0.0;
25 } 25 }
26 } 26 }
27 part { name: "elm.swallow.background"; type: SWALLOW; 27 part { name: "efl.background"; type: SWALLOW;
28 clip_to: "clipper"; 28 clip_to: "clipper";
29 description { state: "default" 0.0; 29 description { state: "default" 0.0;
30 fixed: 1 1; 30 fixed: 1 1;
@@ -38,7 +38,7 @@ group { name: "efl/bg";
38 fill.smooth: 0; 38 fill.smooth: 0;
39 } 39 }
40 } 40 }
41 part { name: "elm.swallow.content"; type: SWALLOW; 41 part { name: "efl.content"; type: SWALLOW;
42 description { state: "default" 0.0; 42 description { state: "default" 0.0;
43 } 43 }
44 } 44 }
diff --git a/data/elementary/themes/edc/efl/border.edc b/data/elementary/themes/edc/efl/border.edc
index f6e8b89..d3ee516 100644
--- a/data/elementary/themes/edc/efl/border.edc
+++ b/data/elementary/themes/edc/efl/border.edc
@@ -7,7 +7,7 @@
7 * - virtual keyboard 7 * - virtual keyboard
8 */ 8 */
9 9
10group { name: "efl/border"; 10group { "efl/border";
11 images.image: "vgrad_med_lighter.png" COMP; 11 images.image: "vgrad_med_lighter.png" COMP;
12 images.image: "vgrad_med_dark.png" COMP; 12 images.image: "vgrad_med_dark.png" COMP;
13 images.image: "bevel_out.png" COMP; 13 images.image: "bevel_out.png" COMP;
@@ -33,7 +33,7 @@ group { name: "efl/border";
33 data.item: "version" "119"; 33 data.item: "version" "119";
34 parts { 34 parts {
35 /* opaque region of the window, to inform the compositor */ 35 /* opaque region of the window, to inform the compositor */
36 spacer { "elm.spacer.opaque"; 36 spacer { "efl.spacer.opaque";
37 desc { 37 desc {
38 rel1.to: "top_clip"; 38 rel1.to: "top_clip";
39 rel2.to: "bottom_clip"; 39 rel2.to: "bottom_clip";
@@ -41,12 +41,12 @@ group { name: "efl/border";
41 desc { "max"; inherit: "default"; } 41 desc { "max"; inherit: "default"; }
42 } 42 }
43 /* covers the entire client contents, excluding the main menu */ 43 /* covers the entire client contents, excluding the main menu */
44 spacer { "elm.spacer.content"; 44 spacer { "efl.spacer.content";
45 required; // since 1.19 45 required; // since 1.19
46 desc { 46 desc {
47 rel1.to: "elm.swallow.menu"; 47 rel1.to: "efl.menu";
48 rel1.relative: 0.0 1.0; 48 rel1.relative: 0.0 1.0;
49 rel2.to: "elm.swallow.keyboard"; 49 rel2.to: "efl.keyboard";
50 rel2.relative: 1.0 0.0; 50 rel2.relative: 1.0 0.0;
51 } 51 }
52 } 52 }
@@ -76,7 +76,7 @@ group { name: "efl/border";
76 rel2.to: "bottom_clip"; 76 rel2.to: "bottom_clip";
77 } 77 }
78 } 78 }
79 rect { "elm.rect.background"; 79 rect { "efl.rect.background";
80 required; // @since 1.19 80 required; // @since 1.19
81 clip: "bg_clip"; 81 clip: "bg_clip";
82 desc { "default"; 82 desc { "default";
@@ -90,7 +90,7 @@ group { name: "efl/border";
90 } 90 }
91 } 91 }
92 /* window background: image */ 92 /* window background: image */
93 swallow { "elm.swallow.background"; 93 swallow { "efl.background";
94 required; // @since 1.19 94 required; // @since 1.19
95 clip: "client_clip"; 95 clip: "client_clip";
96 } 96 }
@@ -102,7 +102,7 @@ group { name: "efl/border";
102 middle: 0; 102 middle: 0;
103 } 103 }
104 fill.smooth: 0; 104 fill.smooth: 0;
105 rel.to: "elm.spacer.content"; 105 rel.to: "efl.spacer.content";
106 visible: 0; 106 visible: 0;
107 } 107 }
108 desc { "visible"; 108 desc { "visible";
@@ -112,7 +112,7 @@ group { name: "efl/border";
112 } 112 }
113 spacer { "indicator_spacer"; 113 spacer { "indicator_spacer";
114 desc { "default"; 114 desc { "default";
115 rel.to: "elm.swallow.indicator"; 115 rel.to: "efl.indicator";
116 } 116 }
117 desc { "hidden"; 117 desc { "hidden";
118 rel.to: "top_clip"; 118 rel.to: "top_clip";
@@ -127,10 +127,10 @@ group { name: "efl/border";
127 desc { "default"; 127 desc { "default";
128 color: 64 64 64 255; // FIXME: color_class 128 color: 64 64 64 255; // FIXME: color_class
129 align: 0.5 0.0; 129 align: 0.5 0.0;
130 rel.to: "elm.swallow.menu"; 130 rel.to: "efl.menu";
131 } 131 }
132 } 132 }
133 swallow { "elm.swallow.menu"; 133 swallow { "efl.menu";
134 required: 1; // since 1.19 134 required: 1; // since 1.19
135 desc { "default"; 135 desc { "default";
136 rel.to: "indicator_spacer"; 136 rel.to: "indicator_spacer";
@@ -148,9 +148,9 @@ group { name: "efl/border";
148 /* application contents - spacer and clipper (without main menu) */ 148 /* application contents - spacer and clipper (without main menu) */
149 spacer { "client_spacer"; 149 spacer { "client_spacer";
150 desc { "default"; 150 desc { "default";
151 rel1.to: "elm.swallow.menu"; 151 rel1.to: "efl.menu";
152 rel1.relative: 0.0 1.0; 152 rel1.relative: 0.0 1.0;
153 rel2.to: "elm.swallow.keyboard"; 153 rel2.to: "efl.keyboard";
154 rel2.relative: 1.0 0.0; 154 rel2.relative: 1.0 0.0;
155 } 155 }
156 } 156 }
@@ -162,7 +162,7 @@ group { name: "efl/border";
162 } 162 }
163 163
164 /* application contents */ 164 /* application contents */
165 swallow { "elm.swallow.client"; 165 swallow { "efl.client";
166 clip: "client_clip"; 166 clip: "client_clip";
167 desc { "default"; 167 desc { "default";
168 rel.to: "client_spacer"; 168 rel.to: "client_spacer";
@@ -170,7 +170,7 @@ group { name: "efl/border";
170 } 170 }
171 171
172 /* modal window blocker */ 172 /* modal window blocker */
173 rect { "elm.rect.blocker"; 173 rect { "rect.blocker";
174 required; 174 required;
175 desc { "default"; 175 desc { "default";
176 rel1.to: "top_clip"; 176 rel1.to: "top_clip";
@@ -234,18 +234,18 @@ group { name: "efl/border";
234 fill.smooth: 0; 234 fill.smooth: 0;
235 } 235 }
236 } 236 }
237 text { "elm.text.title"; nomouse; 237 text { "efl.text.title"; nomouse;
238 scale: 1; 238 scale: 1;
239 effect: SHADOW BOTTOM; 239 effect: SHADOW BOTTOM;
240 clip: "top_clip"; 240 clip: "top_clip";
241 desc { "default"; 241 desc { "default";
242 rel1.relative: 1.0 0.0; 242 rel1.relative: 1.0 0.0;
243 rel1.offset: 1 3; 243 rel1.offset: 1 3;
244 rel1.to_x: "elm.event.icon"; 244 rel1.to_x: "event.icon";
245 rel1.to_y: "shadow_spacer"; 245 rel1.to_y: "shadow_spacer";
246 rel2.relative: 0.0 0.0; 246 rel2.relative: 0.0 0.0;
247 rel2.offset: -2 3; 247 rel2.offset: -2 3;
248 rel2.to_x: "elm.event.minimize"; 248 rel2.to_x: "event.minimize";
249 rel2.to_y: "shadow_spacer"; 249 rel2.to_y: "shadow_spacer";
250 align: 0.5 0.0; 250 align: 0.5 0.0;
251 color_class: "border_title"; 251 color_class: "border_title";
@@ -269,17 +269,17 @@ group { name: "efl/border";
269 desc { "default"; 269 desc { "default";
270 rel1.relative: 1.0 0.0; 270 rel1.relative: 1.0 0.0;
271 rel1.offset: 1 2; 271 rel1.offset: 1 2;
272 rel1.to_x: "elm.event.icon"; 272 rel1.to_x: "event.icon";
273 rel1.to_y: "shadow_spacer"; 273 rel1.to_y: "shadow_spacer";
274 rel2.relative: 0.0 0.0; 274 rel2.relative: 0.0 0.0;
275 rel2.offset: -1 2; 275 rel2.offset: -1 2;
276 rel2.to_x: "elm.event.minimize"; 276 rel2.to_x: "event.minimize";
277 rel2.to_y: "shadow_spacer"; 277 rel2.to_y: "shadow_spacer";
278 align: 0.5 0.0; 278 align: 0.5 0.0;
279 color_class: "border_title_active"; 279 color_class: "border_title_active";
280 color3: 255 255 255 255; 280 color3: 255 255 255 255;
281 text { font: FNBD; size: 10; 281 text { font: FNBD; size: 10;
282 text_source: "elm.text.title"; 282 text_source: "efl.text.title";
283 text_class: "title_bar"; 283 text_class: "title_bar";
284 align: 0.5 0.0; 284 align: 0.5 0.0;
285 min: 0 1; 285 min: 0 1;
@@ -292,10 +292,10 @@ group { name: "efl/border";
292 visible: 1; 292 visible: 1;
293 } 293 }
294 } 294 }
295 spacer { "icon"; 295 spacer { "spacer.icon";
296 desc { "default"; 296 desc { "default";
297 rel1.to: "elm.event.icon"; 297 rel1.to: "event.icon";
298 rel2.to: "elm.event.icon"; 298 rel2.to: "event.icon";
299 } 299 }
300 desc { "bounce1"; 300 desc { "bounce1";
301 inherit: "default"; 301 inherit: "default";
@@ -308,12 +308,12 @@ group { name: "efl/border";
308 rel2.relative: 1.2 1.2; 308 rel2.relative: 1.2 1.2;
309 } 309 }
310 } 310 }
311 swallow { "elm.swallow.icon"; nomouse; 311 swallow { "efl.icon"; nomouse;
312 clip_to: "top_clip"; 312 clip_to: "top_clip";
313 desc { "default"; 313 desc { "default";
314 rel1.to: "icon"; 314 rel1.to: "spacer.icon";
315 rel1.relative: 0.15 0.15; 315 rel1.relative: 0.15 0.15;
316 rel2.to: "icon"; 316 rel2.to: "spacer.icon";
317 rel2.relative: 0.85 0.85; 317 rel2.relative: 0.85 0.85;
318 rel2.offset: 0 0; 318 rel2.offset: 0 0;
319 } 319 }
@@ -338,10 +338,10 @@ group { name: "efl/border";
338 max: 20 20; 338 max: 20 20;
339 rel1.relative: 1.0 0.0; 339 rel1.relative: 1.0 0.0;
340 rel1.offset: 2 -0; 340 rel1.offset: 2 -0;
341 rel1.to: "elm.event.icon"; 341 rel1.to: "event.icon";
342 rel2.relative: 1.0 1.0; 342 rel2.relative: 1.0 1.0;
343 rel2.offset: 2 -1; 343 rel2.offset: 2 -1;
344 rel2.to: "elm.event.icon"; 344 rel2.to: "event.icon";
345 align: 0.0 0.5; 345 align: 0.0 0.5;
346 fixed: 1 1; 346 fixed: 1 1;
347 } 347 }
@@ -387,8 +387,8 @@ group { name: "efl/border";
387 clip: "clip1"; 387 clip: "clip1";
388 desc { "default"; 388 desc { "default";
389 image.normal: "sym_close_dark_normal.png"; 389 image.normal: "sym_close_dark_normal.png";
390 rel1.to: "elm.event.close"; 390 rel1.to: "event.close";
391 rel2.to: "elm.event.close"; 391 rel2.to: "event.close";
392 min: 15 15; 392 min: 15 15;
393 max: 15 15; 393 max: 15 15;
394 fixed: 1 1; 394 fixed: 1 1;
@@ -402,8 +402,8 @@ group { name: "efl/border";
402 clip: "clip1"; 402 clip: "clip1";
403 desc { "default"; 403 desc { "default";
404 image.normal: "sym_up_dark_normal.png"; 404 image.normal: "sym_up_dark_normal.png";
405 rel1.to: "elm.event.maximize"; 405 rel1.to: "event.maximize";
406 rel2.to: "elm.event.maximize"; 406 rel2.to: "event.maximize";
407 min: 15 15; 407 min: 15 15;
408 max: 15 15; 408 max: 15 15;
409 fixed: 1 1; 409 fixed: 1 1;
@@ -417,8 +417,8 @@ group { name: "efl/border";
417 clip: "clip1"; 417 clip: "clip1";
418 desc { "default"; 418 desc { "default";
419 image.normal: "sym_down_dark_normal.png"; 419 image.normal: "sym_down_dark_normal.png";
420 rel1.to: "elm.event.minimize"; 420 rel1.to: "event.minimize";
421 rel2.to: "elm.event.minimize"; 421 rel2.to: "event.minimize";
422 min: 15 15; 422 min: 15 15;
423 max: 15 15; 423 max: 15 15;
424 fixed: 1 1; 424 fixed: 1 1;
@@ -432,8 +432,8 @@ group { name: "efl/border";
432 clip: "clip2"; 432 clip: "clip2";
433 desc { "default"; 433 desc { "default";
434 image.normal: "sym_close_light_normal.png"; 434 image.normal: "sym_close_light_normal.png";
435 rel1.to: "elm.event.close"; 435 rel1.to: "event.close";
436 rel2.to: "elm.event.close"; 436 rel2.to: "event.close";
437 min: 15 15; 437 min: 15 15;
438 max: 15 15; 438 max: 15 15;
439 fixed: 1 1; 439 fixed: 1 1;
@@ -447,8 +447,8 @@ group { name: "efl/border";
447 clip: "clip2"; 447 clip: "clip2";
448 desc { "default"; 448 desc { "default";
449 image.normal: "sym_up_light_normal.png"; 449 image.normal: "sym_up_light_normal.png";
450 rel1.to: "elm.event.maximize"; 450 rel1.to: "event.maximize";
451 rel2.to: "elm.event.maximize"; 451 rel2.to: "event.maximize";
452 min: 15 15; 452 min: 15 15;
453 max: 15 15; 453 max: 15 15;
454 fixed: 1 1; 454 fixed: 1 1;
@@ -462,8 +462,8 @@ group { name: "efl/border";
462 clip: "clip2"; 462 clip: "clip2";
463 desc { "default"; 463 desc { "default";
464 image.normal: "sym_down_light_normal.png"; 464 image.normal: "sym_down_light_normal.png";
465 rel1.to: "elm.event.minimize"; 465 rel1.to: "event.minimize";
466 rel2.to: "elm.event.minimize"; 466 rel2.to: "event.minimize";
467 min: 15 15; 467 min: 15 15;
468 max: 15 15; 468 max: 15 15;
469 fixed: 1 1; 469 fixed: 1 1;
@@ -473,7 +473,7 @@ group { name: "efl/border";
473 image.normal: "sym_down_light_selected.png"; 473 image.normal: "sym_down_light_selected.png";
474 } 474 }
475 } 475 }
476 rect { "elm.event.icon"; 476 rect { "event.icon";
477 desc { "default"; 477 desc { "default";
478 rel1.relative: 0.0 0.0; 478 rel1.relative: 0.0 0.0;
479 rel1.to: "top_clip"; 479 rel1.to: "top_clip";
@@ -484,19 +484,19 @@ group { name: "efl/border";
484 color: 0 0 0 0; 484 color: 0 0 0 0;
485 } 485 }
486 } 486 }
487 rect { "elm.event.titlebar"; 487 rect { "event.titlebar";
488 desc { "default"; 488 desc { "default";
489 rel1.relative: 1.0 0.0; 489 rel1.relative: 1.0 0.0;
490 rel1.to_x: "elm.event.icon"; 490 rel1.to_x: "event.icon";
491 rel1.to_y: "top_clip"; 491 rel1.to_y: "top_clip";
492 rel2.relative: 0.0 1.0; 492 rel2.relative: 0.0 1.0;
493 rel2.offset: 0 -1; 493 rel2.offset: 0 -1;
494 rel2.to_x: "elm.event.minimize"; 494 rel2.to_x: "event.minimize";
495 rel2.to_y: "top_clip"; 495 rel2.to_y: "top_clip";
496 color: 0 0 0 0; 496 color: 0 0 0 0;
497 } 497 }
498 } 498 }
499 rect { "elm.event.close"; 499 rect { "event.close";
500 desc { "default"; 500 desc { "default";
501 rel.to: "top_clip"; 501 rel.to: "top_clip";
502 rel1.relative: 1.0 0.0; 502 rel1.relative: 1.0 0.0;
@@ -506,29 +506,29 @@ group { name: "efl/border";
506 color: 0 0 0 0; 506 color: 0 0 0 0;
507 } 507 }
508 } 508 }
509 rect { "elm.event.maximize"; 509 rect { "event.maximize";
510 desc { "default"; 510 desc { "default";
511 rel1.relative: -0.25 0.0; 511 rel1.relative: -0.25 0.0;
512 rel1.offset: -1 0; 512 rel1.offset: -1 0;
513 rel1.to_x: "elm.event.close"; 513 rel1.to_x: "event.close";
514 rel1.to_y: "top_clip"; 514 rel1.to_y: "top_clip";
515 rel2.relative: -0.25 1.0; 515 rel2.relative: -0.25 1.0;
516 rel2.to_x: "elm.event.close"; 516 rel2.to_x: "event.close";
517 rel2.to_y: "top_clip"; 517 rel2.to_y: "top_clip";
518 align: 1.0 0.5; 518 align: 1.0 0.5;
519 aspect: 1.0 1.0; aspect_preference: VERTICAL; 519 aspect: 1.0 1.0; aspect_preference: VERTICAL;
520 color: 0 0 0 0; 520 color: 0 0 0 0;
521 } 521 }
522 } 522 }
523 rect { "elm.event.minimize"; 523 rect { "event.minimize";
524 desc { "default"; 524 desc { "default";
525 rel1.relative: 0.0 0.0; 525 rel1.relative: 0.0 0.0;
526 rel1.offset: -1 0; 526 rel1.offset: -1 0;
527 rel1.to_x: "elm.event.maximize"; 527 rel1.to_x: "event.maximize";
528 rel1.to_y: "top_clip"; 528 rel1.to_y: "top_clip";
529 rel2.relative: 0.0 1.0; 529 rel2.relative: 0.0 1.0;
530 rel2.to_y: "top_clip"; 530 rel2.to_y: "top_clip";
531 rel2.to_x: "elm.event.maximize"; 531 rel2.to_x: "event.maximize";
532 align: 1.0 0.5; 532 align: 1.0 0.5;
533 aspect: 1.0 1.0; aspect_preference: VERTICAL; 533 aspect: 1.0 1.0; aspect_preference: VERTICAL;
534 color: 0 0 0 0; 534 color: 0 0 0 0;
@@ -544,7 +544,7 @@ group { name: "efl/border";
544 hid; 544 hid;
545 } 545 }
546 } 546 }
547 rect { "elm.event.resize.tl"; 547 rect { "efl.event.resize.tl";
548 clip: "top_resize_clip"; 548 clip: "top_resize_clip";
549 desc { "default"; 549 desc { "default";
550 rel.to: "top_clip"; 550 rel.to: "top_clip";
@@ -556,14 +556,14 @@ group { name: "efl/border";
556 } 556 }
557 desc { "hidden"; inherit: "default"; hid; } 557 desc { "hidden"; inherit: "default"; hid; }
558 } 558 }
559 rect { "elm.event.resize.t"; 559 rect { "efl.event.resize.t";
560 clip: "top_resize_clip"; 560 clip: "top_resize_clip";
561 desc { "default"; 561 desc { "default";
562 rel1.relative: 1.0 0.0; 562 rel1.relative: 1.0 0.0;
563 rel1.to_y: "top_clip"; 563 rel1.to_y: "top_clip";
564 rel1.to_x: "elm.event.resize.tl"; 564 rel1.to_x: "efl.event.resize.tl";
565 rel2.relative: 0.0 0.0; 565 rel2.relative: 0.0 0.0;
566 rel2.to_x: "elm.event.resize.tr"; 566 rel2.to_x: "efl.event.resize.tr";
567 rel2.to_y: "top_clip"; 567 rel2.to_y: "top_clip";
568 min: 0 4; 568 min: 0 4;
569 align: 0.5 0.0; 569 align: 0.5 0.0;
@@ -572,7 +572,7 @@ group { name: "efl/border";
572 } 572 }
573 desc { "hidden"; inherit: "default"; hid; } 573 desc { "hidden"; inherit: "default"; hid; }
574 } 574 }
575 rect { "elm.event.resize.tr"; 575 rect { "efl.event.resize.tr";
576 clip: "top_resize_clip"; 576 clip: "top_resize_clip";
577 desc { "default"; 577 desc { "default";
578 rel.to: "top_clip"; 578 rel.to: "top_clip";
@@ -586,7 +586,7 @@ group { name: "efl/border";
586 desc { "hidden"; inherit: "default"; hid; } 586 desc { "hidden"; inherit: "default"; hid; }
587 } 587 }
588 /* bottom border - spacer and clipper */ 588 /* bottom border - spacer and clipper */
589 swallow { "elm.swallow.keyboard"; 589 swallow { "efl.keyboard";
590 desc { "default"; 590 desc { "default";
591 rel.to: "bottom_clip"; 591 rel.to: "bottom_clip";
592 rel2.relative: 1.0 0.0; 592 rel2.relative: 1.0 0.0;
@@ -626,7 +626,7 @@ group { name: "efl/border";
626 fill.smooth: 0; 626 fill.smooth: 0;
627 } 627 }
628 } 628 }
629 rect { "elm.event.resize.bl"; 629 rect { "efl.event.resize.bl";
630 clip: "bottom_clip"; 630 clip: "bottom_clip";
631 desc { "default"; 631 desc { "default";
632 rel1.relative: 0.0 1.0; 632 rel1.relative: 0.0 1.0;
@@ -640,15 +640,15 @@ group { name: "efl/border";
640 } 640 }
641 desc { "hidden"; inherit: "default"; hid; } 641 desc { "hidden"; inherit: "default"; hid; }
642 } 642 }
643 rect { "elm.event.resize.b"; 643 rect { "efl.event.resize.b";
644 clip: "bottom_clip"; 644 clip: "bottom_clip";
645 desc { "default"; 645 desc { "default";
646 rel1.relative: 1.0 1.0; 646 rel1.relative: 1.0 1.0;
647 rel1.to_x: "elm.event.resize.tl"; 647 rel1.to_x: "efl.event.resize.tl";
648 rel1.to_y: "bottom_clip"; 648 rel1.to_y: "bottom_clip";
649 rel1.offset: 0 -1; 649 rel1.offset: 0 -1;
650 rel2.relative: 0.0 1.0; 650 rel2.relative: 0.0 1.0;
651 rel2.to_x: "elm.event.resize.tr"; 651 rel2.to_x: "efl.event.resize.tr";
652 rel2.to_y: "bottom_clip"; 652 rel2.to_y: "bottom_clip";
653 min: 0 5; 653 min: 0 5;
654 align: 0.5 1.0; 654 align: 0.5 1.0;
@@ -657,7 +657,7 @@ group { name: "efl/border";
657 } 657 }
658 desc { "hidden"; inherit: "default"; hid; } 658 desc { "hidden"; inherit: "default"; hid; }
659 } 659 }
660 rect { "elm.event.resize.br"; 660 rect { "efl.event.resize.br";
661 clip: "bottom_clip"; 661 clip: "bottom_clip";
662 desc { "default"; 662 desc { "default";
663 rel1.relative: 1.0 1.0; 663 rel1.relative: 1.0 1.0;
@@ -687,14 +687,14 @@ group { name: "efl/border";
687 clip: "bg_clip"; 687 clip: "bg_clip";
688 desc { "default"; 688 desc { "default";
689 color: 148 23 45 255; 689 color: 148 23 45 255;
690 rel.to: "elm.swallow.indicator"; 690 rel.to: "efl.indicator";
691 } 691 }
692 desc { "bg_transparent"; 692 desc { "bg_transparent";
693 inherit: "default"; 693 inherit: "default";
694 color: 0 0 0 0; 694 color: 0 0 0 0;
695 } 695 }
696 } 696 }
697 swallow { "elm.swallow.indicator"; 697 swallow { "efl.indicator";
698 clip: "bg_clip"; 698 clip: "bg_clip";
699 desc { "default"; 699 desc { "default";
700 rel.to: "top_clip"; 700 rel.to: "top_clip";
@@ -774,12 +774,12 @@ group { name: "efl/border";
774 program { 774 program {
775 signal: "elm,state,background,solid,on"; source: "elm"; 775 signal: "elm,state,background,solid,on"; source: "elm";
776 action: STATE_SET "visible"; 776 action: STATE_SET "visible";
777 target: "elm.rect.background"; 777 target: "efl.rect.background";
778 } 778 }
779 program { 779 program {
780 signal: "elm,state,background,solid,off"; source: "elm"; 780 signal: "elm,state,background,solid,off"; source: "elm";
781 action: STATE_SET "default"; 781 action: STATE_SET "default";
782 target: "elm.rect.background"; 782 target: "efl.rect.background";
783 } 783 }
784 program { 784 program {
785 signal: "elm,state,background,standard,on"; source: "elm"; 785 signal: "elm,state,background,standard,on"; source: "elm";
@@ -795,7 +795,7 @@ group { name: "efl/border";
795 signal: "elm,action,focus"; source: "elm"; 795 signal: "elm,action,focus"; source: "elm";
796 action: STATE_SET "focused"; 796 action: STATE_SET "focused";
797 target: "top"; 797 target: "top";
798 target: "elm.text.title"; 798 target: "efl.text.title";
799 target: "title2"; 799 target: "title2";
800 target: "clip1"; 800 target: "clip1";
801 target: "clip2"; 801 target: "clip2";
@@ -804,7 +804,7 @@ group { name: "efl/border";
804 signal: "elm,action,unfocus"; source: "elm"; 804 signal: "elm,action,unfocus"; source: "elm";
805 action: STATE_SET "default"; 805 action: STATE_SET "default";
806 target: "top"; 806 target: "top";
807 target: "elm.text.title"; 807 target: "efl.text.title";
808 target: "title2"; 808 target: "title2";
809 target: "clip1"; 809 target: "clip1";
810 target: "clip2"; 810 target: "clip2";
@@ -812,25 +812,25 @@ group { name: "efl/border";
812 program { 812 program {
813 signal: "elm,state,urgent"; source: "elm"; 813 signal: "elm,state,urgent"; source: "elm";
814 action: STATE_SET "bounce1"; 814 action: STATE_SET "bounce1";
815 target: "icon"; 815 target: "spacer.icon";
816 after: "urg1"; 816 after: "urg1";
817 } 817 }
818 program { name: "urg1"; 818 program { name: "urg1";
819 action: STATE_SET "bounce2"; 819 action: STATE_SET "bounce2";
820 transition: DECELERATE 0.4; 820 transition: DECELERATE 0.4;
821 target: "icon"; 821 target: "spacer.icon";
822 after: "urg2"; 822 after: "urg2";
823 } 823 }
824 program { name: "urg2"; 824 program { name: "urg2";
825 action: STATE_SET "bounce1"; 825 action: STATE_SET "bounce1";
826 transition: ACCELERATE 0.3; 826 transition: ACCELERATE 0.3;
827 target: "icon"; 827 target: "spacer.icon";
828 after: "urg1"; 828 after: "urg1";
829 } 829 }
830 program { 830 program {
831 signal: "elm,state,not_urgent"; source: "elm"; 831 signal: "elm,state,not_urgent"; source: "elm";
832 action: STATE_SET "default"; 832 action: STATE_SET "default";
833 target: "icon"; 833 target: "spacer.icon";
834 } 834 }
835 program { name: "spin"; 835 program { name: "spin";
836 signal: "elm,state,hung"; source: "elm"; 836 signal: "elm,state,hung"; source: "elm";
@@ -872,7 +872,7 @@ group { name: "efl/border";
872 program { 872 program {
873 signal: "elm,state,maximize*"; source: "elm"; 873 signal: "elm,state,maximize*"; source: "elm";
874 action: STATE_SET "max"; 874 action: STATE_SET "max";
875 target: "elm.spacer.opaque"; 875 target: "efl.spacer.opaque";
876 } 876 }
877 program { 877 program {
878 signal: "elm,state,maximize*"; source: "elm"; 878 signal: "elm,state,maximize*"; source: "elm";
@@ -881,7 +881,7 @@ group { name: "efl/border";
881 program { 881 program {
882 signal: "elm,state,unmaximize*"; source: "elm"; 882 signal: "elm,state,unmaximize*"; source: "elm";
883 action: STATE_SET "default"; 883 action: STATE_SET "default";
884 target: "elm.spacer.opaque"; 884 target: "efl.spacer.opaque";
885 } 885 }
886 program { 886 program {
887 signal: "elm,state,unmaximize*"; source: "elm"; 887 signal: "elm,state,unmaximize*"; source: "elm";
@@ -928,33 +928,33 @@ group { name: "efl/border";
928 signal: "elm,action,indicator,show_effect"; source: "elm"; 928 signal: "elm,action,indicator,show_effect"; source: "elm";
929 action: STATE_SET "visible"; 929 action: STATE_SET "visible";
930 transition: DECELERATE 0.2; 930 transition: DECELERATE 0.2;
931 target: "elm.swallow.indicator"; 931 target: "efl.indicator";
932 } 932 }
933 program { 933 program {
934 signal: "elm,action,indicator,hide_effect"; source: "elm"; 934 signal: "elm,action,indicator,hide_effect"; source: "elm";
935 action: STATE_SET "hidden"; 935 action: STATE_SET "hidden";
936 transition: DECELERATE 0.2; 936 transition: DECELERATE 0.2;
937 target: "elm.swallow.indicator"; 937 target: "efl.indicator";
938 } 938 }
939 program { name: "update_indicator"; 939 program { name: "update_indicator";
940 script { 940 script {
941 if (get_int(indicator_enabled)) { 941 if (get_int(indicator_enabled)) {
942 if ((get_int(indicator_type) == INDICATOR_TYPE_BG_OPAQUE) || 942 if ((get_int(indicator_type) == INDICATOR_TYPE_BG_OPAQUE) ||
943 (get_int(indicator_type) == INDICATOR_TYPE_UNKNOWN)) { 943 (get_int(indicator_type) == INDICATOR_TYPE_UNKNOWN)) {
944 set_state(PART:"elm.swallow.indicator", "visible", 0.0); 944 set_state(PART:"efl.indicator", "visible", 0.0);
945 set_state(PART:"indicator_spacer", "default", 0.0); 945 set_state(PART:"indicator_spacer", "default", 0.0);
946 set_state(PART:"indicator_bg", "default", 0.0); 946 set_state(PART:"indicator_bg", "default", 0.0);
947 } else if (get_int(indicator_type) == INDICATOR_TYPE_BG_TRANSPARENT) { 947 } else if (get_int(indicator_type) == INDICATOR_TYPE_BG_TRANSPARENT) {
948 set_state(PART:"elm.swallow.indicator", "visible", 0.0); 948 set_state(PART:"efl.indicator", "visible", 0.0);
949 set_state(PART:"indicator_spacer", "default", 0.0); 949 set_state(PART:"indicator_spacer", "default", 0.0);
950 set_state(PART:"indicator_bg", "bg_transparent", 0.0); 950 set_state(PART:"indicator_bg", "bg_transparent", 0.0);
951 } else if (get_int(indicator_type) == INDICATOR_TYPE_HIDDEN) { 951 } else if (get_int(indicator_type) == INDICATOR_TYPE_HIDDEN) {
952 set_state(PART:"elm.swallow.indicator", "hidden", 0.0); 952 set_state(PART:"efl.indicator", "hidden", 0.0);
953 set_state(PART:"indicator_spacer", "hidden", 0.0); 953 set_state(PART:"indicator_spacer", "hidden", 0.0);
954 set_state(PART:"indicator_bg", "default", 0.0); 954 set_state(PART:"indicator_bg", "default", 0.0);
955 } 955 }
956 } else { 956 } else {
957 set_state(PART:"elm.swallow.indicator", "default", 0.0); 957 set_state(PART:"efl.indicator", "default", 0.0);
958 set_state(PART:"indicator_spacer", "default", 0.0); 958 set_state(PART:"indicator_spacer", "default", 0.0);
959 } 959 }
960 } 960 }
@@ -964,171 +964,171 @@ group { name: "efl/border";
964 program { name: "show_menu"; 964 program { name: "show_menu";
965 signal: "elm,action,show_menu"; source: "elm"; 965 signal: "elm,action,show_menu"; source: "elm";
966 action: STATE_SET "visible"; 966 action: STATE_SET "visible";
967 target: "elm.swallow.menu"; 967 target: "efl.menu";
968 } 968 }
969 program { name: "hide_menu"; 969 program { name: "hide_menu";
970 signal: "elm,action,hide"; source: "elm"; 970 signal: "elm,action,hide"; source: "elm";
971 action: STATE_SET "default"; 971 action: STATE_SET "default";
972 target: "elm.swallow.menu"; 972 target: "efl.menu";
973 } 973 }
974 974
975 /* modal windows */ 975 /* modal windows */
976 program { name: "hide_blocker"; 976 program { name: "hide_blocker";
977 signal: "elm,action,hide_blocker"; source: "elm"; 977 signal: "elm,action,hide_blocker"; source: "elm";
978 action: STATE_SET "default" 0.0; 978 action: STATE_SET "default" 0.0;
979 target: "elm.rect.blocker"; 979 target: "rect.blocker";
980 transition: DECELERATE 0.2; 980 transition: DECELERATE 0.2;
981 } 981 }
982 program { name: "show_blocker"; 982 program { name: "show_blocker";
983 signal: "elm,action,show_blocker"; source: "elm"; 983 signal: "elm,action,show_blocker"; source: "elm";
984 action: STATE_SET "visible" 0.0; 984 action: STATE_SET "visible" 0.0;
985 target: "elm.rect.blocker"; 985 target: "rect.blocker";
986 transition: DECELERATE 0.2; 986 transition: DECELERATE 0.2;
987 } 987 }
988 988
989 /* minimize, maximize & close buttons */ 989 /* minimize, maximize & close buttons */
990 program { 990 program {
991 signal: "mouse,down,*"; source: "elm.event.close"; 991 signal: "mouse,down,*"; source: "event.close";
992 action: STATE_SET "selected"; 992 action: STATE_SET "selected";
993 target: "close1"; 993 target: "close1";
994 target: "close2"; 994 target: "close2";
995 } 995 }
996 program { 996 program {
997 signal: "mouse,up,*"; source: "elm.event.close"; 997 signal: "mouse,up,*"; source: "event.close";
998 action: STATE_SET "default"; 998 action: STATE_SET "default";
999 target: "close1"; 999 target: "close1";
1000 target: "close2"; 1000 target: "close2";
1001 } 1001 }
1002 program { 1002 program {
1003 signal: "mouse,down,*"; source: "elm.event.maximize"; 1003 signal: "mouse,down,*"; source: "event.maximize";
1004 action: STATE_SET "selected"; 1004 action: STATE_SET "selected";
1005 target: "max1"; 1005 target: "max1";
1006 target: "max2"; 1006 target: "max2";
1007 } 1007 }
1008 program { 1008 program {
1009 signal: "mouse,up,*"; source: "elm.event.maximize"; 1009 signal: "mouse,up,*"; source: "event.maximize";
1010 action: STATE_SET "default"; 1010 action: STATE_SET "default";
1011 target: "max1"; 1011 target: "max1";
1012 target: "max2"; 1012 target: "max2";
1013 } 1013 }
1014 program { 1014 program {
1015 signal: "mouse,down,*"; source: "elm.event.minimize"; 1015 signal: "mouse,down,*"; source: "event.minimize";
1016 action: STATE_SET "selected"; 1016 action: STATE_SET "selected";
1017 target: "min1"; 1017 target: "min1";
1018 target: "min2"; 1018 target: "min2";
1019 } 1019 }
1020 program { 1020 program {
1021 signal: "mouse,up,*"; source: "elm.event.minimize"; 1021 signal: "mouse,up,*"; source: "event.minimize";
1022 action: STATE_SET "default"; 1022 action: STATE_SET "default";
1023 target: "min1"; 1023 target: "min1";
1024 target: "min2"; 1024 target: "min2";
1025 } 1025 }
1026 program { 1026 program {
1027 signal: "mouse,down,1"; source: "elm.event.titlebar"; 1027 signal: "mouse,down,1"; source: "event.titlebar";
1028 action: SIGNAL_EMIT "elm,action,move,start" "elm"; 1028 action: SIGNAL_EMIT "elm,action,move,start" "elm";
1029 } 1029 }
1030 program { 1030 program {
1031 signal: "mouse,up,1"; source: "elm.event.titlebar"; 1031 signal: "mouse,up,1"; source: "event.titlebar";
1032 action: SIGNAL_EMIT "elm,action,move,stop" "elm"; 1032 action: SIGNAL_EMIT "elm,action,move,stop" "elm";
1033 } 1033 }
1034 program { 1034 program {
1035 signal: "mouse,clicked,1"; source: "elm.event.minimize"; 1035 signal: "mouse,clicked,1"; source: "event.minimize";
1036 action: SIGNAL_EMIT "elm,action,minimize" "elm"; 1036 action: SIGNAL_EMIT "elm,action,minimize" "elm";
1037 } 1037 }
1038 program { 1038 program {
1039 signal: "mouse,clicked,1"; source: "elm.event.maximize"; 1039 signal: "mouse,clicked,1"; source: "event.maximize";
1040 action: SIGNAL_EMIT "elm,action,maximize" "elm"; 1040 action: SIGNAL_EMIT "elm,action,maximize" "elm";
1041 } 1041 }
1042 program { 1042 program {
1043 signal: "mouse,clicked,1"; source: "elm.event.close"; 1043 signal: "mouse,clicked,1"; source: "event.close";
1044 action: SIGNAL_EMIT "elm,action,close" "elm"; 1044 action: SIGNAL_EMIT "elm,action,close" "elm";
1045 } 1045 }
1046 program { 1046 program {
1047 signal: "mouse,in"; source: "elm.event.resize.t"; 1047 signal: "mouse,in"; source: "efl.event.resize.t";
1048 action: SIGNAL_EMIT "elm,action,resize,show" "elm.event.resize.t"; 1048 action: SIGNAL_EMIT "elm,action,resize,show" "efl.event.resize.t";
1049 } 1049 }
1050 program { 1050 program {
1051 signal: "mouse,out"; source: "elm.event.resize.t"; 1051 signal: "mouse,out"; source: "efl.event.resize.t";
1052 action: SIGNAL_EMIT "elm,action,resize,hide" "elm.event.resize.t"; 1052 action: SIGNAL_EMIT "elm,action,resize,hide" "efl.event.resize.t";
1053 } 1053 }
1054 program { 1054 program {
1055 signal: "mouse,down,1"; source: "elm.event.resize.t"; 1055 signal: "mouse,down,1"; source: "efl.event.resize.t";
1056 action: SIGNAL_EMIT "elm,action,resize,start" "elm.event.resize.t"; 1056 action: SIGNAL_EMIT "elm,action,resize,start" "efl.event.resize.t";
1057 } 1057 }
1058 program { 1058 program {
1059 signal: "mouse,in"; source: "elm.event.resize.b"; 1059 signal: "mouse,in"; source: "efl.event.resize.b";
1060 action: SIGNAL_EMIT "elm,action,resize,show" "elm.event.resize.b"; 1060 action: SIGNAL_EMIT "elm,action,resize,show" "efl.event.resize.b";
1061 } 1061 }
1062 program { 1062 program {
1063 signal: "mouse,out"; source: "elm.event.resize.b"; 1063 signal: "mouse,out"; source: "efl.event.resize.b";
1064 action: SIGNAL_EMIT "elm,action,resize,hide" "elm.event.resize.b"; 1064 action: SIGNAL_EMIT "elm,action,resize,hide" "efl.event.resize.b";
1065 } 1065 }
1066 program { 1066 program {
1067 signal: "mouse,down,1"; source: "elm.event.resize.b"; 1067 signal: "mouse,down,1"; source: "efl.event.resize.b";
1068 action: SIGNAL_EMIT "elm,action,resize,start" "elm.event.resize.b"; 1068 action: SIGNAL_EMIT "elm,action,resize,start" "efl.event.resize.b";
1069 } 1069 }
1070 program { 1070 program {
1071 signal: "mouse,in"; source: "elm.event.resize.tl"; 1071 signal: "mouse,in"; source: "efl.event.resize.tl";
1072 action: SIGNAL_EMIT "elm,action,resize,show" "elm.event.resize.tl"; 1072 action: SIGNAL_EMIT "elm,action,resize,show" "efl.event.resize.tl";
1073 } 1073 }
1074 program { 1074 program {
1075 signal: "mouse,out"; source: "elm.event.resize.tl"; 1075 signal: "mouse,out"; source: "efl.event.resize.tl";
1076 action: SIGNAL_EMIT "elm,action,resize,hide" "elm.event.resize.tl"; 1076 action: SIGNAL_EMIT "elm,action,resize,hide" "efl.event.resize.tl";
1077 } 1077 }
1078 program { 1078 program {
1079 signal: "mouse,down,1"; source: "elm.event.resize.tl"; 1079 signal: "mouse,down,1"; source: "efl.event.resize.tl";
1080 action: SIGNAL_EMIT "elm,action,resize,start" "elm.event.resize.tl"; 1080 action: SIGNAL_EMIT "elm,action,resize,start" "efl.event.resize.tl";
1081 } 1081 }
1082 program { 1082 program {
1083 signal: "mouse,in"; source: "elm.event.resize.tr"; 1083 signal: "mouse,in"; source: "efl.event.resize.tr";
1084 action: SIGNAL_EMIT "elm,action,resize,show" "elm.event.resize.tr"; 1084 action: SIGNAL_EMIT "elm,action,resize,show" "efl.event.resize.tr";
1085 } 1085 }
1086 program { 1086 program {
1087 signal: "mouse,out"; source: "elm.event.resize.tr"; 1087 signal: "mouse,out"; source: "efl.event.resize.tr";
1088 action: SIGNAL_EMIT "elm,action,resize,hide" "elm.event.resize.tr"; 1088 action: SIGNAL_EMIT "elm,action,resize,hide" "efl.event.resize.tr";
1089 } 1089 }
1090 program { 1090 program {
1091 signal: "mouse,down,1"; source: "elm.event.resize.tr"; 1091 signal: "mouse,down,1"; source: "efl.event.resize.tr";
1092 action: SIGNAL_EMIT "elm,action,resize,start" "elm.event.resize.tr"; 1092 action: SIGNAL_EMIT "elm,action,resize,start" "efl.event.resize.tr";
1093 } 1093 }
1094 program { 1094 program {
1095 signal: "mouse,in"; source: "elm.event.resize.bl"; 1095 signal: "mouse,in"; source: "efl.event.resize.bl";
1096 action: SIGNAL_EMIT "elm,action,resize,show" "elm.event.resize.bl"; 1096 action: SIGNAL_EMIT "elm,action,resize,show" "efl.event.resize.bl";
1097 } 1097 }
1098 program { 1098 program {
1099 signal: "mouse,out"; source: "elm.event.resize.bl"; 1099 signal: "mouse,out"; source: "efl.event.resize.bl";
1100 action: SIGNAL_EMIT "elm,action,resize,hide" "elm.event.resize.bl"; 1100 action: SIGNAL_EMIT "elm,action,resize,hide" "efl.event.resize.bl";
1101 } 1101 }
1102 program { 1102 program {
1103 signal: "mouse,down,1"; source: "elm.event.resize.bl"; 1103 signal: "mouse,down,1"; source: "efl.event.resize.bl";
1104 action: SIGNAL_EMIT "elm,action,resize,start" "elm.event.resize.bl"; 1104 action: SIGNAL_EMIT "elm,action,resize,start" "efl.event.resize.bl";
1105 } 1105 }
1106 program { 1106 program {
1107 signal: "mouse,in"; source: "elm.event.resize.br"; 1107 signal: "mouse,in"; source: "efl.event.resize.br";
1108 action: SIGNAL_EMIT "elm,action,resize,show" "elm.event.resize.br"; 1108 action: SIGNAL_EMIT "elm,action,resize,show" "efl.event.resize.br";
1109 } 1109 }
1110 program { 1110 program {
1111 signal: "mouse,out"; source: "elm.event.resize.br"; 1111 signal: "mouse,out"; source: "efl.event.resize.br";
1112 action: SIGNAL_EMIT "elm,action,resize,hide" "elm.event.resize.br"; 1112 action: SIGNAL_EMIT "elm,action,resize,hide" "efl.event.resize.br";
1113 } 1113 }
1114 program { 1114 program {
1115 signal: "mouse,down,1"; source: "elm.event.resize.br"; 1115 signal: "mouse,down,1"; source: "efl.event.resize.br";
1116 action: SIGNAL_EMIT "elm,action,resize,start" "elm.event.resize.br"; 1116 action: SIGNAL_EMIT "elm,action,resize,start" "efl.event.resize.br";
1117 } 1117 }
1118 program { 1118 program {
1119 signal: "mouse,clicked,1"; source: "elm.event.icon"; 1119 signal: "mouse,clicked,1"; source: "event.icon";
1120 action: SIGNAL_EMIT "elm,action,menu" "elm"; 1120 action: SIGNAL_EMIT "elm,action,menu" "elm";
1121 } 1121 }
1122 } 1122 }
1123} 1123}
1124 1124
1125group { name: "efl/border/dialog"; 1125group { "efl/border/dialog";
1126 inherit: "efl/border"; 1126 inherit: "efl/border";
1127 parts { 1127 parts {
1128 text { "elm.text.title"; 1128 text { "efl.text.title";
1129 clip: "top_clip"; 1129 clip: "top_clip";
1130 desc { "default"; 1130 desc { "default";
1131 rel2.to_x: "elm.event.close"; 1131 rel2.to_x: "event.close";
1132 } 1132 }
1133 desc { "focused"; 1133 desc { "focused";
1134 inherit: "default"; 1134 inherit: "default";
@@ -1137,7 +1137,7 @@ group { name: "efl/border/dialog";
1137 } 1137 }
1138 text { "title2"; 1138 text { "title2";
1139 desc { "default"; 1139 desc { "default";
1140 rel2.to_x: "elm.event.close"; 1140 rel2.to_x: "event.close";
1141 } 1141 }
1142 desc { "focused"; 1142 desc { "focused";
1143 inherit: "default"; 1143 inherit: "default";
@@ -1176,12 +1176,12 @@ group { name: "efl/border/dialog";
1176 visible: 0; 1176 visible: 0;
1177 } 1177 }
1178 } 1178 }
1179 rect { "elm.event.maximize"; 1179 rect { "event.maximize";
1180 desc { "default"; 1180 desc { "default";
1181 visible: 0; 1181 visible: 0;
1182 } 1182 }
1183 } 1183 }
1184 rect { "elm.event.minimize"; 1184 rect { "event.minimize";
1185 desc { "default"; 1185 desc { "default";
1186 visible: 0; 1186 visible: 0;
1187 } 1187 }
@@ -1189,8 +1189,8 @@ group { name: "efl/border/dialog";
1189 } 1189 }
1190} 1190}
1191 1191
1192group { name: "efl/border/naviframe"; 1192group { "efl/border/naviframe";
1193 inherit: "efl/border/dialog"; 1193 inherit: "efl/border";
1194 images.image: "sym_left_dark_normal.png" COMP; 1194 images.image: "sym_left_dark_normal.png" COMP;
1195 images.image: "sym_left_glow_normal.png" COMP; 1195 images.image: "sym_left_glow_normal.png" COMP;
1196 images.image: "sym_left_light_normal.png" COMP; 1196 images.image: "sym_left_light_normal.png" COMP;
@@ -1220,4 +1220,3 @@ group { name: "efl/border/naviframe";
1220#undef MAXIMIZED 1220#undef MAXIMIZED
1221#undef SET_MODE 1221#undef SET_MODE
1222#undef UNSET_MODE 1222#undef UNSET_MODE
1223
diff --git a/data/elementary/themes/edc/efl/button.edc b/data/elementary/themes/edc/efl/button.edc
index 9853358..752c197 100644
--- a/data/elementary/themes/edc/efl/button.edc
+++ b/data/elementary/themes/edc/efl/button.edc
@@ -18,9 +18,9 @@ group { name: "efl/button";
18 new bg = m & BACKGROUND; 18 new bg = m & BACKGROUND;
19 if (bg) { 19 if (bg) {
20 set_state(PART:"base", "hidden", 0.0); 20 set_state(PART:"base", "hidden", 0.0);
21 set_state(PART:"elm.swallow.background", "visible", 0.0); 21 set_state(PART:"efl.background", "visible", 0.0);
22 } else { 22 } else {
23 set_state(PART:"elm.swallow.background", "default", 0.0); 23 set_state(PART:"efl.background", "default", 0.0);
24 if (!d) { 24 if (!d) {
25 if (!p) 25 if (!p)
26 { 26 {
@@ -36,65 +36,65 @@ group { name: "efl/button";
36 } 36 }
37 if (m1 == (ICON | LABEL)) { 37 if (m1 == (ICON | LABEL)) {
38 if (!d) { 38 if (!d) {
39 set_state(PART:"elm.swallow.content", "visible", 0.0); 39 set_state(PART:"efl.content", "visible", 0.0);
40 set_state(PART:"sizer.content", "visible", 0.0); 40 set_state(PART:"sizer.content", "visible", 0.0);
41 set_state(PART:"event", "default", 0.0); 41 set_state(PART:"event", "default", 0.0);
42 if (!p) { 42 if (!p) {
43 set_state(PART:"elm.text", "visible", 0.0); 43 set_state(PART:"efl.text", "visible", 0.0);
44 set_state(PART:"icon_clip", "default", 0.0); 44 set_state(PART:"icon_clip", "default", 0.0);
45 } else { 45 } else {
46 set_state(PART:"elm.text", "pressed_visible", 0.0); 46 set_state(PART:"efl.text", "pressed_visible", 0.0);
47 set_state(PART:"icon_clip", "pressed", 0.0); 47 set_state(PART:"icon_clip", "pressed", 0.0);
48 } 48 }
49 } else { 49 } else {
50 set_state(PART:"elm.swallow.content", "visible", 0.0); 50 set_state(PART:"efl.content", "visible", 0.0);
51 set_state(PART:"sizer.content", "visible", 0.0); 51 set_state(PART:"sizer.content", "visible", 0.0);
52 set_state(PART:"elm.text", "disabled_visible", 0.0); 52 set_state(PART:"efl.text", "disabled_visible", 0.0);
53 set_state(PART:"icon_clip", "disabled", 0.0); 53 set_state(PART:"icon_clip", "disabled", 0.0);
54 set_state(PART:"event", "disabled", 0.0); 54 set_state(PART:"event", "disabled", 0.0);
55 } 55 }
56 } else if (m1 == (ICON)) { 56 } else if (m1 == (ICON)) {
57 if (!d) { 57 if (!d) {
58 set_state(PART:"elm.swallow.content", "icononly", 0.0); 58 set_state(PART:"efl.content", "icononly", 0.0);
59 set_state(PART:"sizer.content", "icononly", 0.0); 59 set_state(PART:"sizer.content", "icononly", 0.0);
60 set_state(PART:"event", "default", 0.0); 60 set_state(PART:"event", "default", 0.0);
61 set_state(PART:"elm.text", "default", 0.0); 61 set_state(PART:"efl.text", "default", 0.0);
62 if (!p) 62 if (!p)
63 set_state(PART:"icon_clip", "default", 0.0); 63 set_state(PART:"icon_clip", "default", 0.0);
64 else 64 else
65 set_state(PART:"icon_clip", "pressed", 0.0); 65 set_state(PART:"icon_clip", "pressed", 0.0);
66 } else { 66 } else {
67 set_state(PART:"elm.swallow.content", "icononly", 0.0); 67 set_state(PART:"efl.content", "icononly", 0.0);
68 set_state(PART:"sizer.content", "icononly", 0.0); 68 set_state(PART:"sizer.content", "icononly", 0.0);
69 set_state(PART:"elm.text", "default", 0.0); 69 set_state(PART:"efl.text", "default", 0.0);
70 set_state(PART:"icon_clip", "disabled", 0.0); 70 set_state(PART:"icon_clip", "disabled", 0.0);
71 set_state(PART:"event", "disabled", 0.0); 71 set_state(PART:"event", "disabled", 0.0);
72 } 72 }
73 } else if (m1 == (LABEL)) { 73 } else if (m1 == (LABEL)) {
74 if (!d) { 74 if (!d) {
75 set_state(PART:"elm.swallow.content", "default", 0.0); 75 set_state(PART:"efl.content", "default", 0.0);
76 set_state(PART:"sizer.content", "default", 0.0); 76 set_state(PART:"sizer.content", "default", 0.0);
77 set_state(PART:"icon_clip", "default", 0.0); 77 set_state(PART:"icon_clip", "default", 0.0);
78 set_state(PART:"event", "default", 0.0); 78 set_state(PART:"event", "default", 0.0);
79 if (!p) 79 if (!p)
80 set_state(PART:"elm.text", "textonly", 0.0); 80 set_state(PART:"efl.text", "textonly", 0.0);
81 else 81 else
82 set_state(PART:"elm.text", "pressed_textonly", 0.0); 82 set_state(PART:"efl.text", "pressed_textonly", 0.0);
83 } else { 83 } else {
84 set_state(PART:"elm.swallow.content", "default", 0.0); 84 set_state(PART:"efl.content", "default", 0.0);
85 set_state(PART:"sizer.content", "default", 0.0); 85 set_state(PART:"sizer.content", "default", 0.0);
86 set_state(PART:"elm.text", "disabled_textonly", 0.0); 86 set_state(PART:"efl.text", "disabled_textonly", 0.0);
87 set_state(PART:"icon_clip", "disabled", 0.0); 87 set_state(PART:"icon_clip", "disabled", 0.0);
88 set_state(PART:"event", "disabled", 0.0); 88 set_state(PART:"event", "disabled", 0.0);
89 } 89 }
90 } else { 90 } else {
91 if (!d) { 91 if (!d) {
92 set_state(PART:"elm.swallow.content", "default", 0.0); 92 set_state(PART:"efl.content", "default", 0.0);
93 set_state(PART:"sizer.content", "default", 0.0); 93 set_state(PART:"sizer.content", "default", 0.0);
94 set_state(PART:"icon_clip", "default", 0.0); 94 set_state(PART:"icon_clip", "default", 0.0);
95 set_state(PART:"event", "default", 0.0); 95 set_state(PART:"event", "default", 0.0);
96 } else { 96 } else {
97 set_state(PART:"elm.swallow.content", "default", 0.0); 97 set_state(PART:"efl.content", "default", 0.0);
98 set_state(PART:"sizer.content", "default", 0.0); 98 set_state(PART:"sizer.content", "default", 0.0);
99 set_state(PART:"icon_clip", "disabled", 0.0); 99 set_state(PART:"icon_clip", "disabled", 0.0);
100 set_state(PART:"event", "disabled", 0.0); 100 set_state(PART:"event", "disabled", 0.0);
@@ -128,7 +128,7 @@ group { name: "efl/button";
128 visible: 0; 128 visible: 0;
129 } 129 }
130 } 130 }
131 swallow { "elm.swallow.background"; nomouse; 131 swallow { "efl.background"; nomouse;
132 required; 132 required;
133 desc { "default"; 133 desc { "default";
134 rel1.to: "base"; 134 rel1.to: "base";
@@ -153,7 +153,7 @@ group { name: "efl/button";
153 color_class: "button_icon_disabled"; 153 color_class: "button_icon_disabled";
154 } 154 }
155 } 155 }
156 swallow { "elm.swallow.content"; nomouse; 156 swallow { "efl.content"; nomouse;
157 clip_to: "icon_clip"; 157 clip_to: "icon_clip";
158 required; 158 required;
159 desc { "default"; 159 desc { "default";
@@ -193,8 +193,8 @@ group { name: "efl/button";
193 } 193 }
194 desc { "visible"; 194 desc { "visible";
195 inherit: "default"; 195 inherit: "default";
196 rel1.to: "elm.swallow.content"; 196 rel1.to: "efl.content";
197 rel2.to: "elm.swallow.content"; 197 rel2.to: "efl.content";
198 text { 198 text {
199 min: 1 1; 199 min: 1 1;
200 ellipsis: -1; 200 ellipsis: -1;
@@ -203,8 +203,8 @@ group { name: "efl/button";
203 } 203 }
204 desc { "icononly"; 204 desc { "icononly";
205 inherit: "default"; 205 inherit: "default";
206 rel1.to: "elm.swallow.content"; 206 rel1.to: "efl.content";
207 rel2.to: "elm.swallow.content"; 207 rel2.to: "efl.content";
208 text { 208 text {
209 min: 1 1; 209 min: 1 1;
210 ellipsis: -1; 210 ellipsis: -1;
@@ -212,14 +212,14 @@ group { name: "efl/button";
212 } 212 }
213 } 213 }
214 } 214 }
215 text { "elm.text"; nomouse; 215 text { "efl.text"; nomouse;
216 effect: SHADOW BOTTOM; 216 effect: SHADOW BOTTOM;
217 scale; 217 scale;
218 required; 218 required;
219 desc { "default"; 219 desc { "default";
220 rel1.offset: 0 5; 220 rel1.offset: 0 5;
221 rel1.relative: 1.0 0.0; 221 rel1.relative: 1.0 0.0;
222 rel1.to_x: "elm.swallow.content"; 222 rel1.to_x: "efl.content";
223 rel1.to_y: "base"; 223 rel1.to_y: "base";
224 rel2.offset: -8 -8; 224 rel2.offset: -8 -8;
225 rel2.to: "base"; 225 rel2.to: "base";
@@ -336,7 +336,7 @@ group { name: "efl/button";
336 action: SIGNAL_EMIT "elm,action,click" "elm"; 336 action: SIGNAL_EMIT "elm,action,click" "elm";
337 } 337 }
338 program { name: "button_text_visible"; 338 program { name: "button_text_visible";
339 signal: "elm,state,elm.text,set"; source: "elm"; 339 signal: "elm,state,text,set"; source: "elm";
340 script { 340 script {
341 new m = get_int(btmode); 341 new m = get_int(btmode);
342 m |= LABEL; set_int(btmode, m); 342 m |= LABEL; set_int(btmode, m);
@@ -344,7 +344,7 @@ group { name: "efl/button";
344 } 344 }
345 } 345 }
346 program { name: "button_text_hidden"; 346 program { name: "button_text_hidden";
347 signal: "elm,state,elm.text,unset"; source: "elm"; 347 signal: "elm,state,text,unset"; source: "elm";
348 script { 348 script {
349 new m = get_int(btmode); 349 new m = get_int(btmode);
350 m &= ~LABEL; set_int(btmode, m); 350 m &= ~LABEL; set_int(btmode, m);
@@ -421,61 +421,61 @@ group { name: "efl/button:anchor";
421 new d = m & DISABLE; 421 new d = m & DISABLE;
422 if (m1 == (ICON | LABEL)) { 422 if (m1 == (ICON | LABEL)) {
423 if (!d) { 423 if (!d) {
424 set_state(PART:"elm.swallow.content", "visible", 0.0); 424 set_state(PART:"efl.content", "visible", 0.0);
425 set_state(PART:"sizer.content", "visible", 0.0); 425 set_state(PART:"sizer.content", "visible", 0.0);
426 set_state(PART:"elm.text", "visible", 0.0); 426 set_state(PART:"efl.text", "visible", 0.0);
427 set_state(PART:"icon_clip", "default", 0.0); 427 set_state(PART:"icon_clip", "default", 0.0);
428 set_state(PART:"bar", "default", 0.0); 428 set_state(PART:"bar", "default", 0.0);
429 set_state(PART:"event", "default", 0.0); 429 set_state(PART:"event", "default", 0.0);
430 } else { 430 } else {
431 set_state(PART:"elm.swallow.content", "visible", 0.0); 431 set_state(PART:"efl.content", "visible", 0.0);
432 set_state(PART:"sizer.content", "visible", 0.0); 432 set_state(PART:"sizer.content", "visible", 0.0);
433 set_state(PART:"elm.text", "disabled_visible", 0.0); 433 set_state(PART:"efl.text", "disabled_visible", 0.0);
434 set_state(PART:"icon_clip", "disabled", 0.0); 434 set_state(PART:"icon_clip", "disabled", 0.0);
435 set_state(PART:"bar", "disabled", 0.0); 435 set_state(PART:"bar", "disabled", 0.0);
436 set_state(PART:"event", "disabled", 0.0); 436 set_state(PART:"event", "disabled", 0.0);
437 } 437 }
438 } else if (m1 == (ICON)) { 438 } else if (m1 == (ICON)) {
439 if (!d) { 439 if (!d) {
440 set_state(PART:"elm.swallow.content", "icononly", 0.0); 440 set_state(PART:"efl.content", "icononly", 0.0);
441 set_state(PART:"sizer.content", "icononly", 0.0); 441 set_state(PART:"sizer.content", "icononly", 0.0);
442 set_state(PART:"elm.text", "default", 0.0); 442 set_state(PART:"efl.text", "default", 0.0);
443 set_state(PART:"icon_clip", "default", 0.0); 443 set_state(PART:"icon_clip", "default", 0.0);
444 set_state(PART:"bar", "default", 0.0); 444 set_state(PART:"bar", "default", 0.0);
445 set_state(PART:"event", "default", 0.0); 445 set_state(PART:"event", "default", 0.0);
446 } else { 446 } else {
447 set_state(PART:"elm.swallow.content", "icononly", 0.0); 447 set_state(PART:"efl.content", "icononly", 0.0);
448 set_state(PART:"sizer.content", "icononly", 0.0); 448 set_state(PART:"sizer.content", "icononly", 0.0);
449 set_state(PART:"elm.text", "default", 0.0); 449 set_state(PART:"efl.text", "default", 0.0);
450 set_state(PART:"icon_clip", "disabled", 0.0); 450 set_state(PART:"icon_clip", "disabled", 0.0);
451 set_state(PART:"bar", "disabled", 0.0); 451 set_state(PART:"bar", "disabled", 0.0);
452 set_state(PART:"event", "disabled", 0.0); 452 set_state(PART:"event", "disabled", 0.0);
453 } 453 }
454 } else if (m1 == (LABEL)) { 454 } else if (m1 == (LABEL)) {
455 if (!d) { 455 if (!d) {
456 set_state(PART:"elm.swallow.content", "default", 0.0); 456 set_state(PART:"efl.content", "default", 0.0);
457 set_state(PART:"sizer.content", "default", 0.0); 457 set_state(PART:"sizer.content", "default", 0.0);
458 set_state(PART:"elm.text", "textonly", 0.0); 458 set_state(PART:"efl.text", "textonly", 0.0);
459 set_state(PART:"icon_clip", "default", 0.0); 459 set_state(PART:"icon_clip", "default", 0.0);
460 set_state(PART:"bar", "default", 0.0); 460 set_state(PART:"bar", "default", 0.0);
461 set_state(PART:"event", "default", 0.0); 461 set_state(PART:"event", "default", 0.0);
462 } else { 462 } else {
463 set_state(PART:"elm.swallow.content", "default", 0.0); 463 set_state(PART:"efl.content", "default", 0.0);
464 set_state(PART:"sizer.content", "default", 0.0); 464 set_state(PART:"sizer.content", "default", 0.0);
465 set_state(PART:"elm.text", "disabled_textonly", 0.0); 465 set_state(PART:"efl.text", "disabled_textonly", 0.0);
466 set_state(PART:"icon_clip", "disabled", 0.0); 466 set_state(PART:"icon_clip", "disabled", 0.0);
467 set_state(PART:"bar", "disabled", 0.0); 467 set_state(PART:"bar", "disabled", 0.0);
468 set_state(PART:"event", "disabled", 0.0); 468 set_state(PART:"event", "disabled", 0.0);
469 } 469 }
470 } else { 470 } else {
471 if (!d) { 471 if (!d) {
472 set_state(PART:"elm.swallow.content", "default", 0.0); 472 set_state(PART:"efl.content", "default", 0.0);
473 set_state(PART:"sizer.content", "default", 0.0); 473 set_state(PART:"sizer.content", "default", 0.0);
474 set_state(PART:"icon_clip", "default", 0.0); 474 set_state(PART:"icon_clip", "default", 0.0);
475 set_state(PART:"bar", "default", 0.0); 475 set_state(PART:"bar", "default", 0.0);
476 set_state(PART:"event", "default", 0.0); 476 set_state(PART:"event", "default", 0.0);
477 } else { 477 } else {
478 set_state(PART:"elm.swallow.content", "default", 0.0); 478 set_state(PART:"efl.content", "default", 0.0);
479 set_state(PART:"sizer.content", "default", 0.0); 479 set_state(PART:"sizer.content", "default", 0.0);
480 set_state(PART:"icon_clip", "disabled", 0.0); 480 set_state(PART:"icon_clip", "disabled", 0.0);
481 set_state(PART:"bar", "disabled", 0.0); 481 set_state(PART:"bar", "disabled", 0.0);
@@ -498,7 +498,7 @@ group { name: "efl/button:anchor";
498 color: 255 255 255 64; 498 color: 255 255 255 64;
499 } 499 }
500 } 500 }
501 swallow { "elm.swallow.background"; nomouse; 501 swallow { "efl.background"; nomouse;
502 desc { "default"; 502 desc { "default";
503 rel1.to: "base"; 503 rel1.to: "base";
504 rel2.to: "base"; 504 rel2.to: "base";
@@ -509,7 +509,7 @@ group { name: "efl/button:anchor";
509 visible: 1; 509 visible: 1;
510 } 510 }
511 } 511 }
512 swallow { "elm.swallow.content"; nomouse; 512 swallow { "efl.content"; nomouse;
513 clip_to: "icon_clip"; 513 clip_to: "icon_clip";
514 desc { "default"; 514 desc { "default";
515 fixed: 1 0; 515 fixed: 1 0;
@@ -547,8 +547,8 @@ group { name: "efl/button:anchor";
547 } 547 }
548 desc { "visible"; 548 desc { "visible";
549 inherit: "default"; 549 inherit: "default";
550 rel1.to: "elm.swallow.content"; 550 rel1.to: "efl.content";
551 rel2.to: "elm.swallow.content"; 551 rel2.to: "efl.content";
552 text { 552 text {
553 min: 1 1; 553 min: 1 1;
554 ellipsis: -1; 554 ellipsis: -1;
@@ -557,8 +557,8 @@ group { name: "efl/button:anchor";
557 } 557 }
558 desc { "icononly"; 558 desc { "icononly";
559 inherit: "default"; 559 inherit: "default";
560 rel1.to: "elm.swallow.content"; 560 rel1.to: "efl.content";
561 rel2.to: "elm.swallow.content"; 561 rel2.to: "efl.content";
562 text { 562 text {
563 min: 1 1; 563 min: 1 1;
564 ellipsis: -1; 564 ellipsis: -1;
@@ -566,13 +566,13 @@ group { name: "efl/button:anchor";
566 } 566 }
567 } 567 }
568 } 568 }
569 text { "elm.text"; nomouse; 569 text { "efl.text"; nomouse;
570 effect: GLOW; 570 effect: GLOW;
571 scale: 1; 571 scale: 1;
572 desc { "default"; 572 desc { "default";
573 rel1.offset: -2 0; 573 rel1.offset: -2 0;
574 rel1.relative: 1.0 0.0; 574 rel1.relative: 1.0 0.0;
575 rel1.to_x: "elm.swallow.content"; 575 rel1.to_x: "efl.content";
576 rel1.to_y: "base"; 576 rel1.to_y: "base";
577 rel2.offset: -1 -1; 577 rel2.offset: -1 -1;
578 rel2.to: "base"; 578 rel2.to: "base";
@@ -620,13 +620,13 @@ group { name: "efl/button:anchor";
620 scale: 1; 620 scale: 1;
621 desc { "default"; 621 desc { "default";
622 fixed: 1 1; 622 fixed: 1 1;
623 rel1.to: "elm.text"; 623 rel1.to: "efl.text";
624 rel2.to: "elm.text"; 624 rel2.to: "efl.text";
625 color_class: "button_text_anchor"; 625 color_class: "button_text_anchor";
626 color2: 255 255 255 255; 626 color2: 255 255 255 255;
627 color3: 255 255 255 255; 627 color3: 255 255 255 255;
628 text { font: FN; size: 10; 628 text { font: FN; size: 10;
629 text_source: "elm.text"; 629 text_source: "efl.text";
630 min: 1 1; 630 min: 1 1;
631 ellipsis: -1; 631 ellipsis: -1;
632 text_class: "button_anchor"; 632 text_class: "button_anchor";
@@ -718,7 +718,7 @@ group { name: "efl/button:anchor";
718 action: SIGNAL_EMIT "elm,action,click" "elm"; 718 action: SIGNAL_EMIT "elm,action,click" "elm";
719 } 719 }
720 program { name: "button_text_visible"; 720 program { name: "button_text_visible";
721 signal: "elm,state,elm.text,set"; source: "elm"; 721 signal: "elm,state,text,set"; source: "elm";
722 script { 722 script {
723 new m = get_int(btmode); 723 new m = get_int(btmode);
724 m |= LABEL; set_int(btmode, m); 724 m |= LABEL; set_int(btmode, m);
@@ -726,7 +726,7 @@ group { name: "efl/button:anchor";
726 } 726 }
727 } 727 }
728 program { name: "button_text_hidden"; 728 program { name: "button_text_hidden";
729 signal: "elm,state,elm.text,unset"; source: "elm"; 729 signal: "elm,state,text,unset"; source: "elm";
730 script { 730 script {
731 new m = get_int(btmode); 731 new m = get_int(btmode);
732 m &= ~LABEL; set_int(btmode, m); 732 m &= ~LABEL; set_int(btmode, m);
@@ -752,12 +752,12 @@ group { name: "efl/button:anchor";
752 program { name: "button_background_visible"; 752 program { name: "button_background_visible";
753 signal: "elm,state,background,set"; source: "elm"; 753 signal: "elm,state,background,set"; source: "elm";
754 action: STATE_SET "visible" 0.0; 754 action: STATE_SET "visible" 0.0;
755 target: "elm.swallow.background"; 755 target: "efl.background";
756 } 756 }
757 program { name: "button_background_hidden"; 757 program { name: "button_background_hidden";
758 signal: "elm,state,background,unset"; source: "elm"; 758 signal: "elm,state,background,unset"; source: "elm";
759 action: STATE_SET "default" 0.0; 759 action: STATE_SET "default" 0.0;
760 target: "elm.swallow.background"; 760 target: "efl.background";
761 } 761 }
762 program { name: "button_state_disabled"; 762 program { name: "button_state_disabled";
763 signal: "elm,state,disabled"; source: "elm"; 763 signal: "elm,state,disabled"; source: "elm";
diff --git a/data/elementary/themes/edc/efl/calendar.edc b/data/elementary/themes/edc/efl/calendar.edc
index 2fd7e95..e627d28 100644
--- a/data/elementary/themes/edc/efl/calendar.edc
+++ b/data/elementary/themes/edc/efl/calendar.edc
@@ -41,7 +41,7 @@
41 color: 0 0 0 0;\ 41 color: 0 0 0 0;\
42 }\ 42 }\
43 }\ 43 }\
44 part { name: "elm,calendar,button"#_sufix",left";\ 44 part { name: "efl.calendar.button"#_sufix".left";\
45 type: SWALLOW;\ 45 type: SWALLOW;\
46 scale: 1;\ 46 scale: 1;\
47 description { state: "default" 0.0;\ 47 description { state: "default" 0.0;\
@@ -55,7 +55,7 @@
55 rel2.to: "right_bt"#_sufix;\ 55 rel2.to: "right_bt"#_sufix;\
56 }\ 56 }\
57 }\ 57 }\
58 part { name: "elm,calendar,button"#_sufix",right";\ 58 part { name: "efl.calendar.button"#_sufix".right";\
59 type: SWALLOW;\ 59 type: SWALLOW;\
60 scale: 1;\ 60 scale: 1;\
61 description { state: "default" 0.0;\ 61 description { state: "default" 0.0;\
@@ -446,7 +446,7 @@ group { "efl/calendar";
446 rel2.offset: -2 -2; 446 rel2.offset: -2 -2;
447 } 447 }
448 } 448 }
449 part { name: "background"; type: SWALLOW; 449 part { name: "efl.background"; type: SWALLOW;
450 description { state: "default" 0.0; 450 description { state: "default" 0.0;
451 rel1.to: "bg"; 451 rel1.to: "bg";
452 rel2.to: "bg"; 452 rel2.to: "bg";
diff --git a/data/elementary/themes/edc/efl/check.edc b/data/elementary/themes/edc/efl/check.edc
index 6bcc5cf..2984587 100644
--- a/data/elementary/themes/edc/efl/check.edc
+++ b/data/elementary/themes/edc/efl/check.edc
@@ -13,17 +13,17 @@ group { "efl/check";
13 new d = m & DISABLE; 13 new d = m & DISABLE;
14 if (m1 == (ICON | LABEL)) { 14 if (m1 == (ICON | LABEL)) {
15 if (!d) { 15 if (!d) {
16 set_state(PART:"elm.swallow.content", "visible", 0.0); 16 set_state(PART:"efl.content", "visible", 0.0);
17 set_state(PART:"sizer.content", "visible", 0.0); 17 set_state(PART:"sizer.content", "visible", 0.0);
18 set_state(PART:"elm.text", "visible", 0.0); 18 set_state(PART:"efl.text", "visible", 0.0);
19 set_state(PART:"shadow", "default", 0.0); 19 set_state(PART:"shadow", "default", 0.0);
20 set_state(PART:"base", "default", 0.0); 20 set_state(PART:"base", "default", 0.0);
21 set_state(PART:"clip", "default", 0.0); 21 set_state(PART:"clip", "default", 0.0);
22 set_state(PART:"event", "default", 0.0); 22 set_state(PART:"event", "default", 0.0);
23 } else { 23 } else {
24 set_state(PART:"elm.swallow.content", "visible", 0.0); 24 set_state(PART:"efl.content", "visible", 0.0);
25 set_state(PART:"sizer.content", "visible", 0.0); 25 set_state(PART:"sizer.content", "visible", 0.0);
26 set_state(PART:"elm.text", "disabled_visible", 0.0); 26 set_state(PART:"efl.text", "disabled_visible", 0.0);
27 set_state(PART:"shadow", "disabled", 0.0); 27 set_state(PART:"shadow", "disabled", 0.0);
28 set_state(PART:"base", "disabled", 0.0); 28 set_state(PART:"base", "disabled", 0.0);
29 set_state(PART:"clip", "disabled", 0.0); 29 set_state(PART:"clip", "disabled", 0.0);
@@ -31,17 +31,17 @@ group { "efl/check";
31 } 31 }
32 } else if (m1 == (ICON)) { 32 } else if (m1 == (ICON)) {
33 if (!d) { 33 if (!d) {
34 set_state(PART:"elm.swallow.content", "visible", 0.0); 34 set_state(PART:"efl.content", "visible", 0.0);
35 set_state(PART:"sizer.content", "icononly", 0.0); 35 set_state(PART:"sizer.content", "icononly", 0.0);
36 set_state(PART:"elm.text", "default", 0.0); 36 set_state(PART:"efl.text", "default", 0.0);
37 set_state(PART:"shadow", "default", 0.0); 37 set_state(PART:"shadow", "default", 0.0);
38 set_state(PART:"base", "default", 0.0); 38 set_state(PART:"base", "default", 0.0);
39 set_state(PART:"clip", "default", 0.0); 39 set_state(PART:"clip", "default", 0.0);
40 set_state(PART:"event", "default", 0.0); 40 set_state(PART:"event", "default", 0.0);
41 } else { 41 } else {
42 set_state(PART:"elm.swallow.content", "visible", 0.0); 42 set_state(PART:"efl.content", "visible", 0.0);
43 set_state(PART:"sizer.content", "icononly", 0.0); 43 set_state(PART:"sizer.content", "icononly", 0.0);
44 set_state(PART:"elm.text", "disabled", 0.0); 44 set_state(PART:"efl.text", "disabled", 0.0);
45 set_state(PART:"shadow", "disabled", 0.0); 45 set_state(PART:"shadow", "disabled", 0.0);
46 set_state(PART:"base", "disabled", 0.0); 46 set_state(PART:"base", "disabled", 0.0);
47 set_state(PART:"clip", "disabled", 0.0); 47 set_state(PART:"clip", "disabled", 0.0);
@@ -49,17 +49,17 @@ group { "efl/check";
49 } 49 }
50 } else if (m1 == (LABEL)) { 50 } else if (m1 == (LABEL)) {
51 if (!d) { 51 if (!d) {
52 set_state(PART:"elm.swallow.content", "default", 0.0); 52 set_state(PART:"efl.content", "default", 0.0);
53 set_state(PART:"sizer.content", "default", 0.0); 53 set_state(PART:"sizer.content", "default", 0.0);
54 set_state(PART:"elm.text", "visible", 0.0); 54 set_state(PART:"efl.text", "visible", 0.0);
55 set_state(PART:"shadow", "default", 0.0); 55 set_state(PART:"shadow", "default", 0.0);
56 set_state(PART:"base", "default", 0.0); 56 set_state(PART:"base", "default", 0.0);
57 set_state(PART:"clip", "default", 0.0); 57 set_state(PART:"clip", "default", 0.0);
58 set_state(PART:"event", "default", 0.0); 58 set_state(PART:"event", "default", 0.0);
59 } else { 59 } else {
60 set_state(PART:"elm.swallow.content", "default", 0.0); 60 set_state(PART:"efl.content", "default", 0.0);
61 set_state(PART:"sizer.content", "default", 0.0); 61 set_state(PART:"sizer.content", "default", 0.0);
62 set_state(PART:"elm.text", "disabled_visible", 0.0); 62 set_state(PART:"efl.text", "disabled_visible", 0.0);
63 set_state(PART:"shadow", "disabled", 0.0); 63 set_state(PART:"shadow", "disabled", 0.0);
64 set_state(PART:"base", "disabled", 0.0); 64 set_state(PART:"base", "disabled", 0.0);
65 set_state(PART:"clip", "disabled", 0.0); 65 set_state(PART:"clip", "disabled", 0.0);
@@ -67,17 +67,17 @@ group { "efl/check";
67 } 67 }
68 } else { 68 } else {
69 if (!d) { 69 if (!d) {
70 set_state(PART:"elm.swallow.content", "default", 0.0); 70 set_state(PART:"efl.content", "default", 0.0);
71 set_state(PART:"sizer.content", "default", 0.0); 71 set_state(PART:"sizer.content", "default", 0.0);
72 set_state(PART:"elm.text", "default", 0.0); 72 set_state(PART:"efl.text", "default", 0.0);
73 set_state(PART:"shadow", "default", 0.0); 73 set_state(PART:"shadow", "default", 0.0);
74 set_state(PART:"base", "default", 0.0); 74 set_state(PART:"base", "default", 0.0);
75 set_state(PART:"clip", "default", 0.0); 75 set_state(PART:"clip", "default", 0.0);
76 set_state(PART:"event", "default", 0.0); 76 set_state(PART:"event", "default", 0.0);
77 } else { 77 } else {
78 set_state(PART:"elm.swallow.content", "default", 0.0); 78 set_state(PART:"efl.content", "default", 0.0);
79 set_state(PART:"sizer.content", "default", 0.0); 79 set_state(PART:"sizer.content", "default", 0.0);
80 set_state(PART:"elm.text", "default", 0.0); 80 set_state(PART:"efl.text", "default", 0.0);
81 set_state(PART:"shadow", "disabled", 0.0); 81 set_state(PART:"shadow", "disabled", 0.0);
82 set_state(PART:"base", "disabled", 0.0); 82 set_state(PART:"base", "disabled", 0.0);
83 set_state(PART:"clip", "disabled", 0.0); 83 set_state(PART:"clip", "disabled", 0.0);
@@ -153,7 +153,7 @@ group { "efl/check";
153 color: 255 255 255 64; 153 color: 255 255 255 64;
154 } 154 }
155 } 155 }
156 part { name: "elm.swallow.content"; type: SWALLOW; 156 part { name: "efl.content"; type: SWALLOW;
157 scale: 1; 157 scale: 1;
158 clip_to: "clip"; 158 clip_to: "clip";
159 required; 159 required;
@@ -188,8 +188,8 @@ group { "efl/check";
188 } 188 }
189 description { state: "visible" 0.0; 189 description { state: "visible" 0.0;
190 inherit: "default" 0.0; 190 inherit: "default" 0.0;
191 rel1.to: "elm.swallow.content"; 191 rel1.to: "efl.content";
192 rel2.to: "elm.swallow.content"; 192 rel2.to: "efl.content";
193 text { 193 text {
194 min: 1 1; 194 min: 1 1;
195 ellipsis: -1; 195 ellipsis: -1;
@@ -198,8 +198,8 @@ group { "efl/check";
198 } 198 }
199 description { state: "icononly" 0.0; 199 description { state: "icononly" 0.0;
200 inherit: "default" 0.0; 200 inherit: "default" 0.0;
201 rel1.to: "elm.swallow.content"; 201 rel1.to: "efl.content";
202 rel2.to: "elm.swallow.content"; 202 rel2.to: "efl.content";
203 text { 203 text {
204 min: 1 1; 204 min: 1 1;
205 ellipsis: -1; 205 ellipsis: -1;
@@ -207,13 +207,13 @@ group { "efl/check";
207 } 207 }
208 } 208 }
209 } 209 }
210 part { name: "elm.text"; type: TEXT; mouse_events: 0; 210 part { name: "efl.text"; type: TEXT; mouse_events: 0;
211 effect: SHADOW BOTTOM; 211 effect: SHADOW BOTTOM;
212 scale: 1; 212 scale: 1;
213 required; 213 required;
214 description { state: "default" 0.0; 214 description { state: "default" 0.0;
215 rel1.offset: 2 2; 215 rel1.offset: 2 2;
216 rel1.to_x: "elm.swallow.content"; 216 rel1.to_x: "efl.content";
217 rel1.relative: 1.0 0.0; 217 rel1.relative: 1.0 0.0;
218 rel2.offset: -3 -3; 218 rel2.offset: -3 -3;
219 color: FN_COL_DEFAULT; 219 color: FN_COL_DEFAULT;
@@ -271,7 +271,7 @@ group { "efl/check";
271 target: "indicator"; 271 target: "indicator";
272 } 272 }
273 program { 273 program {
274 signal: "elm,state,elm.text,set"; source: "elm"; 274 signal: "elm,state,text,set"; source: "elm";
275 script { 275 script {
276 new m = get_int(btmode); 276 new m = get_int(btmode);
277 m |= LABEL; set_int(btmode, m); 277 m |= LABEL; set_int(btmode, m);
@@ -279,7 +279,7 @@ group { "efl/check";
279 } 279 }
280 } 280 }
281 program { 281 program {
282 signal: "elm,state,elm.text,unset"; source: "elm"; 282 signal: "elm,state,text,unset"; source: "elm";
283 script { 283 script {
284 new m = get_int(btmode); 284 new m = get_int(btmode);
285 m &= ~LABEL; set_int(btmode, m); 285 m &= ~LABEL; set_int(btmode, m);
@@ -347,105 +347,105 @@ group { "efl/check:toggle";
347 new d = m & DISABLE; 347 new d = m & DISABLE;
348 if (m1 == (ICON | LABEL)) { 348 if (m1 == (ICON | LABEL)) {
349 if (!d) { 349 if (!d) {
350 set_state(PART:"elm.swallow.content", "visible", 0.0); 350 set_state(PART:"efl.content", "visible", 0.0);
351 set_state(PART:"sizer.content", "visible", 0.0); 351 set_state(PART:"sizer.content", "visible", 0.0);
352 set_state(PART:"elm.text", "visible", 0.0); 352 set_state(PART:"efl.text", "visible", 0.0);
353 set_state(PART:"shadow", "default", 0.0); 353 set_state(PART:"shadow", "default", 0.0);
354 set_state(PART:"clip", "default", 0.0); 354 set_state(PART:"clip", "default", 0.0);
355 set_state(PART:"event", "default", 0.0); 355 set_state(PART:"event", "default", 0.0);
356 set_state(PART:"event2", "default", 0.0); 356 set_state(PART:"event2", "default", 0.0);
357 set_state(PART:"elm.ontext", "default", 0.0); 357 set_state(PART:"on", "default", 0.0);
358 set_state(PART:"elm.offtext", "default", 0.0); 358 set_state(PART:"off", "default", 0.0);
359 set_state(PART:"onrect", "default", 0.0); 359 set_state(PART:"onrect", "default", 0.0);
360 set_state(PART:"offrect", "default", 0.0); 360 set_state(PART:"offrect", "default", 0.0);
361 } else { 361 } else {
362 set_state(PART:"elm.swallow.content", "visible", 0.0); 362 set_state(PART:"efl.content", "visible", 0.0);
363 set_state(PART:"sizer.content", "visible", 0.0); 363 set_state(PART:"sizer.content", "visible", 0.0);
364 set_state(PART:"elm.text", "disabled_visible", 0.0); 364 set_state(PART:"efl.text", "disabled_visible", 0.0);
365 set_state(PART:"shadow", "disabled", 0.0); 365 set_state(PART:"shadow", "disabled", 0.0);
366 set_state(PART:"clip", "disabled", 0.0); 366 set_state(PART:"clip", "disabled", 0.0);
367 set_state(PART:"event", "disabled", 0.0); 367 set_state(PART:"event", "disabled", 0.0);
368 set_state(PART:"event2", "disabled", 0.0); 368 set_state(PART:"event2", "disabled", 0.0);
369 set_state(PART:"elm.ontext", "disabled", 0.0); 369 set_state(PART:"on", "disabled", 0.0);
370 set_state(PART:"elm.offtext", "disabled", 0.0); 370 set_state(PART:"off", "disabled", 0.0);
371 set_state(PART:"onrect", "disabled", 0.0); 371 set_state(PART:"onrect", "disabled", 0.0);
372 set_state(PART:"offrect", "disabled", 0.0); 372 set_state(PART:"offrect", "disabled", 0.0);
373 } 373 }
374 } else if (m1 == (ICON)) { 374 } else if (m1 == (ICON)) {
375 if (!d) { 375 if (!d) {
376 set_state(PART:"elm.swallow.content", "visible", 0.0); 376 set_state(PART:"efl.content", "visible", 0.0);
377 set_state(PART:"sizer.content", "icononly", 0.0); 377 set_state(PART:"sizer.content", "icononly", 0.0);
378 set_state(PART:"elm.text", "default", 0.0); 378 set_state(PART:"efl.text", "default", 0.0);
379 set_state(PART:"shadow", "default", 0.0); 379 set_state(PART:"shadow", "default", 0.0);
380 set_state(PART:"clip", "default", 0.0); 380 set_state(PART:"clip", "default", 0.0);
381 set_state(PART:"event", "default", 0.0); 381 set_state(PART:"event", "default", 0.0);
382 set_state(PART:"event2", "default", 0.0); 382 set_state(PART:"event2", "default", 0.0);
383 set_state(PART:"elm.ontext", "default", 0.0); 383 set_state(PART:"on", "default", 0.0);
384 set_state(PART:"elm.offtext", "default", 0.0); 384 set_state(PART:"off", "default", 0.0);
385 set_state(PART:"onrect", "default", 0.0); 385 set_state(PART:"onrect", "default", 0.0);
386 set_state(PART:"offrect", "default", 0.0); 386 set_state(PART:"offrect", "default", 0.0);
387 } else { 387 } else {
388 set_state(PART:"elm.swallow.content", "visible", 0.0); 388 set_state(PART:"efl.content", "visible", 0.0);
389 set_state(PART:"sizer.content", "icononly", 0.0); 389 set_state(PART:"sizer.content", "icononly", 0.0);
390 set_state(PART:"elm.text", "disabled", 0.0); 390 set_state(PART:"efl.text", "disabled", 0.0);
391 set_state(PART:"shadow", "disabled", 0.0); 391 set_state(PART:"shadow", "disabled", 0.0);
392 set_state(PART:"clip", "disabled", 0.0); 392 set_state(PART:"clip", "disabled", 0.0);
393 set_state(PART:"event", "disabled", 0.0); 393 set_state(PART:"event", "disabled", 0.0);
394 set_state(PART:"event2", "disabled", 0.0); 394 set_state(PART:"event2", "disabled", 0.0);
395 set_state(PART:"elm.ontext", "disabled", 0.0); 395 set_state(PART:"on", "disabled", 0.0);
396 set_state(PART:"elm.offtext", "disabled", 0.0); 396 set_state(PART:"off", "disabled", 0.0);
397 set_state(PART:"onrect", "disabled", 0.0); 397 set_state(PART:"onrect", "disabled", 0.0);
398 set_state(PART:"offrect", "disabled", 0.0); 398 set_state(PART:"offrect", "disabled", 0.0);
399 } 399 }
400 } else if (m1 == (LABEL)) { 400 } else if (m1 == (LABEL)) {
401 if (!d) { 401 if (!d) {
402 set_state(PART:"elm.swallow.content", "default", 0.0); 402 set_state(PART:"efl.content", "default", 0.0);
403 set_state(PART:"sizer.content", "default", 0.0); 403 set_state(PART:"sizer.content", "default", 0.0);
404 set_state(PART:"elm.text", "visible", 0.0); 404 set_state(PART:"efl.text", "visible", 0.0);
405 set_state(PART:"shadow", "default", 0.0); 405 set_state(PART:"shadow", "default", 0.0);
406 set_state(PART:"clip", "default", 0.0); 406 set_state(PART:"clip", "default", 0.0);
407 set_state(PART:"event", "default", 0.0); 407 set_state(PART:"event", "default", 0.0);
408 set_state(PART:"event2", "default", 0.0); 408 set_state(PART:"event2", "default", 0.0);
409 set_state(PART:"elm.ontext", "default", 0.0); 409 set_state(PART:"on", "default", 0.0);
410 set_state(PART:"elm.offtext", "default", 0.0); 410 set_state(PART:"off", "default", 0.0);
411 set_state(PART:"onrect", "default", 0.0); 411 set_state(PART:"onrect", "default", 0.0);
412 set_state(PART:"offrect", "default", 0.0); 412 set_state(PART:"offrect", "default", 0.0);
413 } else { 413 } else {
414 set_state(PART:"elm.swallow.content", "default", 0.0); 414 set_state(PART:"efl.content", "default", 0.0);
415 set_state(PART:"sizer.content", "default", 0.0); 415 set_state(PART:"sizer.content", "default", 0.0);
416 set_state(PART:"elm.text", "disabled_visible", 0.0); 416 set_state(PART:"efl.text", "disabled_visible", 0.0);
417 set_state(PART:"shadow", "disabled", 0.0); 417 set_state(PART:"shadow", "disabled", 0.0);
418 set_state(PART:"clip", "disabled", 0.0); 418 set_state(PART:"clip", "disabled", 0.0);
419 set_state(PART:"event", "disabled", 0.0); 419 set_state(PART:"event", "disabled", 0.0);
420 set_state(PART:"event2", "disabled", 0.0); 420 set_state(PART:"event2", "disabled", 0.0);
421 set_state(PART:"elm.ontext", "disabled", 0.0); 421 set_state(PART:"on", "disabled", 0.0);
422 set_state(PART:"elm.offtext", "disabled", 0.0); 422 set_state(PART:"off", "disabled", 0.0);
423 set_state(PART:"onrect", "disabled", 0.0); 423 set_state(PART:"onrect", "disabled", 0.0);
424 set_state(PART:"offrect", "disabled", 0.0); 424 set_state(PART:"offrect", "disabled", 0.0);
425 } 425 }
426 } else { 426 } else {
427 if (!d) { 427 if (!d) {
428 set_state(PART:"elm.swallow.content", "default", 0.0); 428 set_state(PART:"efl.content", "default", 0.0);
429 set_state(PART:"sizer.content", "default", 0.0); 429 set_state(PART:"sizer.content", "default", 0.0);
430 set_state(PART:"elm.text", "default", 0.0); 430 set_state(PART:"efl.text", "default", 0.0);
431 set_state(PART:"shadow", "default", 0.0); 431 set_state(PART:"shadow", "default", 0.0);
432 set_state(PART:"clip", "default", 0.0); 432 set_state(PART:"clip", "default", 0.0);
433 set_state(PART:"event", "default", 0.0); 433 set_state(PART:"event", "default", 0.0);
434 set_state(PART:"event2", "default", 0.0); 434 set_state(PART:"event2", "default", 0.0);
435 set_state(PART:"elm.ontext", "default", 0.0); 435 set_state(PART:"on", "default", 0.0);
436 set_state(PART:"elm.offtext", "default", 0.0); 436 set_state(PART:"off", "default", 0.0);
437 set_state(PART:"onrect", "default", 0.0); 437 set_state(PART:"onrect", "default", 0.0);
438 set_state(PART:"offrect", "default", 0.0); 438 set_state(PART:"offrect", "default", 0.0);
439 } else { 439 } else {
440 set_state(PART:"elm.swallow.content", "default", 0.0); 440 set_state(PART:"efl.content", "default", 0.0);
441 set_state(PART:"sizer.content", "default", 0.0); 441 set_state(PART:"sizer.content", "default", 0.0);
442 set_state(PART:"elm.text", "default", 0.0); 442 set_state(PART:"efl.text", "default", 0.0);
443 set_state(PART:"shadow", "disabled", 0.0); 443 set_state(PART:"shadow", "disabled", 0.0);
444 set_state(PART:"clip", "disabled", 0.0); 444 set_state(PART:"clip", "disabled", 0.0);
445 set_state(PART:"event", "disabled", 0.0); 445 set_state(PART:"event", "disabled", 0.0);
446 set_state(PART:"event2", "disabled", 0.0); 446 set_state(PART:"event2", "disabled", 0.0);
447 set_state(PART:"elm.ontext", "disabled", 0.0); 447 set_state(PART:"on", "disabled", 0.0);
448 set_state(PART:"elm.offtext", "disabled", 0.0); 448 set_state(PART:"off", "disabled", 0.0);
449 set_state(PART:"onrect", "disabled", 0.0); 449 set_state(PART:"onrect", "disabled", 0.0);
450 set_state(PART:"offrect", "disabled", 0.0); 450 set_state(PART:"offrect", "disabled", 0.0);
451 } 451 }
@@ -495,7 +495,7 @@ group { "efl/check:toggle";
495 color: 64 64 64 255; 495 color: 64 64 64 255;
496 } 496 }
497 } 497 }
498 part { name: "elm.offtext"; type: TEXT; mouse_events: 0; 498 part { name: "off"; type: TEXT; mouse_events: 0;
499 effect: SHADOW BOTTOM; 499 effect: SHADOW BOTTOM;
500 scale: 1; 500 scale: 1;
501 clip_to: "tog_clip"; 501 clip_to: "tog_clip";
@@ -519,7 +519,7 @@ group { "efl/check:toggle";
519 color3: 255 255 255 255; 519 color3: 255 255 255 255;
520 } 520 }
521 } 521 }
522 part { name: "elm.ontext"; type: TEXT; mouse_events: 0; 522 part { name: "on"; type: TEXT; mouse_events: 0;
523 effect: GLOW; 523 effect: GLOW;
524 scale: 1; 524 scale: 1;
525 clip_to: "tog_clip"; 525 clip_to: "tog_clip";
@@ -661,7 +661,7 @@ group { "efl/check:toggle";
661 color: 255 255 255 64; 661 color: 255 255 255 64;
662 } 662 }
663 } 663 }
664 part { name: "elm.swallow.content"; type: SWALLOW; 664 part { name: "efl.content"; type: SWALLOW;
665 scale: 1; 665 scale: 1;
666 clip_to: "clip"; 666 clip_to: "clip";
667 description { state: "default" 0.0; 667 description { state: "default" 0.0;
@@ -692,8 +692,8 @@ group { "efl/check:toggle";
692 } 692 }
693 description { state: "visible" 0.0; 693 description { state: "visible" 0.0;
694 inherit: "default" 0.0; 694 inherit: "default" 0.0;
695 rel1.to: "elm.swallow.content"; 695 rel1.to: "efl.content";
696 rel2.to: "elm.swallow.content"; 696 rel2.to: "efl.content";
697 text { 697 text {
698 min: 1 1; 698 min: 1 1;
699 ellipsis: -1; 699 ellipsis: -1;
@@ -702,8 +702,8 @@ group { "efl/check:toggle";
702 } 702 }
703 description { state: "icononly" 0.0; 703 description { state: "icononly" 0.0;
704 inherit: "default" 0.0; 704 inherit: "default" 0.0;
705 rel1.to: "elm.swallow.content"; 705 rel1.to: "efl.content";
706 rel2.to: "elm.swallow.content"; 706 rel2.to: "efl.content";
707 text { 707 text {
708 min: 1 1; 708 min: 1 1;
709 ellipsis: -1; 709 ellipsis: -1;
@@ -711,11 +711,11 @@ group { "efl/check:toggle";
711 } 711 }
712 } 712 }
713 } 713 }
714 part { name: "elm.text"; type: TEXT; mouse_events: 0; 714 part { name: "efl.text"; type: TEXT; mouse_events: 0;
715 effect: SHADOW BOTTOM; 715 effect: SHADOW BOTTOM;
716 scale: 1; 716 scale: 1;
717 description { state: "default" 0.0; 717 description { state: "default" 0.0;
718 rel1.to_x: "elm.swallow.content"; 718 rel1.to_x: "efl.content";
719 rel1.relative: 1.0 0.0; 719 rel1.relative: 1.0 0.0;
720 rel1.offset: 2 2; 720 rel1.offset: 2 2;
721 rel2.to_x: "tog"; 721 rel2.to_x: "tog";
@@ -753,8 +753,8 @@ group { "efl/check:toggle";
753 ignore_flags: ON_HOLD; 753 ignore_flags: ON_HOLD;
754 description { state: "default" 0.0; 754 description { state: "default" 0.0;
755 color: 0 0 0 0; 755 color: 0 0 0 0;
756 rel1.to_x: "elm.swallow.content"; 756 rel1.to_x: "efl.content";
757 rel2.to_x: "elm.text"; 757 rel2.to_x: "efl.text";
758 } 758 }
759 description { state: "disabled" 0.0; 759 description { state: "disabled" 0.0;
760 inherit: "default" 0.0; 760 inherit: "default" 0.0;
@@ -870,7 +870,7 @@ group { "efl/check:toggle";
870 target: "glow_but"; 870 target: "glow_but";
871 } 871 }
872 program { 872 program {
873 signal: "elm,state,elm.text,set"; source: "elm"; 873 signal: "elm,state,text,set"; source: "elm";
874 script { 874 script {
875 new m = get_int(btmode); 875 new m = get_int(btmode);
876 m |= LABEL; set_int(btmode, m); 876 m |= LABEL; set_int(btmode, m);
@@ -878,7 +878,7 @@ group { "efl/check:toggle";
878 } 878 }
879 } 879 }
880 program { 880 program {
881 signal: "elm,state,elm.text,unset"; source: "elm"; 881 signal: "elm,state,text,unset"; source: "elm";
882 script { 882 script {
883 new m = get_int(btmode); 883 new m = get_int(btmode);
884 m &= ~LABEL; set_int(btmode, m); 884 m &= ~LABEL; set_int(btmode, m);
diff --git a/data/elementary/themes/edc/efl/cursor.edc b/data/elementary/themes/edc/efl/cursor.edc
index 78b8590..a628177 100644
--- a/data/elementary/themes/edc/efl/cursor.edc
+++ b/data/elementary/themes/edc/efl/cursor.edc
@@ -87,7 +87,7 @@ group { name: "efl/cursor/hand1";
87 image.normal: "pointer_hand1.png"; 87 image.normal: "pointer_hand1.png";
88 } 88 }
89 } 89 }
90 part { name: "elm.swallow.hotspot"; type: SWALLOW; 90 part { name: "efl.hotspot"; type: SWALLOW;
91 description { state: "default" 0.0; 91 description { state: "default" 0.0;
92 visible: 0; 92 visible: 0;
93 fixed: 1 1; 93 fixed: 1 1;
@@ -98,21 +98,21 @@ group { name: "efl/cursor/hand1";
98 rel2.offset: 0 0; 98 rel2.offset: 0 0;
99 } 99 }
100 } 100 }
101 /* elm.content.hotspot is the old name for the above part */ 101 /* efl.content.hotspot is the old name for the above part */
102 alias: "elm.content.hotspot" "elm.swallow.hotspot"; 102 alias: "efl.content.hotspot" "efl.hotspot";
103 } 103 }
104} 104}
105 105
106group { name: "efl/cursor/blank"; 106group { name: "efl/cursor/blank";
107 parts { 107 parts {
108 part { name: "elm.swallow.hotspot"; type: SWALLOW; 108 part { name: "efl.hotspot"; type: SWALLOW;
109 description { state: "default" 0.0; 109 description { state: "default" 0.0;
110 visible: 0; 110 visible: 0;
111 max: 1 1; 111 max: 1 1;
112 } 112 }
113 } 113 }
114 /* elm.content.hotspot is the old name for the above part */ 114 /* efl.content.hotspot is the old name for the above part */
115 alias: "elm.content.hotspot" "elm.swallow.hotspot"; 115 alias: "efl.content.hotspot" "efl.hotspot";
116 } 116 }
117} 117}
118 118
@@ -130,7 +130,7 @@ group { name: "efl/cursor/xterm";
130 rel2.offset: -1 -3; 130 rel2.offset: -1 -3;
131 } 131 }
132 } 132 }
133 part { name: "elm.swallow.hotspot"; type: SWALLOW; 133 part { name: "efl.hotspot"; type: SWALLOW;
134 description { state: "default" 0.0; 134 description { state: "default" 0.0;
135 visible: 0; 135 visible: 0;
136 fixed: 1 1; 136 fixed: 1 1;
@@ -141,8 +141,8 @@ group { name: "efl/cursor/xterm";
141 rel2.offset: 0 0; 141 rel2.offset: 0 0;
142 } 142 }
143 } 143 }
144 /* elm.content.hotspot is the old name for the above part */ 144 /* efl.content.hotspot is the old name for the above part */
145 alias: "elm.content.hotspot" "elm.swallow.hotspot"; 145 alias: "efl.content.hotspot" "efl.hotspot";
146 part { name: "shine"; 146 part { name: "shine";
147 description { state: "default" 0.0; 147 description { state: "default" 0.0;
148 rel1.to: "base"; 148 rel1.to: "base";
diff --git a/data/elementary/themes/edc/efl/frame.edc b/data/elementary/themes/edc/efl/frame.edc
index 729177a..434026d 100644
--- a/data/elementary/themes/edc/efl/frame.edc
+++ b/data/elementary/themes/edc/efl/frame.edc
@@ -26,7 +26,7 @@ group { name: "efl/frame";
26 description { state: "default" 0.0; 26 description { state: "default" 0.0;
27 image.normal: "vgrad_med_curved.png"; 27 image.normal: "vgrad_med_curved.png";
28 rel1.offset: 2 2; 28 rel1.offset: 2 2;
29 rel2.to_y: "elm.text"; 29 rel2.to_y: "efl.text";
30 rel2.offset: -3 -1; 30 rel2.offset: -3 -1;
31 fill.smooth: 0; 31 fill.smooth: 0;
32 TILED_HORIZ(120) 32 TILED_HORIZ(120)
@@ -36,10 +36,10 @@ group { name: "efl/frame";
36 description { state: "default" 0.0; 36 description { state: "default" 0.0;
37 image.normal: "holes_tiny_vert.png"; 37 image.normal: "holes_tiny_vert.png";
38 rel1.offset: 4 0; 38 rel1.offset: 4 0;
39 rel1.to_y: "elm.text"; 39 rel1.to_y: "efl.text";
40 rel2.offset: 4 -1; 40 rel2.offset: 4 -1;
41 rel2.relative: 0.0 1.0; 41 rel2.relative: 0.0 1.0;
42 rel2.to_y: "elm.text"; 42 rel2.to_y: "efl.text";
43 align: 0.0 0.5; 43 align: 0.0 0.5;
44 FIXED_SIZE(3, 11) 44 FIXED_SIZE(3, 11)
45 } 45 }
@@ -48,16 +48,16 @@ group { name: "efl/frame";
48 description { state: "default" 0.0; 48 description { state: "default" 0.0;
49 image.normal: "holes_tiny_vert.png"; 49 image.normal: "holes_tiny_vert.png";
50 rel1.offset: -5 0; 50 rel1.offset: -5 0;
51 rel1.to_y: "elm.text"; 51 rel1.to_y: "efl.text";
52 rel1.relative: 1.0 0.0; 52 rel1.relative: 1.0 0.0;
53 rel2.offset: -5 -1; 53 rel2.offset: -5 -1;
54 rel2.relative: 1.0 1.0; 54 rel2.relative: 1.0 1.0;
55 rel2.to_y: "elm.text"; 55 rel2.to_y: "efl.text";
56 align: 1.0 0.5; 56 align: 1.0 0.5;
57 FIXED_SIZE(3, 11) 57 FIXED_SIZE(3, 11)
58 } 58 }
59 } 59 }
60 part { name: "elm.text"; type: TEXT; 60 part { name: "efl.text"; type: TEXT;
61 scale: 1; 61 scale: 1;
62 effect: SHADOW BOTTOM; 62 effect: SHADOW BOTTOM;
63 description { state: "default" 0.0; 63 description { state: "default" 0.0;
@@ -82,17 +82,17 @@ group { name: "efl/frame";
82 description { state: "default" 0.0; 82 description { state: "default" 0.0;
83 rel1.relative: 0.0 1.0; 83 rel1.relative: 0.0 1.0;
84 rel1.offset: 5 0; 84 rel1.offset: 5 0;
85 rel1.to_y: "elm.text"; 85 rel1.to_y: "efl.text";
86 rel2.offset: -7 -7; 86 rel2.offset: -7 -7;
87 } 87 }
88 } 88 }
89 part { name: "elm.swallow.content"; type: SWALLOW; 89 part { name: "efl.content"; type: SWALLOW;
90 clip_to: "clip"; 90 clip_to: "clip";
91 description { state: "default" 0.0; 91 description { state: "default" 0.0;
92 align: 0.0 1.0; 92 align: 0.0 1.0;
93 rel1.relative: 0.0 1.0; 93 rel1.relative: 0.0 1.0;
94 rel1.offset: 5 0; 94 rel1.offset: 5 0;
95 rel1.to_y: "elm.text"; 95 rel1.to_y: "efl.text";
96 rel2.offset: -7 -7; 96 rel2.offset: -7 -7;
97 } 97 }
98 description { state: "collapsed" 0.0; 98 description { state: "collapsed" 0.0;
@@ -113,21 +113,21 @@ group { name: "efl/frame";
113 part { name: "event"; type: RECT; ignore_flags: ON_HOLD; 113 part { name: "event"; type: RECT; ignore_flags: ON_HOLD;
114 description { state: "default" 0.0; 114 description { state: "default" 0.0;
115 color: 0 0 0 0; 115 color: 0 0 0 0;
116 rel1.to_y: "elm.text"; 116 rel1.to_y: "efl.text";
117 rel2.to_y: "elm.text"; 117 rel2.to_y: "efl.text";
118 } 118 }
119 } 119 }
120 } 120 }
121 programs { 121 programs {
122 program { name: "collapse"; 122 program { name: "collapse";
123 action: STATE_SET "collapsed" 0.0; 123 action: STATE_SET "collapsed" 0.0;
124 target: "elm.swallow.content"; 124 target: "efl.content";
125 transition: ACCELERATE 0.3; 125 transition: ACCELERATE 0.3;
126 after: "signal"; 126 after: "signal";
127 } 127 }
128 program { name: "expand"; 128 program { name: "expand";
129 action: STATE_SET "default" 0.0; 129 action: STATE_SET "default" 0.0;
130 target: "elm.swallow.content"; 130 target: "efl.content";
131 transition: DECELERATE 0.3; 131 transition: DECELERATE 0.3;
132 after: "signal"; 132 after: "signal";
133 } 133 }
@@ -140,7 +140,7 @@ group { name: "efl/frame";
140 script { 140 script {
141 new st[31]; 141 new st[31];
142 new Float:vl; 142 new Float:vl;
143 get_state(PART:"elm.swallow.content", st, 30, vl); 143 get_state(PART:"efl.content", st, 30, vl);
144 if (!strcmp(st, "default")) 144 if (!strcmp(st, "default"))
145 run_program(PROGRAM:"collapse"); 145 run_program(PROGRAM:"collapse");
146 else 146 else
@@ -152,15 +152,15 @@ group { name: "efl/frame";
152 script { 152 script {
153 new st[31]; 153 new st[31];
154 new Float:vl; 154 new Float:vl;
155 get_state(PART:"elm.swallow.content", st, 30, vl); 155 get_state(PART:"efl.content", st, 30, vl);
156 if (!strcmp(st, "default")) 156 if (!strcmp(st, "default"))
157 set_state(PART:"elm.swallow.content", "collapsed", 0.0); 157 set_state(PART:"efl.content", "collapsed", 0.0);
158 else 158 else
159 set_state(PART:"elm.swallow.content", "default", 0.0); 159 set_state(PART:"efl.content", "default", 0.0);
160 } 160 }
161 } 161 }
162 program { name: "signal"; 162 program { name: "signal";
163 action: SIGNAL_EMIT "elm,anim,done" "elm"; 163 action: SIGNAL_EMIT "elm,anim,done" "elm";
164 } 164 }
165 } 165 }
166} \ No newline at end of file 166}
diff --git a/data/elementary/themes/edc/efl/navigation_bar.edc b/data/elementary/themes/edc/efl/navigation_bar.edc
index 212ddd8..d289481 100644
--- a/data/elementary/themes/edc/efl/navigation_bar.edc
+++ b/data/elementary/themes/edc/efl/navigation_bar.edc
@@ -15,7 +15,7 @@ group { "efl/navigation_bar";
15 desc { "default"; 15 desc { "default";
16 } 16 }
17 } 17 }
18 swallow { "back_button"; 18 swallow { "efl.back_button";
19 desc { "default"; 19 desc { "default";
20 fixed: 1 0; 20 fixed: 1 0;
21 min: 0 0; 21 min: 0 0;
@@ -32,14 +32,14 @@ group { "efl/navigation_bar";
32 vis; 32 vis;
33 } 33 }
34 } 34 }
35 swallow { "left_content"; 35 swallow { "efl.left_content";
36 desc { "default"; 36 desc { "default";
37 rel.to: "base"; 37 rel.to: "base";
38 rel2.relative: 0.0 1.0; 38 rel2.relative: 0.0 1.0;
39 align: 0.0 0.5; 39 align: 0.0 0.5;
40 } 40 }
41 } 41 }
42 swallow { "right_content"; 42 swallow { "efl.right_content";
43 desc { "default"; 43 desc { "default";
44 rel.to: "base"; 44 rel.to: "base";
45 rel1.relative: 1.0 0.0; 45 rel1.relative: 1.0 0.0;
@@ -49,23 +49,23 @@ group { "efl/navigation_bar";
49 spacer { "text_base"; 49 spacer { "text_base";
50 desc { "default"; 50 desc { "default";
51 rel1 { 51 rel1 {
52 to: "back_button"; 52 to: "efl.back_button";
53 relative: 1.0 0.0; 53 relative: 1.0 0.0;
54 } 54 }
55 rel2 { 55 rel2 {
56 to: "right_content"; 56 to: "efl.right_content";
57 relative: 0.0 1.0; 57 relative: 0.0 1.0;
58 } 58 }
59 } 59 }
60 desc { "left_content"; 60 desc { "left_content";
61 inherit: "default"; 61 inherit: "default";
62 rel1 { 62 rel1 {
63 to: "left_content"; 63 to: "efl.left_content";
64 relative: 1.0 0.0; 64 relative: 1.0 0.0;
65 } 65 }
66 } 66 }
67 } 67 }
68 textblock { "text"; 68 textblock { "efl.text";
69 scale; 69 scale;
70 desc { "default"; 70 desc { "default";
71 text { 71 text {
@@ -78,12 +78,12 @@ group { "efl/navigation_bar";
78 program { 78 program {
79 signal: "elm,state,back_button,visible"; source: "elm"; 79 signal: "elm,state,back_button,visible"; source: "elm";
80 action: STATE_SET "visible" 0.0; 80 action: STATE_SET "visible" 0.0;
81 target: "back_button"; 81 target: "efl.back_button";
82 } 82 }
83 program { 83 program {
84 signal: "elm,state,back_button,hidden"; source: "elm"; 84 signal: "elm,state,back_button,hidden"; source: "elm";
85 action: STATE_SET "default" 0.0; 85 action: STATE_SET "default" 0.0;
86 target: "back_button"; 86 target: "efl.back_button";
87 } 87 }
88 program { 88 program {
89 signal: "elm,state,left_content,visible"; source: "elm"; 89 signal: "elm,state,left_content,visible"; source: "elm";
@@ -104,7 +104,7 @@ group { name: "efl/navigation_bar/back_button";
104 images.image: "icon_arrow_left.png" COMP; 104 images.image: "icon_arrow_left.png" COMP;
105 parts { 105 parts {
106 image { name: "icon_arrow_left"; 106 image { name: "icon_arrow_left";
107 insert_before: "elm.swallow.content"; 107 insert_before: "efl.content";
108 desc { "default"; 108 desc { "default";
109 image.normal: "icon_arrow_left.png"; 109 image.normal: "icon_arrow_left.png";
110 fill.smooth: 0; 110 fill.smooth: 0;
diff --git a/data/elementary/themes/edc/efl/navigation_layout.edc b/data/elementary/themes/edc/efl/navigation_layout.edc
index c3765cc..4319453 100644
--- a/data/elementary/themes/edc/efl/navigation_layout.edc
+++ b/data/elementary/themes/edc/efl/navigation_layout.edc
@@ -5,7 +5,7 @@ group { "efl/navigation_layout";
5 desc { "default"; 5 desc { "default";
6 } 6 }
7 } 7 }
8 swallow { "bar"; 8 swallow { "efl.bar";
9 desc { "default"; 9 desc { "default";
10 fixed: 0 1; 10 fixed: 0 1;
11 min: 0 40; 11 min: 0 40;
@@ -13,11 +13,11 @@ group { "efl/navigation_layout";
13 align: 0.5 0.0; 13 align: 0.5 0.0;
14 } 14 }
15 } 15 }
16 swallow { "content"; 16 swallow { "efl.content";
17 desc { "default"; 17 desc { "default";
18 rel1 { 18 rel1 {
19 to_x: "base"; 19 to_x: "base";
20 to_y: "bar"; 20 to_y: "efl.bar";
21 relative: 0.0 1.0; 21 relative: 0.0 1.0;
22 } 22 }
23 rel2.to_x: "base"; 23 rel2.to_x: "base";
diff --git a/data/elementary/themes/edc/efl/panes.edc b/data/elementary/themes/edc/efl/panes.edc
index 0ce7738..4983cd3 100644
--- a/data/elementary/themes/edc/efl/panes.edc
+++ b/data/elementary/themes/edc/efl/panes.edc
@@ -18,9 +18,9 @@
18group { name: "efl/panes/vertical"; 18group { name: "efl/panes/vertical";
19 images.image: "holes_vert.png" COMP; 19 images.image: "holes_vert.png" COMP;
20 parts { 20 parts {
21 //TODO: remove elm.swallow.left/right 21 //TODO: remove left/right
22 alias: "first" "elm.swallow.left"; 22 alias: "first" "left";
23 alias: "second" "elm.swallow.right"; 23 alias: "second" "right";
24 24
25 part { name: "whole"; type: SPACER; 25 part { name: "whole"; type: SPACER;
26 description { state: "default" 0.0; 26 description { state: "default" 0.0;
@@ -54,35 +54,35 @@ group { name: "efl/panes/vertical";
54 } 54 }
55 part { name: "whole_left"; type: RECT; 55 part { name: "whole_left"; type: RECT;
56 description { state: "default" 0.0; 56 description { state: "default" 0.0;
57 rel2.to_x: "elm.bar"; 57 rel2.to_x: "efl.bar";
58 rel2.relative: 1.0 1.0; 58 rel2.relative: 1.0 1.0;
59 rel2.offset: -4 -1; 59 rel2.offset: -4 -1;
60 } 60 }
61 } 61 }
62 part { name: "whole_right"; type: RECT; 62 part { name: "whole_right"; type: RECT;
63 description { state: "default" 0.0; 63 description { state: "default" 0.0;
64 rel1.to_x: "elm.bar"; 64 rel1.to_x: "efl.bar";
65 rel1.relative: 0.0 0.0; 65 rel1.relative: 0.0 0.0;
66 rel1.offset: 3 0; 66 rel1.offset: 3 0;
67 } 67 }
68 } 68 }
69 part { name: "elm.swallow.left"; type: SWALLOW; 69 part { name: "left"; type: SWALLOW;
70 clip_to: "whole_left"; 70 clip_to: "whole_left";
71 description { state: "default" 0.0; 71 description { state: "default" 0.0;
72 rel2.to_x: "elm.bar"; 72 rel2.to_x: "efl.bar";
73 rel2.relative: 1.0 1.0; 73 rel2.relative: 1.0 1.0;
74 rel2.offset: -4 -1; 74 rel2.offset: -4 -1;
75 } 75 }
76 } 76 }
77 part { name: "elm.swallow.right"; type: SWALLOW; 77 part { name: "right"; type: SWALLOW;
78 clip_to: "whole_right"; 78 clip_to: "whole_right";
79 description { state: "default" 0.0; 79 description { state: "default" 0.0;
80 rel1.to_x: "elm.bar"; 80 rel1.to_x: "efl.bar";
81 rel1.relative: 0.0 0.0; 81 rel1.relative: 0.0 0.0;
82 rel1.offset: 3 0; 82 rel1.offset: 3 0;
83 } 83 }
84 } 84 }
85 part { name: "elm.bar"; type: SPACER; 85 part { name: "efl.bar"; type: SPACER;
86 dragable { confine: "sub_whole"; 86 dragable { confine: "sub_whole";
87 x: 1 1 1; 87 x: 1 1 1;
88 y: 0 0 0; 88 y: 0 0 0;
@@ -98,28 +98,28 @@ group { name: "efl/panes/vertical";
98 part { name: "dots"; mouse_events: 0; 98 part { name: "dots"; mouse_events: 0;
99 description { state: "default" 0.0; 99 description { state: "default" 0.0;
100 image.normal: "holes_vert.png"; 100 image.normal: "holes_vert.png";
101 rel1.to: "elm.bar"; 101 rel1.to: "efl.bar";
102 rel2.to: "elm.bar"; 102 rel2.to: "efl.bar";
103 FIXED_SIZE(4, 14) 103 FIXED_SIZE(4, 14)
104 } 104 }
105 } 105 }
106 part { name: "elm.swallow.event"; type: SWALLOW; 106 part { name: "efl.event"; type: SWALLOW;
107 description { state: "default" 0.0; 107 description { state: "default" 0.0;
108 visible: 0; 108 visible: 0;
109 min: PANEMIN PANEMIN2; 109 min: PANEMIN PANEMIN2;
110 fixed: 1 1; 110 fixed: 1 1;
111 rel1.to: "elm.bar"; 111 rel1.to: "efl.bar";
112 rel2.to: "elm.bar"; 112 rel2.to: "efl.bar";
113 } 113 }
114 } 114 }
115 part { name: "bar"; type: RECT; 115 part { name: "rect_bar"; type: RECT;
116 dragable.events: "elm.bar"; 116 dragable.events: "efl.bar";
117 description { state: "default" 0.0; 117 description { state: "default" 0.0;
118 min: PANEMIN PANEWID; 118 min: PANEMIN PANEWID;
119 max: 99999 99999; 119 max: 99999 99999;
120 fixed: 1 1; 120 fixed: 1 1;
121 rel1.to_x: "elm.swallow.event"; 121 rel1.to_x: "efl.event";
122 rel2.to_x: "elm.swallow.event"; 122 rel2.to_x: "efl.event";
123 color: 0 0 0 0; 123 color: 0 0 0 0;
124 } 124 }
125 description { state: "disabled" 0.0; 125 description { state: "disabled" 0.0;
@@ -129,27 +129,27 @@ group { name: "efl/panes/vertical";
129 } 129 }
130 } 130 }
131 programs { 131 programs {
132 program {signal: "mouse,down,1"; source: "bar"; // for "press" smart callback 132 program {signal: "mouse,down,1"; source: "rect_bar"; // for "press" smart callback
133 action: SIGNAL_EMIT "elm,action,press" "elm"; 133 action: SIGNAL_EMIT "elm,action,press" "elm";
134 } 134 }
135 program { signal: "mouse,up,1"; source: "bar"; // for "unpress" smart callback 135 program { signal: "mouse,up,1"; source: "rect_bar"; // for "unpress" smart callback
136 action: SIGNAL_EMIT "elm,action,unpress" "elm"; 136 action: SIGNAL_EMIT "elm,action,unpress" "elm";
137 } 137 }
138 program { signal: "mouse,clicked,1"; source: "bar"; // for "clicked" smart callback 138 program { signal: "mouse,clicked,1"; source: "rect_bar"; // for "clicked" smart callback
139 action: SIGNAL_EMIT "elm,action,click" "elm"; 139 action: SIGNAL_EMIT "elm,action,click" "elm";
140 } 140 }
141 program { signal: "mouse,down,1,double"; source: "bar"; // for "clicked,double" smart callback 141 program { signal: "mouse,down,1,double"; source: "rect_bar"; // for "clicked,double" smart callback
142 action: SIGNAL_EMIT "elm,action,click,double" "elm"; 142 action: SIGNAL_EMIT "elm,action,click,double" "elm";
143 } 143 }
144 program { // for elm_panes_fixed_set() 144 program { // for elm_panes_fixed_set()
145 signal: "elm,panes,fixed"; source: "elm"; 145 signal: "elm,panes,fixed"; source: "elm";
146 action: STATE_SET "disabled" 0.0; 146 action: STATE_SET "disabled" 0.0;
147 target: "bar"; 147 target: "rect_bar";
148 } 148 }
149 program { // for elm_panes_fixed_set() 149 program { // for elm_panes_fixed_set()
150 signal: "elm,panes,unfixed"; source: "elm"; 150 signal: "elm,panes,unfixed"; source: "elm";
151 action: STATE_SET "default" 0.0; 151 action: STATE_SET "default" 0.0;
152 target: "bar"; 152 target: "rect_bar";
153 } 153 }
154 } 154 }
155} 155}
@@ -157,9 +157,9 @@ group { name: "efl/panes/vertical";
157group { name: "efl/panes/horizontal"; 157group { name: "efl/panes/horizontal";
158 images.image: "holes_horiz.png" COMP; 158 images.image: "holes_horiz.png" COMP;
159 parts { 159 parts {
160 //TODO: remove elm.swallow.left/right 160 //TODO: remove left/right
161 alias: "first" "elm.swallow.left"; 161 alias: "first" "left";
162 alias: "second" "elm.swallow.right"; 162 alias: "second" "right";
163 163
164 part { name: "whole"; type: SPACER; 164 part { name: "whole"; type: SPACER;
165 description { state: "default" 0.0; 165 description { state: "default" 0.0;
@@ -193,35 +193,35 @@ group { name: "efl/panes/horizontal";
193 } 193 }
194 part { name: "whole_left"; type: RECT; 194 part { name: "whole_left"; type: RECT;
195 description { state: "default" 0.0; 195 description { state: "default" 0.0;
196 rel2.to_y: "elm.bar"; 196 rel2.to_y: "efl.bar";
197 rel2.relative: 1.0 1.0; 197 rel2.relative: 1.0 1.0;
198 rel2.offset: -1 -4; 198 rel2.offset: -1 -4;
199 } 199 }
200 } 200 }
201 part { name: "whole_right"; type: RECT; 201 part { name: "whole_right"; type: RECT;
202 description { state: "default" 0.0; 202 description { state: "default" 0.0;
203 rel1.to_y: "elm.bar"; 203 rel1.to_y: "efl.bar";
204 rel1.relative: 0.0 0.0; 204 rel1.relative: 0.0 0.0;
205 rel1.offset: 0 3; 205 rel1.offset: 0 3;
206 } 206 }
207 } 207 }
208 part { name: "elm.swallow.left"; type: SWALLOW; 208 part { name: "left"; type: SWALLOW;
209 clip_to: "whole_left"; 209 clip_to: "whole_left";
210 description { state: "default" 0.0; 210 description { state: "default" 0.0;
211 rel2.to_y: "elm.bar"; 211 rel2.to_y: "efl.bar";
212 rel2.relative: 1.0 1.0; 212 rel2.relative: 1.0 1.0;
213 rel2.offset: -1 -4; 213 rel2.offset: -1 -4;
214 } 214 }
215 } 215 }
216 part { name: "elm.swallow.right"; type: SWALLOW; 216 part { name: "right"; type: SWALLOW;
217 clip_to: "whole_right"; 217 clip_to: "whole_right";
218 description { state: "default" 0.0; 218 description { state: "default" 0.0;
219 rel1.to_y: "elm.bar"; 219 rel1.to_y: "efl.bar";
220 rel1.relative: 0.0 0.0; 220 rel1.relative: 0.0 0.0;
221 rel1.offset: 0 3; 221 rel1.offset: 0 3;
222 } 222 }
223 } 223 }
224 part { name: "elm.bar"; type: SPACER; 224 part { name: "efl.bar"; type: SPACER;
225 dragable { confine: "sub_whole"; 225 dragable { confine: "sub_whole";
226 x: 0 0 0; 226 x: 0 0 0;
227 y: 1 1 1; 227 y: 1 1 1;
@@ -237,28 +237,28 @@ group { name: "efl/panes/horizontal";
237 part { name: "dots"; mouse_events: 0; 237 part { name: "dots"; mouse_events: 0;
238 description { state: "default" 0.0; 238 description { state: "default" 0.0;
239 image.normal: "holes_horiz.png"; 239 image.normal: "holes_horiz.png";
240 rel1.to: "elm.bar"; 240 rel1.to: "efl.bar";
241 rel2.to: "elm.bar"; 241 rel2.to: "efl.bar";
242 FIXED_SIZE(14, 4) 242 FIXED_SIZE(14, 4)
243 } 243 }
244 } 244 }
245 part { name: "elm.swallow.event"; type: SWALLOW; 245 part { name: "efl.event"; type: SWALLOW;
246 description { state: "default" 0.0; 246 description { state: "default" 0.0;
247 visible: 0; 247 visible: 0;
248 min: PANEMIN2 PANEMIN; 248 min: PANEMIN2 PANEMIN;
249 fixed: 1 1; 249 fixed: 1 1;
250 rel1.to: "elm.bar"; 250 rel1.to: "efl.bar";
251 rel2.to: "elm.bar"; 251 rel2.to: "efl.bar";
252 } 252 }
253 } 253 }
254 part { name: "bar"; type: RECT; 254 part { name: "rect_bar"; type: RECT;
255 dragable.events: "elm.bar"; 255 dragable.events: "efl.bar";
256 description { state: "default" 0.0; 256 description { state: "default" 0.0;
257 min: PANEWID PANEMIN; 257 min: PANEWID PANEMIN;
258 max: 99999 99999; 258 max: 99999 99999;
259 fixed: 1 1; 259 fixed: 1 1;
260 rel1.to_y: "elm.swallow.event"; 260 rel1.to_y: "efl.event";
261 rel2.to_y: "elm.swallow.event"; 261 rel2.to_y: "efl.event";
262 color: 0 0 0 0; 262 color: 0 0 0 0;
263 } 263 }
264 description { state: "disabled" 0.0; 264 description { state: "disabled" 0.0;
@@ -268,27 +268,27 @@ group { name: "efl/panes/horizontal";
268 } 268 }
269 } 269 }
270 programs { 270 programs {
271 program {signal: "mouse,down,1"; source: "bar"; // for "press" smart callback 271 program {signal: "mouse,down,1"; source: "rect_bar"; // for "press" smart callback
272 action: SIGNAL_EMIT "elm,action,press" "elm"; 272 action: SIGNAL_EMIT "elm,action,press" "elm";
273 } 273 }
274 program { signal: "mouse,up,1"; source: "bar"; // for "unpress" smart callback 274 program { signal: "mouse,up,1"; source: "rect_bar"; // for "unpress" smart callback
275 action: SIGNAL_EMIT "elm,action,unpress" "elm"; 275 action: SIGNAL_EMIT "elm,action,unpress" "elm";
276 } 276 }
277 program { signal: "mouse,clicked,1"; source: "bar"; // for "clicked" smart callback 277 program { signal: "mouse,clicked,1"; source: "rect_bar"; // for "clicked" smart callback
278 action: SIGNAL_EMIT "elm,action,click" "elm"; 278 action: SIGNAL_EMIT "elm,action,click" "elm";
279 } 279 }
280 program { signal: "mouse,down,1,double"; source: "bar"; // for "clicked,double" smart callback 280 program { signal: "mouse,down,1,double"; source: "rect_bar"; // for "clicked,double" smart callback
281 action: SIGNAL_EMIT "elm,action,click,double" "elm"; 281 action: SIGNAL_EMIT "elm,action,click,double" "elm";
282 } 282 }
283 program { // for elm_panes_fixed_set() 283 program { // for elm_panes_fixed_set()
284 signal: "elm,panes,fixed"; source: "elm"; 284 signal: "elm,panes,fixed"; source: "elm";
285 action: STATE_SET "disabled" 0.0; 285 action: STATE_SET "disabled" 0.0;
286 target: "bar"; 286 target: "rect_bar";
287 } 287 }
288 program { // for elm_panes_fixed_set() 288 program { // for elm_panes_fixed_set()
289 signal: "elm,panes,unfixed"; source: "elm"; 289 signal: "elm,panes,unfixed"; source: "elm";
290 action: STATE_SET "default" 0.0; 290 action: STATE_SET "default" 0.0;
291 target: "bar"; 291 target: "rect_bar";
292 } 292 }
293 } 293 }
294} 294}
@@ -329,33 +329,33 @@ group { name: "efl/panes/vertical:flush";
329 } 329 }
330 part { name: "whole_left"; type: RECT; 330 part { name: "whole_left"; type: RECT;
331 description { state: "default" 0.0; 331 description { state: "default" 0.0;
332 rel2.to_x: "elm.bar"; 332 rel2.to_x: "efl.bar";
333 rel2.relative: 1.0 1.0; 333 rel2.relative: 1.0 1.0;
334 } 334 }
335 } 335 }
336 part { name: "whole_right"; type: RECT; 336 part { name: "whole_right"; type: RECT;
337 description { state: "default" 0.0; 337 description { state: "default" 0.0;
338 rel1.to_x: "elm.bar"; 338 rel1.to_x: "efl.bar";
339 rel1.relative: 0.0 0.0; 339 rel1.relative: 0.0 0.0;
340 } 340 }
341 } 341 }
342 part { name: "elm.swallow.left"; type: SWALLOW; 342 part { name: "left"; type: SWALLOW;
343 clip_to: "whole_left"; 343 clip_to: "whole_left";
344 description { state: "default" 0.0; 344 description { state: "default" 0.0;
345 rel2.to_x: "elm.bar"; 345 rel2.to_x: "efl.bar";
346 rel2.relative: 1.0 1.0; 346 rel2.relative: 1.0 1.0;
347 fixed: 1 0; 347 fixed: 1 0;
348 } 348 }
349 } 349 }
350 part { name: "elm.swallow.right"; type: SWALLOW; 350 part { name: "right"; type: SWALLOW;
351 clip_to: "whole_right"; 351 clip_to: "whole_right";
352 description { state: "default" 0.0; 352 description { state: "default" 0.0;
353 rel1.to_x: "elm.bar"; 353 rel1.to_x: "efl.bar";
354 rel1.relative: 0.0 0.0; 354 rel1.relative: 0.0 0.0;
355 fixed: 1 0; 355 fixed: 1 0;
356 } 356 }
357 } 357 }
358 part { name: "elm.bar"; type: SPACER; 358 part { name: "efl.bar"; type: SPACER;
359 dragable { confine: "sub_whole"; 359 dragable { confine: "sub_whole";
360 x: 1 1 1; 360 x: 1 1 1;
361 y: 0 0 0; 361 y: 0 0 0;
@@ -368,24 +368,24 @@ group { name: "efl/panes/vertical:flush";
368 rel2.relative: 1.0 0.5; 368 rel2.relative: 1.0 0.5;
369 } 369 }
370 } 370 }
371 part { name: "elm.swallow.event"; type: SWALLOW; 371 part { name: "efl.event"; type: SWALLOW;
372 description { state: "default" 0.0; 372 description { state: "default" 0.0;
373 visible: 0; 373 visible: 0;
374 min: PANEMIN PANEMIN2; 374 min: PANEMIN PANEMIN2;
375 fixed: 1 1; 375 fixed: 1 1;
376 rel1.to: "elm.bar"; 376 rel1.to: "efl.bar";
377 rel2.to: "elm.bar"; 377 rel2.to: "efl.bar";
378 } 378 }
379 } 379 }
380 part { name: "bar"; type: RECT; 380 part { name: "rect_bar"; type: RECT;
381 dragable.events: "elm.bar"; 381 dragable.events: "efl.bar";
382 description { state: "default" 0.0; 382 description { state: "default" 0.0;
383 min: PANEMIN PANEWID; 383 min: PANEMIN PANEWID;
384 max: 99999 99999; 384 max: 99999 99999;
385 fixed: 1 1; 385 fixed: 1 1;
386 rel1.to_x: "elm.swallow.event"; 386 rel1.to_x: "efl.event";
387 rel1.relative: 0.0 0.25; 387 rel1.relative: 0.0 0.25;
388 rel2.to_x: "elm.swallow.event"; 388 rel2.to_x: "efl.event";
389 rel2.relative: 1.0 0.75; 389 rel2.relative: 1.0 0.75;
390 color: 0 0 0 0; 390 color: 0 0 0 0;
391 } 391 }
@@ -399,7 +399,7 @@ group { name: "efl/panes/vertical:flush";
399 image.normal: "downlight_glow_left.png"; 399 image.normal: "downlight_glow_left.png";
400 image.border: 0 3 0 0; 400 image.border: 0 3 0 0;
401 max: 32 99999; 401 max: 32 99999;
402 rel2.to_x: "elm.bar"; 402 rel2.to_x: "efl.bar";
403 color: 255 255 255 0; 403 color: 255 255 255 0;
404 align: 1.0 0.5; 404 align: 1.0 0.5;
405 } 405 }
@@ -412,7 +412,7 @@ group { name: "efl/panes/vertical:flush";
412 description { state: "default" 0.0; 412 description { state: "default" 0.0;
413 image.normal: "downlight_glow_right.png"; 413 image.normal: "downlight_glow_right.png";
414 max: 4 99999; 414 max: 4 99999;
415 rel1.to_x: "elm.bar"; 415 rel1.to_x: "efl.bar";
416 color: 255 255 255 0; 416 color: 255 255 255 0;
417 align: 0.0 0.5; 417 align: 0.0 0.5;
418 } 418 }
@@ -425,7 +425,7 @@ group { name: "efl/panes/vertical:flush";
425 description { state: "default" 0.0; 425 description { state: "default" 0.0;
426 image.normal: "downlight_glow_left.png"; 426 image.normal: "downlight_glow_left.png";
427 max: 4 99999; 427 max: 4 99999;
428 rel2.to_x: "elm.bar"; 428 rel2.to_x: "efl.bar";
429 color: 255 255 255 0; 429 color: 255 255 255 0;
430 align: 1.0 0.5; 430 align: 1.0 0.5;
431 } 431 }
@@ -439,7 +439,7 @@ group { name: "efl/panes/vertical:flush";
439 image.normal: "downlight_glow_right.png"; 439 image.normal: "downlight_glow_right.png";
440 image.border: 3 0 0 0; 440 image.border: 3 0 0 0;
441 max: 32 99999; 441 max: 32 99999;
442 rel1.to_x: "elm.bar"; 442 rel1.to_x: "efl.bar";
443 color: 255 255 255 0; 443 color: 255 255 255 0;
444 align: 0.0 0.5; 444 align: 0.0 0.5;
445 } 445 }
@@ -451,8 +451,8 @@ group { name: "efl/panes/vertical:flush";
451 part { name: "bar1"; type: RECT; repeat_events: 1; 451 part { name: "bar1"; type: RECT; repeat_events: 1;
452 description { state: "default" 0.0; 452 description { state: "default" 0.0;
453 fixed: 1 1; 453 fixed: 1 1;
454 rel1.to: "bar"; 454 rel1.to: "rect_bar";
455 rel2.to: "bar"; 455 rel2.to: "rect_bar";
456 rel2.relative: 0.5 1.0; 456 rel2.relative: 0.5 1.0;
457 color: 0 0 0 0; 457 color: 0 0 0 0;
458 } 458 }
@@ -460,35 +460,35 @@ group { name: "efl/panes/vertical:flush";
460 part { name: "bar2"; type: RECT; repeat_events: 1; 460 part { name: "bar2"; type: RECT; repeat_events: 1;
461 description { state: "default" 0.0; 461 description { state: "default" 0.0;
462 fixed: 1 1; 462 fixed: 1 1;
463 rel1.to: "bar"; 463 rel1.to: "rect_bar";
464 rel1.relative: 0.5 0.0; 464 rel1.relative: 0.5 0.0;
465 rel2.to: "bar"; 465 rel2.to: "rect_bar";
466 color: 0 0 0 0; 466 color: 0 0 0 0;
467 } 467 }
468 } 468 }
469 } 469 }
470 programs { 470 programs {
471 program {signal: "mouse,down,1"; source: "bar"; // for "press" smart callback 471 program {signal: "mouse,down,1"; source: "rect_bar"; // for "press" smart callback
472 action: SIGNAL_EMIT "elm,action,press" "elm"; 472 action: SIGNAL_EMIT "elm,action,press" "elm";
473 } 473 }
474 program { signal: "mouse,up,1"; source: "bar"; // for "unpress" smart callback 474 program { signal: "mouse,up,1"; source: "rect_bar"; // for "unpress" smart callback
475 action: SIGNAL_EMIT "elm,action,unpress" "elm"; 475 action: SIGNAL_EMIT "elm,action,unpress" "elm";
476 } 476 }
477 program { signal: "mouse,clicked,1"; source: "bar"; // for "clicked" smart callback 477 program { signal: "mouse,clicked,1"; source: "rect_bar"; // for "clicked" smart callback
478 action: SIGNAL_EMIT "elm,action,click" "elm"; 478 action: SIGNAL_EMIT "elm,action,click" "elm";
479 } 479 }
480 program { signal: "mouse,down,1,double"; source: "bar"; // for "clicked,double" smart callback 480 program { signal: "mouse,down,1,double"; source: "rect_bar"; // for "clicked,double" smart callback
481 action: SIGNAL_EMIT "elm,action,click,double" "elm"; 481 action: SIGNAL_EMIT "elm,action,click,double" "elm";
482 } 482 }
483 program { // for elm_panes_fixed_set() 483 program { // for elm_panes_fixed_set()
484 signal: "elm,panes,fixed"; source: "elm"; 484 signal: "elm,panes,fixed"; source: "elm";
485 action: STATE_SET "disabled" 0.0; 485 action: STATE_SET "disabled" 0.0;
486 target: "bar"; 486 target: "rect_bar";
487 } 487 }
488 program { // for elm_panes_fixed_set() 488 program { // for elm_panes_fixed_set()
489 signal: "elm,panes,unfixed"; source: "elm"; 489 signal: "elm,panes,unfixed"; source: "elm";
490 action: STATE_SET "default" 0.0; 490 action: STATE_SET "default" 0.0;
491 target: "bar"; 491 target: "rect_bar";
492 } 492 }
493 program { 493 program {
494 signal: "mouse,in"; source: "bar1"; 494 signal: "mouse,in"; source: "bar1";
@@ -557,33 +557,33 @@ group { name: "efl/panes/horizontal:flush";
557 } 557 }
558 part { name: "whole_left"; type: RECT; 558 part { name: "whole_left"; type: RECT;
559 description { state: "default" 0.0; 559 description { state: "default" 0.0;
560 rel2.to_y: "elm.bar"; 560 rel2.to_y: "efl.bar";
561 rel2.relative: 1.0 1.0; 561 rel2.relative: 1.0 1.0;
562 } 562 }
563 } 563 }
564 part { name: "whole_right"; type: RECT; 564 part { name: "whole_right"; type: RECT;
565 description { state: "default" 0.0; 565 description { state: "default" 0.0;
566 rel1.to_y: "elm.bar"; 566 rel1.to_y: "efl.bar";
567 rel1.relative: 0.0 0.0; 567 rel1.relative: 0.0 0.0;
568 } 568 }
569 } 569 }
570 part { name: "elm.swallow.left"; type: SWALLOW; 570 part { name: "left"; type: SWALLOW;
571 clip_to: "whole_left"; 571 clip_to: "whole_left";
572 description { state: "default" 0.0; 572 description { state: "default" 0.0;
573 rel2.to_y: "elm.bar"; 573 rel2.to_y: "efl.bar";
574 rel2.relative: 1.0 1.0; 574 rel2.relative: 1.0 1.0;
575 fixed: 0 1; 575 fixed: 0 1;
576 } 576 }
577 } 577 }
578 part { name: "elm.swallow.right"; type: SWALLOW; 578 part { name: "right"; type: SWALLOW;
579 clip_to: "whole_right"; 579 clip_to: "whole_right";
580 description { state: "default" 0.0; 580 description { state: "default" 0.0;
581 rel1.to_y: "elm.bar"; 581 rel1.to_y: "efl.bar";
582 rel1.relative: 0.0 0.0; 582 rel1.relative: 0.0 0.0;
583 fixed: 0 1; 583 fixed: 0 1;
584 } 584 }
585 } 585 }
586 part { name: "elm.bar"; type: SPACER; 586 part { name: "efl.bar"; type: SPACER;
587 dragable { confine: "sub_whole"; 587 dragable { confine: "sub_whole";
588 x: 0 0 0; 588 x: 0 0 0;
589 y: 1 1 1; 589 y: 1 1 1;
@@ -596,24 +596,24 @@ group { name: "efl/panes/horizontal:flush";
596 rel2.relative: 0.5 1.0; 596 rel2.relative: 0.5 1.0;
597 } 597 }
598 } 598 }
599 part { name: "elm.swallow.event"; type: SWALLOW; 599 part { name: "efl.event"; type: SWALLOW;
600 description { state: "default" 0.0; 600 description { state: "default" 0.0;
601 visible: 0; 601 visible: 0;
602 min: PANEMIN2 PANEMIN; 602 min: PANEMIN2 PANEMIN;
603 fixed: 1 1; 603 fixed: 1 1;
604 rel1.to: "elm.bar"; 604 rel1.to: "efl.bar";
605 rel2.to: "elm.bar"; 605 rel2.to: "efl.bar";
606 } 606 }
607 } 607 }
608 part { name: "bar"; type: RECT; 608 part { name: "rect_bar"; type: RECT;
609 dragable.events: "elm.bar"; 609 dragable.events: "efl.bar";
610 description { state: "default" 0.0; 610 description { state: "default" 0.0;
611 min: PANEWID PANEMIN; 611 min: PANEWID PANEMIN;
612 max: 99999 99999; 612 max: 99999 99999;
613 fixed: 1 1; 613 fixed: 1 1;
614 rel1.to_y: "elm.swallow.event"; 614 rel1.to_y: "efl.event";
615 rel1.relative: 0.25 0.0; 615 rel1.relative: 0.25 0.0;
616 rel2.to_y: "elm.swallow.event"; 616 rel2.to_y: "efl.event";
617 rel2.relative: 0.75 1.0; 617 rel2.relative: 0.75 1.0;
618 color: 0 0 0 0; 618 color: 0 0 0 0;
619 } 619 }
@@ -627,7 +627,7 @@ group { name: "efl/panes/horizontal:flush";
627 image.normal: "downlight_glow_up.png"; 627 image.normal: "downlight_glow_up.png";
628 image.border: 0 0 0 3; 628 image.border: 0 0 0 3;
629 max: 99999 32; 629 max: 99999 32;
630 rel2.to_y: "elm.bar"; 630 rel2.to_y: "efl.bar";
631 color: 255 255 255 0; 631 color: 255 255 255 0;
632 align: 0.5 1.0; 632 align: 0.5 1.0;
633 } 633 }
@@ -640,7 +640,7 @@ group { name: "efl/panes/horizontal:flush";
640 description { state: "default" 0.0; 640 description { state: "default" 0.0;
641 image.normal: "downlight_glow.png"; 641 image.normal: "downlight_glow.png";
642 max: 99999 4; 642 max: 99999 4;
643 rel1.to_y: "elm.bar"; 643 rel1.to_y: "efl.bar";
644 color: 255 255 255 0; 644 color: 255 255 255 0;
645 align: 0.5 0.0; 645 align: 0.5 0.0;
646 } 646 }
@@ -653,7 +653,7 @@ group { name: "efl/panes/horizontal:flush";
653 description { state: "default" 0.0; 653 description { state: "default" 0.0;
654 image.normal: "downlight_glow_up.png"; 654 image.normal: "downlight_glow_up.png";
655 max: 99999 4; 655 max: 99999 4;
656 rel2.to_y: "elm.bar"; 656 rel2.to_y: "efl.bar";
657 color: 255 255 255 0; 657 color: 255 255 255 0;
658 align: 0.5 1.0; 658 align: 0.5 1.0;
659 } 659 }
@@ -667,7 +667,7 @@ group { name: "efl/panes/horizontal:flush";
667 image.normal: "downlight_glow.png"; 667 image.normal: "downlight_glow.png";
668 image.border: 0 0 3 0; 668 image.border: 0 0 3 0;
669 max: 99999 32; 669 max: 99999 32;
670 rel1.to_y: "elm.bar"; 670 rel1.to_y: "efl.bar";
671 color: 255 255 255 0; 671 color: 255 255 255 0;
672 align: 0.5 0.0; 672 align: 0.5 0.0;
673 } 673 }
@@ -679,8 +679,8 @@ group { name: "efl/panes/horizontal:flush";
679 part { name: "bar1"; type: RECT; repeat_events: 1; 679 part { name: "bar1"; type: RECT; repeat_events: 1;
680 description { state: "default" 0.0; 680 description { state: "default" 0.0;
681 fixed: 1 1; 681 fixed: 1 1;
682 rel1.to: "bar"; 682 rel1.to: "rect_bar";
683 rel2.to: "bar"; 683 rel2.to: "rect_bar";
684 rel2.relative: 1.0 0.5; 684 rel2.relative: 1.0 0.5;
685 color: 0 0 0 0; 685 color: 0 0 0 0;
686 } 686 }
@@ -688,9 +688,9 @@ group { name: "efl/panes/horizontal:flush";
688 part { name: "bar2"; type: RECT; repeat_events: 1; 688 part { name: "bar2"; type: RECT; repeat_events: 1;
689 description { state: "default" 0.0; 689 description { state: "default" 0.0;
690 fixed: 1 1; 690 fixed: 1 1;
691 rel1.to: "bar"; 691 rel1.to: "rect_bar";
692 rel1.relative: 0.0 0.5; 692 rel1.relative: 0.0 0.5;
693 rel2.to: "bar"; 693 rel2.to: "rect_bar";
694 color: 0 0 0 0; 694 color: 0 0 0 0;
695 } 695 }
696 } 696 }
@@ -724,27 +724,27 @@ group { name: "efl/panes/horizontal:flush";
724 target: "glow2a"; 724 target: "glow2a";
725 target: "glow2b"; 725 target: "glow2b";
726 } 726 }
727 program {signal: "mouse,down,1"; source: "bar"; // for "press" smart callback 727 program {signal: "mouse,down,1"; source: "rect_bar"; // for "press" smart callback
728 action: SIGNAL_EMIT "elm,action,press" "elm"; 728 action: SIGNAL_EMIT "elm,action,press" "elm";
729 } 729 }
730 program { signal: "mouse,up,1"; source: "bar"; // for "unpress" smart callback 730 program { signal: "mouse,up,1"; source: "rect_bar"; // for "unpress" smart callback
731 action: SIGNAL_EMIT "elm,action,unpress" "elm"; 731 action: SIGNAL_EMIT "elm,action,unpress" "elm";
732 } 732 }
733 program { signal: "mouse,clicked,1"; source: "bar"; // for "clicked" smart callback 733 program { signal: "mouse,clicked,1"; source: "rect_bar"; // for "clicked" smart callback
734 action: SIGNAL_EMIT "elm,action,click" "elm"; 734 action: SIGNAL_EMIT "elm,action,click" "elm";
735 } 735 }
736 program { signal: "mouse,down,1,double"; source: "bar"; // for "clicked,double" smart callback 736 program { signal: "mouse,down,1,double"; source: "rect_bar"; // for "clicked,double" smart callback
737 action: SIGNAL_EMIT "elm,action,click,double" "elm"; 737 action: SIGNAL_EMIT "elm,action,click,double" "elm";
738 } 738 }
739 program { // for elm_panes_fixed_set() 739 program { // for elm_panes_fixed_set()
740 signal: "elm,panes,fixed"; source: "elm"; 740 signal: "elm,panes,fixed"; source: "elm";
741 action: STATE_SET "disabled" 0.0; 741 action: STATE_SET "disabled" 0.0;
742 target: "bar"; 742 target: "rect_bar";
743 } 743 }
744 program { // for elm_panes_fixed_set() 744 program { // for elm_panes_fixed_set()
745 signal: "elm,panes,unfixed"; source: "elm"; 745 signal: "elm,panes,unfixed"; source: "elm";
746 action: STATE_SET "default" 0.0; 746 action: STATE_SET "default" 0.0;
747 target: "bar"; 747 target: "rect_bar";
748 } 748 }
749 } 749 }
750} 750}
@@ -796,15 +796,15 @@ group { name: "efl/panes/vertical:left-fold";
796 new Float: dx; 796 new Float: dx;
797 new Float: dy; 797 new Float: dy;
798 set_int(open, 0); 798 set_int(open, 0);
799 get_drag(PART:"elm.bar", dx, dy); 799 get_drag(PART:"efl.bar", dx, dy);
800 set_float(drag_x, dx); 800 set_float(drag_x, dx);
801 set_drag(PART:"elm.bar", 0.0, 0.5); 801 set_drag(PART:"efl.bar", 0.0, 0.5);
802 set_state(PART:"dots", "closed", 0.0); 802 set_state(PART:"dots", "closed", 0.0);
803 } 803 }
804 else if (get_int(open) == 0) 804 else if (get_int(open) == 0)
805 { 805 {
806 set_int(open, 1); 806 set_int(open, 1);
807 set_drag(PART:"elm.bar", get_float(drag_x), 0.5); 807 set_drag(PART:"efl.bar", get_float(drag_x), 0.5);
808 set_state(PART:"dots", "default", 0.0); 808 set_state(PART:"dots", "default", 0.0);
809 } 809 }
810 } 810 }
@@ -859,15 +859,15 @@ group { name: "efl/panes/vertical:right-fold";
859 new Float: dx; 859 new Float: dx;
860 new Float: dy; 860 new Float: dy;
861 set_int(open, 0); 861 set_int(open, 0);
862 get_drag(PART:"elm.bar", dx, dy); 862 get_drag(PART:"efl.bar", dx, dy);
863 set_float(drag_x, dx); 863 set_float(drag_x, dx);
864 set_drag(PART:"elm.bar", 1.0, 0.5); 864 set_drag(PART:"efl.bar", 1.0, 0.5);
865 set_state(PART:"dots", "closed", 0.0); 865 set_state(PART:"dots", "closed", 0.0);
866 } 866 }
867 else if (get_int(open) == 0) 867 else if (get_int(open) == 0)
868 { 868 {
869 set_int(open, 1); 869 set_int(open, 1);
870 set_drag(PART:"elm.bar", get_float(drag_x), 0.5); 870 set_drag(PART:"efl.bar", get_float(drag_x), 0.5);
871 set_state(PART:"dots", "default", 0.0); 871 set_state(PART:"dots", "default", 0.0);
872 } 872 }
873 } 873 }
@@ -922,15 +922,15 @@ group { name: "efl/panes/horizontal:up-fold";
922 new Float: dx; 922 new Float: dx;
923 new Float: dy; 923 new Float: dy;
924 set_int(open, 0); 924 set_int(open, 0);
925 get_drag(PART:"elm.bar", dx, dy); 925 get_drag(PART:"efl.bar", dx, dy);
926 set_float(drag_y, dy); 926 set_float(drag_y, dy);
927 set_drag(PART:"elm.bar", 0.5, 0.0); 927 set_drag(PART:"efl.bar", 0.5, 0.0);
928 set_state(PART:"dots", "closed", 0.0); 928 set_state(PART:"dots", "closed", 0.0);
929 } 929 }
930 else if (get_int(open) == 0) 930 else if (get_int(open) == 0)
931 { 931 {
932 set_int(open, 1); 932 set_int(open, 1);
933 set_drag(PART:"elm.bar", 0.5, get_float(drag_y)); 933 set_drag(PART:"efl.bar", 0.5, get_float(drag_y));
934 set_state(PART:"dots", "default", 0.0); 934 set_state(PART:"dots", "default", 0.0);
935 } 935 }
936 } 936 }
@@ -985,15 +985,15 @@ group { name: "efl/panes/horizontal:down-fold";
985 new Float: dx; 985 new Float: dx;
986 new Float: dy; 986 new Float: dy;
987 set_int(open, 0); 987 set_int(open, 0);
988 get_drag(PART:"elm.bar", dx, dy); 988 get_drag(PART:"efl.bar", dx, dy);
989 set_float(drag_y, dy); 989 set_float(drag_y, dy);
990 set_drag(PART:"elm.bar", 0.5, 1.0); 990 set_drag(PART:"efl.bar", 0.5, 1.0);
991 set_state(PART:"dots", "closed", 0.0); 991 set_state(PART:"dots", "closed", 0.0);
992 } 992 }
993 else if (get_int(open) == 0) 993 else if (get_int(open) == 0)
994 { 994 {
995 set_int(open, 1); 995 set_int(open, 1);
996 set_drag(PART:"elm.bar", 0.5, get_float(drag_y)); 996 set_drag(PART:"efl.bar", 0.5, get_float(drag_y));
997 set_state(PART:"dots", "default", 0.0); 997 set_state(PART:"dots", "default", 0.0);
998 } 998 }
999 } 999 }
diff --git a/data/elementary/themes/edc/efl/pointer.edc b/data/elementary/themes/edc/efl/pointer.edc
index a101aa7..a8836b4 100644
--- a/data/elementary/themes/edc/efl/pointer.edc
+++ b/data/elementary/themes/edc/efl/pointer.edc
@@ -38,7 +38,7 @@ group { name: "efl/pointer";
38 } 38 }
39 } 39 }
40 part { 40 part {
41 name: "elm.swallow.hotspot"; 41 name: "efl.hotspot";
42 /* this is a "fake" swallow part 42 /* this is a "fake" swallow part
43 * that is used by e to determine 43 * that is used by e to determine
44 * the pointer hotspot - or where 44 * the pointer hotspot - or where
@@ -218,4 +218,4 @@ group { name: "efl/pointer:top_side";
218 } 218 }
219 } 219 }
220 } 220 }
221} \ No newline at end of file 221}
diff --git a/data/elementary/themes/edc/efl/popup.edc b/data/elementary/themes/edc/efl/popup.edc
index 50fb460..cfdd560 100644
--- a/data/elementary/themes/edc/efl/popup.edc
+++ b/data/elementary/themes/edc/efl/popup.edc
@@ -15,7 +15,7 @@ group { "efl/popup";
15 image.normal: "rounded_square.png"; 15 image.normal: "rounded_square.png";
16 } 16 }
17 } 17 }
18 swallow { "elm.swallow.content"; 18 swallow { "efl.content";
19 desc { "default"; 19 desc { "default";
20 rel.to: "base"; 20 rel.to: "base";
21 } 21 }
@@ -28,7 +28,7 @@ group { "efl/popup_alert";
28 alias: "efl/popup_alert_text"; 28 alias: "efl/popup_alert_text";
29 images.image: "rounded_square.png" COMP; 29 images.image: "rounded_square.png" COMP;
30 parts { 30 parts {
31 alias: "title" "elm.text.title"; 31 alias: "title" "efl.text.title";
32 image { "bg"; 32 image { "bg";
33 desc { "default"; 33 desc { "default";
34 min: 100 100; 34 min: 100 100;
@@ -57,7 +57,7 @@ group { "efl/popup_alert";
57 min: 0 20; 57 min: 0 20;
58 } 58 }
59 } 59 }
60 textblock { "elm.text.title"; 60 textblock { "efl.text.title";
61 scale; 61 scale;
62 desc { "default"; 62 desc { "default";
63 fixed: 1 1; 63 fixed: 1 1;
@@ -72,7 +72,7 @@ group { "efl/popup_alert";
72 vis; 72 vis;
73 } 73 }
74 } 74 }
75 swallow { "buttons"; 75 swallow { "efl.buttons";
76 desc { "default"; 76 desc { "default";
77 fixed: 0 1; 77 fixed: 0 1;
78 rel.to: "base"; 78 rel.to: "base";
@@ -85,12 +85,12 @@ group { "efl/popup_alert";
85 min: 0 30; 85 min: 0 30;
86 } 86 }
87 } 87 }
88 swallow { "elm.swallow.content"; 88 swallow { "efl.content";
89 desc { "default"; 89 desc { "default";
90 rel1.to_x: "base"; 90 rel1.to_x: "base";
91 rel1.to_y: "title_bg"; 91 rel1.to_y: "title_bg";
92 rel2.to_x: "base"; 92 rel2.to_x: "base";
93 rel2.to_y: "buttons"; 93 rel2.to_y: "efl.buttons";
94 rel1.relative: 0.0 1.0; 94 rel1.relative: 0.0 1.0;
95 rel2.relative: 1.0 0.0; 95 rel2.relative: 1.0 0.0;
96 } 96 }
@@ -101,12 +101,12 @@ group { "efl/popup_alert";
101 signal: "elm,title,show"; source: "elm"; 101 signal: "elm,title,show"; source: "elm";
102 action: STATE_SET "title_visible" 0.0; 102 action: STATE_SET "title_visible" 0.0;
103 target: "title_bg"; 103 target: "title_bg";
104 target: "elm.text.title"; 104 target: "efl.text.title";
105 } 105 }
106 program { 106 program {
107 signal: "elm,buttons,show"; source: "elm"; 107 signal: "elm,efl.buttons,show"; source: "elm";
108 action: STATE_SET "button_visible" 0.0; 108 action: STATE_SET "button_visible" 0.0;
109 target: "buttons"; 109 target: "efl.buttons";
110 } 110 }
111 } 111 }
112} 112}
@@ -125,17 +125,17 @@ group { "efl/popup/backwall";
125 desc { "default"; 125 desc { "default";
126 color: 0 0 0 64; 126 color: 0 0 0 64;
127 } 127 }
128 desc { "show_image"; 128 desc { "content_visible";
129 inherit: "default"; 129 inherit: "default";
130 hid; 130 hid;
131 } 131 }
132 } 132 }
133 swallow { "elm.swallow.image"; 133 swallow { "efl.content";
134 desc { "default"; 134 desc { "default";
135 rel.to: "base"; 135 rel.to: "base";
136 hid; 136 hid;
137 } 137 }
138 desc { "show_image"; 138 desc { "content_visible";
139 inherit: "default"; 139 inherit: "default";
140 vis; 140 vis;
141 } 141 }
@@ -150,16 +150,16 @@ group { "efl/popup/backwall";
150 150
151 programs { 151 programs {
152 program { 152 program {
153 signal: "elm,state,image,visible"; source: "elm"; 153 signal: "elm,state,content,set"; source: "elm";
154 action: STATE_SET "show_image" 0.0; 154 action: STATE_SET "content_visible" 0.0;
155 target: "base"; 155 target: "base";
156 target: "elm.swallow.image"; 156 target: "efl.content";
157 } 157 }
158 program { 158 program {
159 signal: "elm,state,image,hidden"; source: "elm"; 159 signal: "elm,state,content,unset"; source: "elm";
160 action: STATE_SET "default" 0.0; 160 action: STATE_SET "default" 0.0;
161 target: "base"; 161 target: "base";
162 target: "elm.swallow.image"; 162 target: "efl.content";
163 } 163 }
164 program { 164 program {
165 signal: "mouse,clicked,1"; source: "block"; 165 signal: "mouse,clicked,1"; source: "block";
@@ -172,7 +172,7 @@ group { "efl/popup_alert/button_layout1";
172 alias: "efl/popup_alert_scroll/button_layout1"; 172 alias: "efl/popup_alert_scroll/button_layout1";
173 alias: "efl/popup_alert_text/button_layout1"; 173 alias: "efl/popup_alert_text/button_layout1";
174 parts { 174 parts {
175 swallow { "elm.swallow.button1"; 175 swallow { "efl.button1";
176 } 176 }
177 } 177 }
178} 178}
@@ -188,13 +188,13 @@ group { "efl/popup_alert/button_layout2";
188 min: 5 5; 188 min: 5 5;
189 } 189 }
190 } 190 }
191 swallow { "elm.swallow.button1"; 191 swallow { "efl.button1";
192 desc { "default"; 192 desc { "default";
193 rel2.to_x: "div1"; 193 rel2.to_x: "div1";
194 rel2.relative: 0.0 1.0; 194 rel2.relative: 0.0 1.0;
195 } 195 }
196 } 196 }
197 swallow { "elm.swallow.button2"; 197 swallow { "efl.button2";
198 desc { "default"; 198 desc { "default";
199 rel1.to_x: "div1"; 199 rel1.to_x: "div1";
200 rel1.relative: 1.0 0.0; 200 rel1.relative: 1.0 0.0;
@@ -221,13 +221,13 @@ group { "efl/popup_alert/button_layout3";
221 min: 5 5; 221 min: 5 5;
222 } 222 }
223 } 223 }
224 swallow { "elm.swallow.button1"; 224 swallow { "efl.button1";
225 desc { "default"; 225 desc { "default";
226 rel2.to_x: "div1"; 226 rel2.to_x: "div1";
227 rel2.relative: 0.0 1.0; 227 rel2.relative: 0.0 1.0;
228 } 228 }
229 } 229 }
230 swallow { "elm.swallow.button2"; 230 swallow { "efl.button2";
231 desc { "default"; 231 desc { "default";
232 rel1.to_x: "div1"; 232 rel1.to_x: "div1";
233 rel2.to_x: "div2"; 233 rel2.to_x: "div2";
@@ -235,7 +235,7 @@ group { "efl/popup_alert/button_layout3";
235 rel2.relative: 0.0 1.0; 235 rel2.relative: 0.0 1.0;
236 } 236 }
237 } 237 }
238 swallow { "elm.swallow.button3"; 238 swallow { "efl.button3";
239 desc { "default"; 239 desc { "default";
240 rel1.to_x: "div2"; 240 rel1.to_x: "div2";
241 rel1.relative: 1.0 0.0; 241 rel1.relative: 1.0 0.0;
@@ -250,24 +250,24 @@ group { "efl/popup_alert/button";
250 alias: "efl/popup_alert_text/button"; 250 alias: "efl/popup_alert_text/button";
251} 251}
252 252
253group { name: "efl/popup_alert_scroll/scroller"; 253group { "efl/popup_alert_scroll/scroller";
254 inherit: "efl/scroller"; 254 inherit: "efl/scroller";
255 alias: "efl/popup_alert_text/scroller"; 255 alias: "efl/popup_alert_text/scroller";
256 parts { 256 parts {
257 part { name: "elm.swallow.content"; type: SWALLOW; 257 swallow { "efl.content";
258 description { state: "default" 0.0; 258 desc { "default";
259 rel1.offset: 0 0; 259 rel1.offset: 0 0;
260 rel2.offset: 0 0; 260 rel2.offset: 0 0;
261 } 261 }
262 } 262 }
263 part { name: "inset"; 263 spacer { "inset";
264 description { state: "default" 0.0; 264 desc { "default";
265 visible: 0; 265 hid;
266 } 266 }
267 } 267 }
268 part { name: "shadow"; 268 spacer { "shadow";
269 description { state: "default" 0.0; 269 desc { "default";
270 visib