summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorJaehyun Cho <jae_hyun.cho@samsung.com>2018-04-26 20:24:09 +0900
committerJaehyun Cho <jae_hyun.cho@samsung.com>2018-04-26 22:45:59 +0900
commit08a11dcbf989fab76d76dca709598716c419dbc4 (patch)
tree90fe63ec4e03e499013e205b510b9a1b94db627a /src/lib
parentc83895b14413add0d7972ba7cb24220a16dca94a (diff)
efl theme: Replace legacy signal names with efl ui signal names
Replace legacy signal/source names with efl ui signal/source names. e.g. From "elm,state,content,set" "elm" to "efl,state,content,set" "efl"
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/elementary/efl_ui_button.c46
-rw-r--r--src/lib/elementary/efl_ui_calendar.c20
-rw-r--r--src/lib/elementary/efl_ui_check.c130
-rw-r--r--src/lib/elementary/efl_ui_clock.c12
-rw-r--r--src/lib/elementary/efl_ui_frame.c43
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.c153
-rw-r--r--src/lib/elementary/efl_ui_layout_object.c50
-rw-r--r--src/lib/elementary/efl_ui_navigation_bar.c10
-rw-r--r--src/lib/elementary/efl_ui_nstate.c6
-rw-r--r--src/lib/elementary/efl_ui_panes.c81
-rw-r--r--src/lib/elementary/efl_ui_popup.c6
-rw-r--r--src/lib/elementary/efl_ui_popup_alert.c6
-rw-r--r--src/lib/elementary/efl_ui_progressbar.c67
-rw-r--r--src/lib/elementary/efl_ui_radio.c45
-rw-r--r--src/lib/elementary/efl_ui_scroller.c28
-rw-r--r--src/lib/elementary/efl_ui_spin_button.c18
-rw-r--r--src/lib/elementary/efl_ui_text.c72
-rw-r--r--src/lib/elementary/efl_ui_timepicker.c14
-rw-r--r--src/lib/elementary/efl_ui_video.c53
-rw-r--r--src/lib/elementary/efl_ui_widget.c26
-rw-r--r--src/lib/elementary/efl_ui_win.c252
-rw-r--r--src/lib/elementary/els_tooltip.c18
22 files changed, 833 insertions, 323 deletions
diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c
index 1e7dedd..6835d06 100644
--- a/src/lib/elementary/efl_ui_button.c
+++ b/src/lib/elementary/efl_ui_button.c
@@ -87,8 +87,12 @@ _efl_ui_button_efl_ui_widget_on_access_activate(Eo *obj, Efl_Ui_Button_Data *_pd
87 if (evas_object_freeze_events_get(obj)) return EINA_FALSE; 87 if (evas_object_freeze_events_get(obj)) return EINA_FALSE;
88 88
89 efl_event_callback_legacy_call 89 efl_event_callback_legacy_call
90 (obj, EFL_UI_EVENT_CLICKED, NULL); 90 (obj, EFL_UI_EVENT_CLICKED, NULL);
91 elm_layout_signal_emit(obj, "elm,anim,activate", "elm"); 91
92 if (elm_widget_is_legacy(obj))
93 elm_layout_signal_emit(obj, "elm,anim,activate", "elm");
94 else
95 elm_layout_signal_emit(obj, "efl,anim,activate", "efl");
92 96
93 return EINA_TRUE; 97 return EINA_TRUE;
94} 98}
@@ -96,7 +100,10 @@ _efl_ui_button_efl_ui_widget_on_access_activate(Eo *obj, Efl_Ui_Button_Data *_pd
96static Eina_Bool 100static Eina_Bool
97_key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED) 101_key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
98{ 102{
99 elm_layout_signal_emit(obj, "elm,anim,activate", "elm"); 103 if (elm_widget_is_legacy(obj))
104 elm_layout_signal_emit(obj, "elm,anim,activate", "elm");
105 else
106 elm_layout_signal_emit(obj, "efl,anim,activate", "efl");
100 _activate(obj); 107 _activate(obj);
101 return EINA_TRUE; 108 return EINA_TRUE;
102} 109}
@@ -204,15 +211,30 @@ _efl_ui_button_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Button_Data *_pd EINA_
204 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 211 efl_canvas_group_add(efl_super(obj, MY_CLASS));
205 elm_widget_sub_object_parent_add(obj); 212 elm_widget_sub_object_parent_add(obj);
206 213
207 edje_object_signal_callback_add 214 if (elm_widget_is_legacy(obj))
208 (wd->resize_obj, "elm,action,click", "*", 215 {
209 _on_clicked_signal, obj); 216 edje_object_signal_callback_add
210 edje_object_signal_callback_add 217 (wd->resize_obj, "elm,action,click", "*",
211 (wd->resize_obj, "elm,action,press", "*", 218 _on_clicked_signal, obj);
212 _on_pressed_signal, obj); 219 edje_object_signal_callback_add
213 edje_object_signal_callback_add 220 (wd->resize_obj, "elm,action,press", "*",
214 (wd->resize_obj, "elm,action,unpress", "*", 221 _on_pressed_signal, obj);
215 _on_unpressed_signal, obj); 222 edje_object_signal_callback_add
223 (wd->resize_obj, "elm,action,unpress", "*",
224 _on_unpressed_signal, obj);
225 }
226 else
227 {
228 edje_object_signal_callback_add
229 (wd->resize_obj, "efl,action,click", "*",
230 _on_clicked_signal, obj);
231 edje_object_signal_callback_add
232 (wd->resize_obj, "efl,action,press", "*",
233 _on_pressed_signal, obj);
234 edje_object_signal_callback_add
235 (wd->resize_obj, "efl,action,unpress", "*",
236 _on_unpressed_signal, obj);
237 }
216 238
217 _elm_access_object_register(obj, wd->resize_obj); 239 _elm_access_object_register(obj, wd->resize_obj);
218 _elm_access_text_set 240 _elm_access_text_set
diff --git a/src/lib/elementary/efl_ui_calendar.c b/src/lib/elementary/efl_ui_calendar.c
index b55d1c6..02bb517 100644
--- a/src/lib/elementary/efl_ui_calendar.c
+++ b/src/lib/elementary/efl_ui_calendar.c
@@ -112,7 +112,7 @@ _unselect(Evas_Object *obj,
112 char emission[32]; 112 char emission[32];
113 113
114 snprintf(emission, sizeof(emission), "cit_%d,unselected", selected); 114 snprintf(emission, sizeof(emission), "cit_%d,unselected", selected);
115 elm_layout_signal_emit(obj, emission, "elm"); 115 elm_layout_signal_emit(obj, emission, "efl");
116} 116}
117 117
118static inline void 118static inline void
@@ -125,7 +125,7 @@ _select(Evas_Object *obj,
125 125
126 sd->focused_it = sd->selected_it = selected; 126 sd->focused_it = sd->selected_it = selected;
127 snprintf(emission, sizeof(emission), "cit_%d,selected", selected); 127 snprintf(emission, sizeof(emission), "cit_%d,selected", selected);
128 elm_layout_signal_emit(obj, emission, "elm"); 128 elm_layout_signal_emit(obj, emission, "efl");
129} 129}
130 130
131static inline void 131static inline void
@@ -134,7 +134,7 @@ _not_today(Efl_Ui_Calendar_Data *sd)
134 char emission[32]; 134 char emission[32];
135 135
136 snprintf(emission, sizeof(emission), "cit_%d,not_today", sd->today_it); 136 snprintf(emission, sizeof(emission), "cit_%d,not_today", sd->today_it);
137 elm_layout_signal_emit(sd->obj, emission, "elm"); 137 elm_layout_signal_emit(sd->obj, emission, "efl");
138 sd->today_it = -1; 138 sd->today_it = -1;
139} 139}
140 140
@@ -145,7 +145,7 @@ _today(Efl_Ui_Calendar_Data *sd,
145 char emission[32]; 145 char emission[32];
146 146
147 snprintf(emission, sizeof(emission), "cit_%d,today", it); 147 snprintf(emission, sizeof(emission), "cit_%d,today", it);
148 elm_layout_signal_emit(sd->obj, emission, "elm"); 148 elm_layout_signal_emit(sd->obj, emission, "efl");
149 sd->today_it = it; 149 sd->today_it = it;
150} 150}
151 151
@@ -156,7 +156,7 @@ _enable(Efl_Ui_Calendar_Data *sd,
156 char emission[32]; 156 char emission[32];
157 157
158 snprintf(emission, sizeof(emission), "cit_%d,enable", it); 158 snprintf(emission, sizeof(emission), "cit_%d,enable", it);
159 elm_layout_signal_emit(sd->obj, emission, "elm"); 159 elm_layout_signal_emit(sd->obj, emission, "efl");
160} 160}
161 161
162static inline void 162static inline void
@@ -166,7 +166,7 @@ _disable(Efl_Ui_Calendar_Data *sd,
166 char emission[32]; 166 char emission[32];
167 167
168 snprintf(emission, sizeof(emission), "cit_%d,disable", it); 168 snprintf(emission, sizeof(emission), "cit_%d,disable", it);
169 elm_layout_signal_emit(sd->obj, emission, "elm"); 169 elm_layout_signal_emit(sd->obj, emission, "efl");
170} 170}
171 171
172static void 172static void
@@ -759,7 +759,7 @@ _update_unfocused_it(Evas_Object *obj, int unfocused_it)
759 sd->focused_it = -1; 759 sd->focused_it = -1;
760 760
761 snprintf(emission, sizeof(emission), "cit_%d,unfocused", unfocused_it); 761 snprintf(emission, sizeof(emission), "cit_%d,unfocused", unfocused_it);
762 elm_layout_signal_emit(obj, emission, "elm"); 762 elm_layout_signal_emit(obj, emission, "efl");
763} 763}
764 764
765static Eina_Bool 765static Eina_Bool
@@ -775,12 +775,12 @@ _update_focused_it(Evas_Object *obj, int focused_it)
775 return EINA_FALSE; 775 return EINA_FALSE;
776 776
777 snprintf(emission, sizeof(emission), "cit_%d,unfocused", sd->focused_it); 777 snprintf(emission, sizeof(emission), "cit_%d,unfocused", sd->focused_it);
778 elm_layout_signal_emit(obj, emission, "elm"); 778 elm_layout_signal_emit(obj, emission, "efl");
779 779
780 sd->focused_it = focused_it; 780 sd->focused_it = focused_it;
781 781
782 snprintf(emission, sizeof(emission), "cit_%d,focused", sd->focused_it); 782 snprintf(emission, sizeof(emission), "cit_%d,focused", sd->focused_it);
783 elm_layout_signal_emit(obj, emission, "elm"); 783 elm_layout_signal_emit(obj, emission, "efl");
784 784
785 return EINA_TRUE; 785 return EINA_TRUE;
786} 786}
@@ -986,7 +986,7 @@ _efl_ui_calendar_constructor_internal(Eo *obj, Efl_Ui_Calendar_Data *priv)
986 priv->format_cb = NULL; 986 priv->format_cb = NULL;
987 987
988 edje_object_signal_callback_add 988 edje_object_signal_callback_add
989 (wd->resize_obj, "elm,action,selected", "*", 989 (wd->resize_obj, "efl,action,selected", "*",
990 _day_selected, obj); 990 _day_selected, obj);
991 991
992 current_date = time(NULL); 992 current_date = time(NULL);
diff --git a/src/lib/elementary/efl_ui_check.c b/src/lib/elementary/efl_ui_check.c
index 6c781cf..4c55b69 100644
--- a/src/lib/elementary/efl_ui_check.c
+++ b/src/lib/elementary/efl_ui_check.c
@@ -60,8 +60,17 @@ _activate(Evas_Object *obj)
60 // so that we can distinguish between state change by user or state change 60 // so that we can distinguish between state change by user or state change
61 // by calling state_change() api. Keep both the signal for backward compatibility 61 // by calling state_change() api. Keep both the signal for backward compatibility
62 // and remove "elm,state,check,on" signal emission when we can break ABI. 62 // and remove "elm,state,check,on" signal emission when we can break ABI.
63 elm_layout_signal_emit(obj, "elm,activate,check,on", "elm"); 63 if (elm_widget_is_legacy(obj))
64 elm_layout_signal_emit(obj, "elm,state,check,on", "elm"); 64 {
65 elm_layout_signal_emit(obj, "elm,activate,check,on", "elm");
66 elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
67 }
68 else
69 {
70 elm_layout_signal_emit(obj, "efl,activate,check,on", "efl");
71 elm_layout_signal_emit(obj, "efl,state,check,on", "efl");
72 }
73
65 if (_elm_config->access_mode != ELM_ACCESS_MODE_OFF) 74 if (_elm_config->access_mode != ELM_ACCESS_MODE_OFF)
66 _elm_access_say(E_("State: On")); 75 _elm_access_say(E_("State: On"));
67 } 76 }
@@ -71,8 +80,17 @@ _activate(Evas_Object *obj)
71 // so that we can distinguish between state change by user or state change 80 // so that we can distinguish between state change by user or state change
72 // by calling state_change() api. Keep both the signal for backward compatibility 81 // by calling state_change() api. Keep both the signal for backward compatibility
73 // and remove "elm,state,check,off" signal emission when we can break ABI. 82 // and remove "elm,state,check,off" signal emission when we can break ABI.
74 elm_layout_signal_emit(obj, "elm,activate,check,off", "elm"); 83 if (elm_widget_is_legacy(obj))
75 elm_layout_signal_emit(obj, "elm,state,check,off", "elm"); 84 {
85 elm_layout_signal_emit(obj, "elm,activate,check,off", "elm");
86 elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
87 }
88 else
89 {
90 elm_layout_signal_emit(obj, "efl,activate,check,off", "efl");
91 elm_layout_signal_emit(obj, "efl,state,check,off", "efl");
92 }
93
76 if (_elm_config->access_mode != ELM_ACCESS_MODE_OFF) 94 if (_elm_config->access_mode != ELM_ACCESS_MODE_OFF)
77 _elm_access_say(E_("State: Off")); 95 _elm_access_say(E_("State: Off"));
78 } 96 }
@@ -127,10 +145,20 @@ _efl_ui_check_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Check_Data *sd EINA_UNUS
127 145
128 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 146 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
129 147
130 if (efl_ui_nstate_value_get(obj) == 0) 148 if (elm_widget_is_legacy(obj))
131 elm_layout_signal_emit(obj, "elm,state,check,off", "elm"); 149 {
150 if (efl_ui_nstate_value_get(obj) == 0)
151 elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
152 else
153 elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
154 }
132 else 155 else
133 elm_layout_signal_emit(obj, "elm,state,check,on", "elm"); 156 {
157 if (efl_ui_nstate_value_get(obj) == 0)
158 elm_layout_signal_emit(obj, "efl,state,check,off", "efl");
159 else
160 elm_layout_signal_emit(obj, "efl,state,check,on", "efl");
161 }
134 162
135 edje_object_message_signal_process(wd->resize_obj); 163 edje_object_message_signal_process(wd->resize_obj);
136 164
@@ -195,7 +223,12 @@ _on_check_off(void *data,
195 EFL_UI_CHECK_DATA_GET(obj, sd); 223 EFL_UI_CHECK_DATA_GET(obj, sd);
196 224
197 if (sd->statep) *sd->statep = 0; 225 if (sd->statep) *sd->statep = 0;
198 elm_layout_signal_emit(obj, "elm,state,check,off", "elm"); 226
227 if (elm_widget_is_legacy(obj))
228 elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
229 else
230 elm_layout_signal_emit(obj, "efl,state,check,off", "efl");
231
199 efl_ui_nstate_value_set(obj, 0); 232 efl_ui_nstate_value_set(obj, 0);
200 233
201 if (_elm_config->atspi_mode) 234 if (_elm_config->atspi_mode)
@@ -215,7 +248,12 @@ _on_check_on(void *data,
215 EFL_UI_CHECK_DATA_GET(obj, sd); 248 EFL_UI_CHECK_DATA_GET(obj, sd);
216 249
217 if (sd->statep) *sd->statep = 1; 250 if (sd->statep) *sd->statep = 1;
218 elm_layout_signal_emit(obj, "elm,state,check,on", "elm"); 251
252 if (elm_widget_is_legacy(obj))
253 elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
254 else
255 elm_layout_signal_emit(obj, "efl,state,check,on", "efl");
256
219 efl_ui_nstate_value_set(obj, 1); 257 efl_ui_nstate_value_set(obj, 1);
220 258
221 if (_elm_config->atspi_mode) 259 if (_elm_config->atspi_mode)
@@ -246,10 +284,20 @@ _efl_ui_check_selected_set(Eo *obj, Efl_Ui_Check_Data *sd, Eina_Bool value)
246 284
247 if (sd->statep) *sd->statep = value; 285 if (sd->statep) *sd->statep = value;
248 286
249 if (value == 1) 287 if (elm_widget_is_legacy(obj))
250 elm_layout_signal_emit(obj, "elm,state,check,on", "elm"); 288 {
289 if (value == 1)
290 elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
291 else
292 elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
293 }
251 else 294 else
252 elm_layout_signal_emit(obj, "elm,state,check,off", "elm"); 295 {
296 if (value == 1)
297 elm_layout_signal_emit(obj, "efl,state,check,on", "efl");
298 else
299 elm_layout_signal_emit(obj, "efl,state,check,off", "efl");
300 }
253 301
254 edje_object_message_signal_process(wd->resize_obj); 302 edje_object_message_signal_process(wd->resize_obj);
255 303
@@ -280,12 +328,25 @@ _efl_ui_check_efl_object_constructor(Eo *obj, Efl_Ui_Check_Data *pd EINA_UNUSED)
280 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 328 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
281 329
282 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); 330 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
283 efl_layout_signal_callback_add 331
284 (wd->resize_obj, "elm,action,check,on", "*", _on_check_on, obj); 332 if (elm_widget_is_legacy(obj))
285 efl_layout_signal_callback_add 333 {
286 (wd->resize_obj, "elm,action,check,off", "*", _on_check_off, obj); 334 efl_layout_signal_callback_add
287 efl_layout_signal_callback_add 335 (wd->resize_obj, "elm,action,check,on", "*", _on_check_on, obj);
288 (wd->resize_obj, "elm,action,check,toggle", "*", _on_check_toggle, obj); 336 efl_layout_signal_callback_add
337 (wd->resize_obj, "elm,action,check,off", "*", _on_check_off, obj);
338 efl_layout_signal_callback_add
339 (wd->resize_obj, "elm,action,check,toggle", "*", _on_check_toggle, obj);
340 }
341 else
342 {
343 efl_layout_signal_callback_add
344 (wd->resize_obj, "efl,action,check,on", "*", _on_check_on, obj);
345 efl_layout_signal_callback_add
346 (wd->resize_obj, "efl,action,check,off", "*", _on_check_off, obj);
347 efl_layout_signal_callback_add
348 (wd->resize_obj, "efl,action,check,toggle", "*", _on_check_toggle, obj);
349 }
289 350
290 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_CHECK_BOX); 351 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_CHECK_BOX);
291 _elm_access_object_register(obj, wd->resize_obj); 352 _elm_access_object_register(obj, wd->resize_obj);
@@ -313,10 +374,20 @@ elm_check_state_set(Evas_Object *obj, Eina_Bool state)
313 nd->state = state; 374 nd->state = state;
314 if (sd->statep) *sd->statep = state; 375 if (sd->statep) *sd->statep = state;
315 376
316 if (state == 1) 377 if (elm_widget_is_legacy(obj))
317 elm_layout_signal_emit(obj, "elm,state,check,on", "elm"); 378 {
379 if (state == 1)
380 elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
381 else
382 elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
383 }
318 else 384 else
319 elm_layout_signal_emit(obj, "elm,state,check,off", "elm"); 385 {
386 if (state == 1)
387 elm_layout_signal_emit(obj, "efl,state,check,on", "efl");
388 else
389 elm_layout_signal_emit(obj, "efl,state,check,off", "efl");
390 }
320 edje_object_message_signal_process(wd->resize_obj); 391 edje_object_message_signal_process(wd->resize_obj);
321 } 392 }
322} 393}
@@ -343,10 +414,21 @@ elm_check_state_pointer_set(Eo *obj, Eina_Bool *statep)
343 if (*sd->statep != nd->state) 414 if (*sd->statep != nd->state)
344 { 415 {
345 nd->state = *sd->statep; 416 nd->state = *sd->statep;
346 if (nd->state == 1) 417
347 elm_layout_signal_emit(obj, "elm,state,check,on", "elm"); 418 if (elm_widget_is_legacy(obj))
419 {
420 if (nd->state == 1)
421 elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
422 else
423 elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
424 }
348 else 425 else
349 elm_layout_signal_emit(obj, "elm,state,check,off", "elm"); 426 {
427 if (nd->state == 1)
428 elm_layout_signal_emit(obj, "efl,state,check,on", "efl");
429 else
430 elm_layout_signal_emit(obj, "efl,state,check,off", "efl");
431 }
350 } 432 }
351} 433}
352 434
diff --git a/src/lib/elementary/efl_ui_clock.c b/src/lib/elementary/efl_ui_clock.c
index 1b80ab6..95c569a 100644
--- a/src/lib/elementary/efl_ui_clock.c
+++ b/src/lib/elementary/efl_ui_clock.c
@@ -396,13 +396,13 @@ _reload_format(Evas_Object *obj)
396 { 396 {
397 snprintf(buf, sizeof(buf), EDC_PART_FIELD_ENABLE_SIG_STR, 397 snprintf(buf, sizeof(buf), EDC_PART_FIELD_ENABLE_SIG_STR,
398 field->location); 398 field->location);
399 elm_layout_signal_emit(obj, buf, "elm"); 399 elm_layout_signal_emit(obj, buf, "efl");
400 } 400 }
401 else 401 else
402 { 402 {
403 snprintf(buf, sizeof(buf), EDC_PART_FIELD_DISABLE_SIG_STR, 403 snprintf(buf, sizeof(buf), EDC_PART_FIELD_DISABLE_SIG_STR,
404 field->location); 404 field->location);
405 elm_layout_signal_emit(obj, buf, "elm"); 405 elm_layout_signal_emit(obj, buf, "efl");
406 } 406 }
407 if (field->location + 1) 407 if (field->location + 1)
408 { 408 {
@@ -535,7 +535,7 @@ _efl_ui_clock_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Clock_Data *sd)
535 { 535 {
536 snprintf(buf, sizeof(buf), EDC_PART_FIELD_ENABLE_SIG_STR, 536 snprintf(buf, sizeof(buf), EDC_PART_FIELD_ENABLE_SIG_STR,
537 field->location); 537 field->location);
538 elm_layout_signal_emit(obj, buf, "elm"); 538 elm_layout_signal_emit(obj, buf, "efl");
539 539
540 if (field->location) 540 if (field->location)
541 { 541 {
@@ -549,7 +549,7 @@ _efl_ui_clock_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Clock_Data *sd)
549 { 549 {
550 snprintf(buf, sizeof(buf), EDC_PART_FIELD_DISABLE_SIG_STR, 550 snprintf(buf, sizeof(buf), EDC_PART_FIELD_DISABLE_SIG_STR,
551 field->location); 551 field->location);
552 elm_layout_signal_emit(obj, buf, "elm"); 552 elm_layout_signal_emit(obj, buf, "efl");
553 } 553 }
554 } 554 }
555 555
@@ -993,7 +993,7 @@ _efl_ui_clock_field_visible_set(Eo *obj, Efl_Ui_Clock_Data *sd, Efl_Ui_Clock_Typ
993 993
994 snprintf(buf, sizeof(buf), EDC_PART_FIELD_ENABLE_SIG_STR, 994 snprintf(buf, sizeof(buf), EDC_PART_FIELD_ENABLE_SIG_STR,
995 field->location); 995 field->location);
996 elm_layout_signal_emit(obj, buf, "elm"); 996 elm_layout_signal_emit(obj, buf, "efl");
997 997
998 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 998 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
999 edje_object_message_signal_process(wd->resize_obj); 999 edje_object_message_signal_process(wd->resize_obj);
@@ -1010,7 +1010,7 @@ _efl_ui_clock_field_visible_set(Eo *obj, Efl_Ui_Clock_Data *sd, Efl_Ui_Clock_Typ
1010 1010
1011 snprintf(buf, sizeof(buf), EDC_PART_FIELD_DISABLE_SIG_STR, 1011 snprintf(buf, sizeof(buf), EDC_PART_FIELD_DISABLE_SIG_STR,
1012 field->location); 1012 field->location);
1013 elm_layout_signal_emit(obj, buf, "elm"); 1013 elm_layout_signal_emit(obj, buf, "efl");
1014 1014
1015 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 1015 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
1016 edje_object_message_signal_process(wd->resize_obj); 1016 edje_object_message_signal_process(wd->resize_obj);
diff --git a/src/lib/elementary/efl_ui_frame.c b/src/lib/elementary/efl_ui_frame.c
index 6e405f7..69decbe 100644
--- a/src/lib/elementary/efl_ui_frame.c
+++ b/src/lib/elementary/efl_ui_frame.c
@@ -76,7 +76,12 @@ _on_frame_clicked(void *data,
76 if (sd->collapsible) 76 if (sd->collapsible)
77 { 77 {
78 efl_event_callback_add(wd->resize_obj, EFL_LAYOUT_EVENT_RECALC, _recalc, data); 78 efl_event_callback_add(wd->resize_obj, EFL_LAYOUT_EVENT_RECALC, _recalc, data);
79 elm_layout_signal_emit(data, "elm,action,toggle", "elm"); 79
80 if (elm_widget_is_legacy(data))
81 elm_layout_signal_emit(data, "elm,action,toggle", "elm");
82 else
83 elm_layout_signal_emit(data, "efl,action,toggle", "efl");
84
80 sd->collapsed++; 85 sd->collapsed++;
81 sd->anim = EINA_TRUE; 86 sd->anim = EINA_TRUE;
82 elm_widget_tree_unfocusable_set(data, sd->collapsed); 87 elm_widget_tree_unfocusable_set(data, sd->collapsed);
@@ -109,12 +114,24 @@ _efl_ui_frame_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Frame_Data *_pd EINA_UN
109 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 114 efl_canvas_group_add(efl_super(obj, MY_CLASS));
110 elm_widget_sub_object_parent_add(obj); 115 elm_widget_sub_object_parent_add(obj);
111 116
112 edje_object_signal_callback_add 117 if (elm_widget_is_legacy(obj))
113 (wd->resize_obj, "elm,anim,done", "elm", 118 {
114 _on_recalc_done, obj); 119 edje_object_signal_callback_add
115 edje_object_signal_callback_add 120 (wd->resize_obj, "elm,anim,done", "elm",
116 (wd->resize_obj, "elm,action,click", "elm", 121 _on_recalc_done, obj);
117 _on_frame_clicked, obj); 122 edje_object_signal_callback_add
123 (wd->resize_obj, "elm,action,click", "elm",
124 _on_frame_clicked, obj);
125 }
126 else
127 {
128 edje_object_signal_callback_add
129 (wd->resize_obj, "efl,anim,done", "efl",
130 _on_recalc_done, obj);
131 edje_object_signal_callback_add
132 (wd->resize_obj, "efl,action,click", "efl",
133 _on_frame_clicked, obj);
134 }
118 135
119 elm_widget_can_focus_set(obj, EINA_FALSE); 136 elm_widget_can_focus_set(obj, EINA_FALSE);
120 137
@@ -158,7 +175,11 @@ _efl_ui_frame_collapse_set(Eo *obj, Efl_Ui_Frame_Data *sd, Eina_Bool collapse)
158 collapse = !!collapse; 175 collapse = !!collapse;
159 if (sd->collapsed == collapse) return; 176 if (sd->collapsed == collapse) return;
160 177
161 elm_layout_signal_emit(obj, "elm,action,switch", "elm"); 178 if (elm_widget_is_legacy(obj))
179 elm_layout_signal_emit(obj, "elm,action,switch", "elm");
180 else
181 elm_layout_signal_emit(obj, "efl,action,switch", "efl");
182
162 edje_object_message_signal_process(wd->resize_obj); 183 edje_object_message_signal_process(wd->resize_obj);
163 sd->collapsed = !!collapse; 184 sd->collapsed = !!collapse;
164 sd->anim = EINA_FALSE; 185 sd->anim = EINA_FALSE;
@@ -175,7 +196,11 @@ _efl_ui_frame_collapse_go(Eo *obj, Efl_Ui_Frame_Data *sd, Eina_Bool collapse)
175 collapse = !!collapse; 196 collapse = !!collapse;
176 if (sd->collapsed == collapse) return; 197 if (sd->collapsed == collapse) return;
177 198
178 elm_layout_signal_emit(obj, "elm,action,toggle", "elm"); 199 if (elm_widget_is_legacy(obj))
200 elm_layout_signal_emit(obj, "elm,action,toggle", "elm");
201 else
202 elm_layout_signal_emit(obj, "efl,action,toggle", "efl");
203
179 efl_event_callback_legacy_call 204 efl_event_callback_legacy_call
180 (wd->resize_obj, EFL_LAYOUT_EVENT_RECALC, obj); 205 (wd->resize_obj, EFL_LAYOUT_EVENT_RECALC, obj);
181 sd->collapsed = collapse; 206 sd->collapsed = collapse;
diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c
index 1dcd87c..d4426aa 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -267,9 +267,15 @@ _grid_load(Evas_Object *obj,
267 sd->preload_num++; 267 sd->preload_num++;
268 if (sd->preload_num == 1) 268 if (sd->preload_num == 1)
269 { 269 {
270 edje_object_signal_emit 270 if (elm_widget_is_legacy(obj))
271 (wd->resize_obj, 271 edje_object_signal_emit
272 "elm,state,busy,start", "elm"); 272 (wd->resize_obj,
273 "elm,state,busy,start", "elm");
274 else
275 edje_object_signal_emit
276 (wd->resize_obj,
277 "efl,state,busy,start", "efl");
278
273 efl_event_callback_legacy_call 279 efl_event_callback_legacy_call
274 (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL); 280 (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL);
275 } 281 }
@@ -279,9 +285,15 @@ _grid_load(Evas_Object *obj,
279 sd->preload_num--; 285 sd->preload_num--;
280 if (!sd->preload_num) 286 if (!sd->preload_num)
281 { 287 {
282 edje_object_signal_emit 288 if (elm_widget_is_legacy(obj))
283 (wd->resize_obj, 289 edje_object_signal_emit
284 "elm,state,busy,stop", "elm"); 290 (wd->resize_obj,
291 "elm,state,busy,stop", "elm");
292 else
293 edje_object_signal_emit
294 (wd->resize_obj,
295 "efl,state,busy,stop", "efl");
296
285 efl_event_callback_legacy_call 297 efl_event_callback_legacy_call
286 (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOADED_DETAIL, NULL); 298 (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOADED_DETAIL, NULL);
287 } 299 }
@@ -477,9 +489,15 @@ _grid_clear(Evas_Object *obj,
477 sd->preload_num--; 489 sd->preload_num--;
478 if (!sd->preload_num) 490 if (!sd->preload_num)
479 { 491 {
480 edje_object_signal_emit 492 if (elm_widget_is_legacy(obj))
481 (wd->resize_obj, 493 edje_object_signal_emit
482 "elm,state,busy,stop", "elm"); 494 (wd->resize_obj,
495 "elm,state,busy,stop", "elm");
496 else
497 edje_object_signal_emit
498 (wd->resize_obj,
499 "efl,state,busy,stop", "efl");
500
483 efl_event_callback_legacy_call 501 efl_event_callback_legacy_call
484 (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL); 502 (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL);
485 } 503 }
@@ -510,9 +528,15 @@ _tile_preloaded_cb(void *data,
510 sd->preload_num--; 528 sd->preload_num--;
511 if (!sd->preload_num) 529 if (!sd->preload_num)
512 { 530 {
513 edje_object_signal_emit 531 if (elm_widget_is_legacy(git->obj))
514 (wd->resize_obj, "elm,state,busy,stop", 532 edje_object_signal_emit
515 "elm"); 533 (wd->resize_obj, "elm,state,busy,stop",
534 "elm");
535 else
536 edje_object_signal_emit
537 (wd->resize_obj, "efl,state,busy,stop",
538 "efl");
539
516 efl_event_callback_legacy_call 540 efl_event_callback_legacy_call
517 (wd->obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOADED_DETAIL, NULL); 541 (wd->obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOADED_DETAIL, NULL);
518 } 542 }
@@ -715,8 +739,13 @@ _main_img_preloaded_cb(void *data,
715 sd->preload_num--; 739 sd->preload_num--;
716 if (!sd->preload_num) 740 if (!sd->preload_num)
717 { 741 {
718 edje_object_signal_emit 742 if (elm_widget_is_legacy(data))
719 (wd->resize_obj, "elm,state,busy,stop", "elm"); 743 edje_object_signal_emit
744 (wd->resize_obj, "elm,state,busy,stop", "elm");
745 else
746 edje_object_signal_emit
747 (wd->resize_obj, "efl,state,busy,stop", "efl");
748
720 efl_event_callback_legacy_call 749 efl_event_callback_legacy_call
721 (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOADED_DETAIL, NULL); 750 (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOADED_DETAIL, NULL);
722 } 751 }
@@ -872,14 +901,22 @@ _efl_ui_image_zoomable_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Image
872 901
873 if (efl_ui_focus_object_focus_get(obj)) 902 if (efl_ui_focus_object_focus_get(obj))
874 { 903 {
875 edje_object_signal_emit 904 if (elm_widget_is_legacy(obj))
876 (wd->resize_obj, "elm,action,focus", "elm"); 905 edje_object_signal_emit
906 (wd->resize_obj, "elm,action,focus", "elm");
907 else
908 edje_object_signal_emit
909 (wd->resize_obj, "efl,action,focus", "efl");
877 evas_object_focus_set(wd->resize_obj, EINA_TRUE); 910 evas_object_focus_set(wd->resize_obj, EINA_TRUE);
878 } 911 }
879 else 912 else
880 { 913 {
881 edje_object_signal_emit 914 if (elm_widget_is_legacy(obj))
882 (wd->resize_obj, "elm,action,unfocus", "elm"); 915 edje_object_signal_emit
916 (wd->resize_obj, "elm,action,unfocus", "elm");
917 else
918 edje_object_signal_emit
919 (wd->resize_obj, "efl,action,unfocus", "efl");
883 evas_object_focus_set(wd->resize_obj, EINA_FALSE); 920 evas_object_focus_set(wd->resize_obj, EINA_FALSE);
884 } 921 }
885 922
@@ -1549,10 +1586,20 @@ _efl_ui_image_zoomable_bar_show_cb(void *data, const Efl_Event *event)
1549 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 1586 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
1550 Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info); 1587 Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info);
1551 1588
1552 if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL) 1589 if (elm_widget_is_legacy(obj))
1553 edje_object_signal_emit(wd->resize_obj, "elm,action,show,hbar", "elm"); 1590 {
1554 else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL) 1591 if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
1555 edje_object_signal_emit(wd->resize_obj, "elm,action,show,vbar", "elm"); 1592 edje_object_signal_emit(wd->resize_obj, "elm,action,show,hbar", "elm");
1593 else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL)
1594 edje_object_signal_emit(wd->resize_obj, "elm,action,show,vbar", "elm");
1595 }
1596 else
1597 {
1598 if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
1599 edje_object_signal_emit(wd->resize_obj, "efl,action,show,hbar", "efl");
1600 else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL)
1601 edje_object_signal_emit(wd->resize_obj, "efl,action,show,vbar", "efl");
1602 }
1556} 1603}
1557 1604
1558static void 1605static void
@@ -1562,10 +1609,20 @@ _efl_ui_image_zoomable_bar_hide_cb(void *data, const Efl_Event *event)
1562 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 1609 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
1563 Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info); 1610 Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info);
1564 1611
1565 if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL) 1612 if (elm_widget_is_legacy(obj))
1566 edje_object_signal_emit(wd->resize_obj, "elm,action,hide,hbar", "elm"); 1613 {
1567 else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL) 1614 if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
1568 edje_object_signal_emit(wd->resize_obj, "elm,action,hide,vbar", "elm"); 1615 edje_object_signal_emit(wd->resize_obj, "elm,action,hide,hbar", "elm");
1616 else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL)
1617 edje_object_signal_emit(wd->resize_obj, "elm,action,hide,vbar", "elm");
1618 }
1619 else
1620 {
1621 if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
1622 edje_object_signal_emit(wd->resize_obj, "efl,action,hide,hbar", "efl");
1623 else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL)
1624 edje_object_signal_emit(wd->resize_obj, "efl,action,hide,vbar", "efl");
1625 }
1569} 1626}
1570 1627
1571static void 1628static void
@@ -1627,7 +1684,7 @@ _efl_ui_image_zoomable_edje_object_attach(Eo *obj)
1627 else 1684 else
1628 { 1685 {
1629 efl_layout_signal_callback_add 1686 efl_layout_signal_callback_add
1630 (obj, "reload", "elm", _efl_ui_image_zoomable_reload_cb, obj); 1687 (obj, "reload", "efl", _efl_ui_image_zoomable_reload_cb, obj);
1631 efl_layout_signal_callback_add 1688 efl_layout_signal_callback_add
1632 (obj, "drag", "efl.dragable.vbar", _efl_ui_image_zoomable_vbar_drag_cb, 1689 (obj, "drag", "efl.dragable.vbar", _efl_ui_image_zoomable_vbar_drag_cb,
1633 obj); 1690 obj);
@@ -1647,10 +1704,10 @@ _efl_ui_image_zoomable_edje_object_attach(Eo *obj)
1647 (obj, "drag,page", "efl.dragable.vbar", 1704 (obj, "drag,page", "efl.dragable.vbar",
1648 _efl_ui_image_zoomable_edje_drag_cb, obj); 1705 _efl_ui_image_zoomable_edje_drag_cb, obj);
1649 efl_layout_signal_callback_add 1706 efl_layout_signal_callback_add
1650 (obj, "elm,vbar,press", "elm", 1707 (obj, "efl,vbar,press", "efl",
1651 _efl_ui_image_zoomable_vbar_press_cb, obj); 1708 _efl_ui_image_zoomable_vbar_press_cb, obj);
1652 efl_layout_signal_callback_add 1709 efl_layout_signal_callback_add
1653 (obj, "elm,vbar,unpress", "elm", 1710 (obj, "efl,vbar,unpress", "efl",
1654 _efl_ui_image_zoomable_vbar_unpress_cb, obj); 1711 _efl_ui_image_zoomable_vbar_unpress_cb, obj);
1655 efl_layout_signal_callback_add 1712 efl_layout_signal_callback_add
1656 (obj, "drag", "efl.dragable.hbar", _efl_ui_image_zoomable_hbar_drag_cb, 1713 (obj, "drag", "efl.dragable.hbar", _efl_ui_image_zoomable_hbar_drag_cb,
@@ -1671,10 +1728,10 @@ _efl_ui_image_zoomable_edje_object_attach(Eo *obj)
1671 (obj, "drag,page", "efl.dragable.hbar", 1728 (obj, "drag,page", "efl.dragable.hbar",
1672 _efl_ui_image_zoomable_edje_drag_cb, obj); 1729 _efl_ui_image_zoomable_edje_drag_cb, obj);
1673 efl_layout_signal_callback_add 1730 efl_layout_signal_callback_add
1674 (obj, "elm,hbar,press", "elm", 1731 (obj, "efl,hbar,press", "efl",
1675 _efl_ui_image_zoomable_hbar_press_cb, obj); 1732 _efl_ui_image_zoomable_hbar_press_cb, obj);
1676 efl_layout_signal_callback_add 1733 efl_layout_signal_callback_add
1677 (obj, "elm,hbar,unpress", "elm", 1734 (obj, "efl,hbar,unpress", "efl",
1678 _efl_ui_image_zoomable_hbar_unpress_cb, obj); 1735 _efl_ui_image_zoomable_hbar_unpress_cb, obj);
1679 } 1736 }
1680} 1737}
@@ -1738,10 +1795,10 @@ _efl_ui_image_zoomable_edje_object_detach(Evas_Object *obj)
1738 else 1795 else
1739 { 1796 {
1740 efl_layout_signal_callback_del 1797 efl_layout_signal_callback_del
1741 (obj, "reload", "elm", _efl_ui_image_zoomable_reload_cb, obj); 1798 (obj, "reload", "efl", _efl_ui_image_zoomable_reload_cb, obj);
1742 efl_layout_signal_callback_del 1799 efl_layout_signal_callback_del
1743 (obj, "drag", "efl.dragable.vbar", _efl_ui_image_zoomable_vbar_drag_cb, 1800 (obj, "drag", "efl.dragable.vbar",
1744 obj); 1801 _efl_ui_image_zoomable_vbar_drag_cb, obj);
1745 efl_layout_signal_callback_del 1802 efl_layout_signal_callback_del
1746 (obj, "drag,set", "efl.dragable.vbar", 1803 (obj, "drag,set", "efl.dragable.vbar",
1747 _efl_ui_image_zoomable_edje_drag_cb, obj); 1804 _efl_ui_image_zoomable_edje_drag_cb, obj);
@@ -1758,14 +1815,14 @@ _efl_ui_image_zoomable_edje_object_detach(Evas_Object *obj)
1758 (obj, "drag,page", "efl.dragable.vbar", 1815 (obj, "drag,page", "efl.dragable.vbar",
1759 _efl_ui_image_zoomable_edje_drag_cb, obj); 1816 _efl_ui_image_zoomable_edje_drag_cb, obj);
1760 efl_layout_signal_callback_del 1817 efl_layout_signal_callback_del
1761 (obj, "elm,vbar,press", "elm", 1818 (obj, "efl,vbar,press", "efl",
1762 _efl_ui_image_zoomable_vbar_press_cb, obj); 1819 _efl_ui_image_zoomable_vbar_press_cb, obj);
1763 efl_layout_signal_callback_del 1820 efl_layout_signal_callback_del
1764 (obj, "elm,vbar,unpress", "elm", 1821 (obj, "efl,vbar,unpress", "efl",
1765 _efl_ui_image_zoomable_vbar_unpress_cb, obj); 1822 _efl_ui_image_zoomable_vbar_unpress_cb, obj);
1766 efl_layout_signal_callback_del 1823 efl_layout_signal_callback_del
1767 (obj, "drag", "efl.dragable.hbar", _efl_ui_image_zoomable_hbar_drag_cb, 1824 (obj, "drag", "efl.dragable.hbar",
1768 obj); 1825 _efl_ui_image_zoomable_hbar_drag_cb, obj);
1769 efl_layout_signal_callback_del 1826 efl_layout_signal_callback_del
1770 (obj, "drag,set", "efl.dragable.hbar", 1827 (obj, "drag,set", "efl.dragable.hbar",
1771 _efl_ui_image_zoomable_edje_drag_cb, obj); 1828 _efl_ui_image_zoomable_edje_drag_cb, obj);
@@ -1782,10 +1839,10 @@ _efl_ui_image_zoomable_edje_object_detach(Evas_Object *obj)
1782 (obj, "drag,page", "efl.dragable.hbar", 1839 (obj, "drag,page", "efl.dragable.hbar",
1783 _efl_ui_image_zoomable_edje_drag_cb, obj); 1840 _efl_ui_image_zoomable_edje_drag_cb, obj);
1784 efl_layout_signal_callback_del 1841 efl_layout_signal_callback_del
1785 (obj, "elm,hbar,press", "elm", 1842 (obj, "efl,hbar,press", "efl",
1786 _efl_ui_image_zoomable_hbar_press_cb, obj); 1843 _efl_ui_image_zoomable_hbar_press_cb, obj);
1787 efl_layout_signal_callback_del 1844 efl_layout_signal_callback_del
1788 (obj, "elm,hbar,unpress", "elm", 1845 (obj, "efl,hbar,unpress", "efl",
1789 _efl_ui_image_zoomable_hbar_unpress_cb, obj); 1846 _efl_ui_image_zoomable_hbar_unpress_cb, obj);
1790 } 1847 }
1791} 1848}
@@ -2044,8 +2101,12 @@ _img_proxy_set(Evas_Object *obj, Efl_Ui_Image_Zoomable_Data *sd,
2044 sd->preload_num++; 2101 sd->preload_num++;
2045 if (sd->preload_num == 1) 2102 if (sd->preload_num == 1)
2046 { 2103 {
2047 edje_object_signal_emit 2104 if (elm_widget_is_legacy(obj))
2048 (wd->resize_obj, "elm,state,busy,start", "elm"); 2105 edje_object_signal_emit
2106 (wd->resize_obj, "elm,state,busy,start", "elm");
2107 else
2108 edje_object_signal_emit
2109 (wd->resize_obj, "efl,state,busy,start", "efl");
2049 efl_event_callback_legacy_call(obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL); 2110 efl_event_callback_legacy_call(obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL);
2050 } 2111 }
2051 2112
@@ -2128,8 +2189,12 @@ _internal_file_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd, const char *file, Ei
2128 sd->preload_num++; 2189 sd->preload_num++;
2129 if (sd->preload_num == 1) 2190 if (sd->preload_num == 1)
2130 { 2191 {
2131 edje_object_signal_emit 2192 if (elm_widget_is_legacy(obj))
2132 (wd->resize_obj, "elm,state,busy,start", "elm"); 2193 edje_object_signal_emit
2194 (wd->resize_obj, "elm,state,busy,start", "elm");
2195 else
2196 edje_object_signal_emit
2197 (wd->resize_obj, "efl,state,busy,start", "efl");
2133 efl_event_callback_legacy_call(obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL); 2198 efl_event_callback_legacy_call(obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL);
2134 } 2199 }
2135 2200
diff --git a/src/lib/elementary/efl_ui_layout_object.c b/src/lib/elementary/efl_ui_layout_object.c
index 76bbd10..a499704 100644
--- a/src/lib/elementary/efl_ui_layout_object.c
+++ b/src/lib/elementary/efl_ui_layout_object.c
@@ -180,13 +180,14 @@ _signals_emit(Eo *obj,
180 { 180 {
181 snprintf(buf, sizeof(buf), "elm,state,%s,%s", type, 181 snprintf(buf, sizeof(buf), "elm,state,%s,%s", type,
182 set ? "visible" : "hidden"); 182 set ? "visible" : "hidden");
183 efl_layout_signal_emit(obj, buf, "elm");
183 } 184 }
184 else 185 else
185 { 186 {
186 snprintf(buf, sizeof(buf), "elm,state,%s,%s", type, 187 snprintf(buf, sizeof(buf), "efl,state,%s,%s", type,
187 set ? "set" : "unset"); 188 set ? "set" : "unset");
189 efl_layout_signal_emit(obj, buf, "efl");
188 } 190 }
189 efl_layout_signal_emit(obj, buf, "elm");
190} 191}
191 192
192static inline void 193static inline void
@@ -413,12 +414,24 @@ _efl_ui_layout_object_efl_ui_widget_on_disabled_update(Eo *obj, Efl_Ui_Layout_Ob
413 414
414 // Not calling efl_super here: Elm.Widget simply returns false. 415 // Not calling efl_super here: Elm.Widget simply returns false.
415 416
416 if (disabled) 417 if (elm_widget_is_legacy(obj))
417 edje_object_signal_emit 418 {
418 (wd->resize_obj, "elm,state,disabled", "elm"); 419 if (disabled)
420 edje_object_signal_emit
421 (wd->resize_obj, "elm,state,disabled", "elm");
422 else
423 edje_object_signal_emit
424 (wd->resize_obj, "elm,state,enabled", "elm");
425 }
419 else 426 else
420 edje_object_signal_emit 427 {
421 (wd->resize_obj, "elm,state,enabled", "elm"); 428 if (disabled)
429 edje_object_signal_emit
430 (wd->resize_obj, "efl,state,disabled", "efl");
431 else
432 edje_object_signal_emit
433 (wd->resize_obj, "efl,state,enabled", "efl");
434 }
422 435
423 return EINA_TRUE; 436 return EINA_TRUE;
424} 437}
@@ -470,12 +483,18 @@ _efl_ui_layout_object_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Layout
470 483
471 if (efl_ui_focus_object_focus_get(obj)) 484 if (efl_ui_focus_object_focus_get(obj))
472 { 485 {
473 elm_layout_signal_emit(obj, "elm,action,focus", "elm"); 486 if (elm_widget_is_legacy(obj))
487 elm_layout_signal_emit(obj, "elm,action,focus", "elm");
488 else
489 elm_layout_signal_emit(obj, "efl,action,focus", "efl");
474 evas_object_focus_set(wd->resize_obj, EINA_TRUE); 490 evas_object_focus_set(wd->resize_obj, EINA_TRUE);
475 } 491 }
476 else 492 else
477 { 493 {
478 elm_layout_signal_emit(obj, "elm,action,unfocus", "elm"); 494 if (elm_widget_is_legacy(obj))
495 elm_layout_signal_emit(obj, "elm,action,unfocus", "elm");
496 else
497 elm_layout_signal_emit(obj, "efl,action,unfocus", "efl");
479 evas_object_focus_set(wd->resize_obj, EINA_FALSE); 498 evas_object_focus_set(wd->resize_obj, EINA_FALSE);
480 } 499 }
481 500
@@ -710,8 +729,12 @@ _efl_ui_layout_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Layout_Object_Data *_p
710 729
711 elm_widget_can_focus_set(obj, EINA_FALSE); 730 elm_widget_can_focus_set(obj, EINA_FALSE);
712 731
713 edje_object_signal_callback_add 732 if (elm_widget_is_legacy(obj))
714 (edje, "size,eval", "elm", _on_size_evaluate_signal, obj); 733 edje_object_signal_callback_add
734 (edje, "size,eval", "elm", _on_size_evaluate_signal, obj);
735 else
736 edje_object_signal_callback_add
737 (edje, "size,eval", "efl", _on_size_evaluate_signal, obj);
715 738
716 elm_layout_sizing_eval(obj); 739 elm_layout_sizing_eval(obj);
717} 740}
@@ -1934,7 +1957,10 @@ _view_update(Efl_Ui_Layout_Sub_Connect *sc, const char *property)
1934 eina_strbuf_append(buf, sc->name); 1957 eina_strbuf_append(buf, sc->name);
1935 eina_strbuf_replace_all(buf, "%v", property); 1958 eina_strbuf_replace_all(buf, "%v", property);
1936 1959
1937 elm_layout_signal_emit(sc->obj, eina_strbuf_string_get(buf), "elm"); 1960 if (elm_widget_is_legacy(sc->obj))
1961 elm_layout_signal_emit(sc->obj, eina_strbuf_string_get(buf), "elm");
1962 else
1963 elm_layout_signal_emit(sc->obj, eina_strbuf_string_get(buf), "efl");
1938 eina_strbuf_free(buf); 1964 eina_strbuf_free(buf);
1939} 1965}
1940 1966
diff --git a/src/lib/elementary/efl_ui_navigation_bar.c b/src/lib/elementary/efl_ui_navigation_bar.c
index 2a1720d..77d6a31 100644
--- a/src/lib/elementary/efl_ui_navigation_bar.c
+++ b/src/lib/elementary/efl_ui_navigation_bar.c
@@ -71,9 +71,9 @@ _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, "efl,state,left_content,set", "efl");
75 else 75 else
76 efl_layout_signal_emit(obj, "elm,state,left_content,hidden", "elm"); 76 efl_layout_signal_emit(obj, "efl,state,left_content,unset", "efl");
77 efl_layout_signal_process(obj, EINA_FALSE); 77 efl_layout_signal_process(obj, EINA_FALSE);
78 78
79 return efl_content_set(efl_part(efl_super(obj, MY_CLASS), "efl.left_content"), content); 79 return efl_content_set(efl_part(efl_super(obj, MY_CLASS), "efl.left_content"), content);
@@ -100,7 +100,7 @@ _efl_ui_navigation_bar_content_unset(Eo *obj, Efl_Ui_Navigation_Bar_Data *_pd EI
100{ 100{
101 if (eina_streq(part, "left_content")) 101 if (eina_streq(part, "left_content"))
102 { 102 {
103 efl_layout_signal_emit(obj, "elm,state,left_content,hidden", "elm"); 103 efl_layout_signal_emit(obj, "efl,state,left_content,unset", "efl");
104 efl_layout_signal_process(obj, EINA_FALSE); 104 efl_layout_signal_process(obj, EINA_FALSE);
105 return efl_content_unset(efl_part(efl_super(obj, MY_CLASS), "efl.left_content")); 105 return efl_content_unset(efl_part(efl_super(obj, MY_CLASS), "efl.left_content"));
106 } 106 }
@@ -136,13 +136,13 @@ _efl_ui_navigation_bar_part_back_button_efl_gfx_entity_visible_set(Eo *obj, void
136 if (!efl_content_set(efl_part(efl_super(pd->obj, MY_CLASS), "efl.back_button"), ppd->back_button)) 136 if (!efl_content_set(efl_part(efl_super(pd->obj, MY_CLASS), "efl.back_button"), ppd->back_button))
137 ERR("Part for back button(i.e. \"back_button\") does not exist!"); 137 ERR("Part for back button(i.e. \"back_button\") does not exist!");
138 else 138 else
139 efl_layout_signal_emit(pd->obj, "elm,state,back_button,visible", "elm"); 139 efl_layout_signal_emit(pd->obj, "efl,state,back_button,visible", "efl");
140 } 140 }
141 else 141 else
142 { 142 {
143 efl_content_unset(efl_part(efl_super(pd->obj, MY_CLASS), "efl.back_button")); 143 efl_content_unset(efl_part(efl_super(pd->obj, MY_CLASS), "efl.back_button"));
144 efl_gfx_entity_visible_set(ppd->back_button, visible); 144 efl_gfx_entity_visible_set(ppd->back_button, visible);
145 efl_layout_signal_emit(pd->obj, "elm,state,back_button,hidden", "elm"); 145 efl_layout_signal_emit(pd->obj, "efl,state,back_button,hidden", "efl");
146 } 146 }
147 147
148 efl_layout_signal_process(pd->obj, EINA_FALSE); 148 efl_layout_signal_process(pd->obj, EINA_FALSE);
diff --git a/src/lib/elementary/efl_ui_nstate.c b/src/lib/elementary/efl_ui_nstate.c
index f0cf1e5..3811bbb 100644
--- a/src/lib/elementary/efl_ui_nstate.c
+++ b/src/lib/elementary/efl_ui_nstate.c
@@ -45,7 +45,7 @@ _efl_ui_nstate_efl_object_constructor(Eo *obj, Efl_Ui_Nstate_Data *pd)
45 45
46 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); 46 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
47 efl_layout_signal_callback_add 47 efl_layout_signal_callback_add
48 (wd->resize_obj, "elm,action,state,changed", "*", _on_state_changed, obj); 48 (wd->resize_obj, "efl,action,state,changed", "*", _on_state_changed, obj);
49 49
50 //TODO: Add ATSPI call here 50 //TODO: Add ATSPI call here
51 51
@@ -64,8 +64,8 @@ _state_signal_emit(Evas_Object *obj, Efl_Ui_Nstate_Data *sd)
64{ 64{
65 char buf[64]; 65 char buf[64];
66 66
67 sprintf(buf, "elm,state,changed,%d", sd->state); 67 sprintf(buf, "efl,state,changed,%d", sd->state);
68 elm_layout_signal_emit(obj, buf, "elm"); 68 elm_layout_signal_emit(obj, buf, "efl");
69 edje_object_message_signal_process(elm_layout_edje_get(obj)); 69 edje_object_message_signal_process(elm_layout_edje_get(obj));
70 elm_layout_sizing_eval(obj); 70 elm_layout_sizing_eval(obj);
71} 71}
diff --git a/src/lib/elementary/efl_ui_panes.c b/src/lib/elementary/efl_ui_panes.c
index 57b4ecf..b6c19b0 100644
--- a/src/lib/elementary/efl_ui_panes.c
+++ b/src/lib/elementary/efl_ui_panes.c
@@ -136,11 +136,16 @@ _efl_ui_panes_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Panes_Data *sd)
136 136
137 if (sd->fixed) 137 if (sd->fixed)
138 { 138 {
139 elm_layout_signal_emit(obj, "elm,panes,fixed", "elm"); 139 if (elm_widget_is_legacy(obj))
140 {
141 elm_layout_signal_emit(obj, "elm,panes,fixed", "elm");
140 142
141 //TODO: remove this signal on EFL 2.0. 143 //TODO: remove this signal on EFL 2.0.
142 // I left this due to the backward compatibility. 144 // I left this due to the backward compatibility.
143 elm_layout_signal_emit(obj, "elm.panes.fixed", "elm"); 145 elm_layout_signal_emit(obj, "elm.panes.fixed", "elm");
146 }
147 else
148 elm_layout_signal_emit(obj, "efl,panes,fixed", "efl");
144 } 149 }
145 150
146 elm_layout_sizing_eval(obj); 151 elm_layout_sizing_eval(obj);
@@ -415,18 +420,36 @@ _efl_ui_panes_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Panes_Data *_pd EINA_UN
415 420
416 elm_panes_content_left_size_set(obj, 0.5); 421 elm_panes_content_left_size_set(obj, 0.5);
417 422
418 edje_object_signal_callback_add 423 if (elm_widget_is_legacy(obj))
419 (wd->resize_obj, "elm,action,click", "*", 424 {
420 _on_clicked, obj); 425 edje_object_signal_callback_add
421 edje_object_signal_callback_add 426 (wd->resize_obj, "elm,action,click", "*",
422 (wd->resize_obj, "elm,action,click,double", "*", 427 _on_clicked, obj);
423 _double_clicked, obj); 428 edje_object_signal_callback_add
424 edje_object_signal_callback_add 429 (wd->resize_obj, "elm,action,click,double", "*",
425 (wd->resize_obj, "elm,action,press", "*", 430 _double_clicked, obj);
426 _on_pressed, obj); 431 edje_object_signal_callback_add
427 edje_object_signal_callback_add 432 (wd->resize_obj, "elm,action,press", "*",
428 (wd->resize_obj, "elm,action,unpress", "*", 433 _on_pressed, obj);
429 _on_unpressed, obj); 434 edje_object_signal_callback_add
435 (wd->resize_obj, "elm,action,unpress", "*",
436 _on_unpressed, obj);
437 }
438 else
439 {
440 edje_object_signal_callback_add
441 (wd->resize_obj, "efl,action,click", "*",
442 _on_clicked, obj);
443 edje_object_signal_callback_add
444 (wd->resize_obj, "efl,action,click,double", "*",
445 _double_clicked, obj);
446 edje_object_signal_callback_add
447 (wd->resize_obj, "efl,action,press", "*",
448 _on_pressed, obj);
449 edje_object_signal_callback_add
450 (wd->resize_obj, "efl,action,unpress", "*",
451 _on_unpressed, obj);
452 }
430 evas_object_event_callback_add 453 evas_object_event_callback_add
431 (wd->resize_obj, EVAS_CALLBACK_RESIZE, 454 (wd->resize_obj, EVAS_CALLBACK_RESIZE,
432 _on_resize, obj); 455 _on_resize, obj);
@@ -555,19 +578,29 @@ _efl_ui_panes_fixed_set(Eo *obj, Efl_Ui_Panes_Data *sd, Eina_Bool fixed)
555 sd->fixed = !!fixed; 578 sd->fixed = !!fixed;
556 if (sd->fixed == EINA_TRUE) 579 if (sd->fixed == EINA_TRUE)
557 { 580 {
558 elm_layout_signal_emit(obj, "elm,panes,fixed", "elm"); 581 if (elm_widget_is_legacy(obj))
582 {
583 elm_layout_signal_emit(obj, "elm,panes,fixed", "elm");
559 584
560 //TODO: remove this signal on EFL 2.0. 585 //TODO: remove this signal on EFL 2.0.
561 // I left this due to the backward compatibility. 586 // I left this due to the backward compatibility.
562 elm_layout_signal_emit(obj, "elm.panes.fixed", "elm"); 587 elm_layout_signal_emit(obj, "elm.panes.fixed", "elm");
588 }
589 else
590 elm_layout_signal_emit(obj, "efl,panes,fixed", "efl");
563 } 591 }
564 else 592 else
565 { 593 {
566 elm_layout_signal_emit(obj, "elm,panes,unfixed", "elm"); 594 if (elm_widget_is_legacy(obj))
595 {
596 elm_layout_signal_emit(obj, "elm,panes,unfixed", "elm");
567 597
568 //TODO: remove this signal on EFL 2.0. 598 //TODO: remove this signal on EFL 2.0.
569 // I left this due to the backward compatibility. 599 // I left this due to the backward compatibility.
570 elm_layout_signal_emit(obj, "elm.panes.unfixed", "elm"); 600 elm_layout_signal_emit(obj, "elm.panes.unfixed", "elm");
601 }
602 else
603 elm_layout_signal_emit(obj, "efl,panes,unfixed", "efl");
571 } 604 }
572} 605}
573 606
diff --git a/src/lib/elementary/efl_ui_popup.c b/src/lib/elementary/efl_ui_popup.c
index 1b16ffd..b3772bb 100644
--- a/src/lib/elementary/efl_ui_popup.c
+++ b/src/lib/elementary/efl_ui_popup.c
@@ -227,7 +227,7 @@ _efl_ui_popup_efl_object_constructor(Eo *obj, Efl_Ui_Popup_Data *pd)
227 evas_object_smart_member_add(pd->backwall, obj); 227 evas_object_smart_member_add(pd->backwall, obj);
228 evas_object_stack_below(pd->backwall, wd->resize_obj); 228 evas_object_stack_below(pd->backwall, wd->resize_obj);
229 229
230 edje_object_signal_callback_add(pd->backwall, "elm,action,clicked", "*", 230 edje_object_signal_callback_add(pd->backwall, "efl,action,clicked", "*",
231 _backwall_clicked_cb, obj); 231 _backwall_clicked_cb, obj);
232 232
233 pd->align = EFL_UI_POPUP_ALIGN_CENTER; 233 pd->align = EFL_UI_POPUP_ALIGN_CENTER;
@@ -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,content,unset", "elm"); 370 edje_object_signal_emit(sd->backwall, "efl,state,content,unset", "efl");
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,content,set", "elm"); 383 edje_object_signal_emit(sd->backwall, "efl,state,content,set", "efl");
384 384
385 return EINA_TRUE; 385 return EINA_TRUE;
386 } 386 }
diff --git a/src/lib/elementary/efl_ui_popup_alert.c b/src/lib/elementary/efl_ui_popup_alert.c
index 0799635..16e88a1 100644
--- a/src/lib/elementary/efl_ui_popup_alert.c
+++ b/src/lib/elementary/efl_ui_popup_alert.c
@@ -33,9 +33,9 @@ _efl_ui_popup_alert_text_set(Eo *obj, Efl_Ui_Popup_Alert_Data *pd, const char *p
33 { 33 {
34 efl_text_set(efl_part(efl_super(obj, MY_CLASS), "title"), label); 34 efl_text_set(efl_part(efl_super(obj, MY_CLASS), "title"), label);
35 if (label) 35 if (label)
36 elm_layout_signal_emit(obj, "elm,title,show", "elm"); 36 elm_layout_signal_emit(obj, "efl,title,show", "efl");
37 else 37 else
38 elm_layout_signal_emit(obj, "elm,title,hide", "elm"); 38 elm_layout_signal_emit(obj, "efl,title,hide", "efl");
39 39
40 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 40 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
41 edje_object_message_signal_process(wd->resize_obj); 41 edje_object_message_signal_process(wd->resize_obj);
@@ -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,buttons,show", "elm"); 171 elm_layout_signal_emit(obj, "efl,buttons,show", "efl");
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_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c
index 51451b1..e483440 100644
--- a/src/lib/elementary/efl_ui_progressbar.c
+++ b/src/lib/elementary/efl_ui_progressbar.c
@@ -247,16 +247,32 @@ _efl_ui_progressbar_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Progressbar_Data *
247 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 247 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
248 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 248 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
249 249
250 if (sd->pulse) 250 if (elm_widget_is_legacy(obj))
251 elm_layout_signal_emit(obj, "elm,state,pulse", "elm"); 251 {
252 if (sd->pulse)
253 elm_layout_signal_emit(obj, "elm,state,pulse", "elm");
254 else
255 elm_layout_signal_emit(obj, "elm,state,fraction", "elm");
256
257 if (sd->pulse_state)
258 elm_layout_signal_emit(obj, "elm,state,pulse,start", "elm");
259
260 if (sd->format_cb && (!sd->pulse))
261 elm_layout_signal_emit(obj, "elm,state,units,visible", "elm");
262 }
252 else 263 else
253 elm_layout_signal_emit(obj, "elm,state,fraction", "elm"); 264 {
265 if (sd->pulse)
266 elm_layout_signal_emit(obj, "efl,state,pulse", "efl");
267 else
268 elm_layout_signal_emit(obj, "efl,state,fraction", "efl");
254 269
255 if (sd->pulse_state) 270 if (sd->pulse_state)
256 elm_layout_signal_emit(obj, "elm,state,pulse,start", "elm"); 271 elm_layout_signal_emit(obj, "efl,state,pulse,start", "efl");
257 272
258 if (sd->format_cb && (!sd->pulse)) 273 if (sd->format_cb && (!sd->pulse))
259 elm_layout_signal_emit(obj, "elm,state,units,visible", "elm"); 274 elm_layout_signal_emit(obj, "efl,state,units,visible", "efl");
275 }
260 276
261 if (_is_horizontal(sd->dir)) 277 if (_is_horizontal(sd->dir))
262 evas_object_size_hint_min_set 278 evas_object_size_hint_min_set
@@ -267,10 +283,20 @@ _efl_ui_progressbar_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Progressbar_Data *
267 (sd->spacer, 1, (double)sd->size * efl_gfx_entity_scale_get(obj) * 283 (sd->spacer, 1, (double)sd->size * efl_gfx_entity_scale_get(obj) *
268 elm_config_scale_get()); 284 elm_config_scale_get());
269 285
270 if (_is_inverted(sd->dir)) 286 if (elm_widget_is_legacy(obj))
271 elm_layout_signal_emit(obj, "elm,state,inverted,on", "elm"); 287 {
288 if (_is_inverted(sd->dir))
289 elm_layout_signal_emit(obj, "elm,state,inverted,on", "elm");
290 else
291 elm_layout_signal_emit(obj, "elm,state,inverted,off", "elm");
292 }
272 else 293 else
273 elm_layout_signal_emit(obj, "elm,state,inverted,off", "elm"); 294 {
295 if (_is_inverted(sd->dir))
296 elm_layout_signal_emit(obj, "efl,state,inverted,on", "efl");
297 else
298 elm_layout_signal_emit(obj, "efl,state,inverted,off", "efl");
299 }
274 300
275 _units_set(obj); 301 _units_set(obj);
276 _val_set(obj); 302 _val_set(obj);
@@ -608,7 +634,10 @@ _efl_ui_progressbar_efl_ui_format_format_cb_set(Eo *obj, Efl_Ui_Progressbar_Data
608 sd->format_free_cb = func_free_cb; 634 sd->format_free_cb = func_free_cb;
609 if (!sd->format_strbuf) sd->format_strbuf = eina_strbuf_new(); 635 if (!sd->format_strbuf) sd->format_strbuf = eina_strbuf_new();
610 636
611 elm_layout_signal_emit(obj, "elm,state,units,visible", "elm"); 637 if (elm_widget_is_legacy(obj))
638 elm_layout_signal_emit(obj, "elm,state,units,visible", "elm");
639 else
640 elm_layout_signal_emit(obj, "efl,state,units,visible", "efl");
612 edje_object_message_signal_process(wd->resize_obj); 641 edje_object_message_signal_process(wd->resize_obj);
613 642
614 _units_set(obj); 643 _units_set(obj);
@@ -623,10 +652,20 @@ _efl_ui_progressbar_pulse_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, Eina_Bool st
623 652
624 sd->pulse_state = state; 653 sd->pulse_state = state;
625 654
626 if (sd->pulse_state) 655 if (elm_widget_is_legacy(obj))
627 elm_layout_signal_emit(obj, "elm,state,pulse,start", "elm"); 656 {
657 if (sd->pulse_state)
658 elm_layout_signal_emit(obj, "elm,state,pulse,start", "elm");
659 else
660 elm_layout_signal_emit(obj, "elm,state,pulse,stop", "elm");
661 }
628 else 662 else
629 elm_layout_signal_emit(obj, "elm,state,pulse,stop", "elm"); 663 {
664 if (sd->pulse_state)
665 elm_layout_signal_emit(obj, "efl,state,pulse,start", "efl");
666 else
667 elm_layout_signal_emit(obj, "efl,state,pulse,stop", "efl");
668 }
630} 669}
631 670
632EOLIAN static Eina_Bool 671EOLIAN static Eina_Bool
diff --git a/src/lib/elementary/efl_ui_radio.c b/src/lib/elementary/efl_ui_radio.c
index 755532d..d986860 100644
--- a/src/lib/elementary/efl_ui_radio.c
+++ b/src/lib/elementary/efl_ui_radio.c
@@ -55,8 +55,16 @@ _state_set(Evas_Object *obj, Eina_Bool state, Eina_Bool activate)
55 // so that we can distinguish between state change by user or state change 55 // so that we can distinguish between state change by user or state change
56 // by calling state_change() api. Keep both the signal for backward compatibility 56 // by calling state_change() api. Keep both the signal for backward compatibility
57 // and only emit "elm,state,radio,on" when activate is false when we can break ABI. 57 // and only emit "elm,state,radio,on" when activate is false when we can break ABI.
58 if (activate) elm_layout_signal_emit(obj, "elm,activate,radio,on", "elm"); 58 if (elm_widget_is_legacy(obj))
59 elm_layout_signal_emit(obj, "elm,state,radio,on", "elm"); 59 {
60 if (activate) elm_layout_signal_emit(obj, "elm,activate,radio,on", "elm");
61 elm_layout_signal_emit(obj, "elm,state,radio,on", "elm");
62 }
63 else
64 {
65 if (activate) elm_layout_signal_emit(obj, "efl,activate,radio,on", "efl");
66 elm_layout_signal_emit(obj, "efl,state,radio,on", "efl");
67 }
60 } 68 }
61 else 69 else
62 { 70 {
@@ -64,8 +72,16 @@ _state_set(Evas_Object *obj, Eina_Bool state, Eina_Bool activate)
64 // so that we can distinguish between state change by user or state change 72 // so that we can distinguish between state change by user or state change
65 // by calling state_change() api. Keep both the signal for backward compatibility 73 // by calling state_change() api. Keep both the signal for backward compatibility
66 // and only emit "elm,state,radio,off"when activate is false when we can break ABI. 74 // and only emit "elm,state,radio,off"when activate is false when we can break ABI.
67 if (activate) elm_layout_signal_emit(obj, "elm,activate,radio,off", "elm"); 75 if (elm_widget_is_legacy(obj))
68 elm_layout_signal_emit(obj, "elm,state,radio,off", "elm"); 76 {
77 if (activate) elm_layout_signal_emit(obj, "elm,activate,radio,off", "elm");
78 elm_layout_signal_emit(obj, "elm,state,radio,off", "elm");
79 }
80 else
81 {
82 if (activate) elm_layout_signal_emit(obj, "efl,activate,radio,off", "efl");
83 elm_layout_signal_emit(obj, "efl,state,radio,off", "efl");
84 }
69 } 85 }
70 if (_elm_config->atspi_mode) 86 if (_elm_config->atspi_mode)
71 { 87 {
@@ -138,8 +154,16 @@ _efl_ui_radio_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Radio_Data *sd)
138 int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_CHECK_CLASS)); 154 int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_CHECK_CLASS));
139 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 155 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
140 156
141 if (sd->state) elm_layout_signal_emit(obj, "elm,state,radio,on", "elm"); 157 if (elm_widget_is_legacy(obj))
142 else elm_layout_signal_emit(obj, "elm,state,radio,off", "elm"); 158 {
159 if (sd->state) elm_layout_signal_emit(obj, "elm,state,radio,on", "elm");
160 else elm_layout_signal_emit(obj, "elm,state,radio,off", "elm");
161 }
162 else
163 {
164 if (sd->state) elm_layout_signal_emit(obj, "efl,state,radio,on", "efl");
165 else elm_layout_signal_emit(obj, "efl,state,radio,off", "efl");
166 }
143 167
144 edje_object_message_signal_process(wd->resize_obj); 168 edje_object_message_signal_process(wd->resize_obj);
145 169
@@ -188,8 +212,13 @@ _efl_ui_radio_efl_object_constructor(Eo *obj, Efl_Ui_Radio_Data *pd)
188 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 212 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
189 213
190 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); 214 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
191 elm_layout_signal_callback_add 215
192 (obj, "elm,action,radio,toggle", "*", _radio_on_cb, obj); 216 if (elm_widget_is_legacy(obj))
217 elm_layout_signal_callback_add
218 (obj, "elm,action,radio,toggle", "*", _radio_on_cb, obj);
219 else
220 elm_layout_signal_callback_add
221 (obj, "efl,action,radio,toggle", "*", _radio_on_cb, obj);
193 222
194 pd->group = calloc(1, sizeof(Group)); 223 pd->group = calloc(1, sizeof(Group));
195 pd->group->radios = eina_list_append(pd->group->radios, obj); 224 pd->group->radios = eina_list_append(pd->group->radios, obj);
diff --git a/src/lib/elementary/efl_ui_scroller.c b/src/lib/elementary/efl_ui_scroller.c
index c086957..c7351e9 100644
--- a/src/lib/elementary/efl_ui_scroller.c
+++ b/src/lib/elementary/efl_ui_scroller.c
@@ -233,9 +233,9 @@ _efl_ui_scroller_bar_show_cb(void *data, const Efl_Event *event)
233 Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info); 233 Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info);
234 234
235 if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL) 235 if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
236 edje_object_signal_emit(wd->resize_obj, "elm,action,show,hbar", "elm"); 236 edje_object_signal_emit(wd->resize_obj, "efl,action,show,hbar", "efl");
237 else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL) 237 else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL)
238 edje_object_signal_emit(wd->resize_obj, "elm,action,show,vbar", "elm"); 238 edje_object_signal_emit(wd->resize_obj, "efl,action,show,vbar", "efl");
239} 239}
240 240
241static void 241static void
@@ -247,9 +247,9 @@ _efl_ui_scroller_bar_hide_cb(void *data, const Efl_Event *event)
247 Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info); 247 Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info);
248 248
249 if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL) 249 if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
250 edje_object_signal_emit(wd->resize_obj, "elm,action,hide,hbar", "elm"); 250 edje_object_signal_emit(wd->resize_obj, "efl,action,hide,hbar", "efl");
251 else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL) 251 else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL)
252 edje_object_signal_emit(wd->resize_obj, "elm,action,hide,vbar", "elm"); 252 edje_object_signal_emit(wd->resize_obj, "efl,action,hide,vbar", "efl");
253} 253}
254 254
255static void 255static void
@@ -258,7 +258,7 @@ _scroll_edje_object_attach(Eo *obj)
258 EFL_UI_SCROLLER_DATA_GET_OR_RETURN(obj, sd); 258 EFL_UI_SCROLLER_DATA_GET_OR_RETURN(obj, sd);
259 259
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", "efl", _efl_ui_scroller_reload_cb, obj);
262 efl_layout_signal_callback_add 262 efl_layout_signal_callback_add
263 (obj, "drag", "efl.dragable.vbar", _efl_ui_scroller_vbar_drag_cb, 263 (obj, "drag", "efl.dragable.vbar", _efl_ui_scroller_vbar_drag_cb,
264 obj); 264 obj);
@@ -278,10 +278,10 @@ _scroll_edje_object_attach(Eo *obj)
278 (obj, "drag,page", "efl.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, "efl,vbar,press", "efl",
282 _efl_ui_scroller_vbar_press_cb, obj); 282 _efl_ui_scroller_vbar_press_cb, obj);
283 efl_layout_signal_callback_add 283 efl_layout_signal_callback_add
284 (obj, "elm,vbar,unpress", "elm", 284 (obj, "efl,vbar,unpress", "efl",
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", "efl.dragable.hbar", _efl_ui_scroller_hbar_drag_cb, 287 (obj, "drag", "efl.dragable.hbar", _efl_ui_scroller_hbar_drag_cb,
@@ -302,10 +302,10 @@ _scroll_edje_object_attach(Eo *obj)
302 (obj, "drag,page", "efl.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, "efl,hbar,press", "efl",
306 _efl_ui_scroller_hbar_press_cb, obj); 306 _efl_ui_scroller_hbar_press_cb, obj);
307 efl_layout_signal_callback_add 307 efl_layout_signal_callback_add
308 (obj, "elm,hbar,unpress", "elm", 308 (obj, "efl,hbar,unpress", "efl",
309 _efl_ui_scroller_hbar_unpress_cb, obj); 309 _efl_ui_scroller_hbar_unpress_cb, obj);
310} 310}
311 311
@@ -315,7 +315,7 @@ _scroll_edje_object_detach(Evas_Object *obj)
315 EFL_UI_SCROLLER_DATA_GET_OR_RETURN(obj, sd); 315 EFL_UI_SCROLLER_DATA_GET_OR_RETURN(obj, sd);
316 316
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", "efl", _efl_ui_scroller_reload_cb, obj);
319 efl_layout_signal_callback_del 319 efl_layout_signal_callback_del
320 (obj, "drag", "efl.dragable.vbar", _efl_ui_scroller_vbar_drag_cb, 320 (obj, "drag", "efl.dragable.vbar", _efl_ui_scroller_vbar_drag_cb,
321 obj); 321 obj);
@@ -335,10 +335,10 @@ _scroll_edje_object_detach(Evas_Object *obj)
335 (obj, "drag,page", "efl.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, "efl,vbar,press", "efl",
339 _efl_ui_scroller_vbar_press_cb, obj); 339 _efl_ui_scroller_vbar_press_cb, obj);
340 efl_layout_signal_callback_del 340 efl_layout_signal_callback_del
341 (obj, "elm,vbar,unpress", "elm", 341 (obj, "efl,vbar,unpress", "efl",
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", "efl.dragable.hbar", _efl_ui_scroller_hbar_drag_cb, 344 (obj, "drag", "efl.dragable.hbar", _efl_ui_scroller_hbar_drag_cb,
@@ -359,10 +359,10 @@ _scroll_edje_object_detach(Evas_Object *obj)
359 (obj, "drag,page", "efl.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, "efl,hbar,press", "efl",
363 _efl_ui_scroller_hbar_press_cb, obj); 363 _efl_ui_scroller_hbar_press_cb, obj);
364 efl_layout_signal_callback_del 364 efl_layout_signal_callback_del
365 (obj, "elm,hbar,unpress", "elm", 365 (obj, "efl,hbar,unpress", "efl",
366 _efl_ui_scroller_hbar_unpress_cb, obj); 366 _efl_ui_scroller_hbar_unpress_cb, obj);
367} 367}
368 368
diff --git a/src/lib/elementary/efl_ui_spin_button.c b/src/lib/elementary/efl_ui_spin_button.c
index 2a37bce..37ef72f 100644
--- a/src/lib/elementary/efl_ui_spin_button.c
+++ b/src/lib/elementary/efl_ui_spin_button.c
@@ -157,8 +157,8 @@ _entry_hide(Evas_Object *obj)
157{ 157{
158 Efl_Ui_Spin_Button_Data *sd = efl_data_scope_get(obj, MY_CLASS); 158 Efl_Ui_Spin_Button_Data *sd = efl_data_scope_get(obj, MY_CLASS);
159 159
160 elm_layout_signal_emit(obj, "elm,state,button,active", "elm"); 160 elm_layout_signal_emit(obj, "efl,state,button,active", "efl");
161 elm_layout_signal_emit(obj, "elm,state,entry,inactive", "elm"); 161 elm_layout_signal_emit(obj, "efl,state,entry,inactive", "efl");
162 162
163 if (sd->entry_visible && !evas_focus_state_get(evas_object_evas_get(obj))) 163 if (sd->entry_visible && !evas_focus_state_get(evas_object_evas_get(obj)))
164 sd->entry_reactivate = EINA_TRUE; 164 sd->entry_reactivate = EINA_TRUE;
@@ -340,7 +340,7 @@ _entry_show_cb(void *data,
340 elm_object_focus_set(obj, EINA_TRUE); 340 elm_object_focus_set(obj, EINA_TRUE);
341 elm_entry_select_all(obj); 341 elm_entry_select_all(obj);
342 sd->entry_visible = EINA_TRUE; 342 sd->entry_visible = EINA_TRUE;
343 elm_layout_signal_emit(data, "elm,state,button,inactive", "elm"); 343 elm_layout_signal_emit(data, "efl,state,button,inactive", "efl");
344} 344}
345 345
346static void 346static void
@@ -378,7 +378,7 @@ _toggle_entry(Evas_Object *obj)
378 efl_event_callback_add(sd->ent, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED, 378 efl_event_callback_add(sd->ent, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED,
379 _entry_focus_changed_cb, obj); 379 _entry_focus_changed_cb, obj);
380 sd->entry_visible = EINA_TRUE; 380 sd->entry_visible = EINA_TRUE;
381 elm_layout_signal_emit(obj, "elm,state,entry,active", "elm"); 381 elm_layout_signal_emit(obj, "efl,state,entry,active", "efl");
382 { 382 {
383 Eina_List *items = NULL; 383 Eina_List *items = NULL;
384 384
@@ -658,13 +658,13 @@ _access_increment_decrement_info_say(Evas_Object *obj,
658 if (is_incremented) 658 if (is_incremented)
659 { 659 {
660 elm_object_signal_emit 660 elm_object_signal_emit
661 (sd->inc_button, "elm,action,anim,activate", "elm"); 661 (sd->inc_button, "efl,action,anim,activate", "efl");
662 eina_strbuf_append(buf, E_("incremented")); 662 eina_strbuf_append(buf, E_("incremented"));
663 } 663 }
664 else 664 else
665 { 665 {
666 elm_object_signal_emit 666 elm_object_signal_emit
667 (sd->dec_button, "elm,action,anim,activate", "elm"); 667 (sd->dec_button, "efl,action,anim,activate", "efl");
668 eina_strbuf_append(buf, E_("decremented")); 668 eina_strbuf_append(buf, E_("decremented"));
669 } 669 }
670 670
@@ -688,10 +688,10 @@ _access_spinner_register(Evas_Object *obj, Eina_Bool is_access)
688 /* unregister access */ 688 /* unregister access */
689 _elm_access_edje_object_part_object_unregister 689 _elm_access_edje_object_part_object_unregister
690 (obj, elm_layout_edje_get(obj), "access"); 690 (obj, elm_layout_edje_get(obj), "access");
691 elm_layout_signal_emit(obj, "elm,state,access,inactive", "elm"); 691 elm_layout_signal_emit(obj, "efl,state,access,inactive", "efl");
692 return; 692 return;
693 } 693 }
694 elm_layout_signal_emit(obj, "elm,state,access,active", "elm"); 694 elm_layout_signal_emit(obj, "efl,state,access,active", "efl");
695 ao = _elm_access_edje_object_part_object_register 695 ao = _elm_access_edje_object_part_object_register
696 (obj, elm_layout_edje_get(obj), "access"); 696 (obj, elm_layout_edje_get(obj), "access");
697 697
@@ -783,7 +783,7 @@ _efl_ui_spin_button_efl_object_constructor(Eo *obj, Efl_Ui_Spin_Button_Data *sd)
783 } 783 }
784 784
785 elm_layout_signal_callback_add 785 elm_layout_signal_callback_add
786 (obj, "elm,action,entry,toggle", "*", _entry_toggle_cb, NULL); 786 (obj, "efl,action,entry,toggle", "*", _entry_toggle_cb, NULL);
787 787
788 elm_widget_can_focus_set(obj, EINA_TRUE); 788 elm_widget_can_focus_set(obj, EINA_TRUE);
789 789
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index c984e23..3a87047 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -444,9 +444,9 @@ _efl_ui_text_guide_update(Evas_Object *obj,
444 EFL_UI_TEXT_DATA_GET(obj, sd); 444 EFL_UI_TEXT_DATA_GET(obj, sd);
445 445
446 if ((has_text) && (!sd->has_text)) 446 if ((has_text) && (!sd->has_text))
447 edje_object_signal_emit(sd->entry_edje, "elm,guide,disabled", "elm"); 447 edje_object_signal_emit(sd->entry_edje, "efl,guide,disabled", "efl");
448 else if ((!has_text) && (sd->has_text)) 448 else if ((!has_text) && (sd->has_text))
449 edje_object_signal_emit(sd->entry_edje, "elm,guide,enabled", "elm"); 449 edje_object_signal_emit(sd->entry_edje, "efl,guide,enabled", "efl");
450 450
451 sd->has_text = has_text; 451 sd->has_text = has_text;
452} 452}
@@ -465,7 +465,7 @@ _validate(Evas_Object *obj)
465 res = efl_event_callback_call(obj, EFL_UI_TEXT_EVENT_VALIDATE, (void *)&vc); 465 res = efl_event_callback_call(obj, EFL_UI_TEXT_EVENT_VALIDATE, (void *)&vc);
466 buf = eina_strbuf_new(); 466 buf = eina_strbuf_new();
467 eina_strbuf_append_printf(buf, "validation,%s,%s", vc.signal, res == EINA_FALSE ? "fail" : "pass"); 467 eina_strbuf_append_printf(buf, "validation,%s,%s", vc.signal, res == EINA_FALSE ? "fail" : "pass");
468 edje_object_signal_emit(sd->scr_edje, eina_strbuf_string_get(buf), "elm"); 468 edje_object_signal_emit(sd->scr_edje, eina_strbuf_string_get(buf), "efl");
469 eina_tmpstr_del(vc.signal); 469 eina_tmpstr_del(vc.signal);
470 eina_strbuf_free(buf); 470 eina_strbuf_free(buf);
471} 471}
@@ -515,12 +515,12 @@ _hide_selection_handler(Evas_Object *obj)
515 515
516 if (sd->start_handler_shown) 516 if (sd->start_handler_shown)
517 { 517 {
518 edje_object_signal_emit(sd->start_handler, "elm,handler,hide", "elm"); 518 edje_object_signal_emit(sd->start_handler, "efl,handler,hide", "efl");
519 sd->start_handler_shown = EINA_FALSE; 519 sd->start_handler_shown = EINA_FALSE;
520 } 520 }
521 if (sd->end_handler_shown) 521 if (sd->end_handler_shown)
522 { 522 {
523 edje_object_signal_emit(sd->end_handler, "elm,handler,hide", "elm"); 523 edje_object_signal_emit(sd->end_handler, "efl,handler,hide", "efl");
524 sd->end_handler_shown = EINA_FALSE; 524 sd->end_handler_shown = EINA_FALSE;
525 } 525 }
526} 526}
@@ -606,13 +606,13 @@ _update_selection_handler(Eo *obj)
606 if (!sd->start_handler_shown && !hidden) 606 if (!sd->start_handler_shown && !hidden)
607 { 607 {
608 edje_object_signal_emit(sd->start_handler, 608 edje_object_signal_emit(sd->start_handler,
609 "elm,handler,show", "elm"); 609 "efl,handler,show", "efl");
610 sd->start_handler_shown = EINA_TRUE; 610 sd->start_handler_shown = EINA_TRUE;
611 } 611 }
612 else if (sd->start_handler_shown && hidden) 612 else if (sd->start_handler_shown && hidden)
613 { 613 {
614 edje_object_signal_emit(sd->start_handler, 614 edje_object_signal_emit(sd->start_handler,
615 "elm,handler,hide", "elm"); 615 "efl,handler,hide", "efl");
616 sd->start_handler_shown = EINA_FALSE; 616 sd->start_handler_shown = EINA_FALSE;
617 } 617 }
618 618
@@ -632,13 +632,13 @@ _update_selection_handler(Eo *obj)
632 if (!sd->end_handler_shown && !hidden) 632 if (!sd->end_handler_shown && !hidden)
633 { 633 {
634 edje_object_signal_emit(sd->end_handler, 634 edje_object_signal_emit(sd->end_handler,
635 "elm,handler,show", "elm"); 635 "efl,handler,show", "efl");
636 sd->end_handler_shown = EINA_TRUE; 636 sd->end_handler_shown = EINA_TRUE;
637 } 637 }
638 else if (sd->end_handler_shown && hidden) 638 else if (sd->end_handler_shown && hidden)
639 { 639 {
640 edje_object_signal_emit(sd->end_handler, 640 edje_object_signal_emit(sd->end_handler,
641 "elm,handler,hide", "elm"); 641 "efl,handler,hide", "efl");
642 sd->end_handler_shown = EINA_FALSE; 642 sd->end_handler_shown = EINA_FALSE;
643 } 643 }
644 eina_rectangle_free(rect); 644 eina_rectangle_free(rect);
@@ -648,13 +648,13 @@ _update_selection_handler(Eo *obj)
648 if (sd->start_handler_shown) 648 if (sd->start_handler_shown)
649 { 649 {
650 edje_object_signal_emit(sd->start_handler, 650 edje_object_signal_emit(sd->start_handler,
651 "elm,handler,hide", "elm"); 651 "efl,handler,hide", "efl");
652 sd->start_handler_shown = EINA_FALSE; 652 sd->start_handler_shown = EINA_FALSE;
653 } 653 }
654 if (sd->end_handler_shown) 654 if (sd->end_handler_shown)
655 { 655 {
656 edje_object_signal_emit(sd->end_handler, 656 edje_object_signal_emit(sd->end_handler,
657 "elm,handler,hide", "elm"); 657 "efl,handler,hide", "efl");
658 sd->end_handler_shown = EINA_FALSE; 658 sd->end_handler_shown = EINA_FALSE;
659 } 659 }
660 } 660 }
@@ -804,11 +804,11 @@ _efl_ui_text_efl_ui_widget_on_disabled_update(Eo *obj, Efl_Ui_Text_Data *sd, Ein
804 _dnd_pos_cb, NULL, 804 _dnd_pos_cb, NULL,
805 _dnd_drop_cb, NULL); 805 _dnd_drop_cb, NULL);
806 806
807 emission = disabled ? "elm,state,disabled" : "elm,state,enabled"; 807 emission = disabled ? "efl,state,disabled" : "efl,state,enabled";
808 edje_object_signal_emit(sd->entry_edje, emission, "elm"); 808 edje_object_signal_emit(sd->entry_edje, emission, "efl");
809 if (sd->scroll) 809 if (sd->scroll)
810 { 810 {
811 edje_object_signal_emit(sd->scr_edje, emission, "elm"); 811 edje_object_signal_emit(sd->scr_edje, emission, "efl");
812 elm_interface_scrollable_freeze_set(obj, disabled); 812 elm_interface_scrollable_freeze_set(obj, disabled);
813 } 813 }
814 sd->disabled = disabled; 814 sd->disabled = disabled;
@@ -881,7 +881,7 @@ _efl_ui_text_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd)
881 elm_widget_theme_element_get(obj)); 881 elm_widget_theme_element_get(obj));
882 882
883 if (elm_widget_disabled_get(obj)) 883 if (elm_widget_disabled_get(obj))
884 edje_object_signal_emit(sd->entry_edje, "elm,state,disabled", "elm"); 884 edje_object_signal_emit(sd->entry_edje, "efl,state,disabled", "efl");
885 885
886 edje_object_part_text_input_panel_layout_set 886 edje_object_part_text_input_panel_layout_set
887 (sd->entry_edje, "efl.text", (Edje_Input_Panel_Layout)sd->input_panel_layout); 887 (sd->entry_edje, "efl.text", (Edje_Input_Panel_Layout)sd->input_panel_layout);
@@ -912,9 +912,9 @@ _efl_ui_text_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd)
912 912
913 if (efl_ui_focus_object_focus_get(obj)) 913 if (efl_ui_focus_object_focus_get(obj))
914 { 914 {
915 edje_object_signal_emit(sd->entry_edje, "elm,action,focus", "elm"); 915 edje_object_signal_emit(sd->entry_edje, "efl,action,focus", "efl");
916 if (sd->scroll) 916 if (sd->scroll)
917 edje_object_signal_emit(sd->scr_edje, "elm,action,focus", "elm"); 917 edje_object_signal_emit(sd->scr_edje, "efl,action,focus", "efl");
918 } 918 }
919 919
920 edje_object_message_signal_process(sd->entry_edje); 920 edje_object_message_signal_process(sd->entry_edje);
@@ -1144,9 +1144,9 @@ _efl_ui_text_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd)
1144 Eo *sw = edje_object_part_swallow_get(sd->entry_edje, "efl.text"); 1144 Eo *sw = edje_object_part_swallow_get(sd->entry_edje, "efl.text");
1145 evas_object_focus_set(sw, EINA_TRUE); 1145 evas_object_focus_set(sw, EINA_TRUE);
1146 1146
1147 _edje_signal_emit(sd, "elm,action,focus", "elm"); 1147 _edje_signal_emit(sd, "efl,action,focus", "efl");
1148 if (sd->scroll) 1148 if (sd->scroll)
1149 edje_object_signal_emit(sd->scr_edje, "elm,action,focus", "elm"); 1149 edje_object_signal_emit(sd->scr_edje, "efl,action,focus", "efl");
1150 1150
1151 if (top && top_is_win && sd->input_panel_enable && !sd->input_panel_show_on_demand) 1151 if (top && top_is_win && sd->input_panel_enable && !sd->input_panel_show_on_demand)
1152 elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON); 1152 elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON);
@@ -1159,9 +1159,9 @@ _efl_ui_text_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd)
1159 { 1159 {
1160 Eo *sw = edje_object_part_swallow_get(sd->entry_edje, "efl.text"); 1160 Eo *sw = edje_object_part_swallow_get(sd->entry_edje, "efl.text");
1161 1161
1162 _edje_signal_emit(sd, "elm,action,unfocus", "elm"); 1162 _edje_signal_emit(sd, "efl,action,unfocus", "efl");
1163 if (sd->scroll) 1163 if (sd->scroll)
1164 edje_object_signal_emit(sd->scr_edje, "elm,action,unfocus", "elm"); 1164 edje_object_signal_emit(sd->scr_edje, "efl,action,unfocus", "efl");
1165 evas_object_focus_set(sw, EINA_FALSE); 1165 evas_object_focus_set(sw, EINA_FALSE);
1166 1166
1167 if (top && top_is_win && sd->input_panel_enable) 1167 if (top && top_is_win && sd->input_panel_enable)
@@ -1176,11 +1176,11 @@ _efl_ui_text_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd)
1176 sd->sel_mode = EINA_FALSE; 1176 sd->sel_mode = EINA_FALSE;
1177 elm_widget_scroll_hold_pop(obj); 1177 elm_widget_scroll_hold_pop(obj);
1178 edje_object_part_text_select_allow_set(sd->entry_edje, "efl.text", EINA_FALSE); 1178 edje_object_part_text_select_allow_set(sd->entry_edje, "efl.text", EINA_FALSE);
1179 edje_object_signal_emit(sd->entry_edje, "elm,state,select,off", "elm"); 1179 edje_object_signal_emit(sd->entry_edje, "efl,state,select,off", "efl");
1180 edje_object_part_text_select_none(sd->entry_edje, "efl.text"); 1180 edje_object_part_text_select_none(sd->entry_edje, "efl.text");
1181 } 1181 }
1182 } 1182 }
1183 edje_object_signal_emit(sd->scr_edje, "validation,default", "elm"); 1183 edje_object_signal_emit(sd->scr_edje, "validation,default", "efl");
1184 } 1184 }
1185 1185
1186 return EINA_TRUE; 1186 return EINA_TRUE;
@@ -1230,11 +1230,11 @@ _efl_ui_text_efl_ui_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Text_Data *_pd
1230 * smart function */ 1230 * smart function */
1231 if (sobj == elm_layout_content_get(obj, "efl.icon")) 1231 if (sobj == elm_layout_content_get(obj, "efl.icon"))
1232 { 1232 {
1233 elm_layout_signal_emit(obj, "elm,action,hide,icon", "elm"); 1233 elm_layout_signal_emit(obj, "efl,action,hide,icon", "efl");
1234 } 1234 }
1235 else if (sobj == elm_layout_content_get(obj, "efl.end")) 1235 else if (sobj == elm_layout_content_get(obj, "efl.end"))
1236 { 1236 {
1237 elm_layout_signal_emit(obj, "elm,action,hide,end", "elm"); 1237 elm_layout_signal_emit(obj, "efl,action,hide,end", "efl");
1238 } 1238 }
1239 1239
1240 ret = elm_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj); 1240 ret = elm_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj);
@@ -1321,7 +1321,7 @@ _hover_selected_cb(void *data,
1321 edje_object_part_text_select_allow_set 1321 edje_object_part_text_select_allow_set
1322 (sd->entry_edje, "efl.text", EINA_TRUE); 1322 (sd->entry_edje, "efl.text", EINA_TRUE);
1323 } 1323 }
1324 edje_object_signal_emit(sd->entry_edje, "elm,state,select,on", "elm"); 1324 edje_object_signal_emit(sd->entry_edje, "efl,state,select,on", "efl");
1325 1325
1326 if (!_elm_config->desktop_entry) 1326 if (!_elm_config->desktop_entry)
1327 elm_widget_scroll_hold_push(data); 1327 elm_widget_scroll_hold_push(data);
@@ -1478,7 +1478,7 @@ _cut_cb(Eo *obj)
1478 if (!_elm_config->desktop_entry) 1478 if (!_elm_config->desktop_entry)
1479 edje_object_part_text_select_allow_set 1479 edje_object_part_text_select_allow_set
1480 (sd->entry_edje, "efl.text", EINA_FALSE); 1480 (sd->entry_edje, "efl.text", EINA_FALSE);
1481 edje_object_signal_emit(sd->entry_edje, "elm,state,select,off", "elm"); 1481 edje_object_signal_emit(sd->entry_edje, "efl,state,select,off", "efl");
1482 1482
1483 if (!_elm_config->desktop_entry) 1483 if (!_elm_config->desktop_entry)
1484 elm_widget_scroll_hold_pop(obj); 1484 elm_widget_scroll_hold_pop(obj);
@@ -1507,7 +1507,7 @@ _copy_cb(Eo *obj)
1507 { 1507 {
1508 edje_object_part_text_select_allow_set 1508 edje_object_part_text_select_allow_set
1509 (sd->entry_edje, "efl.text", EINA_FALSE); 1509 (sd->entry_edje, "efl.text", EINA_FALSE);
1510 edje_object_signal_emit(sd->entry_edje, "elm,state,select,off", "elm"); 1510 edje_object_signal_emit(sd->entry_edje, "efl,state,select,off", "efl");
1511 elm_widget_scroll_hold_pop(obj); 1511 elm_widget_scroll_hold_pop(obj);
1512 } 1512 }
1513 _selection_store(ELM_SEL_TYPE_CLIPBOARD, obj); 1513 _selection_store(ELM_SEL_TYPE_CLIPBOARD, obj);
@@ -1532,7 +1532,7 @@ _hover_cancel_cb(void *data,
1532 if (!_elm_config->desktop_entry) 1532 if (!_elm_config->desktop_entry)
1533 edje_object_part_text_select_allow_set 1533 edje_object_part_text_select_allow_set
1534 (sd->entry_edje, "efl.text", EINA_FALSE); 1534 (sd->entry_edje, "efl.text", EINA_FALSE);
1535 edje_object_signal_emit(sd->entry_edje, "elm,state,select,off", "elm"); 1535 edje_object_signal_emit(sd->entry_edje, "efl,state,select,off", "efl");
1536 if (!_elm_config->desktop_entry) 1536 if (!_elm_config->desktop_entry)
1537 elm_widget_scroll_hold_pop(data); 1537 elm_widget_scroll_hold_pop(data);
1538 edje_object_part_text_select_none(sd->entry_edje, "efl.text"); 1538 edje_object_part_text_select_none(sd->entry_edje, "efl.text");
@@ -1807,7 +1807,7 @@ static void
1807_magnifier_hide(void *data) 1807_magnifier_hide(void *data)
1808{ 1808{
1809 EFL_UI_TEXT_DATA_GET(data, sd); 1809 EFL_UI_TEXT_DATA_GET(data, sd);
1810 edje_object_signal_emit(sd->mgf_bg, "elm,action,hide,magnifier", "elm"); 1810 edje_object_signal_emit(sd->mgf_bg, "efl,action,hide,magnifier", "efl");
1811 elm_widget_scroll_freeze_pop(data); 1811 elm_widget_scroll_freeze_pop(data);
1812 evas_object_hide(sd->mgf_clip); 1812 evas_object_hide(sd->mgf_clip);
1813} 1813}
@@ -1816,7 +1816,7 @@ static void
1816_magnifier_show(void *data) 1816_magnifier_show(void *data)
1817{ 1817{
1818 EFL_UI_TEXT_DATA_GET(data, sd); 1818 EFL_UI_TEXT_DATA_GET(data, sd);
1819 edje_object_signal_emit(sd->mgf_bg, "elm,action,show,magnifier", "elm"); 1819 edje_object_signal_emit(sd->mgf_bg, "efl,action,show,magnifier", "efl");
1820 elm_widget_scroll_freeze_push(data); 1820 elm_widget_scroll_freeze_push(data);
1821 evas_object_show(sd->mgf_clip); 1821 evas_object_show(sd->mgf_clip);
1822} 1822}
@@ -2181,11 +2181,11 @@ _entry_cursor_changed_signal_cb(void *data,
2181 sd->cur_changed = EINA_TRUE; 2181 sd->cur_changed = EINA_TRUE;
2182 if (efl_ui_focus_object_focus_get(data)) 2182 if (efl_ui_focus_object_focus_get(data))
2183 { 2183 {
2184 edje_object_signal_emit(sd->entry_edje, "elm,action,show,cursor", "elm"); 2184 edje_object_signal_emit(sd->entry_edje, "efl,action,show,cursor", "efl");
2185 } 2185 }
2186 else 2186 else
2187 { 2187 {
2188 edje_object_signal_emit(sd->entry_edje, "elm,action,hide,cursor", "elm"); 2188 edje_object_signal_emit(sd->entry_edje, "efl,action,hide,cursor", "efl");
2189 } 2189 }
2190 2190
2191 sd->deferred_decoration_cursor = EINA_TRUE; 2191 sd->deferred_decoration_cursor = EINA_TRUE;
@@ -2574,7 +2574,7 @@ _efl_ui_text_content_set(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, const char
2574 if (!int_ret) return EINA_FALSE; 2574 if (!int_ret) return EINA_FALSE;
2575 2575
2576 /* too bad entry does not follow the pattern 2576 /* too bad entry does not follow the pattern
2577 * "elm,state,{icon,end},visible", we have to repeat ourselves */ 2577 * "efl,state,{icon,end},visible", we have to repeat ourselves */
2578 if (!part || !strcmp(part, "icon") || !strcmp(part, "efl.icon")) 2578 if (!part || !strcmp(part, "icon") || !strcmp(part, "efl.icon"))
2579 efl_ui_text_icon_visible_set(obj, EINA_TRUE); 2579 efl_ui_text_icon_visible_set(obj, EINA_TRUE);
2580 2580
@@ -2593,7 +2593,7 @@ _efl_ui_text_content_unset(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, const cha
2593 if (!ret) return NULL; 2593 if (!ret) return NULL;
2594 2594
2595 /* too bad entry does not follow the pattern 2595 /* too bad entry does not follow the pattern
2596 * "elm,state,{icon,end},hidden", we have to repeat ourselves */ 2596 * "efl,state,{icon,end},hidden", we have to repeat ourselves */
2597 if (!part || !strcmp(part, "icon") || !strcmp(part, "efl.icon")) 2597 if (!part || !strcmp(part, "icon") || !strcmp(part, "efl.icon"))
2598 efl_ui_text_icon_visible_set(obj, EINA_FALSE); 2598 efl_ui_text_icon_visible_set(obj, EINA_FALSE);
2599 2599
@@ -3426,7 +3426,7 @@ _efl_ui_text_select_none(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
3426 if (!_elm_config->desktop_entry) 3426 if (!_elm_config->desktop_entry)
3427 edje_object_part_text_select_allow_set 3427 edje_object_part_text_select_allow_set
3428 (sd->entry_edje, "efl.text", EINA_FALSE); 3428 (sd->entry_edje, "efl.text", EINA_FALSE);
3429 edje_object_signal_emit(sd->entry_edje, "elm,state,select,off", "elm"); 3429 edje_object_signal_emit(sd->entry_edje, "efl,state,select,off", "efl");
3430 } 3430 }
3431 if (sd->have_selection) 3431 if (sd->have_selection)
3432 efl_event_callback_call(obj, EFL_UI_EVENT_SELECTION_CLEARED, NULL); 3432 efl_event_callback_call(obj, EFL_UI_EVENT_SELECTION_CLEARED, NULL);
diff --git a/src/lib/elementary/efl_ui_timepicker.c b/src/lib/elementary/efl_ui_timepicker.c
index 9d00554..3c13f4f 100644
--- a/src/lib/elementary/efl_ui_timepicker.c
+++ b/src/lib/elementary/efl_ui_timepicker.c
@@ -173,16 +173,16 @@ _fields_init(Eo *obj)
173 //TODO: monitoring locale change and update field location. 173 //TODO: monitoring locale change and update field location.
174 if (field == 0) 174 if (field == 0)
175 { 175 {
176 elm_object_signal_emit(obj, "elm,state,colon,visible,field1", "elm"); 176 elm_object_signal_emit(obj, "efl,state,colon,visible,field1", "efl");
177 elm_object_signal_emit(obj, "elm,state,colon,invisible,field0", "elm"); 177 elm_object_signal_emit(obj, "efl,state,colon,invisible,field0", "efl");
178 } 178 }
179 else 179 else
180 { 180 {
181 elm_object_signal_emit(obj, "elm,state,colon,visible,field0", "elm"); 181 elm_object_signal_emit(obj, "efl,state,colon,visible,field0", "efl");
182 elm_object_signal_emit(obj, "elm,state,colon,invisible,field1", "elm"); 182 elm_object_signal_emit(obj, "efl,state,colon,invisible,field1", "efl");
183 } 183 }
184 184
185 elm_layout_signal_emit(obj, "elm,state,ampm,visible", "elm"); 185 elm_layout_signal_emit(obj, "efl,state,ampm,visible", "efl");
186 edje_object_message_signal_process(elm_layout_edje_get(obj)); 186 edje_object_message_signal_process(elm_layout_edje_get(obj));
187 efl_content_set(efl_part(obj, buf), pd->ampm); 187 efl_content_set(efl_part(obj, buf), pd->ampm);
188 } 188 }
@@ -267,9 +267,9 @@ _efl_ui_timepicker_ampm_set(Eo *obj, Efl_Ui_Timepicker_Data *pd, Eina_Bool is_24
267 267
268 pd->is_24hour = is_24hour; 268 pd->is_24hour = is_24hour;
269 if (pd->is_24hour == EINA_TRUE) 269 if (pd->is_24hour == EINA_TRUE)
270 elm_layout_signal_emit(obj, "elm,state,ampm,invisible", "elm"); 270 elm_layout_signal_emit(obj, "efl,state,ampm,invisible", "efl");
271 else 271 else
272 elm_layout_signal_emit(obj, "elm,state,ampm,visible", "elm"); 272 elm_layout_signal_emit(obj, "efl,state,ampm,visible", "efl");
273 _field_value_update(obj); 273 _field_value_update(obj);
274} 274}
275 275
diff --git a/src/lib/elementary/efl_ui_video.c b/src/lib/elementary/efl_ui_video.c
index 58a3d8d..c9afad2 100644
--- a/src/lib/elementary/efl_ui_video.c
+++ b/src/lib/elementary/efl_ui_video.c
@@ -140,13 +140,19 @@ _on_size_hints_changed(void *data EINA_UNUSED,
140static void 140static void
141_on_open_done(void *data, const Efl_Event *event EINA_UNUSED) 141_on_open_done(void *data, const Efl_Event *event EINA_UNUSED)
142{ 142{
143 elm_layout_signal_emit(data, "elm,video,open", "elm"); 143 if(elm_widget_is_legacy(data))
144 elm_layout_signal_emit(data, "elm,video,open", "elm");
145 else
146 elm_layout_signal_emit(data, "efl,video,open", "efl");
144} 147}
145 148
146static void 149static void
147_on_playback_started(void *data, const Efl_Event *event EINA_UNUSED) 150_on_playback_started(void *data, const Efl_Event *event EINA_UNUSED)
148{ 151{
149 elm_layout_signal_emit(data, "elm,video,play", "elm"); 152 if(elm_widget_is_legacy(data))
153 elm_layout_signal_emit(data, "elm,video,play", "elm");
154 else
155 elm_layout_signal_emit(data, "efl,video,play", "efl");
150 156
151 return; 157 return;
152 158
@@ -157,7 +163,11 @@ _on_playback_finished(void *data, const Efl_Event *event EINA_UNUSED)
157{ 163{
158 EFL_UI_VIDEO_DATA_GET(data, sd); 164 EFL_UI_VIDEO_DATA_GET(data, sd);
159 emotion_object_play_set(sd->emotion, EINA_FALSE); 165 emotion_object_play_set(sd->emotion, EINA_FALSE);
160 elm_layout_signal_emit(data, "elm,video,end", "elm"); 166
167 if(elm_widget_is_legacy(data))
168 elm_layout_signal_emit(data, "elm,video,end", "elm");
169 else
170 elm_layout_signal_emit(data, "efl,video,end", "efl");
161} 171}
162 172
163static void 173static void
@@ -174,8 +184,17 @@ _on_title_changed(void *data, const Efl_Event *event EINA_UNUSED)
174 EFL_UI_VIDEO_DATA_GET(data, sd); 184 EFL_UI_VIDEO_DATA_GET(data, sd);
175 185
176 title = emotion_object_title_get(sd->emotion); 186 title = emotion_object_title_get(sd->emotion);
177 elm_layout_text_set(data, "elm,title", title); 187
178 elm_layout_signal_emit(data, "elm,video,title", "elm"); 188 if(elm_widget_is_legacy(data))
189 {
190 elm_layout_text_set(data, "elm,title", title);
191 elm_layout_signal_emit(data, "elm,video,title", "elm");
192 }
193 else
194 {
195 elm_layout_text_set(data, "efl,title", title);
196 elm_layout_signal_emit(data, "efl,video,title", "efl");
197 }
179} 198}
180 199
181static void 200static void
@@ -279,7 +298,10 @@ _efl_ui_video_efl_file_file_set(Eo *obj, Efl_Ui_Video_Data *sd, const char *file
279 if (filename && ((!strncmp(filename, "file://", 7)) || (!strstr(filename, "://")))) 298 if (filename && ((!strncmp(filename, "file://", 7)) || (!strstr(filename, "://"))))
280 emotion_object_last_position_load(sd->emotion); 299 emotion_object_last_position_load(sd->emotion);
281 300
282 elm_layout_signal_emit(obj, "elm,video,load", "elm"); 301 if(elm_widget_is_legacy(obj))
302 elm_layout_signal_emit(obj, "elm,video,load", "elm");
303 else
304 elm_layout_signal_emit(obj, "efl,video,load", "efl");
283 305
284 return EINA_TRUE; 306 return EINA_TRUE;
285} 307}
@@ -314,7 +336,11 @@ _efl_ui_video_efl_player_play_set(Eo *obj, Efl_Ui_Video_Data *sd, Eina_Bool play
314 ELM_SAFE_FREE(sd->timer, ecore_timer_del); 336 ELM_SAFE_FREE(sd->timer, ecore_timer_del);
315 sd->stop = EINA_FALSE; 337 sd->stop = EINA_FALSE;
316 emotion_object_play_set(sd->emotion, EINA_TRUE); 338 emotion_object_play_set(sd->emotion, EINA_TRUE);
317 elm_layout_signal_emit(obj, "elm,video,play", "elm"); 339
340 if(elm_widget_is_legacy(obj))
341 elm_layout_signal_emit(obj, "elm,video,play", "elm");
342 else
343 elm_layout_signal_emit(obj, "efl,video,play", "efl");
318 } 344 }
319 else 345 else
320 { 346 {
@@ -323,7 +349,11 @@ _efl_ui_video_efl_player_play_set(Eo *obj, Efl_Ui_Video_Data *sd, Eina_Bool play
323 */ 349 */
324 if (!sd->timer) sd->timer = ecore_timer_add(20.0, _suspend_cb, obj); 350 if (!sd->timer) sd->timer = ecore_timer_add(20.0, _suspend_cb, obj);
325 emotion_object_play_set(sd->emotion, EINA_FALSE); 351 emotion_object_play_set(sd->emotion, EINA_FALSE);
326 elm_layout_signal_emit(obj, "elm,video,pause", "elm"); 352
353 if(elm_widget_is_legacy(obj))
354 elm_layout_signal_emit(obj, "elm,video,pause", "elm");
355 else
356 elm_layout_signal_emit(obj, "efl,video,pause", "efl");
327 } 357 }
328} 358}
329 359
@@ -338,7 +368,12 @@ _efl_ui_video_efl_player_stop(Eo *obj, Efl_Ui_Video_Data *sd)
338 368
339 sd->stop = EINA_TRUE; 369 sd->stop = EINA_TRUE;
340 emotion_object_play_set(sd->emotion, EINA_FALSE); 370 emotion_object_play_set(sd->emotion, EINA_FALSE);
341 elm_layout_signal_emit(obj, "elm,video,stop", "elm"); 371
372 if(elm_widget_is_legacy(obj))
373 elm_layout_signal_emit(obj, "elm,video,stop", "elm");
374 else
375 elm_layout_signal_emit(obj, "efl,video,stop", "efl");
376
342 emotion_object_suspend_set(sd->emotion, EMOTION_HIBERNATE); 377 emotion_object_suspend_set(sd->emotion, EMOTION_HIBERNATE);
343} 378}
344 379
diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c
index 5b1c5d5..db97056 100644
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -3098,8 +3098,17 @@ elm_widget_theme_object_set(Evas_Object *obj, Evas_Object *edj, const char *wnam
3098 if (sd->orient_mode != -1) 3098 if (sd->orient_mode != -1)
3099 { 3099 {
3100 char buf[128]; 3100 char buf[128];
3101 snprintf(buf, sizeof(buf), "elm,state,orient,%d", sd->orient_mode); 3101
3102 elm_widget_signal_emit(obj, buf, "elm"); 3102 if (elm_widget_is_legacy(obj))
3103 {
3104 snprintf(buf, sizeof(buf), "elm,state,orient,%d", sd->orient_mode);
3105 elm_widget_signal_emit(obj, buf, "elm");
3106 }
3107 else
3108 {
3109 snprintf(buf, sizeof(buf), "efl,state,orient,%d", sd->orient_mode);
3110 elm_widget_signal_emit(obj, buf, "efl");
3111 }
3103 } 3112 }
3104 3113
3105 return ret; 3114 return ret;
@@ -3583,8 +3592,17 @@ _efl_ui_widget_on_orientation_update(Eo *obj, Elm_Widget_Smart_Data *sd, int ori
3583 if (orient_mode != -1) 3592 if (orient_mode != -1)
3584 { 3593 {
3585 char buf[128]; 3594 char buf[128];
3586 snprintf(buf, sizeof(buf), "elm,state,orient,%d", orient_mode); 3595
3587 elm_widget_signal_emit(obj, buf, "elm"); 3596 if (elm_widget_is_legacy(obj))
3597 {
3598 snprintf(buf, sizeof(buf), "elm,state,orient,%d", orient_mode);
3599 elm_widget_signal_emit(obj, buf, "elm");
3600 }
3601 else
3602 {
3603 snprintf(buf, sizeof(buf), "efl,state,orient,%d", orient_mode);
3604 elm_widget_signal_emit(obj, buf, "efl");
3605 }
3588 } 3606 }
3589} 3607}
3590 3608
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 14e6c9f..ea57983 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -1077,11 +1077,17 @@ _elm_win_focus_highlight_visible_set(Efl_Ui_Win_Data *sd,
1077 if (visible) 1077 if (visible)
1078 { 1078 {
1079 evas_object_show(fobj); 1079 evas_object_show(fobj);
1080 edje_object_signal_emit(fobj, "elm,action,focus,show", "elm"); 1080 if (elm_widget_is_legacy(sd->obj))
1081 edje_object_signal_emit(fobj, "elm,action,focus,show", "elm");
1082 else
1083 edje_object_signal_emit(fobj, "efl,action,focus,show", "efl");
1081 } 1084 }
1082 else 1085 else
1083 { 1086 {
1084 edje_object_signal_emit(fobj, "elm,action,focus,hide", "elm"); 1087 if (elm_widget_is_legacy(sd->obj))
1088 edje_object_signal_emit(fobj, "elm,action,focus,hide", "elm");
1089 else
1090 edje_object_signal_emit(fobj, "efl,action,focus,hide", "efl");
1085 } 1091 }
1086} 1092}
1087 1093
@@ -1137,7 +1143,10 @@ _elm_win_focus_highlight_simple_setup(Efl_Ui_Win_Data *sd,
1137 if (clip) evas_object_clip_set(obj, clip); 1143 if (clip) evas_object_clip_set(obj, clip);
1138 } 1144 }
1139 1145
1140 edje_object_signal_emit(obj, "elm,state,anim,stop", "elm"); 1146 if (elm_widget_is_legacy(sd->obj))
1147 edje_object_signal_emit(obj, "elm,state,anim,stop", "elm");
1148 else
1149 edje_object_signal_emit(obj, "efl,state,anim,stop", "efl");
1141} 1150}
1142 1151
1143static void 1152static void
@@ -1178,8 +1187,14 @@ _elm_win_focus_highlight_reconfigure_job(void *data)
1178 evas_object_event_callback_del_full 1187 evas_object_event_callback_del_full
1179 (previous, EVAS_CALLBACK_DEL, _elm_win_focus_prev_target_del, data); 1188 (previous, EVAS_CALLBACK_DEL, _elm_win_focus_prev_target_del, data);
1180 if (sd->focus_highlight.prev.in_theme) 1189 if (sd->focus_highlight.prev.in_theme)
1181 elm_widget_signal_emit 1190 {
1182 (previous, "elm,action,focus_highlight,hide", "elm"); 1191 if (elm_widget_is_legacy(sd->obj))
1192 elm_widget_signal_emit
1193 (previous, "elm,action,focus_highlight,hide", "elm");
1194 else
1195 elm_widget_signal_emit
1196 (previous, "efl,action,focus_highlight,hide", "efl");
1197 }
1183 } 1198 }
1184 1199
1185 if (!target) 1200 if (!target)
@@ -1187,16 +1202,32 @@ _elm_win_focus_highlight_reconfigure_job(void *data)
1187 else if (sd->focus_highlight.cur.in_theme) 1202 else if (sd->focus_highlight.cur.in_theme)
1188 { 1203 {
1189 common_visible = EINA_FALSE; 1204 common_visible = EINA_FALSE;
1190 if (sd->focus_highlight.cur.visible) 1205
1191 sig = "elm,action,focus_highlight,show"; 1206 if (elm_widget_is_legacy(sd->obj))
1207 {
1208 if (sd->focus_highlight.cur.visible)
1209 sig = "elm,action,focus_highlight,show";
1210 else
1211 sig = "elm,action,focus_highlight,hide";
1212 }
1192 else 1213 else
1193 sig = "elm,action,focus_highlight,hide"; 1214 {
1215 if (sd->focus_highlight.cur.visible)
1216 sig = "efl,action,focus_highlight,show";
1217 else
1218 sig = "efl,action,focus_highlight,hide";
1219 }
1194 } 1220 }
1195 else 1221 else
1196 common_visible = sd->focus_highlight.cur.visible; 1222 common_visible = sd->focus_highlight.cur.visible;
1197 1223
1198 if (sig) 1224 if (sig)
1199 elm_widget_signal_emit(target, sig, "elm"); 1225 {
1226 if (elm_widget_is_legacy(sd->obj))
1227 elm_widget_signal_emit(target, sig, "elm");
1228 else
1229 elm_widget_signal_emit(target, sig, "efl");
1230 }
1200 1231
1201 if ((!target) || (!common_visible) || (sd->focus_highlight.cur.in_theme)) 1232 if ((!target) || (!common_visible) || (sd->focus_highlight.cur.in_theme))
1202 { 1233 {
@@ -2232,6 +2263,7 @@ _elm_win_modality_increment(Efl_Ui_Win_Data *modalsd)
2232{ 2263{
2233 Efl_Ui_Win *current; 2264 Efl_Ui_Win *current;
2234 Eina_List *l; 2265 Eina_List *l;
2266 Eina_Bool is_legacy = elm_widget_is_legacy(modalsd->obj);
2235 2267
2236 EINA_LIST_FOREACH(_elm_win_list, l, current) 2268 EINA_LIST_FOREACH(_elm_win_list, l, current)
2237 { 2269 {
@@ -2241,7 +2273,10 @@ _elm_win_modality_increment(Efl_Ui_Win_Data *modalsd)
2241 if (cursd->modal_count > 0) 2273 if (cursd->modal_count > 0)
2242 { 2274 {
2243 Edje_Object *ed = _elm_win_modal_blocker_edje_get(cursd); 2275 Edje_Object *ed = _elm_win_modal_blocker_edje_get(cursd);
2244 edje_object_signal_emit(ed, "elm,action,show_blocker", "elm"); 2276 if (is_legacy)
2277 edje_object_signal_emit(ed, "elm,action,show_blocker", "elm");
2278 else
2279 edje_object_signal_emit(ed, "efl,action,show_blocker", "efl");
2245 efl_event_callback_legacy_call 2280 efl_event_callback_legacy_call
2246 (cursd->main_menu, EFL_UI_WIN_EVENT_ELM_ACTION_BLOCK_MENU, NULL); 2281 (cursd->main_menu, EFL_UI_WIN_EVENT_ELM_ACTION_BLOCK_MENU, NULL);
2247 _elm_win_frame_style_update(cursd, 0, 1); 2282 _elm_win_frame_style_update(cursd, 0, 1);
@@ -2254,6 +2289,7 @@ _elm_win_modality_decrement(Efl_Ui_Win_Data *modalsd)
2254{ 2289{
2255 Efl_Ui_Win *current; 2290 Efl_Ui_Win *current;
2256 Eina_List *l; 2291 Eina_List *l;
2292 Eina_Bool is_legacy = elm_widget_is_legacy(modalsd->obj);
2257 2293
2258 EINA_LIST_FOREACH(_elm_win_list, l, current) 2294 EINA_LIST_FOREACH(_elm_win_list, l, current)
2259 { 2295 {
@@ -2263,7 +2299,10 @@ _elm_win_modality_decrement(Efl_Ui_Win_Data *modalsd)
2263 if (cursd->modal_count == 0) 2299 if (cursd->modal_count == 0)
2264 { 2300 {
2265 Edje_Object *ed = _elm_win_modal_blocker_edje_get(cursd); 2301 Edje_Object *ed = _elm_win_modal_blocker_edje_get(cursd);
2266 edje_object_signal_emit(ed, "elm,action,hide_blocker", "elm"); 2302 if (is_legacy)
2303 edje_object_signal_emit(ed, "elm,action,hide_blocker", "elm");
2304 else
2305 edje_object_signal_emit(ed, "efl,action,hide_blocker", "efl");
2267 efl_event_callback_legacy_call 2306 efl_event_callback_legacy_call
2268 (cursd->main_menu, ELM_MENU_EVENT_ELM_ACTION_UNBLOCK_MENU, NULL); 2307 (cursd->main_menu, ELM_MENU_EVENT_ELM_ACTION_UNBLOCK_MENU, NULL);
2269 _elm_win_frame_style_update(cursd, 0, 1); 2308 _elm_win_frame_style_update(cursd, 0, 1);
@@ -2687,8 +2726,12 @@ _elm_win_focus_highlight_shutdown(Efl_Ui_Win_Data *sd)
2687 _elm_win_focus_highlight_reconfigure_job_stop(sd); 2726 _elm_win_focus_highlight_reconfigure_job_stop(sd);
2688 if (sd->focus_highlight.cur.target) 2727 if (sd->focus_highlight.cur.target)
2689 { 2728 {
2690 elm_widget_signal_emit(sd->focus_highlight.cur.target, 2729 if (elm_widget_is_legacy(sd->obj))
2691 "elm,action,focus_highlight,hide", "elm"); 2730 elm_widget_signal_emit(sd->focus_highlight.cur.target,
2731 "elm,action,focus_highlight,hide", "elm");
2732 else
2733 elm_widget_signal_emit(sd->focus_highlight.cur.target,
2734 "efl,action,focus_highlight,hide", "efl");
2692 _elm_win_focus_target_callbacks_del(sd); 2735 _elm_win_focus_target_callbacks_del(sd);
2693 evas_object_event_callback_del_full 2736 evas_object_event_callback_del_full
2694 (sd->focus_highlight.cur.target, 2737 (sd->focus_highlight.cur.target,
@@ -3826,12 +3869,25 @@ _elm_win_focus_highlight_init(Efl_Ui_Win_Data *sd)
3826 if (!sd->focus_highlight.fobj) 3869 if (!sd->focus_highlight.fobj)
3827 { 3870 {
3828 sd->focus_highlight.fobj = edje_object_add(sd->evas); 3871 sd->focus_highlight.fobj = edje_object_add(sd->evas);
3829 edje_object_signal_callback_add(sd->focus_highlight.fobj, 3872
3830 "elm,action,focus,hide,end", "*", 3873 if (elm_widget_is_legacy(sd->obj))
3831 _elm_win_focus_highlight_hide, NULL); 3874 {
3832 edje_object_signal_callback_add(sd->focus_highlight.fobj, 3875 edje_object_signal_callback_add(sd->focus_highlight.fobj,
3833 "elm,action,focus,anim,end", "*", 3876 "elm,action,focus,hide,end", "*",
3834 _elm_win_focus_highlight_anim_end, sd->obj); 3877 _elm_win_focus_highlight_hide, NULL);
3878 edje_object_signal_callback_add(sd->focus_highlight.fobj,
3879 "elm,action,focus,anim,end", "*",
3880 _elm_win_focus_highlight_anim_end, sd->obj);
3881 }
3882 else
3883 {
3884 edje_object_signal_callback_add(sd->focus_highlight.fobj,
3885 "efl,action,focus,hide,end", "*",
3886 _elm_win_focus_highlight_hide, NULL);
3887 edje_object_signal_callback_add(sd->focus_highlight.fobj,
3888 "efl,action,focus,anim,end", "*",
3889 _elm_win_focus_highlight_anim_end, sd->obj);
3890 }
3835 } 3891 }
3836 3892
3837 _elm_win_focus_highlight_reconfigure_job_start(sd); 3893 _elm_win_focus_highlight_reconfigure_job_start(sd);
@@ -4353,31 +4409,66 @@ _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style)
4353 evas_object_event_callback_add 4409 evas_object_event_callback_add
4354 (sd->frame_obj, EVAS_CALLBACK_RESIZE, _elm_win_frame_obj_resize, sd); 4410 (sd->frame_obj, EVAS_CALLBACK_RESIZE, _elm_win_frame_obj_resize, sd);
4355 4411
4356 edje_object_signal_callback_add 4412 if (elm_widget_is_legacy(sd->obj))
4357 (sd->frame_obj, "elm,action,move,start", "elm", 4413 {
4358 _elm_win_frame_cb_move_start, obj); 4414 edje_object_signal_callback_add
4359 edje_object_signal_callback_add 4415 (sd->frame_obj, "elm,action,move,start", "elm",
4360 (sd->frame_obj, "elm,action,move,stop", "elm", 4416 _elm_win_frame_cb_move_start, obj);
4361 _elm_win_frame_cb_move_stop, obj); 4417 edje_object_signal_callback_add
4362 edje_object_signal_callback_add 4418 (sd->frame_obj, "elm,action,move,stop", "elm",
4363 (sd->frame_obj, "elm,action,resize,show", "*", 4419 _elm_win_frame_cb_move_stop, obj);
4364 _elm_win_frame_cb_resize_show, obj); 4420 edje_object_signal_callback_add
4365 edje_object_signal_callback_add 4421 (sd->frame_obj, "elm,action,resize,show", "*",
4366 (sd->frame_obj, "elm,action,resize,hide", "*", 4422 _elm_win_frame_cb_resize_show, obj);
4367 _elm_win_frame_cb_resize_hide, obj); 4423 edje_object_signal_callback_add
4368 edje_object_signal_callback_add 4424 (sd->frame_obj, "elm,action,resize,hide", "*",
4369 (sd->frame_obj, "elm,action,resize,start", "*", 4425 _elm_win_frame_cb_resize_hide, obj);
4370 _elm_win_frame_cb_resize_start, obj); 4426 edje_object_signal_callback_add
4371 edje_object_signal_callback_add 4427 (sd->frame_obj, "elm,action,resize,start", "*",
4372 (sd->frame_obj, "elm,action,minimize", "elm", 4428 _elm_win_frame_cb_resize_start, obj);
4373 _elm_win_frame_cb_minimize, obj); 4429 edje_object_signal_callback_add
4374 edje_object_signal_callback_add 4430 (sd->frame_obj, "elm,action,minimize", "elm",
4375 (sd->frame_obj, "elm,action,maximize", "elm", 4431 _elm_win_frame_cb_minimize, obj);
4376 _elm_win_frame_cb_maximize, obj); 4432 edje_object_signal_callback_add
4377 edje_object_signal_callback_add 4433 (sd->frame_obj, "elm,action,maximize", "elm",
4378 (sd->frame_obj, "elm,action,close", "elm", _elm_win_frame_cb_close, obj); 4434 _elm_win_frame_cb_maximize, obj);
4379 edje_object_signal_callback_add 4435 edje_object_signal_callback_add
4380 (sd->frame_obj, "elm,action,menu", "elm", _elm_win_frame_cb_menu, obj); 4436 (sd->frame_obj, "elm,action,close", "elm",
4437 _elm_win_frame_cb_close, obj);
4438 edje_object_signal_callback_add
4439 (sd->frame_obj, "elm,action,menu", "elm",
4440 _elm_win_frame_cb_menu, obj);
4441 }
4442 else
4443 {
4444 edje_object_signal_callback_add
4445 (sd->frame_obj, "efl,action,move,start", "efl",
4446 _elm_win_frame_cb_move_start, obj);
4447 edje_object_signal_callback_add
4448 (sd->frame_obj, "efl,action,move,stop", "efl",
4449 _elm_win_frame_cb_move_stop, obj);
4450 edje_object_signal_callback_add
4451 (sd->frame_obj, "efl,action,resize,show", "*",
4452 _elm_win_frame_cb_resize_show, obj);
4453 edje_object_signal_callback_add
4454 (sd->frame_obj, "efl,action,resize,hide", "*",
4455 _elm_win_frame_cb_resize_hide, obj);
4456 edje_object_signal_callback_add
4457 (sd->frame_obj, "efl,action,resize,start", "*",
4458 _elm_win_frame_cb_resize_start, obj);
4459 edje_object_signal_callback_add
4460 (sd->frame_obj, "efl,action,minimize", "efl",
4461 _elm_win_frame_cb_minimize, obj);
4462 edje_object_signal_callback_add
4463 (sd->frame_obj, "efl,action,maximize", "efl",
4464 _elm_win_frame_cb_maximize, obj);
4465 edje_object_signal_callback_add
4466 (sd->frame_obj, "efl,action,close", "efl",
4467 _elm_win_frame_cb_close, obj);
4468 edje_object_signal_callback_add
4469 (sd->frame_obj, "efl,action,menu", "efl",
4470 _elm_win_frame_cb_menu, obj);
4471 }
4381 4472
4382 if (!sd->pointer.obj) 4473 if (!sd->pointer.obj)
4383 { 4474 {
@@ -4487,25 +4578,40 @@ _elm_win_frame_style_update(Efl_Ui_Win_Data *sd, Eina_Bool force_emit, Eina_Bool
4487 if (trap && sd->csd.wayland && sd->csd.need_borderless) 4578 if (trap && sd->csd.wayland && sd->csd.need_borderless)
4488 shadow = 0; 4579 shadow = 0;
4489 4580
4490#define STATE_SET(state, s1, s2) do { \ 4581#define STATE_SET(state, s1, s2, s3) do { \
4491 if (force_emit || (state != sd->csd.cur_##state)) \ 4582 if (force_emit || (state != sd->csd.cur_##state)) \
4492 { \ 4583 { \
4493 const char *sig = state ? s1 : s2; \ 4584 const char *sig = state ? s1 : s2; \
4494 edje_object_signal_emit(sd->frame_obj, sig, "elm"); \ 4585 edje_object_signal_emit(sd->frame_obj, sig, s3); \
4495 DBG("frame style emit: %p %s", sd->obj, sig); \ 4586 DBG("frame style emit: %p %s", sd->obj, sig); \
4496 sd->csd.cur_##state = state; \ 4587 sd->csd.cur_##state = state; \
4497 changed = EINA_TRUE; \ 4588 changed = EINA_TRUE; \
4498 } } while (0) 4589 } } while (0)
4499 4590
4500 STATE_SET(borderless, "elm,state,borderless,on", "elm,state,borderless,off"); 4591 if (elm_widget_is_legacy(sd->obj))
4501 STATE_SET(shadow, "elm,state,shadow,on", "elm,state,shadow,off"); 4592 {
4502 STATE_SET(maximized, "elm,state,maximized", "elm,state,unmaximized"); 4593 STATE_SET(borderless, "elm,state,borderless,on", "elm,state,borderless,off", "elm");
4503 STATE_SET(focus, "elm,action,focus", "elm,action,unfocus"); 4594 STATE_SET(shadow, "elm,state,shadow,on", "elm,state,shadow,off", "elm");
4504 STATE_SET(bg_solid, "elm,state,background,solid,on", "elm,state,background,solid,off"); 4595 STATE_SET(maximized, "elm,state,maximized", "elm,state,unmaximized", "elm");
4505 STATE_SET(bg_standard, "elm,state,background,standard,on", "elm,state,background,standard,off"); 4596 STATE_SET(focus, "elm,action,focus", "elm,action,unfocus", "elm");
4506 STATE_SET(unresizable, "elm,state,unresizable,on", "elm,state,unresizable,off"); 4597 STATE_SET(bg_solid, "elm,state,background,solid,on", "elm,state,background,solid,off", "elm");
4507 STATE_SET(menu, "elm,action,show_menu", "elm,action,hide_menu"); 4598 STATE_SET(bg_standard, "elm,state,background,standard,on", "elm,state,background,standard,off", "elm");
4508 STATE_SET(indicator, "elm,action,show_indicator", "elm,action,hide_indicator"); 4599 STATE_SET(unresizable, "elm,state,unresizable,on", "elm,state,unresizable,off", "elm");
4600 STATE_SET(menu, "elm,action,show_menu", "elm,action,hide_menu", "elm");
4601 STATE_SET(indicator, "elm,action,show_indicator", "elm,action,hide_indicator", "elm");
4602 }
4603 else
4604 {
4605 STATE_SET(borderless, "efl,state,borderless,on", "efl,state,borderless,off", "efl");
4606 STATE_SET(shadow, "efl,state,shadow,on", "efl,state,shadow,off", "efl");
4607 STATE_SET(maximized, "efl,state,maximized", "efl,state,unmaximized", "efl");
4608 STATE_SET(focus, "efl,action,focus", "efl,action,unfocus", "efl");
4609 STATE_SET(bg_solid, "efl,state,background,solid,on", "efl,state,background,solid,off", "efl");
4610 STATE_SET(bg_standard, "efl,state,background,standard,on", "efl,state,background,standard,off", "efl");
4611 STATE_SET(unresizable, "efl,state,unresizable,on", "efl,state,unresizable,off", "efl");
4612 STATE_SET(menu, "efl,action,show_menu", "efl,action,hide_menu", "efl");
4613 STATE_SET(indicator, "efl,action,show_indicator", "efl,action,hide_indicator", "efl");
4614 }
4509 4615
4510#undef STATE_SET 4616#undef STATE_SET
4511 4617
@@ -5959,7 +6065,10 @@ _dbus_menu_set(Eina_Bool dbus_connect, void *data)
5959 { 6065 {
5960 // Note: Based on EFL 1.18 the signal was "elm,action,hide" 6066 // Note: Based on EFL 1.18 the signal was "elm,action,hide"
5961 // and not "elm,action,hide_menu" as expected. 6067 // and not "elm,action,hide_menu" as expected.
5962 edje_object_signal_emit(swallow, "elm,action,hide", "elm"); 6068 if (elm_widget_is_legacy(data))
6069 edje_object_signal_emit(swallow, "elm,action,hide", "elm");
6070 else
6071 edje_object_signal_emit(swallow, "efl,action,hide", "efl");
5963 edje_object_message_signal_recursive_process(swallow); 6072 edje_object_message_signal_recursive_process(swallow);
5964 } 6073 }
5965 } 6074 }
@@ -5981,7 +6090,10 @@ _dbus_menu_set(Eina_Bool dbus_connect, void *data)
5981 } 6090 }
5982 else 6091 else
5983 { 6092 {
5984 edje_object_signal_emit(swallow, "elm,action,show_menu", "elm"); 6093 if (elm_widget_is_legacy(data))
6094 edje_object_signal_emit(swallow, "elm,action,show_menu", "elm");
6095 else
6096 edje_object_signal_emit(swallow, "efl,action,show_menu", "efl");
5985 edje_object_message_signal_recursive_process(swallow); 6097 edje_object_message_signal_recursive_process(swallow);
5986 } 6098 }
5987 } 6099 }
@@ -6478,7 +6590,7 @@ _efl_ui_win_keyboard_mode_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
6478} 6590}
6479 6591
6480EOLIAN static void 6592EOLIAN static void
6481_efl_ui_win_indicator_mode_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Efl_Ui_Win_Indicator_Mode mode) 6593_efl_ui_win_indicator_mode_set(Eo *obj, Efl_Ui_Win_Data *sd, Efl_Ui_Win_Indicator_Mode mode)
6482{ 6594{
6483 sd->legacy.forbidden = EINA_TRUE; 6595 sd->legacy.forbidden = EINA_TRUE;
6484 if (sd->indimode == mode) return; 6596 if (sd->indimode == mode) return;
@@ -6492,12 +6604,24 @@ _efl_ui_win_indicator_mode_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Efl_Ui_
6492 6604
6493 if (!sd->indicator) _indicator_add(sd); 6605 if (!sd->indicator) _indicator_add(sd);
6494 6606
6495 if (sd->indimode == EFL_UI_WIN_INDICATOR_BG_OPAQUE) 6607 if (elm_widget_is_legacy(obj))
6496 edje_object_signal_emit(sd->frame_obj, "elm,action,indicator,bg_opaque", "elm"); 6608 {
6497 else if (sd->indimode == EFL_UI_WIN_INDICATOR_BG_TRANSPARENT) 6609 if (sd->indimode == EFL_UI_WIN_INDICATOR_BG_OPAQUE)
6498 edje_object_signal_emit(sd->frame_obj, "elm,action,indicator,bg_transparent", "elm"); 6610 edje_object_signal_emit(sd->frame_obj, "elm,action,indicator,bg_opaque", "elm");
6499 else if (sd->indimode == EFL_UI_WIN_INDICATOR_HIDDEN) 6611 else if (sd->indimode == EFL_UI_WIN_INDICATOR_BG_TRANSPARENT)
6500 edje_object_signal_emit(sd->frame_obj, "elm,action,indicator,hidden", "elm"); 6612 edje_object_signal_emit(sd->frame_obj, "elm,action,indicator,bg_transparent", "elm");
6613 else if (sd->indimode == EFL_UI_WIN_INDICATOR_HIDDEN)
6614 edje_object_signal_emit(sd->frame_obj, "elm,action,indicator,hidden", "elm");
6615 }
6616 else
6617 {
6618 if (sd->indimode == EFL_UI_WIN_INDICATOR_BG_OPAQUE)
6619 edje_object_signal_emit(sd->frame_obj, "efl,action,indicator,bg_opaque", "efl");
6620 else if (sd->indimode == EFL_UI_WIN_INDICATOR_BG_TRANSPARENT)
6621 edje_object_signal_emit(sd->frame_obj, "efl,action,indicator,bg_transparent", "efl");
6622 else if (sd->indimode == EFL_UI_WIN_INDICATOR_HIDDEN)
6623 edje_object_signal_emit(sd->frame_obj, "efl,action,indicator,hidden", "efl");
6624 }
6501 6625
6502 edje_object_message_signal_process(sd->frame_obj); 6626 edje_object_message_signal_process(sd->frame_obj);
6503 evas_object_smart_calculate(sd->frame_obj); 6627 evas_object_smart_calculate(sd->frame_obj);
diff --git a/src/lib/elementary/els_tooltip.c b/src/lib/elementary/els_tooltip.c
index 322ebbc..8021aa3 100644
--- a/src/lib/elementary/els_tooltip.c
+++ b/src/lib/elementary/els_tooltip.c
@@ -280,7 +280,11 @@ _elm_tooltip_hide_anim_start(Elm_Tooltip *tt)
280 TTDBG("HIDE START\n"); 280 TTDBG("HIDE START\n");
281 /* hide slightly faster when in window mode to look less stupid */ 281 /* hide slightly faster when in window mode to look less stupid */
282 if ((tt->hide_timeout > 0) && tt->tt_win) extra = 0.1; 282 if ((tt->hide_timeout > 0) && tt->tt_win) extra = 0.1;
283 edje_object_signal_emit(tt->tooltip, "elm,action,hide", "elm"); 283
284 if (elm_widget_is_legacy(tt->owner))
285 edje_object_signal_emit(tt->tooltip, "elm,action,hide", "elm");
286 else
287 edje_object_signal_emit(tt->tooltip, "efl,action,hide", "efl");
284 tt->hide_timer = ecore_timer_add 288 tt->hide_timer = ecore_timer_add
285 (tt->hide_timeout - extra, _elm_tooltip_hide_anim_cb, tt); 289 (tt->hide_timeout - extra, _elm_tooltip_hide_anim_cb, tt);
286} 290}
@@ -290,7 +294,12 @@ _elm_tooltip_hide_anim_stop(Elm_Tooltip *tt)
290{ 294{
291 if (!tt->hide_timer) return; 295 if (!tt->hide_timer) return;
292 if (tt->tooltip) 296 if (tt->tooltip)
293 edje_object_signal_emit(tt->tooltip, "elm,action,show", "elm"); 297 {
298 if (elm_widget_is_legacy(tt->owner))
299 edje_object_signal_emit(tt->tooltip, "elm,action,show", "elm");
300 else
301 edje_object_signal_emit(tt->tooltip, "efl,action,show", "efl");
302 }
294 303
295 ELM_SAFE_FREE(tt->hide_timer, ecore_timer_del); 304 ELM_SAFE_FREE(tt->hide_timer, ecore_timer_del);
296} 305}
@@ -500,7 +509,10 @@ _elm_tooltip_reconfigure(Elm_Tooltip *tt)
500 tt->content); 509 tt->content);
501 } 510 }
502 511
503 edje_object_signal_emit(tt->tooltip, "elm,action,show", "elm"); 512 if (elm_widget_is_legacy(tt->owner))
513 edje_object_signal_emit(tt->tooltip, "elm,action,show", "elm");
514 else
515 edje_object_signal_emit(tt->tooltip, "efl,action,show", "efl");
504 } 516 }
505 517
506 if (!tt->content) 518 if (!tt->content)