summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile_Elementary.am10
-rw-r--r--src/lib/elementary/elm_dbus_menu.c2
-rw-r--r--src/lib/elementary/elm_icon.c4
-rw-r--r--src/lib/elementary/elm_icon.eo19
-rw-r--r--src/lib/elementary/elm_icon_eo.c47
-rw-r--r--src/lib/elementary/elm_icon_eo.h40
-rw-r--r--src/lib/elementary/elm_icon_eo.legacy.h17
-rw-r--r--src/lib/elementary/elm_icon_legacy.h2
-rw-r--r--src/lib/elementary/elm_photo.c2
-rw-r--r--src/lib/elementary/elm_theme.c2
-rw-r--r--src/lib/elementary/meson.build3
11 files changed, 119 insertions, 29 deletions
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 473cde1..76715ad 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -226,7 +226,6 @@ elm_legacy_eolian_files = \
226 lib/elementary/elm_actionslider_part.eo \ 226 lib/elementary/elm_actionslider_part.eo \
227 lib/elementary/elm_bubble_part.eo \ 227 lib/elementary/elm_bubble_part.eo \
228 lib/elementary/elm_fileselector_part.eo \ 228 lib/elementary/elm_fileselector_part.eo \
229 lib/elementary/elm_icon.eo \
230 lib/elementary/elm_inwin.eo \ 229 lib/elementary/elm_inwin.eo \
231 lib/elementary/elm_mapbuf.eo \ 230 lib/elementary/elm_mapbuf.eo \
232 lib/elementary/elm_naviframe.eo \ 231 lib/elementary/elm_naviframe.eo \
@@ -359,7 +358,9 @@ lib/elementary/elm_hover_eo.legacy.c \
359lib/elementary/elm_hover_eo.c \ 358lib/elementary/elm_hover_eo.c \
360lib/elementary/elm_hoversel_eo.c \ 359lib/elementary/elm_hoversel_eo.c \
361lib/elementary/elm_hoversel_item_eo.c \ 360lib/elementary/elm_hoversel_item_eo.c \
362lib/elementary/elm_hoversel_item_eo.legacy.c 361lib/elementary/elm_hoversel_item_eo.legacy.c \
362lib/elementary/elm_icon_eo.c \
363$(NULL)
363 364
364elm_legacy_eo_headers = \ 365elm_legacy_eo_headers = \
365lib/elementary/efl_ui_bg_eo.legacy.h \ 366lib/elementary/efl_ui_bg_eo.legacy.h \
@@ -477,7 +478,10 @@ lib/elementary/elm_hover_eo.legacy.h \
477lib/elementary/elm_hoversel_eo.h \ 478lib/elementary/elm_hoversel_eo.h \
478lib/elementary/elm_hoversel_eo.legacy.h \ 479lib/elementary/elm_hoversel_eo.legacy.h \
479lib/elementary/elm_hoversel_item_eo.h \ 480lib/elementary/elm_hoversel_item_eo.h \
480lib/elementary/elm_hoversel_item_eo.legacy.h 481lib/elementary/elm_hoversel_item_eo.legacy.h \
482lib/elementary/elm_icon_eo.h \
483lib/elementary/elm_icon_eo.legacy.h \
484$(NULL)
481 485
482 486
483EXTRA_DIST2 += ${elementaryeolianfiles_DATA} $(elm_legacy_eolian_files) $(elm_private_eolian_files) $(elm_legacy_eo_files) 487EXTRA_DIST2 += ${elementaryeolianfiles_DATA} $(elm_legacy_eolian_files) $(elm_private_eolian_files) $(elm_legacy_eo_files)
diff --git a/src/lib/elementary/elm_dbus_menu.c b/src/lib/elementary/elm_dbus_menu.c
index 73b8a7b..7d1d950 100644
--- a/src/lib/elementary/elm_dbus_menu.c
+++ b/src/lib/elementary/elm_dbus_menu.c
@@ -5,7 +5,7 @@
5#include <Elementary.h> 5#include <Elementary.h>
6#include <stdint.h> 6#include <stdint.h>
7#include "elm_priv.h" 7#include "elm_priv.h"
8#include "elm_icon.eo.h" 8#include "elm_icon_eo.h"
9#include "elm_widget_menu.h" 9#include "elm_widget_menu.h"
10#include "elm_widget_icon.h" 10#include "elm_widget_icon.h"
11 11
diff --git a/src/lib/elementary/elm_icon.c b/src/lib/elementary/elm_icon.c
index e7bed43..819f549 100644
--- a/src/lib/elementary/elm_icon.c
+++ b/src/lib/elementary/elm_icon.c
@@ -9,7 +9,7 @@
9#include "elm_priv.h" 9#include "elm_priv.h"
10#include "elm_widget_icon.h" 10#include "elm_widget_icon.h"
11#include "efl_ui_widget_image.h" 11#include "efl_ui_widget_image.h"
12#include "elm_icon.eo.h" 12#include "elm_icon_eo.h"
13 13
14#define NON_EXISTING (void *)-1 14#define NON_EXISTING (void *)-1
15 15
@@ -923,4 +923,4 @@ elm_icon_order_lookup_get(const Evas_Object *obj EINA_UNUSED)
923#define ELM_ICON_EXTRA_OPS \ 923#define ELM_ICON_EXTRA_OPS \
924 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_icon) 924 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_icon)
925 925
926#include "elm_icon.eo.c" 926#include "elm_icon_eo.c"
diff --git a/src/lib/elementary/elm_icon.eo b/src/lib/elementary/elm_icon.eo
deleted file mode 100644
index a933381..0000000
--- a/src/lib/elementary/elm_icon.eo
+++ /dev/null
@@ -1,19 +0,0 @@
1class Elm.Icon extends Efl.Ui.Image implements Efl.Ui.Legacy
2{
3 [[Elementary Icon Class]]
4 legacy_prefix: elm_icon;
5 eo_prefix: elm_obj_icon;
6 event_prefix: elm_icon;
7 methods {
8 }
9 implements {
10 class.constructor;
11 Efl.Object.constructor;
12 Efl.Ui.Widget.theme_apply;
13 Efl.File.load;
14 }
15 events {
16 thumb,done: void; [[Called when thumb nailing is successfully done]]
17 thumb,error: void; [[Called when thumb nailing failed]]
18 }
19}
diff --git a/src/lib/elementary/elm_icon_eo.c b/src/lib/elementary/elm_icon_eo.c
new file mode 100644
index 0000000..ce76bed
--- /dev/null
+++ b/src/lib/elementary/elm_icon_eo.c
@@ -0,0 +1,47 @@
1EWAPI const Efl_Event_Description _ELM_ICON_EVENT_THUMB_DONE =
2 EFL_EVENT_DESCRIPTION("thumb,done");
3EWAPI const Efl_Event_Description _ELM_ICON_EVENT_THUMB_ERROR =
4 EFL_EVENT_DESCRIPTION("thumb,error");
5
6Efl_Object *_elm_icon_efl_object_constructor(Eo *obj, Elm_Icon_Data *pd);
7
8
9Eina_Error _elm_icon_efl_ui_widget_theme_apply(Eo *obj, Elm_Icon_Data *pd);
10
11
12Eina_Error _elm_icon_efl_file_load(Eo *obj, Elm_Icon_Data *pd);
13
14
15static Eina_Bool
16_elm_icon_class_initializer(Efl_Class *klass)
17{
18 const Efl_Object_Ops *opsp = NULL;
19
20 const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
21
22#ifndef ELM_ICON_EXTRA_OPS
23#define ELM_ICON_EXTRA_OPS
24#endif
25
26 EFL_OPS_DEFINE(ops,
27 EFL_OBJECT_OP_FUNC(efl_constructor, _elm_icon_efl_object_constructor),
28 EFL_OBJECT_OP_FUNC(efl_ui_widget_theme_apply, _elm_icon_efl_ui_widget_theme_apply),
29 EFL_OBJECT_OP_FUNC(efl_file_load, _elm_icon_efl_file_load),
30 ELM_ICON_EXTRA_OPS
31 );
32 opsp = &ops;
33
34 return efl_class_functions_set(klass, opsp, ropsp);
35}
36
37static const Efl_Class_Description _elm_icon_class_desc = {
38 EO_VERSION,
39 "Elm.Icon",
40 EFL_CLASS_TYPE_REGULAR,
41 sizeof(Elm_Icon_Data),
42 _elm_icon_class_initializer,
43 _elm_icon_class_constructor,
44 NULL
45};
46
47EFL_DEFINE_CLASS(elm_icon_class_get, &_elm_icon_class_desc, EFL_UI_IMAGE_CLASS, EFL_UI_LEGACY_INTERFACE, NULL);
diff --git a/src/lib/elementary/elm_icon_eo.h b/src/lib/elementary/elm_icon_eo.h
new file mode 100644
index 0000000..b53fed2
--- /dev/null
+++ b/src/lib/elementary/elm_icon_eo.h
@@ -0,0 +1,40 @@
1#ifndef _ELM_ICON_EO_H_
2#define _ELM_ICON_EO_H_
3
4#ifndef _ELM_ICON_EO_CLASS_TYPE
5#define _ELM_ICON_EO_CLASS_TYPE
6
7typedef Eo Elm_Icon;
8
9#endif
10
11#ifndef _ELM_ICON_EO_TYPES
12#define _ELM_ICON_EO_TYPES
13
14
15#endif
16/** Elementary Icon Class
17 *
18 * @ingroup Elm_Icon
19 */
20#define ELM_ICON_CLASS elm_icon_class_get()
21
22EWAPI const Efl_Class *elm_icon_class_get(void);
23
24EWAPI extern const Efl_Event_Description _ELM_ICON_EVENT_THUMB_DONE;
25
26/** Called when thumb nailing is successfully done
27 *
28 * @ingroup Elm_Icon
29 */
30#define ELM_ICON_EVENT_THUMB_DONE (&(_ELM_ICON_EVENT_THUMB_DONE))
31
32EWAPI extern const Efl_Event_Description _ELM_ICON_EVENT_THUMB_ERROR;
33
34/** Called when thumb nailing failed
35 *
36 * @ingroup Elm_Icon
37 */
38#define ELM_ICON_EVENT_THUMB_ERROR (&(_ELM_ICON_EVENT_THUMB_ERROR))
39
40#endif
diff --git a/src/lib/elementary/elm_icon_eo.legacy.h b/src/lib/elementary/elm_icon_eo.legacy.h
new file mode 100644
index 0000000..0639c78
--- /dev/null
+++ b/src/lib/elementary/elm_icon_eo.legacy.h
@@ -0,0 +1,17 @@
1#ifndef _ELM_ICON_EO_LEGACY_H_
2#define _ELM_ICON_EO_LEGACY_H_
3
4#ifndef _ELM_ICON_EO_CLASS_TYPE
5#define _ELM_ICON_EO_CLASS_TYPE
6
7typedef Eo Elm_Icon;
8
9#endif
10
11#ifndef _ELM_ICON_EO_TYPES
12#define _ELM_ICON_EO_TYPES
13
14
15#endif
16
17#endif
diff --git a/src/lib/elementary/elm_icon_legacy.h b/src/lib/elementary/elm_icon_legacy.h
index fa19077..4adda26 100644
--- a/src/lib/elementary/elm_icon_legacy.h
+++ b/src/lib/elementary/elm_icon_legacy.h
@@ -103,4 +103,4 @@ EAPI Eina_Bool elm_icon_standard_set(Evas_Object *obj, const char *name);
103 */ 103 */
104EAPI const char *elm_icon_standard_get(const Evas_Object *obj); 104EAPI const char *elm_icon_standard_get(const Evas_Object *obj);
105 105
106#include "elm_icon.eo.legacy.h" 106#include "elm_icon_eo.legacy.h"
diff --git a/src/lib/elementary/elm_photo.c b/src/lib/elementary/elm_photo.c
index 6ec12a5..2f9dc66 100644
--- a/src/lib/elementary/elm_photo.c
+++ b/src/lib/elementary/elm_photo.c
@@ -9,7 +9,7 @@
9#include "elm_priv.h" 9#include "elm_priv.h"
10#include "elm_widget_photo.h" 10#include "elm_widget_photo.h"
11#include "elm_photo.eo.h" 11#include "elm_photo.eo.h"
12#include "elm_icon.eo.h" 12#include "elm_icon_eo.h"
13 13
14#define MY_CLASS ELM_PHOTO_CLASS 14#define MY_CLASS ELM_PHOTO_CLASS
15 15
diff --git a/src/lib/elementary/elm_theme.c b/src/lib/elementary/elm_theme.c
index 3295f12..538b6fa 100644
--- a/src/lib/elementary/elm_theme.c
+++ b/src/lib/elementary/elm_theme.c
@@ -5,7 +5,7 @@
5#include <Elementary.h> 5#include <Elementary.h>
6 6
7#include "elm_priv.h" 7#include "elm_priv.h"
8#include "elm_icon.eo.h" 8#include "elm_icon_eo.h"
9 9
10#include "efl_ui_theme.eo.h" 10#include "efl_ui_theme.eo.h"
11 11
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index ab3bbcf..8075bad 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -40,7 +40,6 @@ pub_legacy_eo_files = [
40 'elm_actionslider_part.eo', 40 'elm_actionslider_part.eo',
41 'elm_bubble_part.eo', 41 'elm_bubble_part.eo',
42 'elm_fileselector_part.eo', 42 'elm_fileselector_part.eo',
43 'elm_icon.eo',
44 'elm_inwin.eo', 43 'elm_inwin.eo',
45 'elm_mapbuf.eo', 44 'elm_mapbuf.eo',
46 'elm_naviframe.eo', 45 'elm_naviframe.eo',
@@ -760,6 +759,8 @@ elementary_pub_headers = [
760 'elm_hoversel_eo.legacy.h', 759 'elm_hoversel_eo.legacy.h',
761 'elm_hoversel_item_eo.h', 760 'elm_hoversel_item_eo.h',
762 'elm_hoversel_item_eo.legacy.h', 761 'elm_hoversel_item_eo.legacy.h',
762 'elm_icon_eo.h',
763 'elm_icon_eo.legacy.h',
763] 764]
764 765
765elementary_header_src = [ 766elementary_header_src = [