diff options
24 files changed, 98 insertions, 98 deletions
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am index fd7c903..2c1921a 100644 --- a/src/Makefile_Edje.am +++ b/src/Makefile_Edje.am | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | edje_eolian_files = \ | 4 | edje_eolian_files = \ |
5 | lib/edje/efl_canvas_layout_calc.eo \ | 5 | lib/edje/efl_canvas_layout_calc.eo \ |
6 | lib/edje/efl_canvas_layout_signal.eo \ | 6 | lib/edje/efl_layout_signal.eo \ |
7 | lib/edje/efl_canvas_layout_group.eo \ | 7 | lib/edje/efl_canvas_layout_group.eo \ |
8 | lib/edje/edje_object.eo \ | 8 | lib/edje/edje_object.eo \ |
9 | lib/edje/efl_canvas_layout_part.eo \ | 9 | lib/edje/efl_canvas_layout_part.eo \ |
diff --git a/src/lib/edje/Edje_Eo.h b/src/lib/edje/Edje_Eo.h index 877f3be..9f3c7bc 100644 --- a/src/lib/edje/Edje_Eo.h +++ b/src/lib/edje/Edje_Eo.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #include <Efl.h> | 1 | #include <Efl.h> |
2 | 2 | ||
3 | #include "efl_canvas_layout_calc.eo.h" | 3 | #include "efl_canvas_layout_calc.eo.h" |
4 | #include "efl_canvas_layout_signal.eo.h" | 4 | #include "efl_layout_signal.eo.h" |
5 | #include "efl_canvas_layout_group.eo.h" | 5 | #include "efl_canvas_layout_group.eo.h" |
6 | #include "edje_object.eo.h" | 6 | #include "edje_object.eo.h" |
7 | #include "edje_edit.eo.h" | 7 | #include "edje_edit.eo.h" |
diff --git a/src/lib/edje/edje_legacy.c b/src/lib/edje/edje_legacy.c index 4bf32aa..700d17c 100644 --- a/src/lib/edje/edje_legacy.c +++ b/src/lib/edje/edje_legacy.c | |||
@@ -64,20 +64,20 @@ edje_object_part_state_get(const Edje_Object *obj, const char * part, double *va | |||
64 | EAPI void | 64 | EAPI void |
65 | edje_object_message_signal_process(Edje_Object *obj) | 65 | edje_object_message_signal_process(Edje_Object *obj) |
66 | { | 66 | { |
67 | efl_canvas_layout_signal_process(obj, EINA_FALSE); | 67 | efl_layout_signal_process(obj, EINA_FALSE); |
68 | } | 68 | } |
69 | 69 | ||
70 | /* since 1.20 */ | 70 | /* since 1.20 */ |
71 | EAPI void | 71 | EAPI void |
72 | edje_object_message_signal_recursive_process(Edje_Object *obj) | 72 | edje_object_message_signal_recursive_process(Edje_Object *obj) |
73 | { | 73 | { |
74 | efl_canvas_layout_signal_process(obj, EINA_TRUE); | 74 | efl_layout_signal_process(obj, EINA_TRUE); |
75 | } | 75 | } |
76 | 76 | ||
77 | EAPI void | 77 | EAPI void |
78 | edje_object_signal_callback_add(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func, void *data) | 78 | edje_object_signal_callback_add(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func, void *data) |
79 | { | 79 | { |
80 | efl_canvas_layout_signal_callback_add(obj, emission, source, (Efl_Signal_Cb) func, data); | 80 | efl_layout_signal_callback_add(obj, emission, source, (Efl_Signal_Cb) func, data); |
81 | } | 81 | } |
82 | 82 | ||
83 | EAPI void * | 83 | EAPI void * |
@@ -133,7 +133,7 @@ edje_object_signal_callback_del(Evas_Object *obj, const char *emission, const ch | |||
133 | EAPI void | 133 | EAPI void |
134 | edje_object_signal_emit(Evas_Object *obj, const char *emission, const char *source) | 134 | edje_object_signal_emit(Evas_Object *obj, const char *emission, const char *source) |
135 | { | 135 | { |
136 | efl_canvas_layout_signal_emit(obj, emission, source); | 136 | efl_layout_signal_emit(obj, emission, source); |
137 | } | 137 | } |
138 | 138 | ||
139 | EAPI Eina_Bool | 139 | EAPI Eina_Bool |
diff --git a/src/lib/edje/edje_message_queue.c b/src/lib/edje/edje_message_queue.c index 4e13215..d971582 100644 --- a/src/lib/edje/edje_message_queue.c +++ b/src/lib/edje/edje_message_queue.c | |||
@@ -32,7 +32,7 @@ _edje_object_message_propagate_send(Evas_Object *obj, Edje_Message_Type type, in | |||
32 | } | 32 | } |
33 | 33 | ||
34 | EOLIAN void | 34 | EOLIAN void |
35 | _edje_object_efl_canvas_layout_signal_message_send(Eo *obj, Edje *pd EINA_UNUSED, int id, const Eina_Value val) | 35 | _edje_object_efl_layout_signal_message_send(Eo *obj, Edje *pd EINA_UNUSED, int id, const Eina_Value val) |
36 | { | 36 | { |
37 | const Eina_Value_Type *valtype; | 37 | const Eina_Value_Type *valtype; |
38 | Edje_Message_Type msgtype; | 38 | Edje_Message_Type msgtype; |
@@ -228,7 +228,7 @@ end: | |||
228 | } | 228 | } |
229 | 229 | ||
230 | EOLIAN void | 230 | EOLIAN void |
231 | _edje_object_efl_canvas_layout_signal_signal_process(Eo *obj, Edje *ed, Eina_Bool recurse) | 231 | _edje_object_efl_layout_signal_signal_process(Eo *obj, Edje *ed, Eina_Bool recurse) |
232 | { | 232 | { |
233 | Eina_List *l; | 233 | Eina_List *l; |
234 | Evas_Object *o; | 234 | Evas_Object *o; |
@@ -238,7 +238,7 @@ _edje_object_efl_canvas_layout_signal_signal_process(Eo *obj, Edje *ed, Eina_Boo | |||
238 | if (!recurse) return; | 238 | if (!recurse) return; |
239 | 239 | ||
240 | EINA_LIST_FOREACH(ed->subobjs, l, o) | 240 | EINA_LIST_FOREACH(ed->subobjs, l, o) |
241 | efl_canvas_layout_signal_process(o, EINA_TRUE); | 241 | efl_layout_signal_process(o, EINA_TRUE); |
242 | } | 242 | } |
243 | 243 | ||
244 | static Eina_Bool | 244 | static Eina_Bool |
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo index 66d584b..af514c5 100644 --- a/src/lib/edje/edje_object.eo +++ b/src/lib/edje/edje_object.eo | |||
@@ -4,7 +4,7 @@ import edje_types; | |||
4 | 4 | ||
5 | class Edje.Object (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part, | 5 | class Edje.Object (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part, |
6 | Efl.Observer, Efl.Ui.Base, Efl.Canvas.Layout_Calc, | 6 | Efl.Observer, Efl.Ui.Base, Efl.Canvas.Layout_Calc, |
7 | Efl.Canvas.Layout_Signal, Efl.Canvas.Layout_Group, | 7 | Efl.Layout.Signal, Efl.Canvas.Layout_Group, |
8 | Efl.Player, Efl.Gfx.Color_Class, Efl.Gfx.Text_Class, | 8 | Efl.Player, Efl.Gfx.Color_Class, Efl.Gfx.Text_Class, |
9 | Efl.Gfx.Size_Class) | 9 | Efl.Gfx.Size_Class) |
10 | { | 10 | { |
@@ -118,11 +118,11 @@ class Edje.Object (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part, | |||
118 | Efl.Canvas.Layout_Group.group_size_min { get; } | 118 | Efl.Canvas.Layout_Group.group_size_min { get; } |
119 | Efl.Canvas.Layout_Group.group_size_max { get; } | 119 | Efl.Canvas.Layout_Group.group_size_max { get; } |
120 | Efl.Canvas.Layout_Group.group_data { get; } | 120 | Efl.Canvas.Layout_Group.group_data { get; } |
121 | Efl.Canvas.Layout_Signal.message_send; | 121 | Efl.Layout.Signal.message_send; |
122 | Efl.Canvas.Layout_Signal.signal_callback_add; | 122 | Efl.Layout.Signal.signal_callback_add; |
123 | Efl.Canvas.Layout_Signal.signal_callback_del; | 123 | Efl.Layout.Signal.signal_callback_del; |
124 | Efl.Canvas.Layout_Signal.signal_emit; | 124 | Efl.Layout.Signal.signal_emit; |
125 | Efl.Canvas.Layout_Signal.signal_process; | 125 | Efl.Layout.Signal.signal_process; |
126 | Efl.Ui.Base.mirrored { set; get; } | 126 | Efl.Ui.Base.mirrored { set; get; } |
127 | Efl.Ui.Base.language { set; get; } | 127 | Efl.Ui.Base.language { set; get; } |
128 | Efl.Gfx.scale { set; get; } | 128 | Efl.Gfx.scale { set; get; } |
diff --git a/src/lib/edje/edje_program.c b/src/lib/edje/edje_program.c index a231f24..7412fa2 100644 --- a/src/lib/edje/edje_program.c +++ b/src/lib/edje/edje_program.c | |||
@@ -248,13 +248,13 @@ edje_object_propagate_callback_add(Evas_Object *obj, Efl_Signal_Cb func, void *d | |||
248 | } | 248 | } |
249 | 249 | ||
250 | EOLIAN Eina_Bool | 250 | EOLIAN Eina_Bool |
251 | _edje_object_efl_canvas_layout_signal_signal_callback_add(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source, Efl_Signal_Cb func, void *data) | 251 | _edje_object_efl_layout_signal_signal_callback_add(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source, Efl_Signal_Cb func, void *data) |
252 | { | 252 | { |
253 | return _edje_object_signal_callback_add(ed, emission, source, func, data); | 253 | return _edje_object_signal_callback_add(ed, emission, source, func, data); |
254 | } | 254 | } |
255 | 255 | ||
256 | EOLIAN Eina_Bool | 256 | EOLIAN Eina_Bool |
257 | _edje_object_efl_canvas_layout_signal_signal_callback_del(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source, Efl_Signal_Cb func, void *data) | 257 | _edje_object_efl_layout_signal_signal_callback_del(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source, Efl_Signal_Cb func, void *data) |
258 | { | 258 | { |
259 | Edje_Signal_Callback_Group *gp; | 259 | Edje_Signal_Callback_Group *gp; |
260 | Eina_Bool ok; | 260 | Eina_Bool ok; |
@@ -277,7 +277,7 @@ _edje_object_efl_canvas_layout_signal_signal_callback_del(Eo *obj EINA_UNUSED, E | |||
277 | } | 277 | } |
278 | 278 | ||
279 | EOLIAN void | 279 | EOLIAN void |
280 | _edje_object_efl_canvas_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source) | 280 | _edje_object_efl_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source) |
281 | { | 281 | { |
282 | if (ed->delete_me) return; | 282 | if (ed->delete_me) return; |
283 | if ((!emission) || (!source)) return; | 283 | if ((!emission) || (!source)) return; |
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c index 733879c..662d4f5 100644 --- a/src/lib/edje/edje_smart.c +++ b/src/lib/edje/edje_smart.c | |||
@@ -545,5 +545,5 @@ _edje_object_efl_player_play_speed_get(Eo *obj EINA_UNUSED, Edje *pd) | |||
545 | #include "edje_object.eo.c" | 545 | #include "edje_object.eo.c" |
546 | #include "edje_global.eo.c" | 546 | #include "edje_global.eo.c" |
547 | #include "efl_canvas_layout_calc.eo.c" | 547 | #include "efl_canvas_layout_calc.eo.c" |
548 | #include "efl_canvas_layout_signal.eo.c" | 548 | #include "efl_layout_signal.eo.c" |
549 | #include "efl_canvas_layout_group.eo.c" | 549 | #include "efl_canvas_layout_group.eo.c" |
diff --git a/src/lib/edje/efl_canvas_layout_signal.eo b/src/lib/edje/efl_layout_signal.eo index 669c7e4..708dc32 100644 --- a/src/lib/edje/efl_canvas_layout_signal.eo +++ b/src/lib/edje/efl_layout_signal.eo | |||
@@ -10,7 +10,7 @@ | |||
10 | 10 | ||
11 | type Efl.Signal_Cb: __undefined_type; [[Signal callback.]] | 11 | type Efl.Signal_Cb: __undefined_type; [[Signal callback.]] |
12 | 12 | ||
13 | interface Efl.Canvas.Layout_Signal | 13 | interface Efl.Layout.Signal |
14 | { | 14 | { |
15 | [[Layouts asynchronous messaging and signaling interface. | 15 | [[Layouts asynchronous messaging and signaling interface. |
16 | 16 | ||
diff --git a/src/lib/elementary/efl_ui_check.c b/src/lib/elementary/efl_ui_check.c index d0997ba..c79e430 100644 --- a/src/lib/elementary/efl_ui_check.c +++ b/src/lib/elementary/efl_ui_check.c | |||
@@ -328,11 +328,11 @@ _efl_ui_check_efl_object_constructor(Eo *obj, Efl_Ui_Check_Data *pd EINA_UNUSED) | |||
328 | CRI("Failed to set layout!"); | 328 | CRI("Failed to set layout!"); |
329 | 329 | ||
330 | ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); | 330 | ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); |
331 | efl_canvas_layout_signal_callback_add | 331 | efl_layout_signal_callback_add |
332 | (wd->resize_obj, "elm,action,check,on", "*", _on_check_on, obj); | 332 | (wd->resize_obj, "elm,action,check,on", "*", _on_check_on, obj); |
333 | efl_canvas_layout_signal_callback_add | 333 | efl_layout_signal_callback_add |
334 | (wd->resize_obj, "elm,action,check,off", "*", _on_check_off, obj); | 334 | (wd->resize_obj, "elm,action,check,off", "*", _on_check_off, obj); |
335 | efl_canvas_layout_signal_callback_add | 335 | efl_layout_signal_callback_add |
336 | (wd->resize_obj, "elm,action,check,toggle", "*", _on_check_toggle, obj); | 336 | (wd->resize_obj, "elm,action,check,toggle", "*", _on_check_toggle, obj); |
337 | 337 | ||
338 | efl_access_role_set(obj, EFL_ACCESS_ROLE_CHECK_BOX); | 338 | efl_access_role_set(obj, EFL_ACCESS_ROLE_CHECK_BOX); |
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c index 8038e84..292875d 100644 --- a/src/lib/elementary/efl_ui_image.c +++ b/src/lib/elementary/efl_ui_image.c | |||
@@ -1165,7 +1165,7 @@ _efl_ui_image_efl_file_file_set(Eo *obj, Efl_Ui_Image_Data *sd, const char *file | |||
1165 | } | 1165 | } |
1166 | 1166 | ||
1167 | EOLIAN static void | 1167 | EOLIAN static void |
1168 | _efl_ui_image_efl_canvas_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd, const char *emission, const char *source) | 1168 | _efl_ui_image_efl_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd, const char *emission, const char *source) |
1169 | { | 1169 | { |
1170 | if (sd->edje) | 1170 | if (sd->edje) |
1171 | edje_object_signal_emit(sd->img, emission, source); | 1171 | edje_object_signal_emit(sd->img, emission, source); |
diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo index 09faa04..3e6f1e6 100644 --- a/src/lib/elementary/efl_ui_image.eo +++ b/src/lib/elementary/efl_ui_image.eo | |||
@@ -48,7 +48,7 @@ class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable, | |||
48 | Efl.Access.Image, Efl.Access.Widget.Action, | 48 | Efl.Access.Image, Efl.Access.Widget.Action, |
49 | Efl.Orientation, Efl.Flipable, | 49 | Efl.Orientation, Efl.Flipable, |
50 | Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Canvas.Layout_Calc, | 50 | Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Canvas.Layout_Calc, |
51 | Efl.Canvas.Layout_Group, Efl.Canvas.Layout_Signal) | 51 | Efl.Canvas.Layout_Group, Efl.Layout.Signal) |
52 | { | 52 | { |
53 | [[ Efl UI image class]] | 53 | [[ Efl UI image class]] |
54 | event_prefix: efl_ui_image; | 54 | event_prefix: efl_ui_image; |
@@ -137,7 +137,7 @@ class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable, | |||
137 | Efl.Flipable.flip { get; set; } | 137 | Efl.Flipable.flip { get; set; } |
138 | Efl.Player.playable { get; } | 138 | Efl.Player.playable { get; } |
139 | Efl.Player.play { get; set; } | 139 | Efl.Player.play { get; set; } |
140 | Efl.Canvas.Layout_Signal.signal_emit; | 140 | Efl.Layout.Signal.signal_emit; |
141 | Efl.Canvas.Layout_Group.group_size_min { get; } | 141 | Efl.Canvas.Layout_Group.group_size_min { get; } |
142 | Efl.Canvas.Layout_Group.group_size_max { get; } | 142 | Efl.Canvas.Layout_Group.group_size_max { get; } |
143 | //Efl.Canvas.Layout_Group.group_data { get; } | 143 | //Efl.Canvas.Layout_Group.group_data { get; } |
diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c index 0e42559..f1efc08 100644 --- a/src/lib/elementary/efl_ui_layout.c +++ b/src/lib/elementary/efl_ui_layout.c | |||
@@ -816,27 +816,27 @@ _efl_ui_layout_theme_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *klass, con | |||
816 | } | 816 | } |
817 | 817 | ||
818 | EOLIAN static void | 818 | EOLIAN static void |
819 | _efl_ui_layout_efl_canvas_layout_signal_signal_emit(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, const char *emission, const char *source) | 819 | _efl_ui_layout_efl_layout_signal_signal_emit(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, const char *emission, const char *source) |
820 | { | 820 | { |
821 | // Don't do anything else than call forward here | 821 | // Don't do anything else than call forward here |
822 | ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); | 822 | ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); |
823 | efl_canvas_layout_signal_emit(wd->resize_obj, emission, source); | 823 | efl_layout_signal_emit(wd->resize_obj, emission, source); |
824 | } | 824 | } |
825 | 825 | ||
826 | EOLIAN static Eina_Bool | 826 | EOLIAN static Eina_Bool |
827 | _efl_ui_layout_efl_canvas_layout_signal_signal_callback_add(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, const char *emission, const char *source, Efl_Signal_Cb func, void *data) | 827 | _efl_ui_layout_efl_layout_signal_signal_callback_add(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, const char *emission, const char *source, Efl_Signal_Cb func, void *data) |
828 | { | 828 | { |
829 | // Don't do anything else than call forward here | 829 | // Don't do anything else than call forward here |
830 | ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); | 830 | ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); |
831 | return efl_canvas_layout_signal_callback_add(wd->resize_obj, emission, source, func, data); | 831 | return efl_layout_signal_callback_add(wd->resize_obj, emission, source, func, data); |
832 | } | 832 | } |
833 | 833 | ||
834 | EOLIAN static Eina_Bool | 834 | EOLIAN static Eina_Bool |
835 | _efl_ui_layout_efl_canvas_layout_signal_signal_callback_del(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, const char *emission, const char *source, Edje_Signal_Cb func, void *data) | 835 | _efl_ui_layout_efl_layout_signal_signal_callback_del(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, const char *emission, const char *source, Edje_Signal_Cb func, void *data) |
836 | { | 836 | { |
837 | // Don't do anything else than call forward here | 837 | // Don't do anything else than call forward here |
838 | ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); | 838 | ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); |
839 | return efl_canvas_layout_signal_callback_add(wd->resize_obj, emission, source, func, data); | 839 | return efl_layout_signal_callback_add(wd->resize_obj, emission, source, func, data); |
840 | } | 840 | } |
841 | 841 | ||
842 | // TODO: | 842 | // TODO: |
@@ -2069,17 +2069,17 @@ EOLIAN static void _efl_ui_layout_class_constructor(Efl_Class *klass) | |||
2069 | } | 2069 | } |
2070 | 2070 | ||
2071 | EOLIAN static void | 2071 | EOLIAN static void |
2072 | _efl_ui_layout_efl_canvas_layout_signal_message_send(Eo *obj, Efl_Ui_Layout_Data *pd EINA_UNUSED, int id, const Eina_Value msg) | 2072 | _efl_ui_layout_efl_layout_signal_message_send(Eo *obj, Efl_Ui_Layout_Data *pd EINA_UNUSED, int id, const Eina_Value msg) |
2073 | { | 2073 | { |
2074 | ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); | 2074 | ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); |
2075 | efl_canvas_layout_signal_message_send(wd->resize_obj, id, msg); | 2075 | efl_layout_signal_message_send(wd->resize_obj, id, msg); |
2076 | } | 2076 | } |
2077 | 2077 | ||
2078 | EOLIAN static void | 2078 | EOLIAN static void |
2079 | _efl_ui_layout_efl_canvas_layout_signal_signal_process(Eo *obj, Efl_Ui_Layout_Data *pd EINA_UNUSED, Eina_Bool recurse) | 2079 | _efl_ui_layout_efl_layout_signal_signal_process(Eo *obj, Efl_Ui_Layout_Data *pd EINA_UNUSED, Eina_Bool recurse) |
2080 | { | 2080 | { |
2081 | ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); | 2081 | ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); |
2082 | efl_canvas_layout_signal_process(wd->resize_obj, recurse); | 2082 | efl_layout_signal_process(wd->resize_obj, recurse); |
2083 | } | 2083 | } |
2084 | 2084 | ||
2085 | 2085 | ||
@@ -2273,7 +2273,7 @@ _elm_layout_signal_callback_add_legacy(Eo *obj, Eo *edje, Eina_List **p_edje_sig | |||
2273 | esd->data = data; | 2273 | esd->data = data; |
2274 | *p_edje_signals = eina_list_append(*p_edje_signals, esd); | 2274 | *p_edje_signals = eina_list_append(*p_edje_signals, esd); |
2275 | 2275 | ||
2276 | efl_canvas_layout_signal_callback_add(edje, emission, source, | 2276 | efl_layout_signal_callback_add(edje, emission, source, |
2277 | _edje_signal_callback, esd); | 2277 | _edje_signal_callback, esd); |
2278 | } | 2278 | } |
2279 | 2279 | ||
@@ -2316,7 +2316,7 @@ _elm_layout_signal_callback_del_legacy(Eo *obj EINA_UNUSED, Eo *edje, Eina_List | |||
2316 | { | 2316 | { |
2317 | *p_edje_signals = eina_list_remove_list(*p_edje_signals, l); | 2317 | *p_edje_signals = eina_list_remove_list(*p_edje_signals, l); |
2318 | 2318 | ||
2319 | efl_canvas_layout_signal_callback_del(edje, emission, source, | 2319 | efl_layout_signal_callback_del(edje, emission, source, |
2320 | _edje_signal_callback, esd); | 2320 | _edje_signal_callback, esd); |
2321 | 2321 | ||
2322 | eina_stringshare_del(esd->emission); | 2322 | eina_stringshare_del(esd->emission); |
@@ -2352,7 +2352,7 @@ elm_layout_signal_callback_del(Eo *obj, const char *emission, const char *source | |||
2352 | EAPI void | 2352 | EAPI void |
2353 | elm_layout_signal_emit(Eo *obj, const char *emission, const char *source) | 2353 | elm_layout_signal_emit(Eo *obj, const char *emission, const char *source) |
2354 | { | 2354 | { |
2355 | efl_canvas_layout_signal_emit(obj, emission, source); | 2355 | efl_layout_signal_emit(obj, emission, source); |
2356 | } | 2356 | } |
2357 | 2357 | ||
2358 | EAPI const char * | 2358 | EAPI const char * |
diff --git a/src/lib/elementary/efl_ui_layout.eo b/src/lib/elementary/efl_ui_layout.eo index 7bb5aa0..44cd39f 100644 --- a/src/lib/elementary/efl_ui_layout.eo +++ b/src/lib/elementary/efl_ui_layout.eo | |||
@@ -1,6 +1,6 @@ | |||
1 | class Efl.Ui.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File, | 1 | class Efl.Ui.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File, |
2 | Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Ui.Model.Factory.Connect, | 2 | Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Ui.Model.Factory.Connect, |
3 | Efl.Canvas.Layout_Calc, Efl.Canvas.Layout_Signal, | 3 | Efl.Canvas.Layout_Calc, Efl.Layout.Signal, |
4 | Efl.Canvas.Layout_Group) | 4 | Efl.Canvas.Layout_Group) |
5 | { | 5 | { |
6 | [[Elementary layout class]] | 6 | [[Elementary layout class]] |
@@ -50,11 +50,11 @@ class Efl.Ui.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File, | |||
50 | Efl.Canvas.Group.group_calculate; | 50 | Efl.Canvas.Group.group_calculate; |
51 | Efl.Canvas.Layout_Calc.calc_freeze; | 51 | Efl.Canvas.Layout_Calc.calc_freeze; |
52 | Efl.Canvas.Layout_Calc.calc_thaw; | 52 | Efl.Canvas.Layout_Calc.calc_thaw; |
53 | Efl.Canvas.Layout_Signal.signal_callback_add; | 53 | Efl.Layout.Signal.signal_callback_add; |
54 | Efl.Canvas.Layout_Signal.signal_callback_del; | 54 | Efl.Layout.Signal.signal_callback_del; |
55 | Efl.Canvas.Layout_Signal.signal_emit; | 55 | Efl.Layout.Signal.signal_emit; |
56 | Efl.Canvas.Layout_Signal.message_send; | 56 | Efl.Layout.Signal.message_send; |
57 | Efl.Canvas.Layout_Signal.signal_process; | 57 | Efl.Layout.Signal.signal_process; |
58 | Efl.Canvas.Layout_Group.group_data { get; } | 58 | Efl.Canvas.Layout_Group.group_data { get; } |
59 | Efl.Canvas.Layout_Group.group_size_min { get; } | 59 | Efl.Canvas.Layout_Group.group_size_min { get; } |
60 | Efl.Canvas.Layout_Group.group_size_max { get; } | 60 | Efl.Canvas.Layout_Group.group_size_max { get; } |
diff --git a/src/lib/elementary/efl_ui_nstate.c b/src/lib/elementary/efl_ui_nstate.c index b1798cf..7eab66d 100644 --- a/src/lib/elementary/efl_ui_nstate.c +++ b/src/lib/elementary/efl_ui_nstate.c | |||
@@ -50,7 +50,7 @@ _efl_ui_nstate_efl_object_constructor(Eo *obj, Efl_Ui_Nstate_Data *pd) | |||
50 | CRI("Failed to set layout!"); | 50 | CRI("Failed to set layout!"); |
51 | 51 | ||
52 | ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); | 52 | ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); |
53 | efl_canvas_layout_signal_callback_add | 53 | efl_layout_signal_callback_add |
54 | (wd->resize_obj, "elm,action,state,changed", "*", _on_state_changed, obj); | 54 | (wd->resize_obj, "elm,action,state,changed", "*", _on_state_changed, obj); |
55 | 55 | ||
56 | //TODO: Add ATSPI call here | 56 | //TODO: Add ATSPI call here |
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c index b568e22..341b5a4 100644 --- a/src/lib/elementary/efl_ui_text.c +++ b/src/lib/elementary/efl_ui_text.c | |||
@@ -2615,41 +2615,41 @@ _markup_filter_cb(void *data, | |||
2615 | } | 2615 | } |
2616 | 2616 | ||
2617 | EOLIAN static void | 2617 | EOLIAN static void |
2618 | _efl_ui_text_efl_canvas_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, const char *emission, const char *source) | 2618 | _efl_ui_text_efl_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, const char *emission, const char *source) |
2619 | { | 2619 | { |
2620 | /* always pass to both edje objs */ | 2620 | /* always pass to both edje objs */ |
2621 | efl_canvas_layout_signal_emit(sd->entry_edje, emission, source); | 2621 | efl_layout_signal_emit(sd->entry_edje, emission, source); |
2622 | 2622 | ||
2623 | // FIXME: This should not be here! | 2623 | // FIXME: This should not be here! |
2624 | efl_canvas_layout_signal_process(sd->entry_edje, EINA_TRUE); | 2624 | efl_layout_signal_process(sd->entry_edje, EINA_TRUE); |
2625 | 2625 | ||
2626 | if (sd->scr_edje) | 2626 | if (sd->scr_edje) |
2627 | { | 2627 | { |
2628 | efl_canvas_layout_signal_emit(sd->scr_edje, emission, source); | 2628 | efl_layout_signal_emit(sd->scr_edje, emission, source); |
2629 | efl_canvas_layout_signal_process(sd->scr_edje, EINA_TRUE); // FIXME | 2629 | efl_layout_signal_process(sd->scr_edje, EINA_TRUE); // FIXME |
2630 | } | 2630 | } |
2631 | } | 2631 | } |
2632 | 2632 | ||
2633 | EOLIAN static Eina_Bool | 2633 | EOLIAN static Eina_Bool |
2634 | _efl_ui_text_efl_canvas_layout_signal_signal_callback_add(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data) | 2634 | _efl_ui_text_efl_layout_signal_signal_callback_add(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data) |
2635 | { | 2635 | { |
2636 | Eina_Bool ok; | 2636 | Eina_Bool ok; |
2637 | 2637 | ||
2638 | ok = efl_canvas_layout_signal_callback_add(sd->entry_edje, emission, source, func_cb, data); | 2638 | ok = efl_layout_signal_callback_add(sd->entry_edje, emission, source, func_cb, data); |
2639 | if (sd->scr_edje) | 2639 | if (sd->scr_edje) |
2640 | ok = efl_canvas_layout_signal_callback_add(sd->scr_edje, emission, source, func_cb, data); | 2640 | ok = efl_layout_signal_callback_add(sd->scr_edje, emission, source, func_cb, data); |
2641 | 2641 | ||
2642 | return ok; | 2642 | return ok; |
2643 | } | 2643 | } |
2644 | 2644 | ||
2645 | EOLIAN static Eina_Bool | 2645 | EOLIAN static Eina_Bool |
2646 | _efl_ui_text_efl_canvas_layout_signal_signal_callback_del(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data) | 2646 | _efl_ui_text_efl_layout_signal_signal_callback_del(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data) |
2647 | { | 2647 | { |
2648 | Eina_Bool ok; | 2648 | Eina_Bool ok; |
2649 | 2649 | ||
2650 | ok = efl_canvas_layout_signal_callback_del(sd->entry_edje, emission, source, func_cb, data); | 2650 | ok = efl_layout_signal_callback_del(sd->entry_edje, emission, source, func_cb, data); |
2651 | if (sd->scr_edje) | 2651 | if (sd->scr_edje) |
2652 | ok = efl_canvas_layout_signal_callback_del(sd->scr_edje, emission, source, func_cb, data); | 2652 | ok = efl_layout_signal_callback_del(sd->scr_edje, emission, source, func_cb, data); |
2653 | 2653 | ||
2654 | return ok; | 2654 | return ok; |
2655 | } | 2655 | } |
diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo index 67ad82d..567d692 100644 --- a/src/lib/elementary/efl_ui_text.eo +++ b/src/lib/elementary/efl_ui_text.eo | |||
@@ -355,9 +355,9 @@ class Efl.Ui.Text (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, | |||
355 | Efl.Gfx.position { set; } | 355 | Efl.Gfx.position { set; } |
356 | Efl.Gfx.size { set; } | 356 | Efl.Gfx.size { set; } |
357 | Efl.Canvas.Group.group_member_add; | 357 | Efl.Canvas.Group.group_member_add; |
358 | Efl.Canvas.Layout_Signal.signal_callback_add; | 358 | Efl.Layout.Signal.signal_callback_add; |
359 | Efl.Canvas.Layout_Signal.signal_callback_del; | 359 | Efl.Layout.Signal.signal_callback_del; |
360 | Efl.Canvas.Layout_Signal.signal_emit; | 360 | Efl.Layout.Signal.signal_emit; |
361 | Elm.Widget.on_access_activate; | 361 | Elm.Widget.on_access_activate; |
362 | Elm.Widget.theme_apply; | 362 | Elm.Widget.theme_apply; |
363 | Elm.Widget.on_focus_update; | 363 | Elm.Widget.on_focus_update; |
diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c index 0a63100..412cf63 100644 --- a/src/lib/elementary/elc_naviframe.c +++ b/src/lib/elementary/elc_naviframe.c | |||
@@ -1048,7 +1048,7 @@ _back_btn_new(Evas_Object *obj, const char *title_label) | |||
1048 | } | 1048 | } |
1049 | 1049 | ||
1050 | EOLIAN static void | 1050 | EOLIAN static void |
1051 | _elm_naviframe_efl_canvas_layout_signal_signal_emit(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED, const char *emission, const char *source) | 1051 | _elm_naviframe_efl_layout_signal_signal_emit(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED, const char *emission, const char *source) |
1052 | { | 1052 | { |
1053 | Elm_Object_Item *eo_top_it; | 1053 | Elm_Object_Item *eo_top_it; |
1054 | 1054 | ||
@@ -1056,7 +1056,7 @@ _elm_naviframe_efl_canvas_layout_signal_signal_emit(Eo *obj, Elm_Naviframe_Data | |||
1056 | if (!eo_top_it) return; | 1056 | if (!eo_top_it) return; |
1057 | ELM_NAVIFRAME_ITEM_DATA_GET(eo_top_it, top_it); | 1057 | ELM_NAVIFRAME_ITEM_DATA_GET(eo_top_it, top_it); |
1058 | 1058 | ||
1059 | efl_canvas_layout_signal_emit(VIEW(top_it), emission, source); | 1059 | efl_layout_signal_emit(VIEW(top_it), emission, source); |
1060 | } | 1060 | } |
1061 | 1061 | ||
1062 | /* content/text smart functions proxying things to the top item, which | 1062 | /* content/text smart functions proxying things to the top item, which |
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c index d7bb894..cc10c9d 100644 --- a/src/lib/elementary/elc_popup.c +++ b/src/lib/elementary/elc_popup.c | |||
@@ -500,7 +500,7 @@ _elm_popup_elm_layout_sizing_eval(Eo *obj, Elm_Popup_Data *sd) | |||
500 | } | 500 | } |
501 | 501 | ||
502 | EOLIAN static void | 502 | EOLIAN static void |
503 | _elm_popup_efl_canvas_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Elm_Popup_Data *sd, const char *emission, const char *source) | 503 | _elm_popup_efl_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Elm_Popup_Data *sd, const char *emission, const char *source) |
504 | { | 504 | { |
505 | elm_layout_signal_emit(sd->main_layout, emission, source); | 505 | elm_layout_signal_emit(sd->main_layout, emission, source); |
506 | } | 506 | } |
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c index be39d2d..3d7f23b 100644 --- a/src/lib/elementary/elm_entry.c +++ b/src/lib/elementary/elm_entry.c | |||
@@ -984,9 +984,9 @@ _elm_entry_elm_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd) | |||
984 | elm_entry_end_visible_set(obj, EINA_TRUE); | 984 | elm_entry_end_visible_set(obj, EINA_TRUE); |
985 | 985 | ||
986 | if (sd->scroll) | 986 | if (sd->scroll) |
987 | efl_canvas_layout_signal_emit(sd->entry_edje, "elm,scroll,enable", "elm"); | 987 | efl_layout_signal_emit(sd->entry_edje, "elm,scroll,enable", "elm"); |
988 | else | 988 | else |
989 | efl_canvas_layout_signal_emit(sd->entry_edje, "elm,scroll,disable", "elm"); | 989 | efl_layout_signal_emit(sd->entry_edje, "elm,scroll,disable", "elm"); |
990 | 990 | ||
991 | sd->changed = EINA_TRUE; | 991 | sd->changed = EINA_TRUE; |
992 | elm_layout_sizing_eval(obj); | 992 | elm_layout_sizing_eval(obj); |
@@ -3054,7 +3054,7 @@ _chars_add_till_limit(Evas_Object *obj, | |||
3054 | } | 3054 | } |
3055 | 3055 | ||
3056 | EOLIAN static void | 3056 | EOLIAN static void |
3057 | _elm_entry_efl_canvas_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd, const char *emission, const char *source) | 3057 | _elm_entry_efl_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd, const char *emission, const char *source) |
3058 | { | 3058 | { |
3059 | /* always pass to both edje objs */ | 3059 | /* always pass to both edje objs */ |
3060 | edje_object_signal_emit(sd->entry_edje, emission, source); | 3060 | edje_object_signal_emit(sd->entry_edje, emission, source); |
@@ -3068,25 +3068,25 @@ _elm_entry_efl_canvas_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Elm_Entry_D | |||
3068 | } | 3068 | } |
3069 | 3069 | ||
3070 | EOLIAN static Eina_Bool | 3070 | EOLIAN static Eina_Bool |
3071 | _elm_entry_efl_canvas_layout_signal_signal_callback_add(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data) | 3071 | _elm_entry_efl_layout_signal_signal_callback_add(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data) |
3072 | { | 3072 | { |
3073 | Eina_Bool ok; | 3073 | Eina_Bool ok; |
3074 | 3074 | ||
3075 | ok = efl_canvas_layout_signal_callback_add(sd->entry_edje, emission, source, func_cb, data); | 3075 | ok = efl_layout_signal_callback_add(sd->entry_edje, emission, source, func_cb, data); |
3076 | if (sd->scr_edje) | 3076 | if (sd->scr_edje) |
3077 | ok = efl_canvas_layout_signal_callback_add(sd->scr_edje, emission, source, func_cb, data); | 3077 | ok = efl_layout_signal_callback_add(sd->scr_edje, emission, source, func_cb, data); |
3078 | 3078 | ||
3079 | return ok; | 3079 | return ok; |
3080 | } | 3080 | } |
3081 | 3081 | ||
3082 | EOLIAN static Eina_Bool | 3082 | EOLIAN static Eina_Bool |
3083 | _elm_entry_efl_canvas_layout_signal_signal_callback_del(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data) | 3083 | _elm_entry_efl_layout_signal_signal_callback_del(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data) |
3084 | { | 3084 | { |
3085 | Eina_Bool ok; | 3085 | Eina_Bool ok; |
3086 | 3086 | ||
3087 | ok = efl_canvas_layout_signal_callback_del(sd->entry_edje, emission, source, func_cb, data); | 3087 | ok = efl_layout_signal_callback_del(sd->entry_edje, emission, source, func_cb, data); |
3088 | if (sd->scr_edje) | 3088 | if (sd->scr_edje) |
3089 | ok = efl_canvas_layout_signal_callback_del(sd->scr_edje, emission, source, func_cb, data); | 3089 | ok = efl_layout_signal_callback_del(sd->scr_edje, emission, source, func_cb, data); |
3090 | 3090 | ||
3091 | return ok; | 3091 | return ok; |
3092 | } | 3092 | } |
@@ -3104,7 +3104,7 @@ _elm_entry_signal_callback_add_legacy(Eo *obj, const char *emission, const char | |||
3104 | emission, source, func_cb, data); | 3104 | emission, source, func_cb, data); |
3105 | 3105 | ||
3106 | if (sd->scr_edje) | 3106 | if (sd->scr_edje) |
3107 | efl_canvas_layout_signal_callback_add(sd->scr_edje, emission, source, func_cb, data); | 3107 | efl_layout_signal_callback_add(sd->scr_edje, emission, source, func_cb, data); |
3108 | } | 3108 | } |
3109 | 3109 | ||
3110 | void * | 3110 | void * |
@@ -3120,7 +3120,7 @@ _elm_entry_signal_callback_del_legacy(Eo *obj, const char *emission, const char | |||
3120 | emission, source, func_cb); | 3120 | emission, source, func_cb); |
3121 | 3121 | ||
3122 | if (sd->scr_edje) | 3122 | if (sd->scr_edje) |
3123 | efl_canvas_layout_signal_callback_del(sd->scr_edje, emission, source, func_cb, data); | 3123 | efl_layout_signal_callback_del(sd->scr_edje, emission, source, func_cb, data); |
3124 | 3124 | ||
3125 | return data; | 3125 | return data; |
3126 | } | 3126 | } |
diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo index a2d9b2d..a6015a9 100644 --- a/src/lib/elementary/elm_entry.eo +++ b/src/lib/elementary/elm_entry.eo | |||
@@ -842,9 +842,9 @@ class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, | |||
842 | Efl.Gfx.position { set; } | 842 | Efl.Gfx.position { set; } |
843 | Efl.Gfx.size { set; } | 843 | Efl.Gfx.size { set; } |
844 | Efl.Canvas.Group.group_member_add; | 844 | Efl.Canvas.Group.group_member_add; |
845 | Efl.Canvas.Layout_Signal.signal_callback_add; | 845 | Efl.Layout.Signal.signal_callback_add; |
846 | Efl.Canvas.Layout_Signal.signal_callback_del; | 846 | Efl.Layout.Signal.signal_callback_del; |
847 | Efl.Canvas.Layout_Signal.signal_emit; | 847 | Efl.Layout.Signal.signal_emit; |
848 | Elm.Widget.on_access_activate; | 848 | Elm.Widget.on_access_activate; |
849 | Elm.Widget.theme_apply; | 849 | Elm.Widget.theme_apply; |
850 | Elm.Widget.on_focus_update; | 850 | Elm.Widget.on_focus_update; |
diff --git a/src/lib/elementary/elm_naviframe.eo b/src/lib/elementary/elm_naviframe.eo index bfdbfc8..0cb644f 100644 --- a/src/lib/elementary/elm_naviframe.eo +++ b/src/lib/elementary/elm_naviframe.eo | |||
@@ -148,7 +148,7 @@ class Elm.Naviframe (Efl.Ui.Layout, Efl.Access.Widget.Action) | |||
148 | Efl.Ui.Translatable.translation_update; | 148 | Efl.Ui.Translatable.translation_update; |
149 | Elm.Widget.theme_apply; | 149 | Elm.Widget.theme_apply; |
150 | Elm.Widget.widget_event; | 150 | Elm.Widget.widget_event; |
151 | Efl.Canvas.Layout_Signal.signal_emit; | 151 | Efl.Layout.Signal.signal_emit; |
152 | Efl.Access.Widget.Action.elm_actions { get; } | 152 | Efl.Access.Widget.Action.elm_actions { get; } |
153 | Elm.Widget.resize_object { set; } | 153 | Elm.Widget.resize_object { set; } |
154 | Efl.Part.part; | 154 | Efl.Part.part; |
diff --git a/src/lib/elementary/elm_popup.eo b/src/lib/elementary/elm_popup.eo index db836a8..1532328 100644 --- a/src/lib/elementary/elm_popup.eo +++ b/src/lib/elementary/elm_popup.eo | |||
@@ -174,7 +174,7 @@ class Elm.Popup (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Efl.Access.Widget.Action) | |||
174 | Efl.Ui.Translatable.translation_update; | 174 | Efl.Ui.Translatable.translation_update; |
175 | Elm.Widget.widget_sub_object_del; | 175 | Elm.Widget.widget_sub_object_del; |
176 | Elm.Widget.widget_event; | 176 | Elm.Widget.widget_event; |
177 | Efl.Canvas.Layout_Signal.signal_emit; | 177 | Efl.Layout.Signal.signal_emit; |
178 | Efl.Access.Widget.Action.elm_actions { get; } | 178 | Efl.Access.Widget.Action.elm_actions { get; } |
179 | Efl.Access.state_set { get; } | 179 | Efl.Access.state_set { get; } |
180 | Efl.Access.name { get; } | 180 | Efl.Access.name { get; } |
diff --git a/src/tests/edje/edje_test_edje.c b/src/tests/edje/edje_test_edje.c index 3ea0a34..4d83f48 100644 --- a/src/tests/edje/edje_test_edje.c +++ b/src/tests/edje/edje_test_edje.c | |||
@@ -835,7 +835,7 @@ START_TEST(edje_test_message_send_eo) | |||
835 | 835 | ||
836 | eina_value_setup(&v, EINA_VALUE_TYPE_STRING); | 836 | eina_value_setup(&v, EINA_VALUE_TYPE_STRING); |
837 | eina_value_set(&v, "hello world"); | 837 | eina_value_set(&v, "hello world"); |
838 | efl_canvas_layout_signal_message_send(obj, 0, v); | 838 | efl_layout_signal_message_send(obj, 0, v); |
839 | eina_value_flush(&v); | 839 | eina_value_flush(&v); |
840 | edje_message_signal_process(); | 840 | edje_message_signal_process(); |
841 | edje_object_calc_force(obj); | 841 | edje_object_calc_force(obj); |
@@ -843,7 +843,7 @@ START_TEST(edje_test_message_send_eo) | |||
843 | 843 | ||
844 | eina_value_setup(&v, EINA_VALUE_TYPE_INT); | 844 | eina_value_setup(&v, EINA_VALUE_TYPE_INT); |
845 | eina_value_set(&v, 42); | 845 | eina_value_set(&v, 42); |
846 | efl_canvas_layout_signal_message_send(obj, 1, v); | 846 | efl_layout_signal_message_send(obj, 1, v); |
847 | eina_value_flush(&v); | 847 | eina_value_flush(&v); |
848 | edje_message_signal_process(); | 848 | edje_message_signal_process(); |
849 | edje_object_calc_force(obj); | 849 | edje_object_calc_force(obj); |
@@ -851,7 +851,7 @@ START_TEST(edje_test_message_send_eo) | |||
851 | 851 | ||
852 | eina_value_setup(&v, EINA_VALUE_TYPE_FLOAT); | 852 | eina_value_setup(&v, EINA_VALUE_TYPE_FLOAT); |
853 | eina_value_set(&v, 0.12); | 853 | eina_value_set(&v, 0.12); |
854 | efl_canvas_layout_signal_message_send(obj, 2, v); | 854 | efl_layout_signal_message_send(obj, 2, v); |
855 | eina_value_flush(&v); | 855 | eina_value_flush(&v); |
856 | edje_message_signal_process(); | 856 | edje_message_signal_process(); |
857 | edje_object_calc_force(obj); | 857 | edje_object_calc_force(obj); |
@@ -862,7 +862,7 @@ START_TEST(edje_test_message_send_eo) | |||
862 | eina_value_array_append(va, 12); | 862 | eina_value_array_append(va, 12); |
863 | eina_value_array_append(va, 42); | 863 | eina_value_array_append(va, 42); |
864 | eina_value_array_append(va, 255); | 864 | eina_value_array_append(va, 255); |
865 | efl_canvas_layout_signal_message_send(obj, 3, *va); | 865 | efl_layout_signal_message_send(obj, 3, *va); |
866 | eina_value_free(va); | 866 | eina_value_free(va); |
867 | edje_message_signal_process(); | 867 | edje_message_signal_process(); |
868 | edje_object_calc_force(obj); | 868 | edje_object_calc_force(obj); |
diff --git a/src/tests/emotion/emotion_test_main-eo.c b/src/tests/emotion/emotion_test_main-eo.c index 66bcfa9..d3e4218 100644 --- a/src/tests/emotion/emotion_test_main-eo.c +++ b/src/tests/emotion/emotion_test_main-eo.c | |||
@@ -434,7 +434,7 @@ video_obj_signal_play_cb(void *data, Evas_Object *o, const char *emission EINA_U | |||
434 | { | 434 | { |
435 | Evas_Object *ov = data; | 435 | Evas_Object *ov = data; |
436 | emotion_object_play_set(ov, EINA_TRUE); | 436 | emotion_object_play_set(ov, EINA_TRUE); |
437 | efl_canvas_layout_signal_emit(o, "video_state", "play"); | 437 | efl_layout_signal_emit(o, "video_state", "play"); |
438 | } | 438 | } |
439 | 439 | ||
440 | static void | 440 | static void |
@@ -442,7 +442,7 @@ video_obj_signal_pause_cb(void *data, Evas_Object *o, const char *emission EINA_ | |||
442 | { | 442 | { |
443 | Evas_Object *ov = data; | 443 | Evas_Object *ov = data; |
444 | emotion_object_play_set(ov, EINA_FALSE); | 444 | emotion_object_play_set(ov, EINA_FALSE); |
445 | efl_canvas_layout_signal_emit(o, "video_state", "pause"); | 445 | efl_layout_signal_emit(o, "video_state", "pause"); |
446 | } | 446 | } |
447 | 447 | ||
448 | static void | 448 | static void |
@@ -451,7 +451,7 @@ video_obj_signal_stop_cb(void *data, Evas_Object *o, const char *emission EINA_U | |||
451 | Evas_Object *ov = data; | 451 | Evas_Object *ov = data; |
452 | emotion_object_play_set(ov, EINA_FALSE); | 452 | emotion_object_play_set(ov, EINA_FALSE); |
453 | emotion_object_position_set(ov, 0.0); | 453 | emotion_object_position_set(ov, 0.0); |
454 | efl_canvas_layout_signal_emit(o, "video_state", "stop"); | 454 | efl_layout_signal_emit(o, "video_state", "stop"); |
455 | } | 455 | } |
456 | 456 | ||
457 | static void | 457 | static void |
@@ -634,22 +634,22 @@ init_video_object(const char *module_filename, const char *filename) | |||
634 | 634 | ||
635 | efl_event_callback_array_add(o, emotion_object_test_callbacks(), oe); | 635 | efl_event_callback_array_add(o, emotion_object_test_callbacks(), oe); |
636 | 636 | ||
637 | efl_canvas_layout_signal_callback_add(oe, "video_control", "play", video_obj_signal_play_cb, o); | 637 | efl_layout_signal_callback_add(oe, "video_control", "play", video_obj_signal_play_cb, o); |
638 | efl_canvas_layout_signal_callback_add(oe, "video_control", "pause", video_obj_signal_pause_cb, o); | 638 | efl_layout_signal_callback_add(oe, "video_control", "pause", video_obj_signal_pause_cb, o); |
639 | efl_canvas_layout_signal_callback_add(oe, "video_control", "stop", video_obj_signal_stop_cb, o); | 639 | efl_layout_signal_callback_add(oe, "video_control", "stop", video_obj_signal_stop_cb, o); |
640 | efl_canvas_layout_signal_callback_add(oe, "drag", "video_progress", video_obj_signal_jump_cb, o); | 640 | efl_layout_signal_callback_add(oe, "drag", "video_progress", video_obj_signal_jump_cb, o); |
641 | efl_canvas_layout_signal_callback_add(oe, "drag", "video_alpha", video_obj_signal_alpha_cb, o); | 641 | efl_layout_signal_callback_add(oe, "drag", "video_alpha", video_obj_signal_alpha_cb, o); |
642 | efl_canvas_layout_signal_callback_add(oe, "drag", "video_volume", video_obj_signal_vol_cb, o); | 642 | efl_layout_signal_callback_add(oe, "drag", "video_volume", video_obj_signal_vol_cb, o); |
643 | efl_canvas_layout_signal_callback_add(oe, "frame_move", "start", video_obj_signal_frame_move_start_cb, oe); | 643 | efl_layout_signal_callback_add(oe, "frame_move", "start", video_obj_signal_frame_move_start_cb, oe); |
644 | efl_canvas_layout_signal_callback_add(oe, "frame_move", "stop", video_obj_signal_frame_move_stop_cb, oe); | 644 | efl_layout_signal_callback_add(oe, "frame_move", "stop", video_obj_signal_frame_move_stop_cb, oe); |
645 | efl_canvas_layout_signal_callback_add(oe, "frame_resize", "start", video_obj_signal_frame_resize_start_cb, oe); | 645 | efl_layout_signal_callback_add(oe, "frame_resize", "start", video_obj_signal_frame_resize_start_cb, oe); |
646 | efl_canvas_layout_signal_callback_add(oe, "frame_resize", "stop", video_obj_signal_frame_resize_stop_cb, oe); | 646 | efl_layout_signal_callback_add(oe, "frame_resize", "stop", video_obj_signal_frame_resize_stop_cb, oe); |
647 | efl_canvas_layout_signal_callback_add(oe, "mouse, move", "*", video_obj_signal_frame_move_cb, oe); | 647 | efl_layout_signal_callback_add(oe, "mouse, move", "*", video_obj_signal_frame_move_cb, oe); |
648 | efl_ui_drag_value_set(efl_part(oe, "video_alpha"), 0.0, 1.0); | 648 | efl_ui_drag_value_set(efl_part(oe, "video_alpha"), 0.0, 1.0); |
649 | efl_text_set(efl_part(oe, "video_alpha_txt"), "alpha 255"); | 649 | efl_text_set(efl_part(oe, "video_alpha_txt"), "alpha 255"); |
650 | efl_ui_drag_value_set(efl_part(oe, "video_volume"), 0.0, 0.5); | 650 | efl_ui_drag_value_set(efl_part(oe, "video_volume"), 0.0, 0.5); |
651 | efl_text_set(efl_part(oe, "video_volume_txt"), "vol 0.50"); | 651 | efl_text_set(efl_part(oe, "video_volume_txt"), "vol 0.50"); |
652 | efl_canvas_layout_signal_emit(oe, "video_state", "play"); | 652 | efl_layout_signal_emit(oe, "video_state", "play"); |
653 | efl_gfx_visible_set(oe, EINA_TRUE); | 653 | efl_gfx_visible_set(oe, EINA_TRUE); |
654 | } | 654 | } |
655 | 655 | ||