summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaehyun Cho <jae_hyun.cho@samsung.com>2018-04-23 21:14:47 +0900
committerJaehyun Cho <jae_hyun.cho@samsung.com>2018-04-23 21:14:47 +0900
commitab66f39e9aa47d158d4f3db8fb5a7ad3e6e08577 (patch)
tree00c1262d870209d614c40e8eb2b1ba728507845f
parent5cb01d2f704f2e403eed40d39f6a17e69e891d50 (diff)
Apply patch to remove "efl." in signaldevs/jaehyun/efl_part_legacy_remove2
-rw-r--r--data/elementary/themes/edc/efl/bg.edc4
-rw-r--r--data/elementary/themes/edc/efl/button.edc24
-rw-r--r--data/elementary/themes/edc/efl/check.edc16
-rw-r--r--data/elementary/themes/edc/efl/navigation_bar.edc28
-rw-r--r--data/elementary/themes/edc/efl/navigation_layout.edc6
-rw-r--r--data/elementary/themes/edc/efl/popup.edc4
-rw-r--r--data/elementary/themes/edc/efl/progress.edc16
-rw-r--r--data/elementary/themes/edc/efl/radio.edc4
-rw-r--r--src/lib/elementary/efl_ui_bg_widget.c2
-rw-r--r--src/lib/elementary/efl_ui_layout.c37
-rw-r--r--src/lib/elementary/efl_ui_navigation_bar.c39
-rw-r--r--src/lib/elementary/efl_ui_navigation_layout.c4
-rw-r--r--src/lib/elementary/efl_ui_popup.c4
13 files changed, 113 insertions, 75 deletions
diff --git a/data/elementary/themes/edc/efl/bg.edc b/data/elementary/themes/edc/efl/bg.edc
index ab1045d81f..a665703962 100644
--- a/data/elementary/themes/edc/efl/bg.edc
+++ b/data/elementary/themes/edc/efl/bg.edc
@@ -24,7 +24,7 @@ group { "efl/bg";
24 description { state: "default" 0.0; 24 description { state: "default" 0.0;
25 } 25 }
26 } 26 }
27 part { name: "efl.bg"; 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;
@@ -43,4 +43,4 @@ group { "efl/bg";
43 } 43 }
44 } 44 }
45 } 45 }
46} \ No newline at end of file 46}
diff --git a/data/elementary/themes/edc/efl/button.edc b/data/elementary/themes/edc/efl/button.edc
index 6927e41878..752c197da4 100644
--- a/data/elementary/themes/edc/efl/button.edc
+++ b/data/elementary/themes/edc/efl/button.edc
@@ -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,efl.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,efl.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);
@@ -352,7 +352,7 @@ group { name: "efl/button";
352 } 352 }
353 } 353 }
354 program { name: "button_icon_visible"; 354 program { name: "button_icon_visible";
355 signal: "elm,state,efl.content,set"; source: "elm"; 355 signal: "elm,state,content,set"; source: "elm";
356 script { 356 script {
357 new m = get_int(btmode); 357 new m = get_int(btmode);
358 m |= ICON; set_int(btmode, m); 358 m |= ICON; set_int(btmode, m);
@@ -360,7 +360,7 @@ group { name: "efl/button";
360 } 360 }
361 } 361 }
362 program { name: "button_icon_hidden"; 362 program { name: "button_icon_hidden";
363 signal: "elm,state,efl.content,unset"; source: "elm"; 363 signal: "elm,state,content,unset"; source: "elm";
364 script { 364 script {
365 new m = get_int(btmode); 365 new m = get_int(btmode);
366 m &= ~ICON; set_int(btmode, m); 366 m &= ~ICON; set_int(btmode, m);
@@ -368,7 +368,7 @@ group { name: "efl/button";
368 } 368 }
369 } 369 }
370 program { name: "button_background_visible"; 370 program { name: "button_background_visible";
371 signal: "elm,state,efl.background,set"; source: "elm"; 371 signal: "elm,state,background,set"; source: "elm";
372 script { 372 script {
373 new m = get_int(btmode); 373 new m = get_int(btmode);
374 m |= BACKGROUND; set_int(btmode, m); 374 m |= BACKGROUND; set_int(btmode, m);
@@ -376,7 +376,7 @@ group { name: "efl/button";
376 } 376 }
377 } 377 }
378 program { name: "button_background_hidden"; 378 program { name: "button_background_hidden";
379 signal: "elm,state,efl.background,unset"; source: "elm"; 379 signal: "elm,state,background,unset"; source: "elm";
380 script { 380 script {
381 new m = get_int(btmode); 381 new m = get_int(btmode);
382 m &= ~BACKGROUND; set_int(btmode, m); 382 m &= ~BACKGROUND; set_int(btmode, m);
@@ -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,efl.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,efl.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);
@@ -734,7 +734,7 @@ group { name: "efl/button:anchor";
734 } 734 }
735 } 735 }
736 program { name: "button_icon_visible"; 736 program { name: "button_icon_visible";
737 signal: "elm,state,efl.content,set"; source: "elm"; 737 signal: "elm,state,content,set"; source: "elm";
738 script { 738 script {
739 new m = get_int(btmode); 739 new m = get_int(btmode);
740 m |= ICON; set_int(btmode, m); 740 m |= ICON; set_int(btmode, m);
@@ -742,7 +742,7 @@ group { name: "efl/button:anchor";
742 } 742 }
743 } 743 }
744 program { name: "button_icon_hidden"; 744 program { name: "button_icon_hidden";
745 signal: "elm,state,efl.content,unset"; source: "elm"; 745 signal: "elm,state,content,unset"; source: "elm";
746 script { 746 script {
747 new m = get_int(btmode); 747 new m = get_int(btmode);
748 m &= ~ICON; set_int(btmode, m); 748 m &= ~ICON; set_int(btmode, m);
@@ -750,12 +750,12 @@ group { name: "efl/button:anchor";
750 } 750 }
751 } 751 }
752 program { name: "button_background_visible"; 752 program { name: "button_background_visible";
753 signal: "elm,state,efl.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: "efl.background"; 755 target: "efl.background";
756 } 756 }
757 program { name: "button_background_hidden"; 757 program { name: "button_background_hidden";
758 signal: "elm,state,efl.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: "efl.background"; 760 target: "efl.background";
761 } 761 }
diff --git a/data/elementary/themes/edc/efl/check.edc b/data/elementary/themes/edc/efl/check.edc
index cbfa75d509..298458769d 100644
--- a/data/elementary/themes/edc/efl/check.edc
+++ b/data/elementary/themes/edc/efl/check.edc
@@ -271,7 +271,7 @@ group { "efl/check";
271 target: "indicator"; 271 target: "indicator";
272 } 272 }
273 program { 273 program {
274 signal: "elm,state,efl.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,efl.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);
@@ -287,7 +287,7 @@ group { "efl/check";
287 } 287 }
288 } 288 }
289 program { 289 program {
290 signal: "elm,state,efl.content,set"; source: "elm"; 290 signal: "elm,state,content,set"; source: "elm";
291 script { 291 script {
292 new m = get_int(btmode); 292 new m = get_int(btmode);
293 m |= ICON; set_int(btmode, m); 293 m |= ICON; set_int(btmode, m);
@@ -295,7 +295,7 @@ group { "efl/check";
295 } 295 }
296 } 296 }
297 program { 297 program {
298 signal: "elm,state,efl.content,unset"; source: "elm"; 298 signal: "elm,state,content,unset"; source: "elm";
299 script { 299 script {
300 new m = get_int(btmode); 300 new m = get_int(btmode);
301 m &= ~ICON; set_int(btmode, m); 301 m &= ~ICON; set_int(btmode, m);
@@ -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,efl.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,efl.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);
@@ -886,7 +886,7 @@ group { "efl/check:toggle";
886 } 886 }
887 } 887 }
888 program { 888 program {
889 signal: "elm,state,efl.content,set"; source: "elm"; 889 signal: "elm,state,content,set"; source: "elm";
890 script { 890 script {
891 new m = get_int(btmode); 891 new m = get_int(btmode);
892 m |= ICON; set_int(btmode, m); 892 m |= ICON; set_int(btmode, m);
@@ -894,7 +894,7 @@ group { "efl/check:toggle";
894 } 894 }
895 } 895 }
896 program { 896 program {
897 signal: "elm,state,efl.content,unset"; source: "elm"; 897 signal: "elm,state,content,unset"; source: "elm";
898 script { 898 script {
899 new m = get_int(btmode); 899 new m = get_int(btmode);
900 m &= ~ICON; set_int(btmode, m); 900 m &= ~ICON; set_int(btmode, m);
diff --git a/data/elementary/themes/edc/efl/navigation_bar.edc b/data/elementary/themes/edc/efl/navigation_bar.edc
index 212ddd8d76..d67a679d31 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 {
@@ -76,22 +76,22 @@ group { "efl/navigation_bar";
76 } 76 }
77 programs { 77 programs {
78 program { 78 program {
79 signal: "elm,state,back_button,visible"; source: "elm"; 79 signal: "elm,state,back_button,set"; 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,unset"; 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,set"; source: "elm";
90 action: STATE_SET "left_content" 0.0; 90 action: STATE_SET "left_content" 0.0;
91 target: "text_base"; 91 target: "text_base";
92 } 92 }
93 program { 93 program {
94 signal: "elm,state,left_content,hidden"; source: "elm"; 94 signal: "elm,state,left_content,unset"; source: "elm";
95 action: STATE_SET "default" 0.0; 95 action: STATE_SET "default" 0.0;
96 target: "text_base"; 96 target: "text_base";
97 } 97 }
@@ -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 c3765cce9f..4319453b96 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/popup.edc b/data/elementary/themes/edc/efl/popup.edc
index 2ffca4cd5a..cfdd560c37 100644
--- a/data/elementary/themes/edc/efl/popup.edc
+++ b/data/elementary/themes/edc/efl/popup.edc
@@ -150,13 +150,13 @@ group { "efl/popup/backwall";
150 150
151 programs { 151 programs {
152 program { 152 program {
153 signal: "elm,state,efl.content,set"; source: "elm"; 153 signal: "elm,state,content,set"; source: "elm";
154 action: STATE_SET "content_visible" 0.0; 154 action: STATE_SET "content_visible" 0.0;
155 target: "base"; 155 target: "base";
156 target: "efl.content"; 156 target: "efl.content";
157 } 157 }
158 program { 158 program {
159 signal: "elm,state,efl.content,unset"; 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: "efl.content"; 162 target: "efl.content";
diff --git a/data/elementary/themes/edc/efl/progress.edc b/data/elementary/themes/edc/efl/progress.edc
index 37efd3e8ee..d525ba5cd4 100644
--- a/data/elementary/themes/edc/efl/progress.edc
+++ b/data/elementary/themes/edc/efl/progress.edc
@@ -504,7 +504,7 @@ group { "efl/progressbar/horizontal";
504 target: "efl.text.status"; 504 target: "efl.text.status";
505 } 505 }
506 program { name: "text-visible"; 506 program { name: "text-visible";
507 signal: "elm,state,efl.text,set"; source: "elm"; 507 signal: "elm,state,text,set"; source: "elm";
508 script { 508 script {
509 new m = get_int(slmode); 509 new m = get_int(slmode);
510 m |= LABEL; set_int(slmode, m); 510 m |= LABEL; set_int(slmode, m);
@@ -512,7 +512,7 @@ group { "efl/progressbar/horizontal";
512 } 512 }
513 } 513 }
514 program { name: "text-hidden"; 514 program { name: "text-hidden";
515 signal: "elm,state,efl.text,unset"; source: "elm"; 515 signal: "elm,state,text,unset"; source: "elm";
516 script { 516 script {
517 new m = get_int(slmode); 517 new m = get_int(slmode);
518 m &= ~LABEL; set_int(slmode, m); 518 m &= ~LABEL; set_int(slmode, m);
@@ -520,7 +520,7 @@ group { "efl/progressbar/horizontal";
520 } 520 }
521 } 521 }
522 program { name: "icon-visible"; 522 program { name: "icon-visible";
523 signal: "elm,state,efl.content,set"; source: "elm"; 523 signal: "elm,state,content,set"; source: "elm";
524 script { 524 script {
525 new m = get_int(slmode); 525 new m = get_int(slmode);
526 m |= ICON; set_int(slmode, m); 526 m |= ICON; set_int(slmode, m);
@@ -528,7 +528,7 @@ group { "efl/progressbar/horizontal";
528 } 528 }
529 } 529 }
530 program { name: "icon-hidden"; 530 program { name: "icon-hidden";
531 signal: "elm,state,efl.content,unset"; source: "elm"; 531 signal: "elm,state,content,unset"; source: "elm";
532 script { 532 script {
533 new m = get_int(slmode); 533 new m = get_int(slmode);
534 m &= ~ICON; set_int(slmode, m); 534 m &= ~ICON; set_int(slmode, m);
@@ -1077,7 +1077,7 @@ group { "efl/progressbar/vertical";
1077 target: "efl.text.status"; 1077 target: "efl.text.status";
1078 } 1078 }
1079 program { name: "text-visible"; 1079 program { name: "text-visible";
1080 signal: "elm,state,efl.text,set"; source: "elm"; 1080 signal: "elm,state,text,set"; source: "elm";
1081 script { 1081 script {
1082 new m = get_int(slmode); 1082 new m = get_int(slmode);
1083 m |= LABEL; set_int(slmode, m); 1083 m |= LABEL; set_int(slmode, m);
@@ -1085,7 +1085,7 @@ group { "efl/progressbar/vertical";
1085 } 1085 }
1086 } 1086 }
1087 program { name: "text-hidden"; 1087 program { name: "text-hidden";
1088 signal: "elm,state,efl.text,unset"; source: "elm"; 1088 signal: "elm,state,text,unset"; source: "elm";
1089 script { 1089 script {
1090 new m = get_int(slmode); 1090 new m = get_int(slmode);
1091 m &= ~LABEL; set_int(slmode, m); 1091 m &= ~LABEL; set_int(slmode, m);
@@ -1093,7 +1093,7 @@ group { "efl/progressbar/vertical";
1093 } 1093 }
1094 } 1094 }
1095 program { name: "icon-visible"; 1095 program { name: "icon-visible";
1096 signal: "elm,state,efl.content,set"; source: "elm"; 1096 signal: "elm,state,content,set"; source: "elm";
1097 script { 1097 script {
1098 new m = get_int(slmode); 1098 new m = get_int(slmode);
1099 m |= ICON; set_int(slmode, m); 1099 m |= ICON; set_int(slmode, m);
@@ -1101,7 +1101,7 @@ group { "efl/progressbar/vertical";
1101 } 1101 }
1102 } 1102 }
1103 program { name: "icon-hidden"; 1103 program { name: "icon-hidden";
1104 signal: "elm,state,efl.content,unset"; source: "elm"; 1104 signal: "elm,state,content,unset"; source: "elm";
1105 script { 1105 script {
1106 new m = get_int(slmode); 1106 new m = get_int(slmode);
1107 m &= ~ICON; set_int(slmode, m); 1107 m &= ~ICON; set_int(slmode, m);
diff --git a/data/elementary/themes/edc/efl/radio.edc b/data/elementary/themes/edc/efl/radio.edc
index c407713f04..7822d8f14a 100644
--- a/data/elementary/themes/edc/efl/radio.edc
+++ b/data/elementary/themes/edc/efl/radio.edc
@@ -237,7 +237,7 @@ group { "efl/radio";
237 target: "indicator"; 237 target: "indicator";
238 } 238 }
239 program { 239 program {
240 signal: "elm,state,efl.text,set"; source: "elm"; 240 signal: "elm,state,text,set"; source: "elm";
241 script { 241 script {
242 new m = get_int(btmode); 242 new m = get_int(btmode);
243 m |= LABEL; set_int(btmode, m); 243 m |= LABEL; set_int(btmode, m);
@@ -245,7 +245,7 @@ group { "efl/radio";
245 } 245 }
246 } 246 }
247 program { 247 program {
248 signal: "elm,state,efl.text,unset"; source: "elm"; 248 signal: "elm,state,text,unset"; source: "elm";
249 script { 249 script {
250 new m = get_int(btmode); 250 new m = get_int(btmode);
251 m &= ~LABEL; set_int(btmode, m); 251 m &= ~LABEL; set_int(btmode, m);
diff --git a/src/lib/elementary/efl_ui_bg_widget.c b/src/lib/elementary/efl_ui_bg_widget.c
index 43b73ecd6c..af905c8e38 100644
--- a/src/lib/elementary/efl_ui_bg_widget.c
+++ b/src/lib/elementary/efl_ui_bg_widget.c
@@ -56,7 +56,7 @@ _efl_ui_bg_widget_efl_object_constructor(Eo *obj, Efl_Ui_Bg_Widget_Data *pd)
56 56
57 pd->img = efl_add(EFL_UI_IMAGE_CLASS, obj, 57 pd->img = efl_add(EFL_UI_IMAGE_CLASS, obj,
58 efl_image_scale_type_set(efl_added, EFL_IMAGE_SCALE_TYPE_FIT_OUTSIDE), 58 efl_image_scale_type_set(efl_added, EFL_IMAGE_SCALE_TYPE_FIT_OUTSIDE),
59 efl_content_set(efl_part(obj, "efl.bg"), efl_added)); 59 efl_content_set(efl_part(obj, "efl.background"), efl_added));
60 } 60 }
61 pd->file = NULL; 61 pd->file = NULL;
62 pd->key = NULL; 62 pd->key = NULL;
diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c
index ed93cf2e7a..536d504c04 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -204,11 +204,20 @@ _icon_signal_emit(Efl_Ui_Layout_Data *sd,
204 } 204 }
205 } 205 }
206 206
207 if (elm_widget_is_legacy(sd->obj) && 207 if (elm_widget_is_legacy(sd->obj))
208 !strncmp(sub_d->part, "elm.swallow.", strlen("elm.swallow."))) 208 {
209 type = sub_d->part + strlen("elm.swallow."); 209 if (!strncmp(sub_d->part, "elm.swallow.", strlen("elm.swallow.")))
210 type = sub_d->part + strlen("elm.swallow.");
211 else
212 type = sub_d->part;
213 }
210 else 214 else
211 type = sub_d->part; 215 {
216 if (!strncmp(sub_d->part, "efl.", strlen("efl.")))
217 type = sub_d->part + strlen("efl.");
218 else
219 type = sub_d->part;
220 }
212 221
213 _signals_emit(sd->obj, type, visible); 222 _signals_emit(sd->obj, type, visible);
214 223
@@ -239,10 +248,20 @@ _text_signal_emit(Efl_Ui_Layout_Data *sd,
239 248
240 ELM_WIDGET_DATA_GET_OR_RETURN(sd->obj, wd); 249 ELM_WIDGET_DATA_GET_OR_RETURN(sd->obj, wd);
241 250
242 if (!strncmp(sub_d->part, "elm.text.", strlen("elm.text."))) 251 if (elm_widget_is_legacy(sd->obj))
243 type = sub_d->part + strlen("elm.text."); 252 {
253 if (!strncmp(sub_d->part, "elm.text.", strlen("elm.text.")))
254 type = sub_d->part + strlen("elm.text.");
255 else
256 type = sub_d->part;
257 }
244 else 258 else
245 type = sub_d->part; 259 {
260 if (!strncmp(sub_d->part, "efl.", strlen("efl.")))
261 type = sub_d->part + strlen("efl.");
262 else
263 type = sub_d->part;
264 }
246 265
247 _signals_emit(sd->obj, type, visible); 266 _signals_emit(sd->obj, type, visible);
248 267
@@ -2183,8 +2202,8 @@ _efl_ui_layout_efl_part_part(const Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED,
2183 2202
2184 if (eina_streq(part, "background")) 2203 if (eina_streq(part, "background"))
2185 { 2204 {
2186 if (efl_layout_group_part_exist_get(wd->resize_obj, part)) 2205 if (efl_layout_group_part_exist_get(wd->resize_obj, "efl.background"))
2187 type = efl_canvas_layout_part_type_get(efl_part(wd->resize_obj, part)); 2206 type = efl_canvas_layout_part_type_get(efl_part(wd->resize_obj, "efl.background"));
2188 if (type != EFL_CANVAS_LAYOUT_PART_TYPE_SWALLOW) 2207 if (type != EFL_CANVAS_LAYOUT_PART_TYPE_SWALLOW)
2189 { 2208 {
2190 if (type < EFL_CANVAS_LAYOUT_PART_TYPE_LAST && 2209 if (type < EFL_CANVAS_LAYOUT_PART_TYPE_LAST &&
diff --git a/src/lib/elementary/efl_ui_navigation_bar.c b/src/lib/elementary/efl_ui_navigation_bar.c
index 911f3386ef..2087fa7b6f 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 \
@@ -71,17 +71,29 @@ _efl_ui_navigation_bar_content_set(Eo *obj, Efl_Ui_Navigation_Bar_Data *_pd EINA
71 if (eina_streq(part, "left_content")) 71 if (eina_streq(part, "left_content"))
72 { 72 {
73 if (content) 73 if (content)
74 efl_layout_signal_emit(obj, "elm,state,left_content,visible", "elm"); 74 efl_layout_signal_emit(obj, "elm,state,left_content,set", "elm");
75 else 75 else
76 efl_layout_signal_emit(obj, "elm,state,left_content,hidden", "elm"); 76 efl_layout_signal_emit(obj, "elm,state,left_content,unset", "elm");
77 efl_layout_signal_process(obj, EINA_FALSE); 77 efl_layout_signal_process(obj, EINA_FALSE);
78
79 return efl_content_set(efl_part(efl_super(obj, MY_CLASS), "efl.left_content"), content);
80 }
81 else if (eina_streq(part, "right_content"))
82 {
83 return efl_content_set(efl_part(efl_super(obj, MY_CLASS), "efl.right_content"), content);
78 } 84 }
85
79 return efl_content_set(efl_part(efl_super(obj, MY_CLASS), part), content); 86 return efl_content_set(efl_part(efl_super(obj, MY_CLASS), part), content);
80} 87}
81 88
82static Efl_Gfx * 89static Efl_Gfx *
83_efl_ui_navigation_bar_content_get(const Eo *obj, Efl_Ui_Navigation_Bar_Data *_pd EINA_UNUSED, const char *part) 90_efl_ui_navigation_bar_content_get(const Eo *obj, Efl_Ui_Navigation_Bar_Data *_pd EINA_UNUSED, const char *part)
84{ 91{
92 if (eina_streq(part, "left_content"))
93 return efl_content_get(efl_part(efl_super(obj, MY_CLASS), "efl.left_content"));
94 else if (eina_streq(part, "right_content"))
95 return efl_content_get(efl_part(efl_super(obj, MY_CLASS), "efl.right_content"));
96
85 return efl_content_get(efl_part(efl_super(obj, MY_CLASS), part)); 97 return efl_content_get(efl_part(efl_super(obj, MY_CLASS), part));
86} 98}
87 99
@@ -90,9 +102,16 @@ _efl_ui_navigation_bar_content_unset(Eo *obj, Efl_Ui_Navigation_Bar_Data *_pd EI
90{ 102{
91 if (eina_streq(part, "left_content")) 103 if (eina_streq(part, "left_content"))
92 { 104 {
93 efl_layout_signal_emit(obj, "elm,state,left_content,hidden", "elm"); 105 efl_layout_signal_emit(obj, "elm,state,left_content,unset", "elm");
94 efl_layout_signal_process(obj, EINA_FALSE); 106 efl_layout_signal_process(obj, EINA_FALSE);
107
108 return efl_content_unset(efl_part(efl_super(obj, MY_CLASS), "efl.left_content"));
95 } 109 }
110 else if (eina_streq(part, "right_content"))
111 {
112 return efl_content_unset(efl_part(efl_super(obj, MY_CLASS), "efl.right_content"));
113 }
114
96 return efl_content_unset(efl_part(efl_super(obj, MY_CLASS), part)); 115 return efl_content_unset(efl_part(efl_super(obj, MY_CLASS), part));
97} 116}
98 117
@@ -119,16 +138,16 @@ _efl_ui_navigation_bar_part_back_button_efl_gfx_visible_set(Eo *obj, void *_pd E
119 138
120 if (visible) 139 if (visible)
121 { 140 {
122 if (!efl_content_set(efl_part(efl_super(pd->obj, MY_CLASS), "back_button"), ppd->back_button)) 141 if (!efl_content_set(efl_part(efl_super(pd->obj, MY_CLASS), "efl.back_button"), ppd->back_button))
123 ERR("Part for back button(i.e. \"back_button\") does not exist!"); 142 ERR("Part for back button(i.e. \"back_button\") does not exist!");
124 else 143 else
125 efl_layout_signal_emit(pd->obj, "elm,state,back_button,visible", "elm"); 144 efl_layout_signal_emit(pd->obj, "elm,state,back_button,set", "elm");
126 } 145 }
127 else 146 else
128 { 147 {
129 efl_content_unset(efl_part(efl_super(pd->obj, MY_CLASS), "back_button")); 148 efl_content_unset(efl_part(efl_super(pd->obj, MY_CLASS), "back_button"));
130 efl_gfx_visible_set(ppd->back_button, visible); 149 efl_gfx_visible_set(ppd->back_button, visible);
131 efl_layout_signal_emit(pd->obj, "elm,state,back_button,hidden", "elm"); 150 efl_layout_signal_emit(pd->obj, "elm,state,back_button,unset", "elm");
132 } 151 }
133 152
134 efl_layout_signal_process(pd->obj, EINA_FALSE); 153 efl_layout_signal_process(pd->obj, EINA_FALSE);
@@ -172,7 +191,7 @@ _efl_ui_navigation_bar_part_back_button_efl_content_content_set(Eo *obj, void *_
172 efl_event_callback_add(content, EFL_UI_EVENT_CLICKED, _back_button_clicked_cb, pd->obj); 191 efl_event_callback_add(content, EFL_UI_EVENT_CLICKED, _back_button_clicked_cb, pd->obj);
173 ppd->back_button = content; 192 ppd->back_button = content;
174 193
175 return _efl_ui_navigation_bar_content_set(pd->obj, ppd, pd->part, content); 194 return _efl_ui_navigation_bar_content_set(pd->obj, ppd, "efl.back_button", content);
176} 195}
177 196
178static Efl_Gfx* 197static Efl_Gfx*
@@ -181,7 +200,7 @@ _efl_ui_navigation_bar_part_back_button_efl_content_content_get(const Eo *obj, v
181 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); 200 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
182 EFL_UI_NAVIGATION_BAR_DATA_GET_OR_RETURN(pd->obj, ppd, NULL); 201 EFL_UI_NAVIGATION_BAR_DATA_GET_OR_RETURN(pd->obj, ppd, NULL);
183 202
184 return _efl_ui_navigation_bar_content_get(pd->obj, ppd, pd->part); 203 return _efl_ui_navigation_bar_content_get(pd->obj, ppd, "efl.back_button");
185} 204}
186 205
187static Efl_Gfx* 206static Efl_Gfx*
@@ -193,7 +212,7 @@ _efl_ui_navigation_bar_part_back_button_efl_content_content_unset(Eo *obj, void
193 efl_event_callback_del(ppd->back_button, EFL_UI_EVENT_CLICKED, _back_button_clicked_cb, pd->obj); 212 efl_event_callback_del(ppd->back_button, EFL_UI_EVENT_CLICKED, _back_button_clicked_cb, pd->obj);
194 ppd->back_button = NULL; 213 ppd->back_button = NULL;
195 214
196 return _efl_ui_navigation_bar_content_unset(pd->obj, ppd, pd->part); 215 return _efl_ui_navigation_bar_content_unset(pd->obj, ppd, "efl.back_button");
197} 216}
198 217
199ELM_PART_OVERRIDE_CONTENT_SET(efl_ui_navigation_bar, EFL_UI_NAVIGATION_BAR, Efl_Ui_Navigation_Bar_Data) 218ELM_PART_OVERRIDE_CONTENT_SET(efl_ui_navigation_bar, EFL_UI_NAVIGATION_BAR, Efl_Ui_Navigation_Bar_Data)
diff --git a/src/lib/elementary/efl_ui_navigation_layout.c b/src/lib/elementary/efl_ui_navigation_layout.c
index 3d280dc528..034a768276 100644
--- a/src/lib/elementary/efl_ui_navigation_layout.c
+++ b/src/lib/elementary/efl_ui_navigation_layout.c
@@ -16,7 +16,7 @@ _efl_ui_navigation_layout_bar_set(Eo *obj, Efl_Ui_Navigation_Layout_Data *pd, Ef
16{ 16{
17 EINA_SAFETY_ON_FALSE_RETURN(efl_isa(bar, EFL_UI_LAYOUT_CLASS)); 17 EINA_SAFETY_ON_FALSE_RETURN(efl_isa(bar, EFL_UI_LAYOUT_CLASS));
18 18
19 efl_content_set(efl_part(obj, "bar"), bar); 19 efl_content_set(efl_part(obj, "efl.bar"), bar);
20 pd->bar = bar; 20 pd->bar = bar;
21} 21}
22 22
@@ -49,7 +49,7 @@ _efl_ui_navigation_layout_efl_object_constructor(Eo *obj, Efl_Ui_Navigation_Layo
49} 49}
50 50
51/* Standard widget overrides */ 51/* Standard widget overrides */
52ELM_PART_CONTENT_DEFAULT_GET(efl_ui_navigation_layout, "content") 52ELM_PART_CONTENT_DEFAULT_GET(efl_ui_navigation_layout, "efl.content")
53ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_navigation_layout, Efl_Ui_Navigation_Layout_Data) 53ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_navigation_layout, Efl_Ui_Navigation_Layout_Data)
54 54
55/* Internal EO APIs and hidden overrides */ 55/* Internal EO APIs and hidden overrides */
diff --git a/src/lib/elementary/efl_ui_popup.c b/src/lib/elementary/efl_ui_popup.c
index 973d09d8d9..ee96f8980e 100644
--- a/src/lib/elementary/efl_ui_popup.c
+++ b/src/lib/elementary/efl_ui_popup.c
@@ -367,7 +367,7 @@ _efl_ui_popup_part_efl_file_file_set(Eo *obj, void *_pd EINA_UNUSED, const char
367 Eo *prev_obj = edje_object_part_swallow_get(sd->backwall, "efl.content"); 367 Eo *prev_obj = edje_object_part_swallow_get(sd->backwall, "efl.content");
368 if (prev_obj) 368 if (prev_obj)
369 { 369 {
370 edje_object_signal_emit(sd->backwall, "elm,state,efl.content,unset", "elm"); 370 edje_object_signal_emit(sd->backwall, "elm,state,content,unset", "elm");
371 edje_object_part_unswallow(sd->backwall, prev_obj); 371 edje_object_part_unswallow(sd->backwall, prev_obj);
372 efl_del(prev_obj); 372 efl_del(prev_obj);
373 } 373 }
@@ -380,7 +380,7 @@ _efl_ui_popup_part_efl_file_file_set(Eo *obj, void *_pd EINA_UNUSED, const char
380 return EINA_FALSE; 380 return EINA_FALSE;
381 } 381 }
382 edje_object_part_swallow(sd->backwall, "efl.content", image); 382 edje_object_part_swallow(sd->backwall, "efl.content", image);
383 edje_object_signal_emit(sd->backwall, "elm,state,efl.content,set", "elm"); 383 edje_object_signal_emit(sd->backwall, "elm,state,content,set", "elm");
384 384
385 return EINA_TRUE; 385 return EINA_TRUE;
386 } 386 }