diff options
author | SangHyeon Jade Lee <sh10233.lee@samsung.com> | 2019-01-31 11:59:19 +0000 |
---|---|---|
committer | Cedric BAIL <cedric.bail@free.fr> | 2019-02-11 11:06:13 -0800 |
commit | 053146598c346aa7c200aee55093a5e463d255de (patch) | |
tree | 44c1acdd0761d0ed48a4ac70121d686504a24a4d /src/lib/efl | |
parent | 9277586fd8244826bdfbbc7625c3a08be71f5e06 (diff) |
efl_ui : rename model connect and factory connect to bind property and factory.
As we discussed in T7469 with V40,
efl_ui_model_connect
efl_ui_factory_model_connect
need to be renamed to
efl_ui_bind_property
efl_ui_bind_factory
for this work,
Efl.Ui.Model.Connect interface is changed as Efl.Ui.Bind,
and bind_property and bind_factory both method is supported by this interface.
bind_factory need Efl.Ui.Factory,
and Efl.Ui.Factory inheritted Efl.Ui.Bind,
so I little bit concerned about circular referencing, but so far, it works well.
Reviewed-by: Cedric BAIL <cedric.bail@free.fr>
Differential Revision: https://phab.enlightenment.org/D7529
Diffstat (limited to '')
-rw-r--r-- | src/lib/efl/Efl.h | 3 | ||||
-rw-r--r-- | src/lib/efl/interfaces/efl_interfaces_main.c | 3 | ||||
-rw-r--r-- | src/lib/efl/interfaces/efl_ui_factory.eo | 9 | ||||
-rw-r--r-- | src/lib/efl/interfaces/efl_ui_factory_bind.eo | 19 | ||||
-rw-r--r-- | src/lib/efl/interfaces/efl_ui_model_connect.eo | 13 | ||||
-rw-r--r-- | src/lib/efl/interfaces/efl_ui_property_bind.eo | 18 | ||||
-rw-r--r-- | src/lib/efl/interfaces/meson.build | 3 |
7 files changed, 44 insertions, 24 deletions
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h index 097111134e..4b37800ced 100644 --- a/src/lib/efl/Efl.h +++ b/src/lib/efl/Efl.h | |||
@@ -149,8 +149,9 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command; | |||
149 | #include "interfaces/efl_canvas_scene.eo.h" | 149 | #include "interfaces/efl_canvas_scene.eo.h" |
150 | #include "interfaces/efl_canvas_pointer.eo.h" | 150 | #include "interfaces/efl_canvas_pointer.eo.h" |
151 | #include "interfaces/efl_ui_view.eo.h" | 151 | #include "interfaces/efl_ui_view.eo.h" |
152 | #include "interfaces/efl_ui_model_connect.eo.h" | 152 | #include "interfaces/efl_ui_property_bind.eo.h" |
153 | #include "interfaces/efl_ui_factory.eo.h" | 153 | #include "interfaces/efl_ui_factory.eo.h" |
154 | #include "interfaces/efl_ui_factory_bind.eo.h" | ||
154 | #include "interfaces/efl_ui_format.eo.h" | 155 | #include "interfaces/efl_ui_format.eo.h" |
155 | #include "interfaces/efl_cached_item.eo.h" | 156 | #include "interfaces/efl_cached_item.eo.h" |
156 | 157 | ||
diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c index 0ede9908f8..75ffcd984c 100644 --- a/src/lib/efl/interfaces/efl_interfaces_main.c +++ b/src/lib/efl/interfaces/efl_interfaces_main.c | |||
@@ -70,8 +70,9 @@ | |||
70 | #include "interfaces/efl_ui_range_interactive.eo.c" | 70 | #include "interfaces/efl_ui_range_interactive.eo.c" |
71 | #include "interfaces/efl_ui_autorepeat.eo.c" | 71 | #include "interfaces/efl_ui_autorepeat.eo.c" |
72 | #include "interfaces/efl_ui_view.eo.c" | 72 | #include "interfaces/efl_ui_view.eo.c" |
73 | #include "interfaces/efl_ui_model_connect.eo.c" | 73 | #include "interfaces/efl_ui_property_bind.eo.c" |
74 | #include "interfaces/efl_ui_factory.eo.c" | 74 | #include "interfaces/efl_ui_factory.eo.c" |
75 | #include "interfaces/efl_ui_factory_bind.eo.c" | ||
75 | 76 | ||
76 | #include "interfaces/efl_ui_draggable.eo.c" | 77 | #include "interfaces/efl_ui_draggable.eo.c" |
77 | #include "interfaces/efl_ui_clickable.eo.c" | 78 | #include "interfaces/efl_ui_clickable.eo.c" |
diff --git a/src/lib/efl/interfaces/efl_ui_factory.eo b/src/lib/efl/interfaces/efl_ui_factory.eo index 45be8aab80..7b4356a04b 100644 --- a/src/lib/efl/interfaces/efl_ui_factory.eo +++ b/src/lib/efl/interfaces/efl_ui_factory.eo | |||
@@ -4,7 +4,7 @@ struct Efl.Ui.Factory_Item_Created_Event { | |||
4 | item: Efl.Gfx.Entity; [[The item that was just created.]] | 4 | item: Efl.Gfx.Entity; [[The item that was just created.]] |
5 | } | 5 | } |
6 | 6 | ||
7 | interface Efl.Ui.Factory extends Efl.Ui.Model.Connect | 7 | interface Efl.Ui.Factory extends Efl.Ui.Property_Bind, Efl.Ui.Factory_Bind |
8 | { | 8 | { |
9 | [[Efl UI factory interface]] | 9 | [[Efl UI factory interface]] |
10 | methods { | 10 | methods { |
@@ -22,13 +22,6 @@ interface Efl.Ui.Factory extends Efl.Ui.Model.Connect | |||
22 | ui_view: Efl.Gfx.Entity; [[Efl canvas]] | 22 | ui_view: Efl.Gfx.Entity; [[Efl canvas]] |
23 | } | 23 | } |
24 | } | 24 | } |
25 | model_connect { | ||
26 | [[Connect factory to a model]] | ||
27 | params { | ||
28 | name: string; [[Model name]] | ||
29 | factory: Efl.Ui.Factory; [[Efl factory]] | ||
30 | } | ||
31 | } | ||
32 | } | 25 | } |
33 | events { | 26 | events { |
34 | created: Efl.Ui.Factory_Item_Created_Event; [[Event triggered when an item has been successfully created.]] | 27 | created: Efl.Ui.Factory_Item_Created_Event; [[Event triggered when an item has been successfully created.]] |
diff --git a/src/lib/efl/interfaces/efl_ui_factory_bind.eo b/src/lib/efl/interfaces/efl_ui_factory_bind.eo new file mode 100644 index 0000000000..0e36b44f05 --- /dev/null +++ b/src/lib/efl/interfaces/efl_ui_factory_bind.eo | |||
@@ -0,0 +1,19 @@ | |||
1 | interface Efl.Ui.Factory_Bind | ||
2 | { | ||
3 | [[Efl UI Property interface. | ||
4 | view object can have @Efl.Model and need to set cotent with those model stored data. | ||
5 | the interface can help binding the factory to create object with model property data. | ||
6 | see @Efl.Model | ||
7 | see @Efl.Ui.Factory]] | ||
8 | methods { | ||
9 | factory_bind { | ||
10 | [[bind the factory with the given key string. when the data is ready or changed, | ||
11 | factory create the object and bind the data to the key action and process promised work. | ||
12 | Note: the input @Efl.Ui.Factory need to be @Efl.Ui.Property_Bind.property_bind at least once.]] | ||
13 | params { | ||
14 | key: string; [[Key string for bind model property data]] | ||
15 | factory: Efl.Ui.Factory; [[@Efl.Ui.Factory for create and bind model property data]] | ||
16 | } | ||
17 | } | ||
18 | } | ||
19 | } | ||
diff --git a/src/lib/efl/interfaces/efl_ui_model_connect.eo b/src/lib/efl/interfaces/efl_ui_model_connect.eo deleted file mode 100644 index 4a5e2c1310..0000000000 --- a/src/lib/efl/interfaces/efl_ui_model_connect.eo +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | interface Efl.Ui.Model.Connect | ||
2 | { | ||
3 | [[Efl UI model connect interface]] | ||
4 | methods { | ||
5 | connect { | ||
6 | [[Connect property]] | ||
7 | params { | ||
8 | name: string; [[Model name]] | ||
9 | property: string; [[Property name]] | ||
10 | } | ||
11 | } | ||
12 | } | ||
13 | } | ||
diff --git a/src/lib/efl/interfaces/efl_ui_property_bind.eo b/src/lib/efl/interfaces/efl_ui_property_bind.eo new file mode 100644 index 0000000000..e709bd87c7 --- /dev/null +++ b/src/lib/efl/interfaces/efl_ui_property_bind.eo | |||
@@ -0,0 +1,18 @@ | |||
1 | interface Efl.Ui.Property_Bind | ||
2 | { | ||
3 | [[Efl UI Property_Bind interface. | ||
4 | view object can have @Efl.Model to manage the data, | ||
5 | the interface can help loading and tracking child data from the model property. | ||
6 | see @Efl.Model | ||
7 | see @Efl.Ui.Factory]] | ||
8 | methods { | ||
9 | property_bind { | ||
10 | [[bind property data with the given key string. when the data is ready or changed, | ||
11 | bind the data to the key action and process promised work.]] | ||
12 | params { | ||
13 | key: string; [[key string for bind model property data]] | ||
14 | property: string; [[Model property name]] | ||
15 | } | ||
16 | } | ||
17 | } | ||
18 | } | ||
diff --git a/src/lib/efl/interfaces/meson.build b/src/lib/efl/interfaces/meson.build index a1ef0ee2ae..4c862196d2 100644 --- a/src/lib/efl/interfaces/meson.build +++ b/src/lib/efl/interfaces/meson.build | |||
@@ -90,8 +90,9 @@ pub_eo_files = [ | |||
90 | 'efl_ui_range_display.eo', | 90 | 'efl_ui_range_display.eo', |
91 | 'efl_ui_range_interactive.eo', | 91 | 'efl_ui_range_interactive.eo', |
92 | 'efl_ui_view.eo', | 92 | 'efl_ui_view.eo', |
93 | 'efl_ui_model_connect.eo', | 93 | 'efl_ui_property_bind.eo', |
94 | 'efl_ui_factory.eo', | 94 | 'efl_ui_factory.eo', |
95 | 'efl_ui_factory_bind.eo', | ||
95 | 'efl_ui_multi_selectable.eo', | 96 | 'efl_ui_multi_selectable.eo', |
96 | 'efl_screen.eo', | 97 | 'efl_screen.eo', |
97 | 'efl_io_closer.eo', | 98 | 'efl_io_closer.eo', |