summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile_Efl_Mono.am2
-rw-r--r--src/Makefile_Elementary.am8
-rw-r--r--src/lib/elementary/elm_view_form.c2
-rw-r--r--src/lib/elementary/elm_view_form.eo31
-rw-r--r--src/lib/elementary/elm_view_form.h2
-rw-r--r--src/lib/elementary/elm_view_form_eo.c45
-rw-r--r--src/lib/elementary/elm_view_form_eo.h49
-rw-r--r--src/lib/elementary/elm_view_form_eo.legacy.h19
-rw-r--r--src/lib/elementary/elm_view_list.c2
-rw-r--r--src/lib/elementary/elm_view_list.eo65
-rw-r--r--src/lib/elementary/elm_view_list.h2
-rw-r--r--src/lib/elementary/elm_view_list_eo.c62
-rw-r--r--src/lib/elementary/elm_view_list_eo.h97
-rw-r--r--src/lib/elementary/elm_view_list_eo.legacy.h22
-rw-r--r--src/lib/elementary/meson.build6
15 files changed, 309 insertions, 105 deletions
diff --git a/src/Makefile_Efl_Mono.am b/src/Makefile_Efl_Mono.am
index cf8884837b..1f09ba1ccd 100644
--- a/src/Makefile_Efl_Mono.am
+++ b/src/Makefile_Efl_Mono.am
@@ -174,7 +174,7 @@ lib/elementary/elm_map_eo.cs \
174lib/elementary/elm_combobox.eo.cs \ 174lib/elementary/elm_combobox.eo.cs \
175lib/elementary/elm_list_eo.cs \ 175lib/elementary/elm_list_eo.cs \
176lib/elementary/elm_genlist_eo.cs \ 176lib/elementary/elm_genlist_eo.cs \
177lib/elementary/elm_view_list.eo.cs \ 177lib/elementary/elm_view_list_eo.cs \
178lib/elementary/elm_genlist_item_eo.cs \ 178lib/elementary/elm_genlist_item_eo.cs \
179lib/elementary/elm_gengrid_eo.cs \ 179lib/elementary/elm_gengrid_eo.cs \
180lib/elementary/elm_glview_eo.cs 180lib/elementary/elm_glview_eo.cs
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index f8b2319bf6..13566cb093 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -146,8 +146,6 @@ elm_public_eolian_files += \
146 lib/elementary/elm_atspi_bridge.eo \ 146 lib/elementary/elm_atspi_bridge.eo \
147 lib/elementary/elm_atspi_app_object.eo \ 147 lib/elementary/elm_atspi_app_object.eo \
148 lib/elementary/efl_ui_image_zoomable_pan.eo \ 148 lib/elementary/efl_ui_image_zoomable_pan.eo \
149 lib/elementary/elm_view_list.eo \
150 lib/elementary/elm_view_form.eo \
151 lib/elementary/elm_web.eo \ 149 lib/elementary/elm_web.eo \
152 lib/elementary/elm_widget_item.eo \ 150 lib/elementary/elm_widget_item.eo \
153 lib/elementary/elm_widget_item_container.eo \ 151 lib/elementary/elm_widget_item_container.eo \
@@ -394,6 +392,8 @@ lib/elementary/elm_toolbar_eo.c \
394lib/elementary/elm_toolbar_eo.legacy.c \ 392lib/elementary/elm_toolbar_eo.legacy.c \
395lib/elementary/elm_toolbar_item_eo.c \ 393lib/elementary/elm_toolbar_item_eo.c \
396lib/elementary/elm_toolbar_item_eo.legacy.c \ 394lib/elementary/elm_toolbar_item_eo.legacy.c \
395lib/elementary/elm_view_form_eo.c \
396lib/elementary/elm_view_list_eo.c \
397$(NULL) 397$(NULL)
398 398
399elm_legacy_eo_headers = \ 399elm_legacy_eo_headers = \
@@ -601,6 +601,10 @@ lib/elementary/elm_toolbar_eo.h \
601lib/elementary/elm_toolbar_eo.legacy.h \ 601lib/elementary/elm_toolbar_eo.legacy.h \
602lib/elementary/elm_toolbar_item_eo.h \ 602lib/elementary/elm_toolbar_item_eo.h \
603lib/elementary/elm_toolbar_item_eo.legacy.h \ 603lib/elementary/elm_toolbar_item_eo.legacy.h \
604lib/elementary/elm_view_form_eo.h \
605lib/elementary/elm_view_form_eo.legacy.h \
606lib/elementary/elm_view_list_eo.h \
607lib/elementary/elm_view_list_eo.legacy.h \
604$(NULL) 608$(NULL)
605 609
606 610
diff --git a/src/lib/elementary/elm_view_form.c b/src/lib/elementary/elm_view_form.c
index 5bb910be58..48440682a1 100644
--- a/src/lib/elementary/elm_view_form.c
+++ b/src/lib/elementary/elm_view_form.c
@@ -96,4 +96,4 @@ _elm_view_form_widget_add(Eo *obj EINA_UNUSED, Elm_View_Form_Data *priv, const c
96 _elm_view_widget_add(priv, propname, evas); 96 _elm_view_widget_add(priv, propname, evas);
97} 97}
98 98
99#include "elm_view_form.eo.c" 99#include "elm_view_form_eo.c"
diff --git a/src/lib/elementary/elm_view_form.eo b/src/lib/elementary/elm_view_form.eo
deleted file mode 100644
index ce32cecce8..0000000000
--- a/src/lib/elementary/elm_view_form.eo
+++ /dev/null
@@ -1,31 +0,0 @@
1class Elm.View.Form extends Efl.Object
2{
3 [[Elementary view form class]]
4 methods {
5 model_set {
6 [[Set model
7
8 @since 1.11
9 ]]
10 params {
11 @in model: Efl.Model; [[Emodel object]]
12 }
13 }
14 widget_add {
15 [[Add new widget
16
17 @since 1.11
18 ]]
19 params {
20 @in propname: string; [[Property name]]
21 @in evas: Efl.Canvas.Object; [[Evas widget]]
22 }
23 }
24 }
25 implements {
26 Efl.Object.destructor;
27 }
28 constructors {
29 .model_set @optional;
30 }
31}
diff --git a/src/lib/elementary/elm_view_form.h b/src/lib/elementary/elm_view_form.h
index 3572c7c725..e97ca6c6e7 100644
--- a/src/lib/elementary/elm_view_form.h
+++ b/src/lib/elementary/elm_view_form.h
@@ -4,7 +4,7 @@
4#define ELM_VIEW_FORM_H 4#define ELM_VIEW_FORM_H
5 5
6#include <Efl.h> 6#include <Efl.h>
7#include <elm_view_form.eo.h> 7#include <elm_view_form_eo.h>
8 8
9#endif 9#endif
10#endif 10#endif
diff --git a/src/lib/elementary/elm_view_form_eo.c b/src/lib/elementary/elm_view_form_eo.c
new file mode 100644
index 0000000000..5a0b58d3e7
--- /dev/null
+++ b/src/lib/elementary/elm_view_form_eo.c
@@ -0,0 +1,45 @@
1
2void _elm_view_form_model_set(Eo *obj, Elm_View_Form_Data *pd, Efl_Model *model);
3
4EOAPI EFL_VOID_FUNC_BODYV(elm_view_form_model_set, EFL_FUNC_CALL(model), Efl_Model *model);
5
6void _elm_view_form_widget_add(Eo *obj, Elm_View_Form_Data *pd, const char *propname, Efl_Canvas_Object *evas);
7
8EOAPI EFL_VOID_FUNC_BODYV(elm_view_form_widget_add, EFL_FUNC_CALL(propname, evas), const char *propname, Efl_Canvas_Object *evas);
9
10void _elm_view_form_efl_object_destructor(Eo *obj, Elm_View_Form_Data *pd);
11
12
13static Eina_Bool
14_elm_view_form_class_initializer(Efl_Class *klass)
15{
16 const Efl_Object_Ops *opsp = NULL;
17
18 const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
19
20#ifndef ELM_VIEW_FORM_EXTRA_OPS
21#define ELM_VIEW_FORM_EXTRA_OPS
22#endif
23
24 EFL_OPS_DEFINE(ops,
25 EFL_OBJECT_OP_FUNC(elm_view_form_model_set, _elm_view_form_model_set),
26 EFL_OBJECT_OP_FUNC(elm_view_form_widget_add, _elm_view_form_widget_add),
27 EFL_OBJECT_OP_FUNC(efl_destructor, _elm_view_form_efl_object_destructor),
28 ELM_VIEW_FORM_EXTRA_OPS
29 );
30 opsp = &ops;
31
32 return efl_class_functions_set(klass, opsp, ropsp);
33}
34
35static const Efl_Class_Description _elm_view_form_class_desc = {
36 EO_VERSION,
37 "Elm.View.Form",
38 EFL_CLASS_TYPE_REGULAR,
39 sizeof(Elm_View_Form_Data),
40 _elm_view_form_class_initializer,
41 NULL,
42 NULL
43};
44
45EFL_DEFINE_CLASS(elm_view_form_class_get, &_elm_view_form_class_desc, EFL_OBJECT_CLASS, NULL);
diff --git a/src/lib/elementary/elm_view_form_eo.h b/src/lib/elementary/elm_view_form_eo.h
new file mode 100644
index 0000000000..83dbe7e6c2
--- /dev/null
+++ b/src/lib/elementary/elm_view_form_eo.h
@@ -0,0 +1,49 @@
1#ifndef _ELM_VIEW_FORM_EO_H_
2#define _ELM_VIEW_FORM_EO_H_
3
4#ifndef _ELM_VIEW_FORM_EO_CLASS_TYPE
5#define _ELM_VIEW_FORM_EO_CLASS_TYPE
6
7typedef Eo Elm_View_Form;
8
9#endif
10
11#ifndef _ELM_VIEW_FORM_EO_TYPES
12#define _ELM_VIEW_FORM_EO_TYPES
13
14
15#endif
16/** Elementary view form class
17 *
18 * @ingroup Elm_View_Form
19 */
20#define ELM_VIEW_FORM_CLASS elm_view_form_class_get()
21
22EWAPI const Efl_Class *elm_view_form_class_get(void);
23
24/**
25 * @brief Set model
26 *
27 * @param[in] obj The object.
28 * @param[in] model Emodel object
29 *
30 * @since 1.11
31 *
32 * @ingroup Elm_View_Form
33 */
34EOAPI void elm_view_form_model_set(Eo *obj, Efl_Model *model);
35
36/**
37 * @brief Add new widget
38 *
39 * @param[in] obj The object.
40 * @param[in] propname Property name
41 * @param[in] evas Evas widget
42 *
43 * @since 1.11
44 *
45 * @ingroup Elm_View_Form
46 */
47EOAPI void elm_view_form_widget_add(Eo *obj, const char *propname, Efl_Canvas_Object *evas);
48
49#endif
diff --git a/src/lib/elementary/elm_view_form_eo.legacy.h b/src/lib/elementary/elm_view_form_eo.legacy.h
new file mode 100644
index 0000000000..dc641a3abd
--- /dev/null
+++ b/src/lib/elementary/elm_view_form_eo.legacy.h
@@ -0,0 +1,19 @@
1#ifndef _ELM_VIEW_FORM_EO_LEGACY_H_
2#define _ELM_VIEW_FORM_EO_LEGACY_H_
3
4#ifndef _ELM_VIEW_FORM_EO_CLASS_TYPE
5#define _ELM_VIEW_FORM_EO_CLASS_TYPE
6
7typedef Eo Elm_View_Form;
8
9#endif
10
11#ifndef _ELM_VIEW_FORM_EO_TYPES
12#define _ELM_VIEW_FORM_EO_TYPES
13
14
15#endif
16
17
18
19#endif
diff --git a/src/lib/elementary/elm_view_list.c b/src/lib/elementary/elm_view_list.c
index f22de4d0eb..9c52b18589 100644
--- a/src/lib/elementary/elm_view_list.c
+++ b/src/lib/elementary/elm_view_list.c
@@ -433,4 +433,4 @@ _elm_view_list_model_get(const Eo *obj EINA_UNUSED, Elm_View_List_Data *priv)
433{ 433{
434 return priv->connect.model; 434 return priv->connect.model;
435} 435}
436#include "elm_view_list.eo.c" 436#include "elm_view_list_eo.c"
diff --git a/src/lib/elementary/elm_view_list.eo b/src/lib/elementary/elm_view_list.eo
deleted file mode 100644
index 932b5863f6..0000000000
--- a/src/lib/elementary/elm_view_list.eo
+++ /dev/null
@@ -1,65 +0,0 @@
1import elm_general;
2
3class Elm.View.List extends Efl.Object
4{
5 [[Elementary view list class]]
6 methods {
7 genlist_set {
8 [[Constructor wrapper
9
10 @since 1.11
11 ]]
12 params {
13 @in genlist: Efl.Canvas.Object; [[Genlist object]]
14 @in item_type: Elm.Genlist.Item.Type; [[Item type]]
15 @in item_style: string; [[The current item style name. $null would be default.]]
16 }
17 }
18 evas_object_get {
19 [[Return evas object
20
21 @since 1.11
22 ]]
23 params {
24 @out widget: Efl.Canvas.Object; [[Returned widget]]
25 }
26 }
27 property_connect {
28 [[Connect property
29
30 @since 1.11
31 ]]
32 params {
33 @in property: string; [[Property name]]
34 @in part: string; [[Edje's theme part]]
35 }
36 }
37 @property model {
38 set {
39 [[Set model
40
41 @since 1.11
42 ]]
43 }
44 get {
45 [[Get model
46
47 @since 1.11
48 ]]
49 }
50 values {
51 model: Efl.Model; [[Efl.Model to set]]
52 }
53 }
54 }
55 /* For some reason the following comment after the event doesn't work: Event dispatch when a model is selected */
56 events {
57 model,selected: Efl.Object; [[Called when model was selected]]
58 }
59 implements {
60 Efl.Object.destructor;
61 }
62 constructors {
63 .genlist_set @optional;
64 }
65}
diff --git a/src/lib/elementary/elm_view_list.h b/src/lib/elementary/elm_view_list.h
index 7d9823e810..4ad048e106 100644
--- a/src/lib/elementary/elm_view_list.h
+++ b/src/lib/elementary/elm_view_list.h
@@ -4,7 +4,7 @@
4#define ELM_VIEW_LIST_H 4#define ELM_VIEW_LIST_H
5 5
6#include <Efl.h> 6#include <Efl.h>
7#include <elm_view_list.eo.h> 7#include <elm_view_list_eo.h>
8 8
9#endif 9#endif
10#endif // ELM_VIEW_LIST_H 10#endif // ELM_VIEW_LIST_H
diff --git a/src/lib/elementary/elm_view_list_eo.c b/src/lib/elementary/elm_view_list_eo.c
new file mode 100644
index 0000000000..3c9a8c208b
--- /dev/null
+++ b/src/lib/elementary/elm_view_list_eo.c
@@ -0,0 +1,62 @@
1EWAPI const Efl_Event_Description _ELM_VIEW_LIST_EVENT_MODEL_SELECTED =
2 EFL_EVENT_DESCRIPTION("model,selected");
3
4void _elm_view_list_genlist_set(Eo *obj, Elm_View_List_Data *pd, Efl_Canvas_Object *genlist, Elm_Genlist_Item_Type item_type, const char *item_style);
5
6EOAPI EFL_VOID_FUNC_BODYV(elm_view_list_genlist_set, EFL_FUNC_CALL(genlist, item_type, item_style), Efl_Canvas_Object *genlist, Elm_Genlist_Item_Type item_type, const char *item_style);
7
8void _elm_view_list_evas_object_get(Eo *obj, Elm_View_List_Data *pd, Efl_Canvas_Object **widget);
9
10EOAPI EFL_VOID_FUNC_BODYV(elm_view_list_evas_object_get, EFL_FUNC_CALL(widget), Efl_Canvas_Object **widget);
11
12void _elm_view_list_property_connect(Eo *obj, Elm_View_List_Data *pd, const char *property, const char *part);
13
14EOAPI EFL_VOID_FUNC_BODYV(elm_view_list_property_connect, EFL_FUNC_CALL(property, part), const char *property, const char *part);
15
16void _elm_view_list_model_set(Eo *obj, Elm_View_List_Data *pd, Efl_Model *model);
17
18EOAPI EFL_VOID_FUNC_BODYV(elm_view_list_model_set, EFL_FUNC_CALL(model), Efl_Model *model);
19
20Efl_Model *_elm_view_list_model_get(const Eo *obj, Elm_View_List_Data *pd);
21
22EOAPI EFL_FUNC_BODY_CONST(elm_view_list_model_get, Efl_Model *, NULL);
23
24void _elm_view_list_efl_object_destructor(Eo *obj, Elm_View_List_Data *pd);
25
26
27static Eina_Bool
28_elm_view_list_class_initializer(Efl_Class *klass)
29{
30 const Efl_Object_Ops *opsp = NULL;
31
32 const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
33
34#ifndef ELM_VIEW_LIST_EXTRA_OPS
35#define ELM_VIEW_LIST_EXTRA_OPS
36#endif
37
38 EFL_OPS_DEFINE(ops,
39 EFL_OBJECT_OP_FUNC(elm_view_list_genlist_set, _elm_view_list_genlist_set),
40 EFL_OBJECT_OP_FUNC(elm_view_list_evas_object_get, _elm_view_list_evas_object_get),
41 EFL_OBJECT_OP_FUNC(elm_view_list_property_connect, _elm_view_list_property_connect),
42 EFL_OBJECT_OP_FUNC(elm_view_list_model_set, _elm_view_list_model_set),
43 EFL_OBJECT_OP_FUNC(elm_view_list_model_get, _elm_view_list_model_get),
44 EFL_OBJECT_OP_FUNC(efl_destructor, _elm_view_list_efl_object_destructor),
45 ELM_VIEW_LIST_EXTRA_OPS
46 );
47 opsp = &ops;
48
49 return efl_class_functions_set(klass, opsp, ropsp);
50}
51
52static const Efl_Class_Description _elm_view_list_class_desc = {
53 EO_VERSION,
54 "Elm.View.List",
55 EFL_CLASS_TYPE_REGULAR,
56 sizeof(Elm_View_List_Data),
57 _elm_view_list_class_initializer,
58 NULL,
59 NULL
60};
61
62EFL_DEFINE_CLASS(elm_view_list_class_get, &_elm_view_list_class_desc, EFL_OBJECT_CLASS, NULL);
diff --git a/src/lib/elementary/elm_view_list_eo.h b/src/lib/elementary/elm_view_list_eo.h
new file mode 100644
index 0000000000..f35c275c3b
--- /dev/null
+++ b/src/lib/elementary/elm_view_list_eo.h
@@ -0,0 +1,97 @@
1#ifndef _ELM_VIEW_LIST_EO_H_
2#define _ELM_VIEW_LIST_EO_H_
3
4#ifndef _ELM_VIEW_LIST_EO_CLASS_TYPE
5#define _ELM_VIEW_LIST_EO_CLASS_TYPE
6
7typedef Eo Elm_View_List;
8
9#endif
10
11#ifndef _ELM_VIEW_LIST_EO_TYPES
12#define _ELM_VIEW_LIST_EO_TYPES
13
14
15#endif
16/** Elementary view list class
17 *
18 * @ingroup Elm_View_List
19 */
20#define ELM_VIEW_LIST_CLASS elm_view_list_class_get()
21
22EWAPI const Efl_Class *elm_view_list_class_get(void);
23
24/**
25 * @brief Constructor wrapper
26 *
27 * @param[in] obj The object.
28 * @param[in] genlist Genlist object
29 * @param[in] item_type Item type
30 * @param[in] item_style The current item style name. @c null would be default.
31 *
32 * @since 1.11
33 *
34 * @ingroup Elm_View_List
35 */
36EOAPI void elm_view_list_genlist_set(Eo *obj, Efl_Canvas_Object *genlist, Elm_Genlist_Item_Type item_type, const char *item_style);
37
38/**
39 * @brief Return evas object
40 *
41 * @param[in] obj The object.
42 * @param[out] widget Returned widget
43 *
44 * @since 1.11
45 *
46 * @ingroup Elm_View_List
47 */
48EOAPI void elm_view_list_evas_object_get(Eo *obj, Efl_Canvas_Object **widget);
49
50/**
51 * @brief Connect property
52 *
53 * @param[in] obj The object.
54 * @param[in] property Property name
55 * @param[in] part Edje's theme part
56 *
57 * @since 1.11
58 *
59 * @ingroup Elm_View_List
60 */
61EOAPI void elm_view_list_property_connect(Eo *obj, const char *property, const char *part);
62
63/**
64 * @brief Set model
65 *
66 * @param[in] obj The object.
67 * @param[in] model Efl.Model to set
68 *
69 * @since 1.11
70 *
71 * @ingroup Elm_View_List
72 */
73EOAPI void elm_view_list_model_set(Eo *obj, Efl_Model *model);
74
75/**
76 * @brief Get model
77 *
78 * @param[in] obj The object.
79 *
80 * @return Efl.Model to set
81 *
82 * @since 1.11
83 *
84 * @ingroup Elm_View_List
85 */
86EOAPI Efl_Model *elm_view_list_model_get(const Eo *obj);
87
88EWAPI extern const Efl_Event_Description _ELM_VIEW_LIST_EVENT_MODEL_SELECTED;
89
90/** Called when model was selected
91 * @return Efl_Object *
92 *
93 * @ingroup Elm_View_List
94 */
95#define ELM_VIEW_LIST_EVENT_MODEL_SELECTED (&(_ELM_VIEW_LIST_EVENT_MODEL_SELECTED))
96
97#endif
diff --git a/src/lib/elementary/elm_view_list_eo.legacy.h b/src/lib/elementary/elm_view_list_eo.legacy.h
new file mode 100644
index 0000000000..d218aa2e3a
--- /dev/null
+++ b/src/lib/elementary/elm_view_list_eo.legacy.h
@@ -0,0 +1,22 @@
1#ifndef _ELM_VIEW_LIST_EO_LEGACY_H_
2#define _ELM_VIEW_LIST_EO_LEGACY_H_
3
4#ifndef _ELM_VIEW_LIST_EO_CLASS_TYPE
5#define _ELM_VIEW_LIST_EO_CLASS_TYPE
6
7typedef Eo Elm_View_List;
8
9#endif
10
11#ifndef _ELM_VIEW_LIST_EO_TYPES
12#define _ELM_VIEW_LIST_EO_TYPES
13
14
15#endif
16
17
18
19
20
21
22#endif
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 04f682ef1a..ebd8a6cd71 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -176,8 +176,6 @@ pub_eo_files = [
176 'elm_atspi_bridge.eo', 176 'elm_atspi_bridge.eo',
177 'elm_atspi_app_object.eo', 177 'elm_atspi_app_object.eo',
178 'efl_ui_image_zoomable_pan.eo', 178 'efl_ui_image_zoomable_pan.eo',
179 'elm_view_list.eo',
180 'elm_view_form.eo',
181 'elm_web.eo', 179 'elm_web.eo',
182 'elm_widget_item.eo', 180 'elm_widget_item.eo',
183 'efl_ui_text_part.eo', 181 'efl_ui_text_part.eo',
@@ -804,6 +802,10 @@ elementary_pub_headers = [
804 'elm_toolbar_eo.legacy.h', 802 'elm_toolbar_eo.legacy.h',
805 'elm_toolbar_item_eo.h', 803 'elm_toolbar_item_eo.h',
806 'elm_toolbar_item_eo.legacy.h', 804 'elm_toolbar_item_eo.legacy.h',
805 'elm_view_form_eo.h',
806 'elm_view_form_eo.legacy.h',
807 'elm_view_list_eo.h',
808 'elm_view_list_eo.legacy.h',
807] 809]
808 810
809elementary_header_src = [ 811elementary_header_src = [