summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaehyun Cho <jae_hyun.cho@samsung.com>2018-04-26 00:12:43 +0900
committerJaehyun Cho <jae_hyun.cho@samsung.com>2018-04-26 00:15:51 +0900
commit444d9dc785e8c6d7be58b5375c2208470dd710c8 (patch)
treef21a4cd4421521174e0d29e8b41989aeafb5d622
parent1765f1ed530b39ae7928c9105e132a38f3fcaad7 (diff)
Fix to replace elm legacy part namedevs/jaehyun/efl_part_legacy_remove_final
-rw-r--r--data/elementary/themes/edc/efl/border.edc114
-rw-r--r--data/elementary/themes/edc/efl/datepicker.edc40
-rw-r--r--data/elementary/themes/edc/efl/pager.edc10
-rw-r--r--data/elementary/themes/edc/efl/panes.edc72
-rw-r--r--data/elementary/themes/edc/efl/popup.edc2
-rw-r--r--data/elementary/themes/edc/efl/progress.edc68
-rw-r--r--data/elementary/themes/edc/efl/radio.edc28
-rw-r--r--data/elementary/themes/edc/efl/scroller.edc10
-rw-r--r--data/elementary/themes/edc/efl/text.edc6
-rw-r--r--data/elementary/themes/edc/efl/timepicker.edc18
-rw-r--r--data/elementary/themes/edc/efl/tooltip.edc26
-rw-r--r--data/elementary/themes/edc/efl/uiclock.edc2
-rw-r--r--src/lib/elementary/efl_ui_button.c6
-rw-r--r--src/lib/elementary/efl_ui_clock.c2
-rw-r--r--src/lib/elementary/efl_ui_datepicker.c2
-rw-r--r--src/lib/elementary/efl_ui_layout_object.c61
-rw-r--r--src/lib/elementary/efl_ui_navigation_bar.c4
-rw-r--r--src/lib/elementary/efl_ui_pager.c8
-rw-r--r--src/lib/elementary/efl_ui_panes.c6
-rw-r--r--src/lib/elementary/efl_ui_popup_alert.c2
-rw-r--r--src/lib/elementary/efl_ui_scroller.c60
-rw-r--r--src/lib/elementary/efl_ui_spin_button.c2
-rw-r--r--src/lib/elementary/efl_ui_timepicker.c2
-rw-r--r--src/lib/elementary/els_tooltip.c20
24 files changed, 294 insertions, 277 deletions
diff --git a/data/elementary/themes/edc/efl/border.edc b/data/elementary/themes/edc/efl/border.edc
index d3ee516..50013c5 100644
--- a/data/elementary/themes/edc/efl/border.edc
+++ b/data/elementary/themes/edc/efl/border.edc
@@ -170,7 +170,7 @@ group { "efl/border";
170 } 170 }
171 171
172 /* modal window blocker */ 172 /* modal window blocker */
173 rect { "rect.blocker"; 173 rect { "efl.rect.blocker";
174 required; 174 required;
175 desc { "default"; 175 desc { "default";
176 rel1.to: "top_clip"; 176 rel1.to: "top_clip";
@@ -241,11 +241,11 @@ group { "efl/border";
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: "event.icon"; 244 rel1.to_x: "efl.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: "event.minimize"; 248 rel2.to_x: "efl.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,11 +269,11 @@ group { "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: "event.icon"; 272 rel1.to_x: "efl.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: "event.minimize"; 276 rel2.to_x: "efl.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";
@@ -292,10 +292,10 @@ group { "efl/border";
292 visible: 1; 292 visible: 1;
293 } 293 }
294 } 294 }
295 spacer { "spacer.icon"; 295 spacer { "icon";
296 desc { "default"; 296 desc { "default";
297 rel1.to: "event.icon"; 297 rel1.to: "efl.event.icon";
298 rel2.to: "event.icon"; 298 rel2.to: "efl.event.icon";
299 } 299 }
300 desc { "bounce1"; 300 desc { "bounce1";
301 inherit: "default"; 301 inherit: "default";
@@ -311,9 +311,9 @@ group { "efl/border";
311 swallow { "efl.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: "spacer.icon"; 314 rel1.to: "icon";
315 rel1.relative: 0.15 0.15; 315 rel1.relative: 0.15 0.15;
316 rel2.to: "spacer.icon"; 316 rel2.to: "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 { "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: "event.icon"; 341 rel1.to: "efl.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: "event.icon"; 344 rel2.to: "efl.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 { "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: "event.close"; 390 rel1.to: "efl.event.close";
391 rel2.to: "event.close"; 391 rel2.to: "efl.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 { "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: "event.maximize"; 405 rel1.to: "efl.event.maximize";
406 rel2.to: "event.maximize"; 406 rel2.to: "efl.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 { "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: "event.minimize"; 420 rel1.to: "efl.event.minimize";
421 rel2.to: "event.minimize"; 421 rel2.to: "efl.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 { "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: "event.close"; 435 rel1.to: "efl.event.close";
436 rel2.to: "event.close"; 436 rel2.to: "efl.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 { "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: "event.maximize"; 450 rel1.to: "efl.event.maximize";
451 rel2.to: "event.maximize"; 451 rel2.to: "efl.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 { "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: "event.minimize"; 465 rel1.to: "efl.event.minimize";
466 rel2.to: "event.minimize"; 466 rel2.to: "efl.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 { "efl/border";
473 image.normal: "sym_down_light_selected.png"; 473 image.normal: "sym_down_light_selected.png";
474 } 474 }
475 } 475 }
476 rect { "event.icon"; 476 rect { "efl.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 { "efl/border";
484 color: 0 0 0 0; 484 color: 0 0 0 0;
485 } 485 }
486 } 486 }
487 rect { "event.titlebar"; 487 rect { "efl.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: "event.icon"; 490 rel1.to_x: "efl.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: "event.minimize"; 494 rel2.to_x: "efl.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 { "event.close"; 499 rect { "efl.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 { "efl/border";
506 color: 0 0 0 0; 506 color: 0 0 0 0;
507 } 507 }
508 } 508 }
509 rect { "event.maximize"; 509 rect { "efl.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: "event.close"; 513 rel1.to_x: "efl.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: "event.close"; 516 rel2.to_x: "efl.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 { "event.minimize"; 523 rect { "efl.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: "event.maximize"; 527 rel1.to_x: "efl.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: "event.maximize"; 531 rel2.to_x: "efl.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;
@@ -812,25 +812,25 @@ group { "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: "spacer.icon"; 815 target: "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: "spacer.icon"; 821 target: "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: "spacer.icon"; 827 target: "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: "spacer.icon"; 833 target: "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";
@@ -976,71 +976,71 @@ group { "efl/border";
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: "rect.blocker"; 979 target: "efl.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: "rect.blocker"; 985 target: "efl.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: "event.close"; 991 signal: "mouse,down,*"; source: "efl.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: "event.close"; 997 signal: "mouse,up,*"; source: "efl.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: "event.maximize"; 1003 signal: "mouse,down,*"; source: "efl.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: "event.maximize"; 1009 signal: "mouse,up,*"; source: "efl.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: "event.minimize"; 1015 signal: "mouse,down,*"; source: "efl.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: "event.minimize"; 1021 signal: "mouse,up,*"; source: "efl.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: "event.titlebar"; 1027 signal: "mouse,down,1"; source: "efl.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: "event.titlebar"; 1031 signal: "mouse,up,1"; source: "efl.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: "event.minimize"; 1035 signal: "mouse,clicked,1"; source: "efl.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: "event.maximize"; 1039 signal: "mouse,clicked,1"; source: "efl.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: "event.close"; 1043 signal: "mouse,clicked,1"; source: "efl.event.close";
1044 action: SIGNAL_EMIT "elm,action,close" "elm"; 1044 action: SIGNAL_EMIT "elm,action,close" "elm";
1045 } 1045 }
1046 program { 1046 program {
@@ -1116,7 +1116,7 @@ group { "efl/border";
1116 action: SIGNAL_EMIT "elm,action,resize,start" "efl.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: "event.icon"; 1119 signal: "mouse,clicked,1"; source: "efl.event.icon";
1120 action: SIGNAL_EMIT "elm,action,menu" "elm"; 1120 action: SIGNAL_EMIT "elm,action,menu" "elm";
1121 } 1121 }
1122 } 1122 }
@@ -1128,7 +1128,7 @@ group { "efl/border/dialog";
1128 text { "efl.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: "event.close"; 1131 rel2.to_x: "efl.event.close";
1132 } 1132 }
1133 desc { "focused"; 1133 desc { "focused";
1134 inherit: "default"; 1134 inherit: "default";
@@ -1137,7 +1137,7 @@ group { "efl/border/dialog";
1137 } 1137 }
1138 text { "title2"; 1138 text { "title2";
1139 desc { "default"; 1139 desc { "default";
1140 rel2.to_x: "event.close"; 1140 rel2.to_x: "efl.event.close";
1141 } 1141 }
1142 desc { "focused"; 1142 desc { "focused";
1143 inherit: "default"; 1143 inherit: "default";
@@ -1176,12 +1176,12 @@ group { "efl/border/dialog";
1176 visible: 0; 1176 visible: 0;
1177 } 1177 }
1178 } 1178 }
1179 rect { "event.maximize"; 1179 rect { "efl.event.maximize";
1180 desc { "default"; 1180 desc { "default";
1181 visible: 0; 1181 visible: 0;
1182 } 1182 }
1183 } 1183 }
1184 rect { "event.minimize"; 1184 rect { "efl.event.minimize";
1185 desc { "default"; 1185 desc { "default";
1186 visible: 0; 1186 visible: 0;
1187 } 1187 }
diff --git a/data/elementary/themes/edc/efl/datepicker.edc b/data/elementary/themes/edc/efl/datepicker.edc
index f0fa470..32e9585 100644
--- a/data/elementary/themes/edc/efl/datepicker.edc
+++ b/data/elementary/themes/edc/efl/datepicker.edc
@@ -97,7 +97,7 @@ group { "efl/datepicker";
97 align: 1.0 1.0; 97 align: 1.0 1.0;
98 } 98 }
99 } 99 }
100 swallow { "field0"; 100 swallow { "efl.field0";
101 mouse; 101 mouse;
102 scale; 102 scale;
103 desc { "default"; 103 desc { "default";
@@ -119,13 +119,13 @@ group { "efl/datepicker";
119 max: 10 -1; 119 max: 10 -1;
120 rel1 { 120 rel1 {
121 relative: 1.0 0.0; 121 relative: 1.0 0.0;
122 to: "field0"; 122 to: "efl.field0";
123 } 123 }
124 rel2.to: "field0"; 124 rel2.to: "efl.field0";
125 align: 0.0 0.5; 125 align: 0.0 0.5;
126 } 126 }
127 } 127 }
128 swallow { "field1"; 128 swallow { "efl.field1";
129 mouse; 129 mouse;
130 scale; 130 scale;
131 desc { "default"; 131 desc { "default";
@@ -148,15 +148,15 @@ group { "efl/datepicker";
148 fixed: 1 0; 148 fixed: 1 0;
149 min: 10 0; 149 min: 10 0;
150 max: 10 -1; 150 max: 10 -1;
151 rel1.to: "field2"; 151 rel1.to: "efl.field2";
152 rel2 { 152 rel2 {
153 relative: 0.0 1.0; 153 relative: 0.0 1.0;
154 to: "field2"; 154 to: "efl.field2";
155 } 155 }
156 align: 1.0 0.5; 156 align: 1.0 0.5;
157 } 157 }
158 } 158 }
159 swallow { "field2"; 159 swallow { "efl.field2";
160 mouse; 160 mouse;
161 scale; 161 scale;
162 desc { "default"; 162 desc { "default";
@@ -186,7 +186,7 @@ group { "efl/datepicker/spin_button";
186 parts { 186 parts {
187 rect { "clip"; 187 rect { "clip";
188 desc { "default"; 188 desc { "default";
189 rel.to: "elm.swallow.text_button"; 189 rel.to: "efl.text_button";
190 } 190 }
191 } 191 }
192 spacer { "base"; 192 spacer { "base";
@@ -215,7 +215,7 @@ group { "efl/datepicker/spin_button";
215 vis; 215 vis;
216 } 216 }
217 } 217 }
218 swallow { "elm.swallow.inc_button"; 218 swallow { "efl.inc_button";
219 scale; 219 scale;
220 desc { "default"; 220 desc { "default";
221 align: 0.5 0.0; 221 align: 0.5 0.0;
@@ -224,7 +224,7 @@ group { "efl/datepicker/spin_button";
224 fixed: 1 1; 224 fixed: 1 1;
225 } 225 }
226 } 226 }
227 swallow { "elm.swallow.dec_button"; 227 swallow { "efl.dec_button";
228 scale; 228 scale;
229 desc { "default"; 229 desc { "default";
230 align: 0.5 1.0; 230 align: 0.5 1.0;
@@ -233,12 +233,12 @@ group { "efl/datepicker/spin_button";
233 fixed: 1 1; 233 fixed: 1 1;
234 } 234 }
235 } 235 }
236 swallow { "elm.swallow.entry"; 236 swallow { "efl.entry";
237 clip: "clip"; 237 clip: "clip";
238 desc { "default"; 238 desc { "default";
239 fixed: 1 1; 239 fixed: 1 1;
240 rel1.to: "elm.swallow.text_button"; 240 rel1.to: "efl.text_button";
241 rel2.to: "elm.swallow.text_button"; 241 rel2.to: "efl.text_button";
242 hid; 242 hid;
243 } 243 }
244 desc { "active"; 244 desc { "active";
@@ -246,16 +246,16 @@ group { "efl/datepicker/spin_button";
246 vis; 246 vis;
247 } 247 }
248 } 248 }
249 swallow { "elm.swallow.text_button"; 249 swallow { "efl.text_button";
250 scale; 250 scale;
251 desc { "default"; 251 desc { "default";
252 rel.to_x: "base"; 252 rel.to_x: "base";
253 rel1 { 253 rel1 {
254 to_y: "elm.swallow.inc_button"; 254 to_y: "efl.inc_button";
255 relative: 0.0 1.0; 255 relative: 0.0 1.0;
256 } 256 }
257 rel2 { 257 rel2 {
258 to_y: "elm.swallow.dec_button"; 258 to_y: "efl.dec_button";
259 relative: 1.0 0.0; 259 relative: 1.0 0.0;
260 } 260 }
261 min: 0 70; 261 min: 0 70;
@@ -285,25 +285,25 @@ group { "efl/datepicker/spin_button";
285 signal: "elm,state,entry,active"; 285 signal: "elm,state,entry,active";
286 source: "elm"; 286 source: "elm";
287 action: STATE_SET "active"; 287 action: STATE_SET "active";
288 target: "elm.swallow.entry"; 288 target: "efl.entry";
289 } 289 }
290 program { "entry_inactive"; 290 program { "entry_inactive";
291 signal: "elm,state,entry,inactive"; 291 signal: "elm,state,entry,inactive";
292 source: "elm"; 292 source: "elm";
293 action: STATE_SET "default"; 293 action: STATE_SET "default";
294 target: "elm.swallow.entry"; 294 target: "efl.entry";
295 } 295 }
296 program { "text_button_active"; 296 program { "text_button_active";
297 signal: "elm,state,button,active"; 297 signal: "elm,state,button,active";
298 source: "elm"; 298 source: "elm";
299 action: STATE_SET "default"; 299 action: STATE_SET "default";
300 target: "elm.swallow.text_button"; 300 target: "efl.text_button";
301 } 301 }
302 program { "text_button_inactive"; 302 program { "text_button_inactive";
303 signal: "elm,state,button,inactive"; 303 signal: "elm,state,button,inactive";
304 source: "elm"; 304 source: "elm";
305 action: STATE_SET "inactive"; 305 action: STATE_SET "inactive";
306 target: "elm.swallow.text_button"; 306 target: "efl.text_button";
307 } 307 }
308 program { "access_activate"; 308 program { "access_activate";
309 signal: "elm,state,access,active"; 309 signal: "elm,state,access,active";
diff --git a/data/elementary/themes/edc/efl/pager.edc b/data/elementary/themes/edc/efl/pager.edc
index 397af0b..d02be54 100644
--- a/data/elementary/themes/edc/efl/pager.edc
+++ b/data/elementary/themes/edc/efl/pager.edc
@@ -5,19 +5,19 @@ group { "efl/pager";
5 desc { "default"; 5 desc { "default";
6 } 6 }
7 } 7 }
8 swallow { "elm.swallow.background"; 8 swallow { "efl.background";
9 scale; 9 scale;
10 desc { "default"; 10 desc { "default";
11 } 11 }
12 } 12 }
13 swallow { "page_root"; 13 swallow { "efl.page_root";
14 scale; 14 scale;
15 desc { "default"; 15 desc { "default";
16 rel1.relative: 0.0 1.0; 16 rel1.relative: 0.0 1.0;
17 rel1.to: "indicator"; 17 rel1.to: "efl.indicator";
18 } 18 }
19 } 19 }
20 swallow { "indicator"; 20 swallow { "efl.indicator";
21 scale; 21 scale;
22 desc { "default"; 22 desc { "default";
23 rel2.relative: 1.0 0.0; 23 rel2.relative: 1.0 0.0;
@@ -25,7 +25,7 @@ group { "efl/pager";
25 min: 0 50; 25 min: 0 50;
26 } 26 }
27 } 27 }
28 swallow { "event"; 28 swallow { "efl.event";
29 scale; 29 scale;
30 repeat_events: 1; 30 repeat_events: 1;
31 desc { "default"; 31 desc { "default";
diff --git a/data/elementary/themes/edc/efl/panes.edc b/data/elementary/themes/edc/efl/panes.edc
index 4983cd3..7db239b 100644
--- a/data/elementary/themes/edc/efl/panes.edc
+++ b/data/elementary/themes/edc/efl/panes.edc
@@ -112,7 +112,7 @@ group { name: "efl/panes/vertical";
112 rel2.to: "efl.bar"; 112 rel2.to: "efl.bar";
113 } 113 }
114 } 114 }
115 part { name: "rect_bar"; type: RECT; 115 part { name: "bar"; type: RECT;
116 dragable.events: "efl.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;
@@ -129,27 +129,27 @@ group { name: "efl/panes/vertical";
129 } 129 }
130 } 130 }
131 programs { 131 programs {
132 program {signal: "mouse,down,1"; source: "rect_bar"; // for "press" smart callback 132 program {signal: "mouse,down,1"; source: "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: "rect_bar"; // for "unpress" smart callback 135 program { signal: "mouse,up,1"; source: "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: "rect_bar"; // for "clicked" smart callback 138 program { signal: "mouse,clicked,1"; source: "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: "rect_bar"; // for "clicked,double" smart callback 141 program { signal: "mouse,down,1,double"; source: "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: "rect_bar"; 147 target: "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: "rect_bar"; 152 target: "bar";
153 } 153 }
154 } 154 }
155} 155}
@@ -251,7 +251,7 @@ group { name: "efl/panes/horizontal";
251 rel2.to: "efl.bar"; 251 rel2.to: "efl.bar";
252 } 252 }
253 } 253 }
254 part { name: "rect_bar"; type: RECT; 254 part { name: "bar"; type: RECT;
255 dragable.events: "efl.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;
@@ -268,27 +268,27 @@ group { name: "efl/panes/horizontal";
268 } 268 }
269 } 269 }
270 programs { 270 programs {
271 program {signal: "mouse,down,1"; source: "rect_bar"; // for "press" smart callback 271 program {signal: "mouse,down,1"; source: "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: "rect_bar"; // for "unpress" smart callback 274 program { signal: "mouse,up,1"; source: "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: "rect_bar"; // for "clicked" smart callback 277 program { signal: "mouse,clicked,1"; source: "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: "rect_bar"; // for "clicked,double" smart callback 280 program { signal: "mouse,down,1,double"; source: "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: "rect_bar"; 286 target: "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: "rect_bar"; 291 target: "bar";
292 } 292 }
293 } 293 }
294} 294}
@@ -377,7 +377,7 @@ group { name: "efl/panes/vertical:flush";
377 rel2.to: "efl.bar"; 377 rel2.to: "efl.bar";
378 } 378 }
379 } 379 }
380 part { name: "rect_bar"; type: RECT; 380 part { name: "bar"; type: RECT;
381 dragable.events: "efl.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;
@@ -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: "rect_bar"; 454 rel1.to: "bar";
455 rel2.to: "rect_bar"; 455 rel2.to: "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: "rect_bar"; 463 rel1.to: "bar";
464 rel1.relative: 0.5 0.0; 464 rel1.relative: 0.5 0.0;
465 rel2.to: "rect_bar"; 465 rel2.to: "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: "rect_bar"; // for "press" smart callback 471 program {signal: "mouse,down,1"; source: "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: "rect_bar"; // for "unpress" smart callback 474 program { signal: "mouse,up,1"; source: "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: "rect_bar"; // for "clicked" smart callback 477 program { signal: "mouse,clicked,1"; source: "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: "rect_bar"; // for "clicked,double" smart callback 480 program { signal: "mouse,down,1,double"; source: "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: "rect_bar"; 486 target: "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: "rect_bar"; 491 target: "bar";
492 } 492 }
493 program { 493 program {
494 signal: "mouse,in"; source: "bar1"; 494 signal: "mouse,in"; source: "bar1";
@@ -605,7 +605,7 @@ group { name: "efl/panes/horizontal:flush";
605 rel2.to: "efl.bar"; 605 rel2.to: "efl.bar";
606 } 606 }
607 } 607 }
608 part { name: "rect_bar"; type: RECT; 608 part { name: "bar"; type: RECT;
609 dragable.events: "efl.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;
@@ -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: "rect_bar"; 682 rel1.to: "bar";
683 rel2.to: "rect_bar"; 683 rel2.to: "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: "rect_bar"; 691 rel1.to: "bar";
692 rel1.relative: 0.0 0.5; 692 rel1.relative: 0.0 0.5;
693 rel2.to: "rect_bar"; 693 rel2.to: "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: "rect_bar"; // for "press" smart callback 727 program {signal: "mouse,down,1"; source: "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: "rect_bar"; // for "unpress" smart callback 730 program { signal: "mouse,up,1"; source: "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: "rect_bar"; // for "clicked" smart callback 733 program { signal: "mouse,clicked,1"; source: "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: "rect_bar"; // for "clicked,double" smart callback 736 program { signal: "mouse,down,1,double"; source: "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: "rect_bar"; 742 target: "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: "rect_bar"; 747 target: "bar";
748 } 748 }
749 } 749 }
750} 750}
diff --git a/data/elementary/themes/edc/efl/popup.edc b/data/elementary/themes/edc/efl/popup.edc
index cfdd560..0fc3120 100644
--- a/data/elementary/themes/edc/efl/popup.edc
+++ b/data/elementary/themes/edc/efl/popup.edc
@@ -104,7 +104,7 @@ group { "efl/popup_alert";
104 target: "efl.text.title"; 104 target: "efl.text.title";
105 } 105 }
106 program { 106 program {
107 signal: "elm,efl.buttons,show"; source: "elm"; 107 signal: "elm,buttons,show"; source: "elm";
108 action: STATE_SET "button_visible" 0.0; 108 action: STATE_SET "button_visible" 0.0;
109 target: "efl.buttons"; 109 target: "efl.buttons";
110 } 110 }
diff --git a/data/elementary/themes/edc/efl/progress.edc b/data/elementary/themes/edc/efl/progress.edc
index d525ba5..f5b6192 100644
--- a/data/elementary/themes/edc/efl/progress.edc
+++ b/data/elementary/themes/edc/efl/progress.edc
@@ -259,7 +259,7 @@ group { "efl/progressbar/horizontal";
259 align: 1.0 0.5; 259 align: 1.0 0.5;
260 } 260 }
261 } 261 }
262 part { name: "image_bar"; 262 part { name: "bar";
263 clip_to: "fract_clip"; 263 clip_to: "fract_clip";
264 scale: 1; 264 scale: 1;
265 description { state: "default" 0.0; 265 description { state: "default" 0.0;
@@ -315,10 +315,10 @@ group { "efl/progressbar/horizontal";
315 min: 64 24; 315 min: 64 24;
316 max: 64 24; 316 max: 64 24;
317 rel1.to_x: "insidep0"; 317 rel1.to_x: "insidep0";
318 rel1.to_y: "image_bar"; 318 rel1.to_y: "bar";
319 rel1.relative: 0.0 0.0; 319 rel1.relative: 0.0 0.0;
320 rel2.to_x: "insidep1"; 320 rel2.to_x: "insidep1";
321 rel2.to_y: "image_bar"; 321 rel2.to_y: "bar";
322 rel2.relative: 1.0 1.0; 322 rel2.relative: 1.0 1.0;
323 image.normal: "inset_bar_horiz_glow_mid_base.png"; 323 image.normal: "inset_bar_horiz_glow_mid_base.png";
324 align: 0.0 0.5; 324 align: 0.0 0.5;
@@ -372,11 +372,11 @@ group { "efl/progressbar/horizontal";
372 scale: 1; 372 scale: 1;
373 description { state: "default" 0.0; 373 description { state: "default" 0.0;
374 max: 36 11; 374 max: 36 11;
375 rel1.to_x: "image_bar"; 375 rel1.to_x: "bar";
376 rel1.to_y: "image_bar"; 376 rel1.to_y: "bar";
377 rel1.relative: 0.0 (26/96); 377 rel1.relative: 0.0 (26/96);
378 rel2.to_x: "barend"; 378 rel2.to_x: "barend";
379 rel2.to_y: "image_bar"; 379 rel2.to_y: "bar";
380 rel2.relative: 0.2 ((26+44)/96); 380 rel2.relative: 0.2 ((26+44)/96);
381 align: 1.0 0.0; 381 align: 1.0 0.0;
382 image.normal: "inset_bar_horiz_glow_light.png"; 382 image.normal: "inset_bar_horiz_glow_light.png";
@@ -387,10 +387,10 @@ group { "efl/progressbar/horizontal";
387 description { state: "inv" 0.0; 387 description { state: "inv" 0.0;
388 inherit: "default" 0.0; 388 inherit: "default" 0.0;
389 rel1.to_x: "barend"; 389 rel1.to_x: "barend";
390 rel1.to_y: "image_bar"; 390 rel1.to_y: "bar";
391 rel1.relative: 0.8 (26/96); 391 rel1.relative: 0.8 (26/96);
392 rel2.to_x: "image_bar"; 392 rel2.to_x: "bar";
393 rel2.to_y: "image_bar"; 393 rel2.to_y: "bar";
394 rel2.relative: 1.0 ((26+44)/96); 394 rel2.relative: 1.0 ((26+44)/96);
395 align: 0.0 0.0; 395 align: 0.0 0.0;
396 image.normal: "inset_bar_horiz_glow_inv_light.png"; 396 image.normal: "inset_bar_horiz_glow_inv_light.png";
@@ -402,14 +402,14 @@ group { "efl/progressbar/horizontal";
402 program { name: "inverted-on"; 402 program { name: "inverted-on";
403 signal: "elm,state,inverted,on"; source: "elm"; 403 signal: "elm,state,inverted,on"; source: "elm";
404 action: STATE_SET "inv" 0.0; 404 action: STATE_SET "inv" 0.0;
405 target: "image_bar"; 405 target: "bar";
406 target: "barend"; 406 target: "barend";
407 target: "light"; 407 target: "light";
408 } 408 }
409 program { name: "inverted-off"; 409 program { name: "inverted-off";
410 signal: "elm,state,inverted,off"; source: "elm"; 410 signal: "elm,state,inverted,off"; source: "elm";
411 action: STATE_SET "default" 0.0; 411 action: STATE_SET "default" 0.0;
412 target: "image_bar"; 412 target: "bar";
413 target: "barend"; 413 target: "barend";
414 target: "light"; 414 target: "light";
415 } 415 }
@@ -419,7 +419,7 @@ group { "efl/progressbar/horizontal";
419 new a, Float:dx, Float:dy, Float:vl, st[20]; 419 new a, Float:dx, Float:dy, Float:vl, st[20];
420 420
421 get_drag(PART:"efl.cur.progressbar", dx, dy); 421 get_drag(PART:"efl.cur.progressbar", dx, dy);
422 get_state(PART:"image_bar", st, 19, vl); 422 get_state(PART:"bar", st, 19, vl);
423 if (!strcmp(st, "inv")) { 423 if (!strcmp(st, "inv")) {
424 a = round(((1.0 - dx) * 255) / 0.2); 424 a = round(((1.0 - dx) * 255) / 0.2);
425 custom_state(PART:"light", "inv", 0.0); 425 custom_state(PART:"light", "inv", 0.0);
@@ -819,7 +819,7 @@ group { "efl/progressbar/vertical";
819 align: 0.5 1.0; 819 align: 0.5 1.0;
820 } 820 }
821 } 821 }
822 part { name: "image_bar"; 822 part { name: "bar";
823 clip_to: "fract_clip"; 823 clip_to: "fract_clip";
824 scale: 1; 824 scale: 1;
825 description { state: "default" 0.0; 825 description { state: "default" 0.0;
@@ -875,10 +875,10 @@ group { "efl/progressbar/vertical";
875 min: 24 64; 875 min: 24 64;
876 max: 24 64; 876 max: 24 64;
877 rel1.to_y: "insidep0"; 877 rel1.to_y: "insidep0";
878 rel1.to_x: "image_bar"; 878 rel1.to_x: "bar";
879 rel1.relative: 0.0 0.0; 879 rel1.relative: 0.0 0.0;
880 rel2.to_y: "insidep1"; 880 rel2.to_y: "insidep1";
881 rel2.to_x: "image_bar"; 881 rel2.to_x: "bar";
882 rel2.relative: 1.0 1.0; 882 rel2.relative: 1.0 1.0;
883 image.normal: "inset_bar_vert_glow_mid_base.png"; 883 image.normal: "inset_bar_vert_glow_mid_base.png";
884 align: 0.5 0.0; 884 align: 0.5 0.0;
@@ -945,11 +945,11 @@ group { "efl/progressbar/vertical";
945 scale: 1; 945 scale: 1;
946 description { state: "default" 0.0; 946 description { state: "default" 0.0;
947 max: 11 36; 947 max: 11 36;
948 rel1.to_y: "image_bar"; 948 rel1.to_y: "bar";
949 rel1.to_x: "image_bar"; 949 rel1.to_x: "bar";
950 rel1.relative: (26/96) 0.0; 950 rel1.relative: (26/96) 0.0;
951 rel2.to_y: "barend"; 951 rel2.to_y: "barend";
952 rel2.to_x: "image_bar"; 952 rel2.to_x: "bar";
953 rel2.relative: ((26+44)/96) 0.2; 953 rel2.relative: ((26+44)/96) 0.2;
954 align: 0.0 1.0; 954 align: 0.0 1.0;
955 image.normal: "inset_bar_vert_glow_light.png"; 955 image.normal: "inset_bar_vert_glow_light.png";
@@ -960,10 +960,10 @@ group { "efl/progressbar/vertical";
960 description { state: "inv" 0.0; 960 description { state: "inv" 0.0;
961 inherit: "default" 0.0; 961 inherit: "default" 0.0;
962 rel1.to_y: "barend"; 962 rel1.to_y: "barend";
963 rel1.to_x: "image_bar"; 963 rel1.to_x: "bar";
964 rel1.relative: (26/96) 0.8; 964 rel1.relative: (26/96) 0.8;
965 rel2.to_y: "image_bar"; 965 rel2.to_y: "bar";
966 rel2.to_x: "image_bar"; 966 rel2.to_x: "bar";
967 rel2.relative: ((26+44)/96) 1.0; 967 rel2.relative: ((26+44)/96) 1.0;
968 align: 0.0 0.0; 968 align: 0.0 0.0;
969 image.normal: "inset_bar_vert_glow_inv_light.png"; 969 image.normal: "inset_bar_vert_glow_inv_light.png";
@@ -975,14 +975,14 @@ group { "efl/progressbar/vertical";
975 program { name: "inverted-on"; 975 program { name: "inverted-on";
976 signal: "elm,state,inverted,on"; source: "elm"; 976 signal: "elm,state,inverted,on"; source: "elm";
977 action: STATE_SET "inv" 0.0; 977 action: STATE_SET "inv" 0.0;
978 target: "image_bar"; 978 target: "bar";
979 target: "barend"; 979 target: "barend";
980 target: "light"; 980 target: "light";
981 } 981 }
982 program { name: "inverted-off"; 982 program { name: "inverted-off";
983 signal: "elm,state,inverted,off"; source: "elm"; 983 signal: "elm,state,inverted,off"; source: "elm";
984 action: STATE_SET "default" 0.0; 984 action: STATE_SET "default" 0.0;
985 target: "image_bar"; 985 target: "bar";
986 target: "barend"; 986 target: "barend";
987 target: "light"; 987 target: "light";
988 } 988 }
@@ -992,7 +992,7 @@ group { "efl/progressbar/vertical";
992 new a, Float:dx, Float:dy, Float:vl, st[20]; 992 new a, Float:dx, Float:dy, Float:vl, st[20];
993 993
994 get_drag(PART:"efl.cur.progressbar", dx, dy); 994 get_drag(PART:"efl.cur.progressbar", dx, dy);
995 get_state(PART:"image_bar", st, 19, vl); 995 get_state(PART:"bar", st, 19, vl);
996 if (!strcmp(st, "inv")) { 996 if (!strcmp(st, "inv")) {
997 a = round(((1.0 - dy) * 255) / 0.2); 997 a = round(((1.0 - dy) * 255) / 0.2);
998 custom_state(PART:"light", "inv", 0.0); 998 custom_state(PART:"light", "inv", 0.0);
@@ -1231,7 +1231,7 @@ group { "efl/progressbar/horizontal:double";
1231 image: "inset_bar_horiz_glow_inv_base_double.png" COMP; 1231 image: "inset_bar_horiz_glow_inv_base_double.png" COMP;
1232 } 1232 }
1233 parts { 1233 parts {
1234 part { name: "cur.progressbar1"; mouse_events: 0; type: SPACER; 1234 part { name: "efl.cur.progressbar1"; mouse_events: 0; type: SPACER;
1235 insert_after: "inside"; 1235 insert_after: "inside";
1236 scale: 1; 1236 scale: 1;
1237 dragable.confine: "inside"; 1237 dragable.confine: "inside";
@@ -1250,9 +1250,9 @@ group { "efl/progressbar/horizontal:double";
1250 description { state: "default" 0.0; 1250 description { state: "default" 0.0;
1251 fixed: 1 0; 1251 fixed: 1 0;
1252 min: 14 16; 1252 min: 14 16;
1253 rel1.to_x: "cur.progressbar1"; 1253 rel1.to_x: "efl.cur.progressbar1";
1254 rel1.relative: 1.0 0.0; 1254 rel1.relative: 1.0 0.0;
1255 rel2.to_x: "cur.progressbar1"; 1255 rel2.to_x: "efl.cur.progressbar1";
1256 rel2.relative: 1.0 1.0; 1256 rel2.relative: 1.0 1.0;
1257 align: 0.0 0.5; 1257 align: 0.0 0.5;
1258 } 1258 }
@@ -1294,7 +1294,7 @@ group { "efl/progressbar/horizontal:double";
1294 program { name: "inverted-on"; 1294 program { name: "inverted-on";
1295 signal: "elm,state,inverted,on"; source: "elm"; 1295 signal: "elm,state,inverted,on"; source: "elm";
1296 action: STATE_SET "inv" 0.0; 1296 action: STATE_SET "inv" 0.0;
1297 target: "image_bar"; 1297 target: "bar";
1298 target: "bar1"; 1298 target: "bar1";
1299 target: "barend"; 1299 target: "barend";
1300 target: "barend1"; 1300 target: "barend1";
@@ -1304,7 +1304,7 @@ group { "efl/progressbar/horizontal:double";
1304 { name: "inverted-off"; 1304 { name: "inverted-off";
1305 signal: "elm,state,inverted,off"; source: "elm"; 1305 signal: "elm,state,inverted,off"; source: "elm";
1306 action: STATE_SET "default" 0.0; 1306 action: STATE_SET "default" 0.0;
1307 target: "image_bar"; 1307 target: "bar";
1308 target: "bar1"; 1308 target: "bar1";
1309 target: "barend"; 1309 target: "barend";
1310 target: "barend1"; 1310 target: "barend1";
@@ -1320,7 +1320,7 @@ group { "efl/progressbar/vertical:double";
1320 image: "inset_bar_vert_glow_inv_base_double.png" COMP; 1320 image: "inset_bar_vert_glow_inv_base_double.png" COMP;
1321 } 1321 }
1322 parts { 1322 parts {
1323 part { name: "cur.progressbar1"; mouse_events: 0; type: SPACER; 1323 part { name: "efl.cur.progressbar1"; mouse_events: 0; type: SPACER;
1324 insert_after: "inside"; 1324 insert_after: "inside";
1325 scale: 1; 1325 scale: 1;
1326 dragable.confine: "inside"; 1326 dragable.confine: "inside";
@@ -1339,9 +1339,9 @@ group { "efl/progressbar/vertical:double";
1339 description { state: "default" 0.0; 1339 description { state: "default" 0.0;
1340 fixed: 0 1; 1340 fixed: 0 1;
1341 min: 16 14; 1341 min: 16 14;
1342 rel1.to_y: "cur.progressbar1"; 1342 rel1.to_y: "efl.cur.progressbar1";
1343 rel1.relative: 0.0 1.0; 1343 rel1.relative: 0.0 1.0;
1344 rel2.to_y: "cur.progressbar1"; 1344 rel2.to_y: "efl.cur.progressbar1";
1345 rel2.relative: 1.0 1.0; 1345 rel2.relative: 1.0 1.0;
1346 align: 0.5 0.0; 1346 align: 0.5 0.0;
1347 } 1347 }
@@ -1383,7 +1383,7 @@ group { "efl/progressbar/vertical:double";
1383 program { name: "inverted-on"; 1383 program { name: "inverted-on";
1384 signal: "elm,state,inverted,on"; source: "elm"; 1384 signal: "elm,state,inverted,on"; source: "elm";
1385 action: STATE_SET "inv" 0.0; 1385 action: STATE_SET "inv" 0.0;
1386 target: "image_bar"; 1386 target: "bar";
1387 target: "barend"; 1387 target: "barend";
1388 target: "light"; 1388 target: "light";
1389 target: "bar1"; 1389 target: "bar1";
@@ -1392,7 +1392,7 @@ group { "efl/progressbar/vertical:double";
1392 program { name: "inverted-off"; 1392 program { name: "inverted-off";
1393 signal: "elm,state,inverted,off"; source: "elm"; 1393 signal: "elm,state,inverted,off"; source: "elm";
1394 action: STATE_SET "default" 0.0; 1394 action: STATE_SET "default" 0.0;
1395 target: "image_bar"; 1395 target: "bar";
1396 target: "barend"; 1396 target: "barend";
1397 target: "light"; 1397 target: "light";
1398 target: "bar1"; 1398 target: "bar1";
diff --git a/data/elementary/themes/edc/efl/radio.edc b/data/elementary/themes/edc/efl/radio.edc
index 7822d8f..d640058 100644
--- a/data/elementary/themes/edc/efl/radio.edc
+++ b/data/elementary/themes/edc/efl/radio.edc
@@ -13,14 +13,14 @@ group { "efl/radio";
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:"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:"efl.text", "visible", 0.0); 18 set_state(PART:"efl.text", "visible", 0.0);
19 set_state(PART:"inset", "default", 0.0); 19 set_state(PART:"inset", "default", 0.0);
20 set_state(PART:"clip", "default", 0.0); 20 set_state(PART:"clip", "default", 0.0);
21 set_state(PART:"event", "default", 0.0); 21 set_state(PART:"event", "default", 0.0);
22 } else { 22 } else {
23 set_state(PART:"content", "visible", 0.0); 23 set_state(PART:"efl.content", "visible", 0.0);
24 set_state(PART:"sizer.content", "visible", 0.0); 24 set_state(PART:"sizer.content", "visible", 0.0);
25 set_state(PART:"efl.text", "disabled_visible", 0.0); 25 set_state(PART:"efl.text", "disabled_visible", 0.0);
26 set_state(PART:"inset", "disabled", 0.0); 26 set_state(PART:"inset", "disabled", 0.0);
@@ -29,14 +29,14 @@ group { "efl/radio";
29 } 29 }
30 } else if (m1 == (ICON)) { 30 } else if (m1 == (ICON)) {
31 if (!d) { 31 if (!d) {
32 set_state(PART:"content", "visible", 0.0); 32 set_state(PART:"efl.content", "visible", 0.0);
33 set_state(PART:"sizer.content", "icononly", 0.0); 33 set_state(PART:"sizer.content", "icononly", 0.0);
34 set_state(PART:"efl.text", "default", 0.0); 34 set_state(PART:"efl.text", "default", 0.0);
35 set_state(PART:"inset", "default", 0.0); 35 set_state(PART:"inset", "default", 0.0);
36 set_state(PART:"clip", "default", 0.0); 36 set_state(PART:"clip", "default", 0.0);
37 set_state(PART:"event", "default", 0.0); 37 set_state(PART:"event", "default", 0.0);
38 } else { 38 } else {
39 set_state(PART:"content", "visible", 0.0); 39 set_state(PART:"efl.content", "visible", 0.0);
40 set_state(PART:"sizer.content", "icononly", 0.0); 40 set_state(PART:"sizer.content", "icononly", 0.0);
41 set_state(PART:"efl.text", "disabled", 0.0); 41 set_state(PART:"efl.text", "disabled", 0.0);
42 set_state(PART:"inset", "disabled", 0.0); 42 set_state(PART:"inset", "disabled", 0.0);
@@ -45,14 +45,14 @@ group { "efl/radio";
45 } 45 }
46 } else if (m1 == (LABEL)) { 46 } else if (m1 == (LABEL)) {
47 if (!d) { 47 if (!d) {
48 set_state(PART:"content", "default", 0.0); 48 set_state(PART:"efl.content", "default", 0.0);
49 set_state(PART:"sizer.content", "default", 0.0); 49 set_state(PART:"sizer.content", "default", 0.0);
50 set_state(PART:"efl.text", "visible", 0.0); 50 set_state(PART:"efl.text", "visible", 0.0);
51 set_state(PART:"inset", "default", 0.0); 51 set_state(PART:"inset", "default", 0.0);
52 set_state(PART:"clip", "default", 0.0); 52 set_state(PART:"clip", "default", 0.0);
53 set_state(PART:"event", "default", 0.0); 53 set_state(PART:"event", "default", 0.0);
54 } else { 54 } else {
55 set_state(PART:"content", "default", 0.0); 55 set_state(PART:"efl.content", "default", 0.0);
56 set_state(PART:"sizer.content", "default", 0.0); 56 set_state(PART:"sizer.content", "default", 0.0);
57 set_state(PART:"efl.text", "disabled_visible", 0.0); 57 set_state(PART:"efl.text", "disabled_visible", 0.0);
58 set_state(PART:"inset", "disabled", 0.0); 58 set_state(PART:"inset", "disabled", 0.0);
@@ -61,14 +61,14 @@ group { "efl/radio";
61 } 61 }
62 } else { 62 } else {
63 if (!d) { 63 if (!d) {
64 set_state(PART:"content", "default", 0.0); 64 set_state(PART:"efl.content", "default", 0.0);
65 set_state(PART:"sizer.content", "default", 0.0); 65 set_state(PART:"sizer.content", "default", 0.0);
66 set_state(PART:"efl.text", "default", 0.0); 66 set_state(PART:"efl.text", "default", 0.0);
67 set_state(PART:"inset", "default", 0.0); 67 set_state(PART:"inset", "default", 0.0);
68 set_state(PART:"clip", "default", 0.0); 68 set_state(PART:"clip", "default", 0.0);
69 set_state(PART:"event", "default", 0.0); 69 set_state(PART:"event", "default", 0.0);
70 } else { 70 } else {
71 set_state(PART:"content", "default", 0.0); 71 set_state(PART:"efl.content", "default", 0.0);
72 set_state(PART:"sizer.content", "default", 0.0); 72 set_state(PART:"sizer.content", "default", 0.0);
73 set_state(PART:"efl.text", "default", 0.0); 73 set_state(PART:"efl.text", "default", 0.0);
74 set_state(PART:"inset", "disabled", 0.0); 74 set_state(PART:"inset", "disabled", 0.0);
@@ -120,7 +120,7 @@ group { "efl/radio";
120 color: 255 255 255 64; 120 color: 255 255 255 64;
121 } 121 }
122 } 122 }
123 part { name: "content"; type: SWALLOW; 123 part { name: "efl.content"; type: SWALLOW;
124 required; 124 required;
125 scale: 1; 125 scale: 1;
126 clip_to: "clip"; 126 clip_to: "clip";
@@ -155,8 +155,8 @@ group { "efl/radio";
155 } 155 }
156 description { state: "visible" 0.0; 156 description { state: "visible" 0.0;
157 inherit: "default" 0.0; 157 inherit: "default" 0.0;
158 rel1.to: "content"; 158 rel1.to: "efl.content";
159 rel2.to: "content"; 159 rel2.to: "efl.content";
160 text { 160 text {
161 min: 1 1; 161 min: 1 1;
162 ellipsis: -1; 162 ellipsis: -1;
@@ -165,8 +165,8 @@ group { "efl/radio";
165 } 165 }
166 description { state: "icononly" 0.0; 166 description { state: "icononly" 0.0;
167 inherit: "default" 0.0; 167 inherit: "default" 0.0;
168 rel1.to: "content"; 168 rel1.to: "efl.content";
169 rel2.to: "content"; 169 rel2.to: "efl.content";
170 text { 170 text {
171 min: 1 1; 171 min: 1 1;
172 ellipsis: -1; 172 ellipsis: -1;
@@ -180,7 +180,7 @@ group { "efl/radio";
180 required; 180 required;
181 description { state: "default" 0.0; 181 description { state: "default" 0.0;
182 rel1.offset: 2 2; 182 rel1.offset: 2 2;
183 rel1.to_x: "content"; 183 rel1.to_x: "efl.content";
184 rel1.relative: 1.0 0.0; 184 rel1.relative: 1.0 0.0;
185 rel2.offset: -3 -3; 185 rel2.offset: -3 -3;
186 color: FN_COL_DEFAULT; 186 color: FN_COL_DEFAULT;
diff --git a/data/elementary/themes/edc/efl/scroller.edc b/data/elementary/themes/edc/efl/scroller.edc
index ce1c372..c10323e 100644
--- a/data/elementary/themes/edc/efl/scroller.edc
+++ b/data/elementary/themes/edc/efl/scroller.edc
@@ -744,7 +744,7 @@ group { name: "efl/scroller";
744 color: 255 255 255 128; 744 color: 255 255 255 128;
745 } 745 }
746 } 746 }
747 part { name: "overlay"; type: SWALLOW; 747 part { name: "efl.overlay"; type: SWALLOW;
748 clip_to: "clipper"; 748 clip_to: "clipper";
749 description { state: "default" 0.0; 749 description { state: "default" 0.0;
750 rel1.to: "efl.content"; 750 rel1.to: "efl.content";
@@ -1256,7 +1256,7 @@ group { name: "efl/scroller:noclip";
1256 rel2.offset: 999999 999999; 1256 rel2.offset: 999999 999999;
1257 } 1257 }
1258 } 1258 }
1259 part { name: "background"; 1259 part { name: "efl.background";
1260 description { state: "default" 0.0; 1260 description { state: "default" 0.0;
1261 rel1.offset: 0 0; 1261 rel1.offset: 0 0;
1262 rel2.offset: -1 -1; 1262 rel2.offset: -1 -1;
@@ -1288,7 +1288,7 @@ group { name: "efl/scroller/contents";
1288 description { state: "default" 0.0; 1288 description { state: "default" 0.0;
1289 } 1289 }
1290 } 1290 }
1291 part { name: "content_r"; 1291 part { name: "efl.content_r";
1292 type: SWALLOW; 1292 type: SWALLOW;
1293 description { state: "default" 0.0; 1293 description { state: "default" 0.0;
1294 fixed: 1 1; 1294 fixed: 1 1;
@@ -1302,7 +1302,7 @@ group { name: "efl/scroller/contents";
1302 } 1302 }
1303 } 1303 }
1304 } 1304 }
1305 part { name: "content_b"; 1305 part { name: "efl.content_b";
1306 type: SWALLOW; 1306 type: SWALLOW;
1307 description { state: "default" 0.0; 1307 description { state: "default" 0.0;
1308 fixed: 1 1; 1308 fixed: 1 1;
@@ -1316,7 +1316,7 @@ group { name: "efl/scroller/contents";
1316 } 1316 }
1317 } 1317 }
1318 } 1318 }
1319 part { name: "content_rb"; 1319 part { name: "efl.content_rb";
1320 type: SWALLOW; 1320 type: SWALLOW;
1321 description { state: "default" 0.0; 1321 description { state: "default" 0.0;
1322 fixed: 1 1; 1322 fixed: 1 1;
diff --git a/data/elementary/themes/edc/efl/text.edc b/data/elementary/themes/edc/efl/text.edc
index d210391..3b9ce50 100644
--- a/data/elementary/themes/edc/efl/text.edc
+++ b/data/elementary/themes/edc/efl/text.edc
@@ -183,7 +183,7 @@ group { "efl/text/single/scroller";
183 visible: 0; 183 visible: 0;
184 } 184 }
185 } 185 }
186 part { name: "dragable.vbar"; type: RECT; 186 part { name: "efl.dragable.vbar"; type: RECT;
187 dragable.x: 0 0 0; 187 dragable.x: 0 0 0;
188 dragable.y: 1 1 0; 188 dragable.y: 1 1 0;
189 dragable.confine: "sb_vbar_base"; 189 dragable.confine: "sb_vbar_base";
@@ -203,7 +203,7 @@ group { "efl/text/single/scroller";
203 visible: 0; 203 visible: 0;
204 } 204 }
205 } 205 }
206 part { name: "dragable.hbar"; type: RECT; 206 part { name: "efl.dragable.hbar"; type: RECT;
207 dragable.x: 1 1 0; 207 dragable.x: 1 1 0;
208 dragable.y: 0 0 0; 208 dragable.y: 0 0 0;
209 dragable.confine: "sb_hbar_base"; 209 dragable.confine: "sb_hbar_base";
@@ -914,4 +914,4 @@ group { "efl/text/emoticon/worried"; images.image:
914group { "efl/text/emoticon/wtf"; images.image: 914group { "efl/text/emoticon/wtf"; images.image:
915 "emo-wtf.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal: 915 "emo-wtf.png" COMP; parts { part { "icon"; nomouse; desc { "default"; max: 64 64; image.normal:
916 "emo-wtf.png"; } } } } 916 "emo-wtf.png"; } } } }
917//------------------------------------------------------------ \ No newline at end of file 917//------------------------------------------------------------
diff --git a/data/elementary/themes/edc/efl/timepicker.edc b/data/elementary/themes/edc/efl/timepicker.edc
index a33ada0..3a0954a 100644
--- a/data/elementary/themes/edc/efl/timepicker.edc
+++ b/data/elementary/themes/edc/efl/timepicker.edc
@@ -105,7 +105,7 @@ group { "efl/timepicker";
105 align: 1.0 1.0; 105 align: 1.0 1.0;
106 } 106 }
107 } 107 }
108 swallow { "field0"; 108 swallow { "efl.field0";
109 mouse; 109 mouse;
110 scale; 110 scale;
111 desc { "default"; 111 desc { "default";
@@ -127,9 +127,9 @@ group { "efl/timepicker";
127 max: 3 -1; 127 max: 3 -1;
128 rel1 { 128 rel1 {
129 relative: 1.0 0.0; 129 relative: 1.0 0.0;
130 to: "field0"; 130 to: "efl.field0";
131 } 131 }
132 rel2.to: "field0"; 132 rel2.to: "efl.field0";
133 align: 0.0 0.5; 133 align: 0.0 0.5;
134 } 134 }
135 desc { "invisible"; 135 desc { "invisible";
@@ -197,7 +197,7 @@ group { "efl/timepicker";
197 max: 0 0; 197 max: 0 0;
198 } 198 }
199 } 199 }
200 swallow { "field1"; 200 swallow { "efl.field1";
201 mouse; 201 mouse;
202 scale; 202 scale;
203 desc { "default"; 203 desc { "default";
@@ -219,9 +219,9 @@ group { "efl/timepicker";
219 max: 3 -1; 219 max: 3 -1;
220 rel1 { 220 rel1 {
221 relative: 1.0 0.0; 221 relative: 1.0 0.0;
222 to: "field1"; 222 to: "efl.field1";
223 } 223 }
224 rel2.to: "field1"; 224 rel2.to: "efl.field1";
225 align: 0.0 0.5; 225 align: 0.0 0.5;
226 } 226 }
227 desc { "invisible"; 227 desc { "invisible";
@@ -289,7 +289,7 @@ group { "efl/timepicker";
289 max: 0 0; 289 max: 0 0;
290 } 290 }
291 } 291 }
292 swallow { "field2"; 292 swallow { "efl.field2";
293 mouse; 293 mouse;
294 scale; 294 scale;
295 desc { "default"; 295 desc { "default";
@@ -326,7 +326,7 @@ group { "efl/timepicker";
326 script { 326 script {
327 set_state(PART:"base", "default", 0.0); 327 set_state(PART:"base", "default", 0.0);
328 set_state(PART:"bg", "default", 0.0); 328 set_state(PART:"bg", "default", 0.0);
329 set_state(PART:"field2", "default", 0.0); 329 set_state(PART:"efl.field2", "default", 0.0);
330 } 330 }
331 } 331 }
332 program { "invisible_ampm"; 332 program { "invisible_ampm";
@@ -335,7 +335,7 @@ group { "efl/timepicker";
335 script { 335 script {
336 set_state(PART:"base", "24layout", 0.0); 336 set_state(PART:"base", "24layout", 0.0);
337 set_state(PART:"bg", "24layout", 0.0); 337 set_state(PART:"bg", "24layout", 0.0);
338 set_state(PART:"field2", "24layout", 0.0); 338 set_state(PART:"efl.field2", "24layout", 0.0);
339 } 339 }
340 } 340 }
341 program { "visible_colon_field0"; 341 program { "visible_colon_field0";
diff --git a/data/elementary/themes/edc/efl/tooltip.edc b/data/elementary/themes/edc/efl/tooltip.edc
index cbe4ca2..07a6093 100644
--- a/data/elementary/themes/edc/efl/tooltip.edc
+++ b/data/elementary/themes/edc/efl/tooltip.edc
@@ -11,7 +11,7 @@ group { name: "efl/label/tooltip";
11 } 11 }
12 } 12 }
13 parts { 13 parts {
14 part { name: "text"; type: TEXTBLOCK; mouse_events: 0; 14 part { name: "efl.text"; type: TEXTBLOCK; mouse_events: 0;
15 scale: 1; 15 scale: 1;
16 description { state: "default" 0.0; 16 description { state: "default" 0.0;
17 text { 17 text {
@@ -161,11 +161,11 @@ group { name: "efl/tooltip";
161 description { state: "default" 0.0; 161 description { state: "default" 0.0;
162 min: 30 30; 162 min: 30 30;
163 rel1 { 163 rel1 {
164 to: "content"; 164 to: "efl.content";
165 offset: -5 -4; 165 offset: -5 -4;
166 } 166 }
167 rel2 { 167 rel2 {
168 to: "content"; 168 to: "efl.content";
169 offset: 4 5; 169 offset: 4 5;
170 } 170 }
171 image { 171 image {
@@ -217,12 +217,12 @@ group { name: "efl/tooltip";
217 rel1 { \ 217 rel1 { \
218 relative: rx 0.0; \ 218 relative: rx 0.0; \
219 offset: ox 0; \ 219 offset: ox 0; \
220 to: "content"; \ 220 to: "efl.content"; \
221 } \ 221 } \
222 rel2 { \ 222 rel2 { \
223 relative: rx 1.0; \ 223 relative: rx 1.0; \
224 offset: ox 0; \ 224 offset: ox 0; \
225 to: "content"; \ 225 to: "efl.content"; \
226 } \ 226 } \
227 } \ 227 } \
228 description { state: "visible" 0.0; \ 228 description { state: "visible" 0.0; \
@@ -241,12 +241,12 @@ group { name: "efl/tooltip";
241 rel1 { \ 241 rel1 { \
242 relative: rx 0.0; \ 242 relative: rx 0.0; \
243 offset: ox 0; \ 243 offset: ox 0; \
244 to: "content"; \ 244 to: "efl.content"; \
245 } \ 245 } \
246 rel2 { \ 246 rel2 { \
247 relative: rx 1.0; \ 247 relative: rx 1.0; \
248 offset: ox 0; \ 248 offset: ox 0; \
249 to: "content"; \ 249 to: "efl.content"; \
250 } \ 250 } \
251 } \ 251 } \
252 } \ 252 } \
@@ -291,12 +291,12 @@ group { name: "efl/tooltip";
291 rel1 { \ 291 rel1 { \
292 relative: 0.0 ry; \ 292 relative: 0.0 ry; \
293 offset: 0 oy; \ 293 offset: 0 oy; \
294 to: "content"; \ 294 to: "efl.content"; \
295 } \ 295 } \
296 rel2 { \ 296 rel2 { \
297 relative: 1.0 ry; \ 297 relative: 1.0 ry; \
298 offset: 0 oy; \ 298 offset: 0 oy; \
299 to: "content"; \ 299 to: "efl.content"; \
300 } \ 300 } \
301 } \ 301 } \
302 description { state: "visible" 0.0; \ 302 description { state: "visible" 0.0; \
@@ -348,15 +348,15 @@ group { name: "efl/tooltip";
348 part { name: "clipper_content"; type: RECT; 348 part { name: "clipper_content"; type: RECT;
349 description { state: "default" 0.0; 349 description { state: "default" 0.0;
350 color: 255 255 255 0; 350 color: 255 255 255 0;
351 rel1.to: "content"; 351 rel1.to: "efl.content";
352 rel2.to: "content"; 352 rel2.to: "efl.content";
353 } 353 }
354 description { state: "visible" 0.0; 354 description { state: "visible" 0.0;
355 inherit: "default" 0.0; 355 inherit: "default" 0.0;
356 color: 255 255 255 255; 356 color: 255 255 255 255;
357 } 357 }
358 } 358 }
359 part { name: "content"; type: SWALLOW; 359 part { name: "efl.content"; type: SWALLOW;
360 clip_to: "clipper_content"; 360 clip_to: "clipper_content";
361 description { state: "default" 0.0; 361 description { state: "default" 0.0;
362 rel1.offset: 10 10; 362 rel1.offset: 10 10;
@@ -421,7 +421,7 @@ group { name: "efl/tooltip:transparent";
421 data.item: "pad_y" "10"; 421 data.item: "pad_y" "10";
422 data.item: "transparent" "enabled"; 422 data.item: "transparent" "enabled";
423 parts { 423 parts {
424 part { name: "content"; type: SWALLOW; mouse_events: 0; 424 part { name: "efl.content"; type: SWALLOW; mouse_events: 0;
425 scale: 1; 425 scale: 1;
426 description { state: "default" 0.0; } 426 description { state: "default" 0.0; }
427 } 427 }
diff --git a/data/elementary/themes/edc/efl/uiclock.edc b/data/elementary/themes/edc/efl/uiclock.edc
index 942b7f2..cb89ac6 100644
--- a/data/elementary/themes/edc/efl/uiclock.edc
+++ b/data/elementary/themes/edc/efl/uiclock.edc
@@ -182,7 +182,7 @@ group { "efl/uiclock";
182 vis; 182 vis;
183 } 183 }
184 } 184 }
185 rect { "access"; 185 rect { "efl.access";
186 repeat; 186 repeat;
187 desc { "default"; 187 desc { "default";
188 color: 0 0 0 0; 188 color: 0 0 0 0;
diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c
index fb64318..1e7dedd 100644
--- a/src/lib/elementary/efl_ui_button.c
+++ b/src/lib/elementary/efl_ui_button.c
@@ -40,12 +40,6 @@ static const Elm_Layout_Part_Alias_Description _content_aliases[] =
40 {NULL, NULL} 40 {NULL, NULL}
41}; 41};
42 42
43static const Elm_Layout_Part_Alias_Description _text_aliases[] =
44{
45 {"default", "elm.text"},
46 {NULL, NULL}
47};
48
49static Eina_Bool _key_action_activate(Evas_Object *obj, const char *params); 43static Eina_Bool _key_action_activate(Evas_Object *obj, const char *params);
50 44
51static const Elm_Action key_actions[] = { 45static const Elm_Action key_actions[] = {
diff --git a/src/lib/elementary/efl_ui_clock.c b/src/lib/elementary/efl_ui_clock.c
index bad166c..1b80ab6 100644
--- a/src/lib/elementary/efl_ui_clock.c
+++ b/src/lib/elementary/efl_ui_clock.c
@@ -895,7 +895,7 @@ _efl_ui_clock_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Clock_Data *priv)
895 Elm_Access_Info *ai; 895 Elm_Access_Info *ai;
896 896
897 priv->access_obj = _elm_access_edje_object_part_object_register 897 priv->access_obj = _elm_access_edje_object_part_object_register
898 (obj, elm_layout_edje_get(obj), "elm.access"); 898 (obj, elm_layout_edje_get(obj), "efl.access");
899 if (!priv->access_obj) 899 if (!priv->access_obj)
900 priv->access_obj = _elm_access_edje_object_part_object_register 900 priv->access_obj = _elm_access_edje_object_part_object_register
901 (obj, elm_layout_edje_get(obj), "access"); 901 (obj, elm_layout_edje_get(obj), "access");
diff --git a/src/lib/elementary/efl_ui_datepicker.c b/src/lib/elementary/efl_ui_datepicker.c
index 2429d21..55f8b1d 100644
--- a/src/lib/elementary/efl_ui_datepicker.c
+++ b/src/lib/elementary/efl_ui_datepicker.c
@@ -206,7 +206,7 @@ _fields_init(Eo *obj)
206 { 206 {
207 if (strchr(fmt_char[i], ch)) 207 if (strchr(fmt_char[i], ch))
208 { 208 {
209 snprintf(buf, sizeof(buf), "field%d", field++); 209 snprintf(buf, sizeof(buf), "efl.field%d", field++);
210 if (i == DATEPICKER_YEAR) 210 if (i == DATEPICKER_YEAR)
211 efl_content_set(efl_part(obj, buf), pd->year); 211 efl_content_set(efl_part(obj, buf), pd->year);
212 else if (i == DATEPICKER_MONTH) 212 else if (i == DATEPICKER_MONTH)
diff --git a/src/lib/elementary/efl_ui_layout_object.c b/src/lib/elementary/efl_ui_layout_object.c
index b7f2052..76bbd10 100644
--- a/src/lib/elementary/efl_ui_layout_object.c
+++ b/src/lib/elementary/efl_ui_layout_object.c
@@ -186,7 +186,7 @@ _signals_emit(Eo *obj,
186 snprintf(buf, sizeof(buf), "elm,state,%s,%s", type, 186 snprintf(buf, sizeof(buf), "elm,state,%s,%s", type,
187 set ? "set" : "unset"); 187 set ? "set" : "unset");
188 } 188 }
189 efl_layout_signal_emit(obj, buf, "elm"); 189 efl_layout_signal_emit(obj, buf, "elm");
190} 190}
191 191
192static inline void 192static inline void
@@ -219,16 +219,22 @@ _icon_signal_emit(Efl_Ui_Layout_Object_Data *sd,
219 if (!_efl_ui_layout_swallow_parts[i]) return; 219 if (!_efl_ui_layout_swallow_parts[i]) return;
220 if (!strcmp(sub_d->part, _efl_ui_layout_swallow_parts[i])) break; 220 if (!strcmp(sub_d->part, _efl_ui_layout_swallow_parts[i])) break;
221 } 221 }
222
223 } 222 }
224 223
225 if (elm_widget_is_legacy(sd->obj) && 224 if (elm_widget_is_legacy(sd->obj))
226 !strncmp(sub_d->part, "elm.swallow.", strlen("elm.swallow."))) 225 {
227 type = sub_d->part + strlen("elm.swallow."); 226 if (!strncmp(sub_d->part, "elm.swallow.", strlen("elm.swallow.")))
228 else if (!strncmp(sub_d->part, "efl.", strlen("efl."))) 227 type = sub_d->part + strlen("elm.swallow.");
229 type = sub_d->part + strlen("efl."); 228 else
229 type = sub_d->part;
230 }
230 else 231 else
231 type = sub_d->part; 232 {
233 if (!strncmp(sub_d->part, "efl.", strlen("efl.")))
234 type = sub_d->part + strlen("efl.");
235 else
236 type = sub_d->part;
237 }
232 238
233 _signals_emit(sd->obj, type, visible); 239 _signals_emit(sd->obj, type, visible);
234 240
@@ -246,30 +252,37 @@ _text_signal_emit(Efl_Ui_Layout_Object_Data *sd,
246 252
247 //FIXME: Don't limit to "elm.text" prefix. 253 //FIXME: Don't limit to "elm.text" prefix.
248 //Send signals for all text parts after elm 2.0 254 //Send signals for all text parts after elm 2.0
255 if (sub_d->type != TEXT) return;
249 256
250 if (sub_d->type != TEXT) 257 if (elm_widget_is_legacy(sd->obj))
251 { 258 {
252 if (elm_widget_is_legacy(sd->obj) && 259 if (!((!strcmp("elm.text", sub_d->part)) ||
253 !((!strcmp("elm.text", sub_d->part)) ||
254 (!strncmp("elm.text.", sub_d->part, 9)))) 260 (!strncmp("elm.text.", sub_d->part, 9))))
255 { 261 return;
256 return; 262 }
257 } 263 else
258 else if (!((!strcmp("efl.text", sub_d->part)) || 264 {
259 (!strncmp("efl.text.", sub_d->part, 9)))) 265 if (!((!strcmp("efl.text", sub_d->part)) ||
260 { 266 (!strncmp("efl.text.", sub_d->part, 9))))
261 return; 267 return;
262 }
263 } 268 }
264 269
265 ELM_WIDGET_DATA_GET_OR_RETURN(sd->obj, wd); 270 ELM_WIDGET_DATA_GET_OR_RETURN(sd->obj, wd);
266 271
267 if (!strncmp(sub_d->part, "elm.text.", strlen("elm.text."))) 272 if (elm_widget_is_legacy(sd->obj))
268 type = sub_d->part + strlen("elm.text."); 273 {
269 else if (!strncmp(sub_d->part, "efl.", strlen("efl."))) 274 if (!strncmp(sub_d->part, "elm.text.", strlen("elm.text.")))
270 type = sub_d->part + strlen("efl."); 275 type = sub_d->part + strlen("elm.text.");
276 else
277 type = sub_d->part;
278 }
271 else 279 else
272 type = sub_d->part; 280 {
281 if (!strncmp(sub_d->part, "efl.", strlen("efl.")))
282 type = sub_d->part + strlen("efl.");
283 else
284 type = sub_d->part;
285 }
273 286
274 _signals_emit(sd->obj, type, visible); 287 _signals_emit(sd->obj, type, visible);
275 288
diff --git a/src/lib/elementary/efl_ui_navigation_bar.c b/src/lib/elementary/efl_ui_navigation_bar.c
index 2f607b1..2a1720d 100644
--- a/src/lib/elementary/efl_ui_navigation_bar.c
+++ b/src/lib/elementary/efl_ui_navigation_bar.c
@@ -59,7 +59,7 @@ _efl_ui_navigation_bar_efl_object_constructor(Eo *obj, Efl_Ui_Navigation_Bar_Dat
59 59
60/* Standard widget overrides */ 60/* Standard widget overrides */
61ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_navigation_bar, Efl_Ui_Navigation_Bar_Data) 61ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_navigation_bar, Efl_Ui_Navigation_Bar_Data)
62ELM_PART_TEXT_DEFAULT_GET(efl_ui_navigation_bar, "text") 62ELM_PART_TEXT_DEFAULT_GET(efl_ui_navigation_bar, "efl.text")
63ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_ui_navigation_bar, Efl_Ui_Navigation_Bar_Data) 63ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_ui_navigation_bar, Efl_Ui_Navigation_Bar_Data)
64 64
65#define EFL_UI_NAVIGATION_BAR_EXTRA_OPS \ 65#define EFL_UI_NAVIGATION_BAR_EXTRA_OPS \
@@ -106,7 +106,7 @@ _efl_ui_navigation_bar_content_unset(Eo *obj, Efl_Ui_Navigation_Bar_Data *_pd EI
106 } 106 }
107 else if (eina_streq(part, "right_content")) 107 else if (eina_streq(part, "right_content"))
108 return efl_content_unset(efl_part(efl_super(obj, MY_CLASS), "efl.right_content")); 108 return efl_content_unset(efl_part(efl_super(obj, MY_CLASS), "efl.right_content"));
109 109
110 return efl_content_unset(efl_part(efl_super(obj, MY_CLASS), part)); 110 return efl_content_unset(efl_part(efl_super(obj, MY_CLASS), part));
111} 111}
112 112
diff --git a/src/lib/elementary/efl_ui_pager.c b/src/lib/elementary/efl_ui_pager.c
index 0017e76..921d767 100644
--- a/src/lib/elementary/efl_ui_pager.c
+++ b/src/lib/elementary/efl_ui_pager.c
@@ -251,7 +251,7 @@ _event_handler_create(Eo *obj, Efl_Ui_Pager_Data *pd)
251 evas_object_color_set(pd->event, 0, 0, 0, 0); 251 evas_object_color_set(pd->event, 0, 0, 0, 0);
252 evas_object_repeat_events_set(pd->event, EINA_TRUE); 252 evas_object_repeat_events_set(pd->event, EINA_TRUE);
253 253
254 efl_content_set(efl_part(obj, "event"), pd->event); 254 efl_content_set(efl_part(obj, "efl.event"), pd->event);
255 255
256 efl_event_callback_add(pd->event, EFL_EVENT_POINTER_DOWN, 256 efl_event_callback_add(pd->event, EFL_EVENT_POINTER_DOWN,
257 _mouse_down_cb, obj); 257 _mouse_down_cb, obj);
@@ -264,7 +264,7 @@ _event_handler_create(Eo *obj, Efl_Ui_Pager_Data *pd)
264static void 264static void
265_event_handler_del(Eo *obj, Efl_Ui_Pager_Data *pd) 265_event_handler_del(Eo *obj, Efl_Ui_Pager_Data *pd)
266{ 266{
267 efl_content_unset(efl_part(obj, "event")); 267 efl_content_unset(efl_part(obj, "efl.event"));
268 efl_del(pd->event); 268 efl_del(pd->event);
269 pd->event = NULL; 269 pd->event = NULL;
270} 270}
@@ -352,7 +352,7 @@ _efl_ui_pager_efl_object_constructor(Eo *obj,
352 elm_widget_can_focus_set(obj, EINA_TRUE); 352 elm_widget_can_focus_set(obj, EINA_TRUE);
353 353
354 pd->page_root = efl_add(EFL_CANVAS_GROUP_CLASS, evas_object_evas_get(obj)); 354 pd->page_root = efl_add(EFL_CANVAS_GROUP_CLASS, evas_object_evas_get(obj));
355 efl_content_set(efl_part(obj, "page_root"), pd->page_root); 355 efl_content_set(efl_part(obj, "efl.page_root"), pd->page_root);
356 356
357 efl_event_callback_add(pd->page_root, EFL_GFX_ENTITY_EVENT_RESIZE, _resize_cb, pd); 357 efl_event_callback_add(pd->page_root, EFL_GFX_ENTITY_EVENT_RESIZE, _resize_cb, pd);
358 efl_event_callback_add(pd->page_root, EFL_GFX_ENTITY_EVENT_MOVE, _move_cb, pd); 358 efl_event_callback_add(pd->page_root, EFL_GFX_ENTITY_EVENT_MOVE, _move_cb, pd);
@@ -671,7 +671,7 @@ _efl_ui_pager_indicator_set(Eo *obj EINA_UNUSED,
671 if (!pd->idbox) 671 if (!pd->idbox)
672 { 672 {
673 pd->idbox = efl_add(EFL_UI_BOX_CLASS, obj); 673 pd->idbox = efl_add(EFL_UI_BOX_CLASS, obj);
674 efl_content_set(efl_part(obj, "indicator"), pd->idbox); 674 efl_content_set(efl_part(obj, "efl.indicator"), pd->idbox);
675 } 675 }
676 676
677 efl_page_indicator_bind(pd->indicator, obj, pd->idbox); 677 efl_page_indicator_bind(pd->indicator, obj, pd->idbox);
diff --git a/src/lib/elementary/efl_ui_panes.c b/src/lib/elementary/efl_ui_panes.c
index 7699889..57b4ecf 100644
--- a/src/lib/elementary/efl_ui_panes.c
+++ b/src/lib/elementary/efl_ui_panes.c
@@ -450,7 +450,7 @@ _efl_ui_panes_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Panes_Data *_pd EINA_UN
450 if (elm_widget_is_legacy(obj)) 450 if (elm_widget_is_legacy(obj))
451 { 451 {
452 if (edje_object_part_exists 452 if (edje_object_part_exists
453 (wd->resize_obj, "elm.swallow.event")) 453 (wd->resize_obj, "elm.swallow.event"))
454 { 454 {
455 Evas_Coord minw = 0, minh = 0; 455 Evas_Coord minw = 0, minh = 0;
456 456
@@ -462,7 +462,7 @@ _efl_ui_panes_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Panes_Data *_pd EINA_UN
462 else 462 else
463 { 463 {
464 if (edje_object_part_exists 464 if (edje_object_part_exists
465 (wd->resize_obj, "efl.event")) 465 (wd->resize_obj, "efl.event"))
466 { 466 {
467 Evas_Coord minw = 0, minh = 0; 467 Evas_Coord minw = 0, minh = 0;
468 468
@@ -470,7 +470,7 @@ _efl_ui_panes_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Panes_Data *_pd EINA_UN
470 evas_object_size_hint_min_set(sd->event, minw, minh); 470 evas_object_size_hint_min_set(sd->event, minw, minh);
471 elm_layout_content_set(obj, "efl.event", sd->event); 471 elm_layout_content_set(obj, "efl.event", sd->event);
472 } 472 }
473 } 473 }
474 elm_widget_sub_object_add(obj, sd->event); 474 elm_widget_sub_object_add(obj, sd->event);
475 475
476 elm_layout_sizing_eval(obj); 476 elm_layout_sizing_eval(obj);
diff --git a/src/lib/elementary/efl_ui_popup_alert.c b/src/lib/elementary/efl_ui_popup_alert.c
index 08097fc..0799635 100644
--- a/src/lib/elementary/efl_ui_popup_alert.c
+++ b/src/lib/elementary/efl_ui_popup_alert.c
@@ -168,7 +168,7 @@ _efl_ui_popup_alert_button_set(Eo *obj, Efl_Ui_Popup_Alert_Data *pd, Efl_Ui_Popu
168 pd->button[EFL_UI_POPUP_ALERT_BUTTON_NEGATIVE]); 168 pd->button[EFL_UI_POPUP_ALERT_BUTTON_NEGATIVE]);
169 } 169 }
170 170
171 elm_layout_signal_emit(obj, "elm,efl.buttons,show", "elm"); 171 elm_layout_signal_emit(obj, "elm,buttons,show", "elm");
172 edje_object_message_signal_process(wd->resize_obj); 172 edje_object_message_signal_process(wd->resize_obj);
173 elm_layout_sizing_eval(obj); 173 elm_layout_sizing_eval(obj);
174} 174}
diff --git a/src/lib/elementary/efl_ui_scroller.c b/src/lib/elementary/efl_ui_scroller.c
index 47a932a..c086957 100644
--- a/src/lib/elementary/efl_ui_scroller.c
+++ b/src/lib/elementary/efl_ui_scroller.c
@@ -72,9 +72,9 @@ _efl_ui_scroller_bar_read_and_update(Eo *obj)
72 double vx, vy; 72 double vx, vy;
73 73
74 edje_object_part_drag_value_get 74 edje_object_part_drag_value_get
75 (wd->resize_obj, "dragable.vbar", NULL, &vy); 75 (wd->resize_obj, "efl.dragable.vbar", NULL, &vy);
76 edje_object_part_drag_value_get 76 edje_object_part_drag_value_get
77 (wd->resize_obj, "dragable.hbar", &vx, NULL); 77 (wd->resize_obj, "efl.dragable.hbar", &vx, NULL);
78 78
79 efl_ui_scrollbar_bar_position_set(sd->smanager, vx, vy); 79 efl_ui_scrollbar_bar_position_set(sd->smanager, vx, vy);
80} 80}
@@ -206,8 +206,8 @@ _efl_ui_scroller_bar_size_changed_cb(void *data, const Efl_Event *event EINA_UNU
206 206
207 edje_object_calc_force(wd->resize_obj); 207 edje_object_calc_force(wd->resize_obj);
208 efl_ui_scrollbar_bar_size_get(sd->smanager, &width, &height); 208 efl_ui_scrollbar_bar_size_get(sd->smanager, &width, &height);
209 edje_object_part_drag_size_set(wd->resize_obj, "dragable.hbar", width, 1.0); 209 edje_object_part_drag_size_set(wd->resize_obj, "efl.dragable.hbar", width, 1.0);
210 edje_object_part_drag_size_set(wd->resize_obj, "dragable.vbar", 1.0, height); 210 edje_object_part_drag_size_set(wd->resize_obj, "efl.dragable.vbar", 1.0, height);
211} 211}
212 212
213static void 213static void
@@ -220,8 +220,8 @@ _efl_ui_scroller_bar_pos_changed_cb(void *data, const Efl_Event *event EINA_UNUS
220 double posx = 0.0, posy = 0.0; 220 double posx = 0.0, posy = 0.0;
221 221
222 efl_ui_scrollbar_bar_position_get(sd->smanager, &posx, &posy); 222 efl_ui_scrollbar_bar_position_get(sd->smanager, &posx, &posy);
223 edje_object_part_drag_value_set(wd->resize_obj, "dragable.hbar", posx, 0.0); 223 edje_object_part_drag_value_set(wd->resize_obj, "efl.dragable.hbar", posx, 0.0);
224 edje_object_part_drag_value_set(wd->resize_obj, "dragable.vbar", 0.0, posy); 224 edje_object_part_drag_value_set(wd->resize_obj, "efl.dragable.vbar", 0.0, posy);
225} 225}
226 226
227static void 227static void
@@ -260,22 +260,22 @@ _scroll_edje_object_attach(Eo *obj)
260 efl_layout_signal_callback_add 260 efl_layout_signal_callback_add
261 (obj, "reload", "elm", _efl_ui_scroller_reload_cb, obj); 261 (obj, "reload", "elm", _efl_ui_scroller_reload_cb, obj);
262 efl_layout_signal_callback_add 262 efl_layout_signal_callback_add
263 (obj, "drag", "dragable.vbar", _efl_ui_scroller_vbar_drag_cb, 263 (obj, "drag", "efl.dragable.vbar", _efl_ui_scroller_vbar_drag_cb,
264 obj); 264 obj);
265 efl_layout_signal_callback_add 265 efl_layout_signal_callback_add
266 (obj, "drag,set", "dragable.vbar", 266 (obj, "drag,set", "efl.dragable.vbar",
267 _efl_ui_scroller_edje_drag_cb, obj); 267 _efl_ui_scroller_edje_drag_cb, obj);
268 efl_layout_signal_callback_add 268 efl_layout_signal_callback_add
269 (obj, "drag,start", "dragable.vbar", 269 (obj, "drag,start", "efl.dragable.vbar",
270 _efl_ui_scroller_edje_drag_start_cb, obj); 270 _efl_ui_scroller_edje_drag_start_cb, obj);
271 efl_layout_signal_callback_add 271 efl_layout_signal_callback_add
272 (obj, "drag,stop", "dragable.vbar", 272 (obj, "drag,stop", "efl.dragable.vbar",
273 _efl_ui_scroller_edje_drag_stop_cb, obj); 273 _efl_ui_scroller_edje_drag_stop_cb, obj);
274 efl_layout_signal_callback_add 274 efl_layout_signal_callback_add
275 (obj, "drag,step", "dragable.vbar", 275 (obj, "drag,step", "efl.dragable.vbar",
276 _efl_ui_scroller_edje_drag_cb, obj); 276 _efl_ui_scroller_edje_drag_cb, obj);
277 efl_layout_signal_callback_add 277 efl_layout_signal_callback_add
278 (obj, "drag,page", "dragable.vbar", 278 (obj, "drag,page", "efl.dragable.vbar",
279 _efl_ui_scroller_edje_drag_cb, obj); 279 _efl_ui_scroller_edje_drag_cb, obj);
280 efl_layout_signal_callback_add 280 efl_layout_signal_callback_add
281 (obj, "elm,vbar,press", "elm", 281 (obj, "elm,vbar,press", "elm",
@@ -284,22 +284,22 @@ _scroll_edje_object_attach(Eo *obj)
284 (obj, "elm,vbar,unpress", "elm", 284 (obj, "elm,vbar,unpress", "elm",
285 _efl_ui_scroller_vbar_unpress_cb, obj); 285 _efl_ui_scroller_vbar_unpress_cb, obj);
286 efl_layout_signal_callback_add 286 efl_layout_signal_callback_add
287 (obj, "drag", "dragable.hbar", _efl_ui_scroller_hbar_drag_cb, 287 (obj, "drag", "efl.dragable.hbar", _efl_ui_scroller_hbar_drag_cb,
288 obj); 288 obj);
289 efl_layout_signal_callback_add 289 efl_layout_signal_callback_add
290 (obj, "drag,set", "dragable.hbar", 290 (obj, "drag,set", "efl.dragable.hbar",
291 _efl_ui_scroller_edje_drag_cb, obj); 291 _efl_ui_scroller_edje_drag_cb, obj);
292 efl_layout_signal_callback_add 292 efl_layout_signal_callback_add
293 (obj, "drag,start", "dragable.hbar", 293 (obj, "drag,start", "efl.dragable.hbar",
294 _efl_ui_scroller_edje_drag_start_cb, obj); 294 _efl_ui_scroller_edje_drag_start_cb, obj);
295 efl_layout_signal_callback_add 295 efl_layout_signal_callback_add
296 (obj, "drag,stop", "dragable.hbar", 296 (obj, "drag,stop", "efl.dragable.hbar",
297 _efl_ui_scroller_edje_drag_stop_cb, obj); 297 _efl_ui_scroller_edje_drag_stop_cb, obj);
298 efl_layout_signal_callback_add 298 efl_layout_signal_callback_add
299 (obj, "drag,step", "dragable.hbar", 299 (obj, "drag,step", "efl.dragable.hbar",
300 _efl_ui_scroller_edje_drag_cb, obj); 300 _efl_ui_scroller_edje_drag_cb, obj);
301 efl_layout_signal_callback_add 301 efl_layout_signal_callback_add
302 (obj, "drag,page", "dragable.hbar", 302 (obj, "drag,page", "efl.dragable.hbar",
303 _efl_ui_scroller_edje_drag_cb, obj); 303 _efl_ui_scroller_edje_drag_cb, obj);
304 efl_layout_signal_callback_add 304 efl_layout_signal_callback_add
305 (obj, "elm,hbar,press", "elm", 305 (obj, "elm,hbar,press", "elm",
@@ -317,22 +317,22 @@ _scroll_edje_object_detach(Evas_Object *obj)
317 efl_layout_signal_callback_del 317 efl_layout_signal_callback_del
318 (obj, "reload", "elm", _efl_ui_scroller_reload_cb, obj); 318 (obj, "reload", "elm", _efl_ui_scroller_reload_cb, obj);
319 efl_layout_signal_callback_del 319 efl_layout_signal_callback_del
320 (obj, "drag", "dragable.vbar", _efl_ui_scroller_vbar_drag_cb, 320 (obj, "drag", "efl.dragable.vbar", _efl_ui_scroller_vbar_drag_cb,
321 obj); 321 obj);
322 efl_layout_signal_callback_del 322 efl_layout_signal_callback_del
323 (obj, "drag,set", "dragable.vbar", 323 (obj, "drag,set", "efl.dragable.vbar",
324 _efl_ui_scroller_edje_drag_cb, obj); 324 _efl_ui_scroller_edje_drag_cb, obj);
325 efl_layout_signal_callback_del 325 efl_layout_signal_callback_del
326 (obj, "drag,start", "dragable.vbar", 326 (obj, "drag,start", "efl.dragable.vbar",
327 _efl_ui_scroller_edje_drag_start_cb, obj); 327 _efl_ui_scroller_edje_drag_start_cb, obj);
328 efl_layout_signal_callback_del 328 efl_layout_signal_callback_del
329 (obj, "drag,stop", "dragable.vbar", 329 (obj, "drag,stop", "efl.dragable.vbar",
330 _efl_ui_scroller_edje_drag_stop_cb, obj); 330 _efl_ui_scroller_edje_drag_stop_cb, obj);
331 efl_layout_signal_callback_del 331 efl_layout_signal_callback_del
332 (obj, "drag,step", "dragable.vbar", 332 (obj, "drag,step", "efl.dragable.vbar",
333 _efl_ui_scroller_edje_drag_cb, obj); 333 _efl_ui_scroller_edje_drag_cb, obj);
334 efl_layout_signal_callback_del 334 efl_layout_signal_callback_del
335 (obj, "drag,page", "dragable.vbar", 335 (obj, "drag,page", "efl.dragable.vbar",
336 _efl_ui_scroller_edje_drag_cb, obj); 336 _efl_ui_scroller_edje_drag_cb, obj);
337 efl_layout_signal_callback_del 337 efl_layout_signal_callback_del
338 (obj, "elm,vbar,press", "elm", 338 (obj, "elm,vbar,press", "elm",
@@ -341,22 +341,22 @@ _scroll_edje_object_detach(Evas_Object *obj)
341 (obj, "elm,vbar,unpress", "elm", 341 (obj, "elm,vbar,unpress", "elm",
342 _efl_ui_scroller_vbar_unpress_cb, obj); 342 _efl_ui_scroller_vbar_unpress_cb, obj);
343 efl_layout_signal_callback_del 343 efl_layout_signal_callback_del
344 (obj, "drag", "dragable.hbar", _efl_ui_scroller_hbar_drag_cb, 344 (obj, "drag", "efl.dragable.hbar", _efl_ui_scroller_hbar_drag_cb,
345 obj); 345 obj);
346 efl_layout_signal_callback_del 346 efl_layout_signal_callback_del
347 (obj, "drag,set", "dragable.hbar", 347 (obj, "drag,set", "efl.dragable.hbar",
348 _efl_ui_scroller_edje_drag_cb, obj); 348 _efl_ui_scroller_edje_drag_cb, obj);
349 efl_layout_signal_callback_del 349 efl_layout_signal_callback_del
350 (obj, "drag,start", "dragable.hbar", 350 (obj, "drag,start", "efl.dragable.hbar",
351 _efl_ui_scroller_edje_drag_start_cb, obj); 351 _efl_ui_scroller_edje_drag_start_cb, obj);
352 efl_layout_signal_callback_del 352 efl_layout_signal_callback_del
353 (obj, "drag,stop", "dragable.hbar", 353 (obj, "drag,stop", "efl.dragable.hbar",
354 _efl_ui_scroller_edje_drag_stop_cb, obj); 354 _efl_ui_scroller_edje_drag_stop_cb, obj);
355 efl_layout_signal_callback_del 355 efl_layout_signal_callback_del
356 (obj, "drag,step", "dragable.hbar", 356 (obj, "drag,step", "efl.dragable.hbar",
357 _efl_ui_scroller_edje_drag_cb, obj); 357 _efl_ui_scroller_edje_drag_cb, obj);
358 efl_layout_signal_callback_del 358 efl_layout_signal_callback_del
359 (obj, "drag,page", "dragable.hbar", 359 (obj, "drag,page", "efl.dragable.hbar",
360 _efl_ui_scroller_edje_drag_cb, obj); 360 _efl_ui_scroller_edje_drag_cb, obj);
361 efl_layout_signal_callback_del 361 efl_layout_signal_callback_del
362 (obj, "elm,hbar,press", "elm", 362 (obj, "elm,hbar,press", "elm",
diff --git a/src/lib/elementary/efl_ui_spin_button.c b/src/lib/elementary/efl_ui_spin_button.c
index f4e0692..2a37bce 100644
--- a/src/lib/elementary/efl_ui_spin_button.c
+++ b/src/lib/elementary/efl_ui_spin_button.c
@@ -883,7 +883,7 @@ _efl_ui_spin_button_efl_access_object_i18n_name_get(const Eo *obj, Efl_Ui_Spin_B
883 const char *name; 883 const char *name;
884 name = efl_access_object_i18n_name_get(efl_super(obj, EFL_UI_SPIN_BUTTON_CLASS)); 884 name = efl_access_object_i18n_name_get(efl_super(obj, EFL_UI_SPIN_BUTTON_CLASS));
885 if (name) return name; 885 if (name) return name;
886 const char *ret = elm_layout_text_get(obj, "text"); 886 const char *ret = elm_layout_text_get(obj, "efl.text");
887 return ret; 887 return ret;
888} 888}
889 889
diff --git a/src/lib/elementary/efl_ui_timepicker.c b/src/lib/elementary/efl_ui_timepicker.c
index 49a4e38..9d00554 100644
--- a/src/lib/elementary/efl_ui_timepicker.c
+++ b/src/lib/elementary/efl_ui_timepicker.c
@@ -163,7 +163,7 @@ _fields_init(Eo *obj)
163 { 163 {
164 if (strchr(fmt_char[i], ch)) 164 if (strchr(fmt_char[i], ch))
165 { 165 {
166 snprintf(buf, sizeof(buf), "field%d", field); 166 snprintf(buf, sizeof(buf), "efl.field%d", field);
167 if (i == TIMEPICKER_HOUR) 167 if (i == TIMEPICKER_HOUR)
168 efl_content_set(efl_part(obj, buf), pd->hour); 168 efl_content_set(efl_part(obj, buf), pd->hour);
169 else if (i == TIMEPICKER_MIN) 169 else if (i == TIMEPICKER_MIN)
diff --git a/src/lib/elementary/els_tooltip.c b/src/lib/elementary/els_tooltip.c
index e4e5352..2defdde 100644
--- a/src/lib/elementary/els_tooltip.c
+++ b/src/lib/elementary/els_tooltip.c
@@ -491,8 +491,14 @@ _elm_tooltip_reconfigure(Elm_Tooltip *tt)
491 491
492 tt->changed_style = EINA_FALSE; 492 tt->changed_style = EINA_FALSE;
493 if (tt->tooltip) 493 if (tt->tooltip)
494 edje_object_part_swallow(tt->tooltip, "elm.swallow.content", 494 {
495 tt->content); 495 if (elm_widget_is_legacy(tt->owner))
496 edje_object_part_swallow(tt->tooltip, "elm.swallow.content",
497 tt->content);
498 else
499 edje_object_part_swallow(tt->tooltip, "efl.content",
500 tt->content);
501 }
496 502
497 edje_object_signal_emit(tt->tooltip, "elm,action,show", "elm"); 503 edje_object_signal_emit(tt->tooltip, "elm,action,show", "elm");
498 } 504 }
@@ -519,11 +525,15 @@ _elm_tooltip_reconfigure(Elm_Tooltip *tt)
519 tt->tooltip = NULL; 525 tt->tooltip = NULL;
520 return; 526 return;
521 } 527 }
522 edje_object_part_swallow 528 if (elm_widget_is_legacy(tt->owner))
523 (tt->tooltip, "elm.swallow.content", tt->content); 529 edje_object_part_swallow
530 (tt->tooltip, "elm.swallow.content", tt->content);
531 else
532 edje_object_part_swallow
533 (tt->tooltip, "efl.content", tt->content);
524 new_content = EINA_TRUE; 534 new_content = EINA_TRUE;
525 evas_object_event_callback_add(tt->content, EVAS_CALLBACK_DEL, 535 evas_object_event_callback_add(tt->content, EVAS_CALLBACK_DEL,
526 _elm_tooltip_content_del_cb, tt); 536 _elm_tooltip_content_del_cb, tt);
527 537
528 /* tooltip has to use layer tooltip */ 538 /* tooltip has to use layer tooltip */
529 evas_object_layer_set(tt->tooltip, ELM_OBJECT_LAYER_TOOLTIP); 539 evas_object_layer_set(tt->tooltip, ELM_OBJECT_LAYER_TOOLTIP);