On Mon, Mar 12, 2012 at 04:45:40PM +0100, Martin Jansa wrote: > On Mon, Mar 12, 2012 at 01:49:40PM +0100, Martin Jansa wrote: > > On Sat, Mar 10, 2012 at 06:54:55PM +0100, Davide Andreoli wrote: > > > Il giorno 08 marzo 2012 12:49, Martin Jansa <martin.ja...@gmail.com> ha > > > scritto: > > > > > > > Hi, > > > > > > > > is someone already working on this issue or should I try to prepare > > > > patch > > > > for this? > > > > > > > > > > yes, please patch! I have no time until 2 weeks for working on this > > > davemds > > > > build tested with r69248 > > > > a lot of APIs should be renamed in bindings, but at least it compiles > > again! > > There will be more patches for runtime issues tomorrow.. > > I have some already e.g. for > ImportError: > /usr/lib/python2.7/site-packages/elementary/c_elementary.so: undefined > symbol: elm_engine_get
with this patchset it now works also in runtime Cheers, -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
From afd125f1d886e49fc279091913e4ae7e497af9fa Mon Sep 17 00:00:00 2001 From: Martin Jansa <martin.ja...@gmail.com> Date: Mon, 12 Mar 2012 16:32:48 +0100 Subject: [PATCH 1/6] python-elementary: fix elm_engine_get/elm_preferred_engine_get usage Signed-off-by: Martin Jansa <martin.ja...@gmail.com> --- .../elementary/elementary.c_elementary.pyx | 8 ++++---- .../include/elementary/c_elementary.pxd | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/BINDINGS/python/python-elementary/elementary/elementary.c_elementary.pyx b/BINDINGS/python/python-elementary/elementary/elementary.c_elementary.pyx index 22e76a6..80968bf 100644 --- a/BINDINGS/python/python-elementary/elementary/elementary.c_elementary.pyx +++ b/BINDINGS/python/python-elementary/elementary/elementary.c_elementary.pyx @@ -161,19 +161,19 @@ def focus_highlight_animate_set(animate): def preferred_engine_get(): cdef const_char_ptr l - l = elm_preferred_engine_get() + l = elm_config_preferred_engine_get() return l if l != NULL else None def preferred_engine_set(engine): - elm_preferred_engine_set(engine) + elm_config_preferred_engine_set(engine) def engine_get(): cdef const_char_ptr l - l = elm_engine_get() + l = elm_config_engine_get() return l if l != NULL else None def engine_set(engine): - elm_engine_set(engine) + elm_config_engine_set(engine) cdef object _elm_widget_type_mapping diff --git a/BINDINGS/python/python-elementary/include/elementary/c_elementary.pxd b/BINDINGS/python/python-elementary/include/elementary/c_elementary.pxd index 9f31bd3..6187120 100644 --- a/BINDINGS/python/python-elementary/include/elementary/c_elementary.pxd +++ b/BINDINGS/python/python-elementary/include/elementary/c_elementary.pxd @@ -210,10 +210,10 @@ cdef extern from "Elementary.h": void elm_exit() # Engine related - char *elm_engine_get() - void elm_engine_set(char *engine) - char *elm_preferred_engine_get() - void elm_preferred_engine_set(char *engine) + char *elm_config_engine_get() + void elm_config_engine_set(const_char_ptr engine) + char *elm_config_preferred_engine_get() + void elm_config_preferred_engine_set(const_char_ptr engine) # Quicklaunch void elm_quicklaunch_init(int argc, char **argv) -- 1.7.8.5
From e0f0d99479535f38c8de5976879cb3c5cdd0e0b3 Mon Sep 17 00:00:00 2001 From: Martin Jansa <martin.ja...@gmail.com> Date: Mon, 12 Mar 2012 19:07:56 +0100 Subject: [PATCH 2/6] python-elementary: fix elm_focus_highlight* usage Signed-off-by: Martin Jansa <martin.ja...@gmail.com> --- .../elementary/elementary.c_elementary.pyx | 8 ++++---- .../include/elementary/c_elementary.pxd | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/BINDINGS/python/python-elementary/elementary/elementary.c_elementary.pyx b/BINDINGS/python/python-elementary/elementary/elementary.c_elementary.pyx index 80968bf..0a74911 100644 --- a/BINDINGS/python/python-elementary/elementary/elementary.c_elementary.pyx +++ b/BINDINGS/python/python-elementary/elementary/elementary.c_elementary.pyx @@ -148,16 +148,16 @@ def theme_extension_add(item): elm_theme_extension_add(NULL, item) def focus_highlight_enabled_get(): - return elm_focus_highlight_enabled_get() + return elm_config_focus_highlight_enabled_get() def focus_highlight_enabled_set(enabled): - elm_focus_highlight_enabled_set(enabled) + elm_config_focus_highlight_enabled_set(enabled) def focus_highlight_animate_get(): - return elm_focus_highlight_animate_get() + return elm_config_focus_highlight_animate_get() def focus_highlight_animate_set(animate): - elm_focus_highlight_animate_set(animate) + elm_config_focus_highlight_animate_set(animate) def preferred_engine_get(): cdef const_char_ptr l diff --git a/BINDINGS/python/python-elementary/include/elementary/c_elementary.pxd b/BINDINGS/python/python-elementary/include/elementary/c_elementary.pxd index 6187120..8528254 100644 --- a/BINDINGS/python/python-elementary/include/elementary/c_elementary.pxd +++ b/BINDINGS/python/python-elementary/include/elementary/c_elementary.pxd @@ -311,10 +311,10 @@ cdef extern from "Elementary.h": evas.c_evas.Eina_Bool elm_object_focus_get(evas.c_evas.Evas_Object *obj) void elm_object_focus_allow_set(evas.c_evas.Evas_Object *obj, evas.c_evas.Eina_Bool enable) evas.c_evas.Eina_Bool elm_object_focus_allow_get(evas.c_evas.Evas_Object *obj) - evas.c_evas.Eina_Bool elm_focus_highlight_enabled_get() - void elm_focus_highlight_enabled_set(evas.c_evas.Eina_Bool enable) - evas.c_evas.Eina_Bool elm_focus_highlight_animate_get() - void elm_focus_highlight_animate_set(evas.c_evas.Eina_Bool animate) + evas.c_evas.Eina_Bool elm_config_focus_highlight_enabled_get() + void elm_config_focus_highlight_enabled_set(evas.c_evas.Eina_Bool enable) + evas.c_evas.Eina_Bool elm_config_focus_highlight_animate_get() + void elm_config_focus_highlight_animate_set(evas.c_evas.Eina_Bool animate) void elm_object_event_callback_add(evas.c_evas.Evas_Object *obj, Elm_Event_Cb func, const_void *data) void *elm_object_event_callback_del(evas.c_evas.Evas_Object *obj, Elm_Event_Cb func, const_void *data) -- 1.7.8.5
From cbb0f6db35ed86f9dd8b729ecc9cb01a5ed4ae32 Mon Sep 17 00:00:00 2001 From: Martin Jansa <martin.ja...@gmail.com> Date: Mon, 12 Mar 2012 20:45:38 +0100 Subject: [PATCH 3/6] python-elementary: fix elm_cursor_engine_only* usage Signed-off-by: Martin Jansa <martin.ja...@gmail.com> --- .../elementary/elementary.c_elementary.pyx | 4 ++-- .../include/elementary/c_elementary.pxd | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BINDINGS/python/python-elementary/elementary/elementary.c_elementary.pyx b/BINDINGS/python/python-elementary/elementary/elementary.c_elementary.pyx index 0a74911..0403c82 100644 --- a/BINDINGS/python/python-elementary/elementary/elementary.c_elementary.pyx +++ b/BINDINGS/python/python-elementary/elementary/elementary.c_elementary.pyx @@ -129,10 +129,10 @@ def config_tooltip_delay_set(delay): def cursor_engine_only_get(): - return elm_cursor_engine_only_get() + return elm_config_cursor_engine_only_get() def cursor_engine_only_set(engine_only): - elm_cursor_engine_only_set(engine_only) + elm_config_cursor_engine_only_set(engine_only) def coords_finger_size_adjust(times_w, w, times_h, h): cdef c_evas.Evas_Coord width diff --git a/BINDINGS/python/python-elementary/include/elementary/c_elementary.pxd b/BINDINGS/python/python-elementary/include/elementary/c_elementary.pxd index 8528254..572bcb9 100644 --- a/BINDINGS/python/python-elementary/include/elementary/c_elementary.pxd +++ b/BINDINGS/python/python-elementary/include/elementary/c_elementary.pxd @@ -252,8 +252,8 @@ cdef extern from "Elementary.h": double elm_config_tooltip_delay_get() evas.c_evas.Eina_Bool elm_config_tooltip_delay_set(double delay) - evas.c_evas.Eina_Bool elm_cursor_engine_only_set(int engine_only) - int elm_cursor_engine_only_get() + evas.c_evas.Eina_Bool elm_config_cursor_engine_only_set(int engine_only) + int elm_config_cursor_engine_only_get() void elm_object_tooltip_show(evas.c_evas.Evas_Object *obj) void elm_object_tooltip_hide(evas.c_evas.Evas_Object *obj) void elm_object_tooltip_text_set(evas.c_evas.Evas_Object *obj, char *text) -- 1.7.8.5
From 988b133f58de746d3f24c97439567c3e8848128a Mon Sep 17 00:00:00 2001 From: Martin Jansa <martin.ja...@gmail.com> Date: Mon, 12 Mar 2012 21:04:08 +0100 Subject: [PATCH 4/6] python-elementary: fix elm_scale* usage Signed-off-by: Martin Jansa <martin.ja...@gmail.com> --- .../elementary/elementary.c_elementary.pyx | 4 ++-- .../include/elementary/c_elementary.pxd | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BINDINGS/python/python-elementary/elementary/elementary.c_elementary.pyx b/BINDINGS/python/python-elementary/elementary/elementary.c_elementary.pyx index 0403c82..a6a5060 100644 --- a/BINDINGS/python/python-elementary/elementary/elementary.c_elementary.pyx +++ b/BINDINGS/python/python-elementary/elementary/elementary.c_elementary.pyx @@ -102,10 +102,10 @@ def policy_get(policy): return elm_policy_get(policy) def scale_get(): - return elm_scale_get() + return elm_config_scale_get() def scale_set(scale): - elm_scale_set(scale) + elm_config_scale_set(scale) def finger_size_get(): return elm_finger_size_get() diff --git a/BINDINGS/python/python-elementary/include/elementary/c_elementary.pxd b/BINDINGS/python/python-elementary/include/elementary/c_elementary.pxd index 572bcb9..758b7b8 100644 --- a/BINDINGS/python/python-elementary/include/elementary/c_elementary.pxd +++ b/BINDINGS/python/python-elementary/include/elementary/c_elementary.pxd @@ -301,8 +301,8 @@ cdef extern from "Elementary.h": evas.c_evas.Evas_Object* elm_object_item_part_content_get(Elm_Object_Item *it, const_char_ptr part) evas.c_evas.Evas_Object* elm_object_item_part_content_unset(Elm_Object_Item *it, const_char_ptr part) - double elm_scale_get() - void elm_scale_set(double scale) + double elm_config_scale_get() + void elm_config_scale_set(double scale) evas.c_evas.Evas_Coord elm_finger_size_get() void elm_finger_size_set(evas.c_evas.Evas_Coord size) -- 1.7.8.5
From 175c5f45120beef7d2d4e57dac586b4e01eded60 Mon Sep 17 00:00:00 2001 From: Martin Jansa <martin.ja...@gmail.com> Date: Mon, 12 Mar 2012 21:25:01 +0100 Subject: [PATCH 5/6] python-elementary: fix elm_genlist_compress_mode_set usage Signed-off-by: Martin Jansa <martin.ja...@gmail.com> --- .../elementary/elementary.c_elementary_genlist.pxi | 4 ++-- .../include/elementary/c_elementary.pxd | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_genlist.pxi b/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_genlist.pxi index 8906a31..6b1232c 100644 --- a/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_genlist.pxi +++ b/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_genlist.pxi @@ -619,8 +619,8 @@ cdef class Genlist(Object): def no_select_mode_set(self, no_select): elm_genlist_no_select_mode_set(self.obj, bool(no_select)) - def compress_mode_set(self, compress): - elm_genlist_compress_mode_set(self.obj, bool(compress)) + def mode_set(self, mode = ELM_LIST_COMPRESS): + elm_genlist_mode_set(self.obj, mode) def bounce_set(self, h_bounce, v_bounce): elm_genlist_bounce_set(self.obj, bool(h_bounce), bool(v_bounce)) diff --git a/BINDINGS/python/python-elementary/include/elementary/c_elementary.pxd b/BINDINGS/python/python-elementary/include/elementary/c_elementary.pxd index 758b7b8..dd82c88 100644 --- a/BINDINGS/python/python-elementary/include/elementary/c_elementary.pxd +++ b/BINDINGS/python/python-elementary/include/elementary/c_elementary.pxd @@ -666,7 +666,6 @@ cdef extern from "Elementary.h": void elm_genlist_multi_select_set(evas.c_evas.Evas_Object *obj, evas.c_evas.Eina_Bool multi) void elm_genlist_always_select_mode_set(evas.c_evas.Evas_Object *obj, evas.c_evas.Eina_Bool always_select) void elm_genlist_no_select_mode_set(evas.c_evas.Evas_Object *obj, evas.c_evas.Eina_Bool no_select) - void elm_genlist_compress_mode_set(evas.c_evas.Evas_Object *obj, evas.c_evas.Eina_Bool compress) void elm_genlist_bounce_set(evas.c_evas.Evas_Object *obj, evas.c_evas.Eina_Bool h_bounce, evas.c_evas.Eina_Bool v_bounce) void elm_genlist_homogeneous_set(evas.c_evas.Evas_Object *obj, evas.c_evas.Eina_Bool homogeneous) void elm_genlist_block_count_set(evas.c_evas.Evas_Object *obj, int n) -- 1.7.8.5
From edc898fa196b866b4df600130e1bfff13325080e Mon Sep 17 00:00:00 2001 From: Martin Jansa <martin.ja...@gmail.com> Date: Mon, 12 Mar 2012 21:42:13 +0100 Subject: [PATCH 6/6] python-elementary: fix elm_finger_size* usage Signed-off-by: Martin Jansa <martin.ja...@gmail.com> --- .../python-elementary/elementary/__init__.py | 2 +- .../elementary/elementary.c_elementary.pyx | 8 ++++---- .../include/elementary/c_elementary.pxd | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/BINDINGS/python/python-elementary/elementary/__init__.py b/BINDINGS/python/python-elementary/elementary/__init__.py index fde1ea5..3e6c541 100644 --- a/BINDINGS/python/python-elementary/elementary/__init__.py +++ b/BINDINGS/python/python-elementary/elementary/__init__.py @@ -25,7 +25,7 @@ from c_elementary import Object, Window, Background, Icon, \ Genlist, GenlistItem, GenlistItemClass, WidgetItem, ScrolledEntry, \ Gengrid, GengridItem, GengridItemClass, \ init, shutdown, run, exit, scale_get, scale_set, \ - finger_size_get, finger_size_set, coords_finger_size_adjust, \ + config_finger_size_get, config_finger_size_set, coords_finger_size_adjust, \ theme_overlay_add, theme_extension_add, policy_set, policy_get, \ tooltip_delay_set, tooltip_delay_get, cursor_engine_only_set, \ cursor_engine_only_get, focus_highlight_enabled_get, \ diff --git a/BINDINGS/python/python-elementary/elementary/elementary.c_elementary.pyx b/BINDINGS/python/python-elementary/elementary/elementary.c_elementary.pyx index a6a5060..7d4aebb 100644 --- a/BINDINGS/python/python-elementary/elementary/elementary.c_elementary.pyx +++ b/BINDINGS/python/python-elementary/elementary/elementary.c_elementary.pyx @@ -107,11 +107,11 @@ def scale_get(): def scale_set(scale): elm_config_scale_set(scale) -def finger_size_get(): - return elm_finger_size_get() +def config_finger_size_get(): + return elm_config_finger_size_get() -def finger_size_set(size): - elm_finger_size_set(size) +def config_finger_size_set(size): + elm_config_finger_size_set(size) def tooltip_delay_get(): _METHOD_DEPRECATED(None, "config_tooltip_delay_get") diff --git a/BINDINGS/python/python-elementary/include/elementary/c_elementary.pxd b/BINDINGS/python/python-elementary/include/elementary/c_elementary.pxd index dd82c88..7d59fd1 100644 --- a/BINDINGS/python/python-elementary/include/elementary/c_elementary.pxd +++ b/BINDINGS/python/python-elementary/include/elementary/c_elementary.pxd @@ -303,8 +303,8 @@ cdef extern from "Elementary.h": double elm_config_scale_get() void elm_config_scale_set(double scale) - evas.c_evas.Evas_Coord elm_finger_size_get() - void elm_finger_size_set(evas.c_evas.Evas_Coord size) + evas.c_evas.Evas_Coord elm_config_finger_size_get() + void elm_config_finger_size_set(evas.c_evas.Evas_Coord size) # Focus handling void elm_object_focus_set(evas.c_evas.Evas_Object *obj, evas.c_evas.Eina_Bool x) -- 1.7.8.5
signature.asc
Description: Digital signature
------------------------------------------------------------------------------ Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2
_______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel