davemds pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=9be98bb979917932cc2850a54f6e79281c871401
commit 9be98bb979917932cc2850a54f6e79281c871401 Author: Dave Andreoli <[email protected]> Date: Mon Jan 5 01:16:03 2015 +0100 And (finally) new style enums for elm --- efl/elementary/actionslider.pxd | 13 +- efl/elementary/actionslider.pyx | 8 +- efl/elementary/background.pxd | 13 +- efl/elementary/background.pyx | 7 - efl/elementary/box.pyx | 10 - efl/elementary/bubble.pxd | 12 +- efl/elementary/bubble.pyx | 6 - efl/elementary/button.pxd | 2 +- efl/elementary/button.pyx | 1 + efl/elementary/calendar_elm.pxd | 48 ++- efl/elementary/calendar_elm.pyx | 23 -- efl/elementary/clock.pxd | 16 +- efl/elementary/clock.pyx | 10 - efl/elementary/cnp_callbacks.pxi | 3 +- efl/elementary/colorselector.pxd | 11 +- efl/elementary/colorselector.pyx | 5 - efl/elementary/configuration.pxd | 29 +- efl/elementary/configuration.pyx | 15 - efl/elementary/ctxpopup.pxd | 13 +- efl/elementary/ctxpopup.pyx | 7 - efl/elementary/datetime_elm.pxd | 14 +- efl/elementary/datetime_elm.pyx | 8 - efl/elementary/dayselector.pxd | 16 +- efl/elementary/dayselector.pyx | 10 - efl/elementary/entry.pxd | 115 ++++++- efl/elementary/entry.pyx | 76 +---- efl/elementary/enums.pxd | 654 --------------------------------------- efl/elementary/fileselector.pxd | 23 +- efl/elementary/fileselector.pyx | 14 - efl/elementary/flip.pxd | 36 ++- efl/elementary/flip.pyx | 24 -- efl/elementary/general.pxd | 66 +++- efl/elementary/general.pyx | 52 +--- efl/elementary/gengrid.pxd | 37 ++- efl/elementary/gengrid.pyx | 13 - efl/elementary/genlist.pxd | 67 +++- efl/elementary/genlist.pyx | 40 --- efl/elementary/genlist_item.pxi | 6 +- efl/elementary/gesture_layer.pxd | 28 +- efl/elementary/gesture_layer.pyx | 38 +-- efl/elementary/glview.pxd | 26 +- efl/elementary/glview.pyx | 13 - efl/elementary/hover.pxd | 11 +- efl/elementary/hover.pyx | 6 - efl/elementary/hoversel.pxd | 10 +- efl/elementary/hoversel.pyx | 5 - efl/elementary/icon.pxd | 19 +- efl/elementary/icon.pyx | 10 - efl/elementary/image.pxd | 17 +- efl/elementary/image.pyx | 17 +- efl/elementary/label.pxd | 18 +- efl/elementary/label.pyx | 50 ++- efl/elementary/list.pxd | 27 +- efl/elementary/list.pyx | 16 - efl/elementary/map.pxd | 50 ++- efl/elementary/map.pyx | 31 -- efl/elementary/notify.pxd | 16 + efl/elementary/notify.pyx | 12 - efl/elementary/object.pxd | 59 +++- efl/elementary/object.pyx | 37 --- efl/elementary/panel.pxd | 11 +- efl/elementary/panel.pyx | 6 - efl/elementary/photocam.pxd | 13 +- efl/elementary/photocam.pyx | 8 - efl/elementary/popup.pxd | 26 +- efl/elementary/popup.pyx | 18 -- efl/elementary/scroller.pxd | 27 +- efl/elementary/scroller.pyx | 13 - efl/elementary/store.pxd | 14 + efl/elementary/thumb.pxd | 47 ++- efl/elementary/thumb.pyx | 28 -- efl/elementary/toolbar.pxd | 40 ++- efl/elementary/toolbar.pyx | 28 +- efl/elementary/transit.pxd | 32 +- efl/elementary/transit.pyx | 19 +- efl/elementary/web.pxd | 20 +- efl/elementary/web.pyx | 12 - efl/elementary/window.pxd | 68 +++- efl/elementary/window.pyx | 50 --- 79 files changed, 1106 insertions(+), 1413 deletions(-) diff --git a/efl/elementary/actionslider.pxd b/efl/elementary/actionslider.pxd index c64d155..b1dbbc6 100644 --- a/efl/elementary/actionslider.pxd +++ b/efl/elementary/actionslider.pxd @@ -1,7 +1,18 @@ from efl.evas cimport Evas_Object -from enums cimport Elm_Actionslider_Pos + cdef extern from "Elementary.h": + + cpdef enum Elm_Actionslider_Pos: + ELM_ACTIONSLIDER_NONE + ELM_ACTIONSLIDER_LEFT + ELM_ACTIONSLIDER_CENTER + ELM_ACTIONSLIDER_RIGHT + ELM_ACTIONSLIDER_ALL + ctypedef enum Elm_Actionslider_Pos: + pass + + Evas_Object *elm_actionslider_add(Evas_Object *parent) const char *elm_actionslider_selected_label_get(const Evas_Object *obj) void elm_actionslider_indicator_pos_set(Evas_Object *obj, Elm_Actionslider_Pos pos) diff --git a/efl/elementary/actionslider.pyx b/efl/elementary/actionslider.pyx index 737478c..1b8bc00 100644 --- a/efl/elementary/actionslider.pyx +++ b/efl/elementary/actionslider.pyx @@ -76,6 +76,7 @@ Actionslider positions .. data:: ELM_ACTIONSLIDER_CENTER Center position + .. data:: ELM_ACTIONSLIDER_RIGHT Right position @@ -93,13 +94,6 @@ from efl.utils.conversions cimport _ctouni from efl.evas cimport Object as evasObject from layout_class cimport LayoutClass -cimport enums - -ELM_ACTIONSLIDER_NONE = enums.ELM_ACTIONSLIDER_NONE -ELM_ACTIONSLIDER_LEFT = enums.ELM_ACTIONSLIDER_LEFT -ELM_ACTIONSLIDER_CENTER = enums.ELM_ACTIONSLIDER_CENTER -ELM_ACTIONSLIDER_RIGHT = enums.ELM_ACTIONSLIDER_RIGHT -ELM_ACTIONSLIDER_ALL = enums.ELM_ACTIONSLIDER_ALL def _cb_string_conv(uintptr_t addr): cdef const char *s = <const char *>addr diff --git a/efl/elementary/background.pxd b/efl/elementary/background.pxd index 85a6873..746f0b4 100644 --- a/efl/elementary/background.pxd +++ b/efl/elementary/background.pxd @@ -1,7 +1,18 @@ from efl.evas cimport Eina_Bool, Evas_Object, Evas_Coord -from enums cimport Elm_Bg_Option + cdef extern from "Elementary.h": + + cpdef enum Elm_Bg_Option: + ELM_BG_OPTION_CENTER + ELM_BG_OPTION_SCALE + ELM_BG_OPTION_STRETCH + ELM_BG_OPTION_TILE + ELM_BG_OPTION_LAST + ctypedef enum Elm_Bg_Option: + pass + + Evas_Object *elm_bg_add(Evas_Object *parent) Eina_Bool elm_bg_file_set(Evas_Object *obj, const char *file, const char *group) void elm_bg_file_get(const Evas_Object *obj, const char **file, const char **group) diff --git a/efl/elementary/background.pyx b/efl/elementary/background.pyx index 2dcfce1..57abaf0 100644 --- a/efl/elementary/background.pyx +++ b/efl/elementary/background.pyx @@ -69,13 +69,6 @@ from efl.utils.conversions cimport _ctouni from efl.evas cimport Object as evasObject from layout_class cimport LayoutClass -cimport enums - -ELM_BG_OPTION_CENTER = enums.ELM_BG_OPTION_CENTER -ELM_BG_OPTION_SCALE = enums.ELM_BG_OPTION_SCALE -ELM_BG_OPTION_STRETCH = enums.ELM_BG_OPTION_STRETCH -ELM_BG_OPTION_TILE = enums.ELM_BG_OPTION_TILE -ELM_BG_OPTION_LAST = enums.ELM_BG_OPTION_LAST cdef class Background(LayoutClass): """ diff --git a/efl/elementary/box.pyx b/efl/elementary/box.pyx index 92c2e92..456ddff 100644 --- a/efl/elementary/box.pyx +++ b/efl/elementary/box.pyx @@ -131,16 +131,6 @@ from object cimport Object from efl.utils.conversions cimport eina_list_objects_to_python_list -#~ ctypedef enum Elm_Box_CLayout: -#~ ELM_BOX_LAYOUT_HORIZONTAL -#~ ELM_BOX_LAYOUT_VERTICAL -#~ ELM_BOX_LAYOUT_HOMOGENEOUS_VERTICAL -#~ ELM_BOX_LAYOUT_HOMOGENEOUS_HORIZONTAL -#~ ELM_BOX_LAYOUT_HOMOGENEOUS_MAX_SIZE_HORIZONTAL -#~ ELM_BOX_LAYOUT_HOMOGENEOUS_MAX_SIZE_VERTICAL -#~ ELM_BOX_LAYOUT_FLOW_HORIZONTAL -#~ ELM_BOX_LAYOUT_FLOW_VERTICAL -#~ ELM_BOX_LAYOUT_STACK ELM_BOX_LAYOUT_HORIZONTAL = 0 ELM_BOX_LAYOUT_VERTICAL = 1 diff --git a/efl/elementary/bubble.pxd b/efl/elementary/bubble.pxd index 97f1606..23e1ae9 100644 --- a/efl/elementary/bubble.pxd +++ b/efl/elementary/bubble.pxd @@ -1,7 +1,17 @@ from efl.evas cimport Evas_Object -from enums cimport Elm_Bubble_Pos + cdef extern from "Elementary.h": + + cpdef enum Elm_Bubble_Pos: + ELM_BUBBLE_POS_TOP_LEFT + ELM_BUBBLE_POS_TOP_RIGHT + ELM_BUBBLE_POS_BOTTOM_LEFT + ELM_BUBBLE_POS_BOTTOM_RIGHT + ctypedef enum Elm_Bubble_Pos: + pass + + Evas_Object *elm_bubble_add(Evas_Object *parent) void elm_bubble_pos_set(Evas_Object *obj, Elm_Bubble_Pos pos) Elm_Bubble_Pos elm_bubble_pos_get(const Evas_Object *obj) diff --git a/efl/elementary/bubble.pyx b/efl/elementary/bubble.pyx index d0d3acd..cfdf303 100644 --- a/efl/elementary/bubble.pyx +++ b/efl/elementary/bubble.pyx @@ -93,12 +93,6 @@ from efl.eo cimport _object_mapping_register from efl.evas cimport Object as evasObject from layout_class cimport LayoutClass -cimport enums - -ELM_BUBBLE_POS_TOP_LEFT = enums.ELM_BUBBLE_POS_TOP_LEFT -ELM_BUBBLE_POS_TOP_RIGHT = enums.ELM_BUBBLE_POS_TOP_RIGHT -ELM_BUBBLE_POS_BOTTOM_LEFT = enums.ELM_BUBBLE_POS_BOTTOM_LEFT -ELM_BUBBLE_POS_BOTTOM_RIGHT = enums.ELM_BUBBLE_POS_BOTTOM_RIGHT cdef class Bubble(LayoutClass): """ diff --git a/efl/elementary/button.pxd b/efl/elementary/button.pxd index fb9063f..cfdfcab 100644 --- a/efl/elementary/button.pxd +++ b/efl/elementary/button.pxd @@ -3,7 +3,6 @@ from layout_class cimport LayoutClass cdef extern from "Elementary.h": - # Button (api:DONE cb:DONE test:DONE doc:DONE) Evas_Object *elm_button_add(Evas_Object *parent) void elm_button_autorepeat_set(Evas_Object *obj, Eina_Bool on) Eina_Bool elm_button_autorepeat_get(const Evas_Object *obj) @@ -12,5 +11,6 @@ cdef extern from "Elementary.h": void elm_button_autorepeat_gap_timeout_set(Evas_Object *obj, double t) double elm_button_autorepeat_gap_timeout_get(const Evas_Object *obj) + cdef class Button(LayoutClass): pass diff --git a/efl/elementary/button.pyx b/efl/elementary/button.pyx index a0194df..c005489 100644 --- a/efl/elementary/button.pyx +++ b/efl/elementary/button.pyx @@ -67,6 +67,7 @@ from efl.eo cimport _object_mapping_register from efl.evas cimport Object as evasObject from layout_class cimport LayoutClass + cdef class Button(LayoutClass): """ diff --git a/efl/elementary/calendar_elm.pxd b/efl/elementary/calendar_elm.pxd index 8a0c26d..3a4ea45 100644 --- a/efl/elementary/calendar_elm.pxd +++ b/efl/elementary/calendar_elm.pxd @@ -1,11 +1,11 @@ from efl.evas cimport Eina_Bool, Eina_List, Evas_Object -from enums cimport Elm_Calendar_Mark_Repeat_Type, Elm_Calendar_Select_Mode, \ - Elm_Calendar_Selectable, Elm_Calendar_Weekday + cdef extern from "string.h": void *memcpy(void *dst, void *src, int n) char *strdup(char *str) + cdef extern from "time.h": struct tm: int tm_sec @@ -21,13 +21,55 @@ cdef extern from "time.h": long int tm_gmtoff const char *tm_zone + cdef extern from "Elementary.h": + cpdef enum Elm_Calendar_Mark_Repeat_Type: + ELM_CALENDAR_UNIQUE + ELM_CALENDAR_DAILY + ELM_CALENDAR_WEEKLY + ELM_CALENDAR_MONTHLY + ELM_CALENDAR_ANNUALLY + ELM_CALENDAR_LAST_DAY_OF_MONTH + ctypedef enum Elm_Calendar_Mark_Repeat_Type: + pass + + cpdef enum Elm_Calendar_Select_Mode: + ELM_CALENDAR_SELECT_MODE_DEFAULT + ELM_CALENDAR_SELECT_MODE_ALWAYS + ELM_CALENDAR_SELECT_MODE_NONE + ELM_CALENDAR_SELECT_MODE_ONDEMAND + ctypedef enum Elm_Calendar_Select_Mode: + pass + + cpdef enum Elm_Calendar_Selectable: + ELM_CALENDAR_SELECTABLE_NONE + ELM_CALENDAR_SELECTABLE_YEAR + ELM_CALENDAR_SELECTABLE_MONTH + ELM_CALENDAR_SELECTABLE_DAY + ctypedef enum Elm_Calendar_Selectable: + pass + + cpdef enum Elm_Calendar_Weekday: + ELM_DAY_SUNDAY + ELM_DAY_MONDAY + ELM_DAY_TUESDAY + ELM_DAY_WEDNESDAY + ELM_DAY_THURSDAY + ELM_DAY_FRIDAY + ELM_DAY_SATURDAY + ELM_DAY_LAST + ctypedef enum Elm_Calendar_Weekday: + pass + + ctypedef char *(*Elm_Calendar_Format_Cb) (tm *stime) + ctypedef struct Elm_Calendar_Mark: pass + Evas_Object * elm_calendar_add(Evas_Object *parent) const char ** elm_calendar_weekdays_names_get(const Evas_Object *obj) void elm_calendar_weekdays_names_set(Evas_Object *obj, const char *weekdays[]) @@ -37,7 +79,7 @@ cdef extern from "Elementary.h": Elm_Calendar_Select_Mode elm_calendar_select_mode_get(const Evas_Object *obj) void elm_calendar_selected_time_set(Evas_Object *obj, tm *selected_time) Eina_Bool elm_calendar_selected_time_get(const Evas_Object *obj, tm *selected_time) - #TODO: void elm_calendar_format_function_set(Evas_Object *obj, Elm_Calendar_Format_Cb format_func) + #TODO: void elm_calendar_format_function_set(Evas_Object *obj, Elm_Calendar_Format_Cb format_func) Elm_Calendar_Mark * elm_calendar_mark_add(Evas_Object *obj, const char *mark_type, tm *mark_time, Elm_Calendar_Mark_Repeat_Type repeat) void elm_calendar_mark_del(Elm_Calendar_Mark *mark) void elm_calendar_marks_clear(Evas_Object *obj) diff --git a/efl/elementary/calendar_elm.pyx b/efl/elementary/calendar_elm.pyx index efcc493..8b22311 100644 --- a/efl/elementary/calendar_elm.pyx +++ b/efl/elementary/calendar_elm.pyx @@ -177,29 +177,6 @@ from layout_class cimport LayoutClass from datetime import date -cimport enums - -ELM_CALENDAR_UNIQUE = enums.ELM_CALENDAR_UNIQUE -ELM_CALENDAR_DAILY = enums.ELM_CALENDAR_DAILY -ELM_CALENDAR_WEEKLY = enums.ELM_CALENDAR_WEEKLY -ELM_CALENDAR_MONTHLY = enums.ELM_CALENDAR_MONTHLY -ELM_CALENDAR_ANNUALLY = enums.ELM_CALENDAR_ANNUALLY -ELM_CALENDAR_LAST_DAY_OF_MONTH = enums.ELM_CALENDAR_LAST_DAY_OF_MONTH - -ELM_CALENDAR_SELECT_MODE_DEFAULT = enums.ELM_CALENDAR_SELECT_MODE_DEFAULT -ELM_CALENDAR_SELECT_MODE_ALWAYS = enums.ELM_CALENDAR_SELECT_MODE_ALWAYS -ELM_CALENDAR_SELECT_MODE_NONE = enums.ELM_CALENDAR_SELECT_MODE_NONE -ELM_CALENDAR_SELECT_MODE_ONDEMAND = enums.ELM_CALENDAR_SELECT_MODE_ONDEMAND - -ELM_DAY_SUNDAY = enums.ELM_DAY_SUNDAY -ELM_DAY_MONDAY = enums.ELM_DAY_MONDAY -ELM_DAY_TUESDAY = enums.ELM_DAY_TUESDAY -ELM_DAY_WEDNESDAY = enums.ELM_DAY_WEDNESDAY -ELM_DAY_THURSDAY = enums.ELM_DAY_THURSDAY -ELM_DAY_FRIDAY = enums.ELM_DAY_FRIDAY -ELM_DAY_SATURDAY = enums.ELM_DAY_SATURDAY -ELM_DAY_LAST = enums.ELM_DAY_LAST - cdef class CalendarMark(object): """ diff --git a/efl/elementary/clock.pxd b/efl/elementary/clock.pxd index 3b05891..6a12a21 100644 --- a/efl/elementary/clock.pxd +++ b/efl/elementary/clock.pxd @@ -1,7 +1,21 @@ from efl.evas cimport Evas_Object, Eina_Bool -from enums cimport Elm_Clock_Edit_Mode + cdef extern from "Elementary.h": + + cpdef enum Elm_Clock_Edit_Mode: + ELM_CLOCK_EDIT_DEFAULT + ELM_CLOCK_EDIT_HOUR_DECIMAL + ELM_CLOCK_EDIT_HOUR_UNIT + ELM_CLOCK_EDIT_MIN_DECIMAL + ELM_CLOCK_EDIT_MIN_UNIT + ELM_CLOCK_EDIT_SEC_DECIMAL + ELM_CLOCK_EDIT_SEC_UNIT + ELM_CLOCK_EDIT_ALL + ctypedef enum Elm_Clock_Edit_Mode: + pass + + Evas_Object *elm_clock_add(Evas_Object *parent) void elm_clock_time_set(Evas_Object *obj, int hrs, int min, int sec) void elm_clock_time_get(const Evas_Object *obj, int *hrs, int *min, int *sec) diff --git a/efl/elementary/clock.pyx b/efl/elementary/clock.pyx index 16506bf..da79fbe 100644 --- a/efl/elementary/clock.pyx +++ b/efl/elementary/clock.pyx @@ -103,16 +103,6 @@ from efl.eo cimport _object_mapping_register from efl.evas cimport Object as evasObject from layout_class cimport LayoutClass -cimport enums - -ELM_CLOCK_EDIT_DEFAULT = enums.ELM_CLOCK_EDIT_DEFAULT -ELM_CLOCK_EDIT_HOUR_DECIMAL = enums.ELM_CLOCK_EDIT_HOUR_DECIMAL -ELM_CLOCK_EDIT_HOUR_UNIT = enums.ELM_CLOCK_EDIT_HOUR_UNIT -ELM_CLOCK_EDIT_MIN_DECIMAL = enums.ELM_CLOCK_EDIT_MIN_DECIMAL -ELM_CLOCK_EDIT_MIN_UNIT = enums.ELM_CLOCK_EDIT_MIN_UNIT -ELM_CLOCK_EDIT_SEC_DECIMAL = enums.ELM_CLOCK_EDIT_SEC_DECIMAL -ELM_CLOCK_EDIT_SEC_UNIT = enums.ELM_CLOCK_EDIT_SEC_UNIT -ELM_CLOCK_EDIT_ALL = enums.ELM_CLOCK_EDIT_ALL cdef class Clock(LayoutClass): """ diff --git a/efl/elementary/cnp_callbacks.pxi b/efl/elementary/cnp_callbacks.pxi index 10044e7..b607a06 100644 --- a/efl/elementary/cnp_callbacks.pxi +++ b/efl/elementary/cnp_callbacks.pxi @@ -1,6 +1,5 @@ from object_item cimport Elm_Object_Item -from efl.elementary.enums cimport Elm_Sel_Type, Elm_Sel_Format, \ - Elm_Xdnd_Action +from efl.elementary.object cimport Elm_Sel_Type, Elm_Sel_Format, Elm_Xdnd_Action from efl.utils.conversions cimport python_list_objects_to_eina_list cdef extern from "Elementary.h": diff --git a/efl/elementary/colorselector.pxd b/efl/elementary/colorselector.pxd index fdc4739..b703af5 100644 --- a/efl/elementary/colorselector.pxd +++ b/efl/elementary/colorselector.pxd @@ -1,8 +1,17 @@ from efl.evas cimport Evas_Object, Eina_List, Eina_Bool from object_item cimport Elm_Object_Item -from enums cimport Elm_Colorselector_Mode + cdef extern from "Elementary.h": + + cpdef enum Elm_Colorselector_Mode: + ELM_COLORSELECTOR_PALETTE + ELM_COLORSELECTOR_COMPONENTS + ELM_COLORSELECTOR_BOTH + ctypedef enum Elm_Colorselector_Mode: + pass + + Evas_Object * elm_colorselector_add(Evas_Object *parent) void elm_colorselector_color_set(Evas_Object *obj, int r, int g, int b, int a) void elm_colorselector_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a) diff --git a/efl/elementary/colorselector.pyx b/efl/elementary/colorselector.pyx index 6522b4b..434d550 100644 --- a/efl/elementary/colorselector.pyx +++ b/efl/elementary/colorselector.pyx @@ -77,11 +77,6 @@ from efl.evas cimport Object as evasObject from object_item cimport ObjectItem, _object_item_to_python from layout_class cimport LayoutClass -cimport enums - -ELM_COLORSELECTOR_PALETTE = enums.ELM_COLORSELECTOR_PALETTE -ELM_COLORSELECTOR_COMPONENTS = enums.ELM_COLORSELECTOR_COMPONENTS -ELM_COLORSELECTOR_BOTH = enums.ELM_COLORSELECTOR_BOTH def _cb_object_item_conv(uintptr_t addr): cdef Elm_Object_Item *it = <Elm_Object_Item *>addr diff --git a/efl/elementary/configuration.pxd b/efl/elementary/configuration.pxd index 49b02c0..c109cc8 100644 --- a/efl/elementary/configuration.pxd +++ b/efl/elementary/configuration.pxd @@ -1,8 +1,33 @@ from efl.evas cimport Eina_Bool, Eina_List, Evas_Coord, Evas_Font_Size -from enums cimport Elm_Softcursor_Mode, Elm_Focus_Move_Policy, \ - Elm_Focus_Autoscroll_Mode, Edje_Channel +from efl.elementary.object cimport Elm_Focus_Move_Policy, \ + Elm_Focus_Autoscroll_Mode + + +cdef extern from "Edje.h": + + cpdef enum Edje_Channel: + EDJE_CHANNEL_EFFECT + EDJE_CHANNEL_BACKGROUND + EDJE_CHANNEL_MUSIC + EDJE_CHANNEL_FOREGROUND + EDJE_CHANNEL_INTERFACE + EDJE_CHANNEL_INPUT + EDJE_CHANNEL_ALERT + EDJE_CHANNEL_ALL + ctypedef enum Edje_Channel: + pass + cdef extern from "Elementary.h": + + cpdef enum Elm_Softcursor_Mode: + ELM_SOFTCURSOR_MODE_AUTO + ELM_SOFTCURSOR_MODE_ON + ELM_SOFTCURSOR_MODE_OFF + ctypedef enum Elm_Softcursor_Mode: + pass + + ctypedef struct Elm_Font_Overlay: const char *text_class const char *font diff --git a/efl/elementary/configuration.pyx b/efl/elementary/configuration.pyx index 2ec7d72..9ce57cb 100644 --- a/efl/elementary/configuration.pyx +++ b/efl/elementary/configuration.pyx @@ -152,21 +152,6 @@ from cpython cimport PyUnicode_AsUTF8String from efl.utils.conversions cimport _ctouni, eina_list_strings_to_python_list -cimport enums - -ELM_SOFTCURSOR_MODE_AUTO = enums.ELM_SOFTCURSOR_MODE_AUTO -ELM_SOFTCURSOR_MODE_ON = enums.ELM_SOFTCURSOR_MODE_ON -ELM_SOFTCURSOR_MODE_OFF = enums.ELM_SOFTCURSOR_MODE_OFF - -EDJE_CHANNEL_EFFECT = enums.EDJE_CHANNEL_EFFECT -EDJE_CHANNEL_BACKGROUND = enums.EDJE_CHANNEL_BACKGROUND -EDJE_CHANNEL_MUSIC = enums.EDJE_CHANNEL_MUSIC -EDJE_CHANNEL_FOREGROUND = enums.EDJE_CHANNEL_FOREGROUND -EDJE_CHANNEL_INTERFACE = enums.EDJE_CHANNEL_INTERFACE -EDJE_CHANNEL_INPUT = enums.EDJE_CHANNEL_INPUT -EDJE_CHANNEL_ALERT = enums.EDJE_CHANNEL_ALERT -EDJE_CHANNEL_ALL = enums.EDJE_CHANNEL_ALL - cdef class Configuration(object): diff --git a/efl/elementary/ctxpopup.pxd b/efl/elementary/ctxpopup.pxd index 31ab98f..c8277cf 100644 --- a/efl/elementary/ctxpopup.pxd +++ b/efl/elementary/ctxpopup.pxd @@ -1,8 +1,19 @@ from efl.evas cimport Eina_Bool, Eina_List, Evas_Object, Evas_Smart_Cb from object_item cimport Elm_Object_Item -from enums cimport Elm_Ctxpopup_Direction + cdef extern from "Elementary.h": + + cpdef enum Elm_Ctxpopup_Direction: + ELM_CTXPOPUP_DIRECTION_DOWN + ELM_CTXPOPUP_DIRECTION_RIGHT + ELM_CTXPOPUP_DIRECTION_LEFT + ELM_CTXPOPUP_DIRECTION_UP + ELM_CTXPOPUP_DIRECTION_UNKNOWN + ctypedef enum Elm_Ctxpopup_Direction: + pass + + Evas_Object *elm_ctxpopup_add(Evas_Object *parent) void elm_ctxpopup_hover_parent_set(Evas_Object *obj, Evas_Object *parent) Evas_Object *elm_ctxpopup_hover_parent_get(const Evas_Object *obj) diff --git a/efl/elementary/ctxpopup.pyx b/efl/elementary/ctxpopup.pyx index 02f75d4..42fe107 100644 --- a/efl/elementary/ctxpopup.pyx +++ b/efl/elementary/ctxpopup.pyx @@ -97,13 +97,6 @@ from layout_class cimport LayoutClass from object_item cimport ObjectItem, _object_item_callback, \ _object_item_callback2, _object_item_to_python, _object_item_list_to_python -cimport enums - -ELM_CTXPOPUP_DIRECTION_DOWN = enums.ELM_CTXPOPUP_DIRECTION_DOWN -ELM_CTXPOPUP_DIRECTION_RIGHT = enums.ELM_CTXPOPUP_DIRECTION_RIGHT -ELM_CTXPOPUP_DIRECTION_LEFT = enums.ELM_CTXPOPUP_DIRECTION_LEFT -ELM_CTXPOPUP_DIRECTION_UP = enums.ELM_CTXPOPUP_DIRECTION_UP -ELM_CTXPOPUP_DIRECTION_UNKNOWN = enums.ELM_CTXPOPUP_DIRECTION_UNKNOWN cdef class CtxpopupItem(ObjectItem): """ diff --git a/efl/elementary/datetime_elm.pxd b/efl/elementary/datetime_elm.pxd index 270c685..3bff33c 100644 --- a/efl/elementary/datetime_elm.pxd +++ b/efl/elementary/datetime_elm.pxd @@ -1,8 +1,20 @@ from efl.evas cimport Evas_Object, Eina_Bool from general cimport tm -from enums cimport Elm_Datetime_Field_Type + cdef extern from "Elementary.h": + + cpdef enum Elm_Datetime_Field_Type: + ELM_DATETIME_YEAR + ELM_DATETIME_MONTH + ELM_DATETIME_DATE + ELM_DATETIME_HOUR + ELM_DATETIME_MINUTE + ELM_DATETIME_AMPM + ctypedef enum Elm_Datetime_Field_Type: + pass + + Evas_Object * elm_datetime_add(Evas_Object *parent) const char * elm_datetime_format_get(const Evas_Object *obj) void elm_datetime_format_set(Evas_Object *obj, const char *fmt) diff --git a/efl/elementary/datetime_elm.pyx b/efl/elementary/datetime_elm.pyx index 0dee36d..3c27551 100644 --- a/efl/elementary/datetime_elm.pyx +++ b/efl/elementary/datetime_elm.pyx @@ -235,14 +235,6 @@ from object cimport Object from datetime import datetime -cimport enums - -ELM_DATETIME_YEAR = enums.ELM_DATETIME_YEAR -ELM_DATETIME_MONTH = enums.ELM_DATETIME_MONTH -ELM_DATETIME_DATE = enums.ELM_DATETIME_DATE -ELM_DATETIME_HOUR = enums.ELM_DATETIME_HOUR -ELM_DATETIME_MINUTE = enums.ELM_DATETIME_MINUTE -ELM_DATETIME_AMPM = enums.ELM_DATETIME_AMPM cdef class Datetime(Object): """ diff --git a/efl/elementary/dayselector.pxd b/efl/elementary/dayselector.pxd index 5375c43..1be455c 100644 --- a/efl/elementary/dayselector.pxd +++ b/efl/elementary/dayselector.pxd @@ -1,7 +1,21 @@ from efl.evas cimport Eina_Bool, Evas_Object, Eina_List -from enums cimport Elm_Dayselector_Day + cdef extern from "Elementary.h": + + cpdef enum Elm_Dayselector_Day: + ELM_DAYSELECTOR_SUN + ELM_DAYSELECTOR_MON + ELM_DAYSELECTOR_TUE + ELM_DAYSELECTOR_WED + ELM_DAYSELECTOR_THU + ELM_DAYSELECTOR_FRI + ELM_DAYSELECTOR_SAT + ELM_DAYSELECTOR_MAX + ctypedef enum Elm_Dayselector_Day: + pass + + Evas_Object *elm_dayselector_add(Evas_Object *parent) void elm_dayselector_day_selected_set(Evas_Object *obj, Elm_Dayselector_Day day, Eina_Bool selected) Eina_Bool elm_dayselector_day_selected_get(const Evas_Object *obj, Elm_Dayselector_Day day) diff --git a/efl/elementary/dayselector.pyx b/efl/elementary/dayselector.pyx index 40372a5..7abcf00 100644 --- a/efl/elementary/dayselector.pyx +++ b/efl/elementary/dayselector.pyx @@ -114,16 +114,6 @@ from efl.utils.conversions cimport python_list_strings_to_array_of_strings, \ eina_list_strings_to_python_list from layout_class cimport LayoutClass -cimport enums - -ELM_DAYSELECTOR_SUN = enums.ELM_DAYSELECTOR_SUN -ELM_DAYSELECTOR_MON = enums.ELM_DAYSELECTOR_MON -ELM_DAYSELECTOR_TUE = enums.ELM_DAYSELECTOR_TUE -ELM_DAYSELECTOR_WED = enums.ELM_DAYSELECTOR_WED -ELM_DAYSELECTOR_THU = enums.ELM_DAYSELECTOR_THU -ELM_DAYSELECTOR_FRI = enums.ELM_DAYSELECTOR_FRI -ELM_DAYSELECTOR_SAT = enums.ELM_DAYSELECTOR_SAT -ELM_DAYSELECTOR_MAX = enums.ELM_DAYSELECTOR_MAX cdef class Dayselector(LayoutClass): """ diff --git a/efl/elementary/entry.pxd b/efl/elementary/entry.pxd index 12a616f..10efcb6 100644 --- a/efl/elementary/entry.pxd +++ b/efl/elementary/entry.pxd @@ -1,12 +1,119 @@ from efl.evas cimport Eina_Bool, Eina_Rectangle, Evas_Object, \ Evas_Coord, Evas_Smart_Cb -from enums cimport Elm_Wrap_Type, Elm_Text_Format, Elm_Cnp_Mode, \ - Elm_Input_Panel_Layout, Elm_Input_Panel_Lang, Elm_Input_Hints, \ - Elm_Input_Panel_Lang, Elm_Input_Panel_Return_Key_Type, \ - Elm_Autocapital_Type, Elm_Icon_Type, Elm_Sel_Type, Elm_Sel_Format, \ +from efl.elementary.object cimport Elm_Sel_Type, Elm_Sel_Format, \ Elm_Xdnd_Action cdef extern from "Elementary.h": + + cpdef enum Elm_Autocapital_Type: + ELM_AUTOCAPITAL_TYPE_NONE + ELM_AUTOCAPITAL_TYPE_WORD + ELM_AUTOCAPITAL_TYPE_SENTENCE + ELM_AUTOCAPITAL_TYPE_ALLCHARACTER + ctypedef enum Elm_Autocapital_Type: + pass + + cpdef enum Elm_Cnp_Mode: + ELM_CNP_MODE_MARKUP + ELM_CNP_MODE_NO_IMAGE + ELM_CNP_MODE_PLAINTEXT + ctypedef enum Elm_Cnp_Mode: + pass + + cpdef enum Elm_Input_Hints: + ELM_INPUT_HINT_NONE + ELM_INPUT_HINT_AUTO_COMPLETE + ELM_INPUT_HINT_SENSITIVE_DATA + ctypedef enum Elm_Input_Hints: + pass + + cpdef enum Elm_Input_Panel_Lang: + ELM_INPUT_PANEL_LANG_AUTOMATIC + ELM_INPUT_PANEL_LANG_ALPHABET + ctypedef enum Elm_Input_Panel_Lang: + pass + + cpdef enum Elm_Input_Panel_Layout: + ELM_INPUT_PANEL_LAYOUT_NORMAL + ELM_INPUT_PANEL_LAYOUT_NUMBER + ELM_INPUT_PANEL_LAYOUT_EMAIL + ELM_INPUT_PANEL_LAYOUT_URL + ELM_INPUT_PANEL_LAYOUT_PHONENUMBER + ELM_INPUT_PANEL_LAYOUT_IP + ELM_INPUT_PANEL_LAYOUT_MONTH + ELM_INPUT_PANEL_LAYOUT_NUMBERONLY + ELM_INPUT_PANEL_LAYOUT_INVALID + ELM_INPUT_PANEL_LAYOUT_HEX + ELM_INPUT_PANEL_LAYOUT_TERMINAL + ELM_INPUT_PANEL_LAYOUT_PASSWORD + ELM_INPUT_PANEL_LAYOUT_DATETIME + ELM_INPUT_PANEL_LAYOUT_EMOTICON + ctypedef enum Elm_Input_Panel_Layout: + pass + + cpdef enum Elm_Input_Panel_Layout_Normal_Variation: + ELM_INPUT_PANEL_LAYOUT_NORMAL_VARIATION_NORMAL + ELM_INPUT_PANEL_LAYOUT_NORMAL_VARIATION_FILENAME + ELM_INPUT_PANEL_LAYOUT_NORMAL_VARIATION_PERSON_NAME + ctypedef enum Elm_Input_Panel_Layout_Normal_Variation: + pass + + cpdef enum Elm_Input_Panel_Layout_Numberonly_Variation: + ELM_INPUT_PANEL_LAYOUT_NUMBERONLY_VARIATION_NORMAL + ELM_INPUT_PANEL_LAYOUT_NUMBERONLY_VARIATION_SIGNED + ELM_INPUT_PANEL_LAYOUT_NUMBERONLY_VARIATION_DECIMAL + ELM_INPUT_PANEL_LAYOUT_NUMBERONLY_VARIATION_SIGNED_AND_DECIMAL + ctypedef enum Elm_Input_Panel_Layout_Numberonly_Variation: + pass + + cpdef enum Elm_Input_Panel_Layout_Password_Variation: + ELM_INPUT_PANEL_LAYOUT_PASSWORD_VARIATION_NORMAL + ELM_INPUT_PANEL_LAYOUT_PASSWORD_VARIATION_NUMBERONLY + ctypedef enum Elm_Input_Panel_Layout_Password_Variation: + pass + + cpdef enum Elm_Input_Panel_Return_Key_Type: + ELM_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT + ELM_INPUT_PANEL_RETURN_KEY_TYPE_DONE + ELM_INPUT_PANEL_RETURN_KEY_TYPE_GO + ELM_INPUT_PANEL_RETURN_KEY_TYPE_JOIN + ELM_INPUT_PANEL_RETURN_KEY_TYPE_LOGIN + ELM_INPUT_PANEL_RETURN_KEY_TYPE_NEXT + ELM_INPUT_PANEL_RETURN_KEY_TYPE_SEARCH + ELM_INPUT_PANEL_RETURN_KEY_TYPE_SEND + ELM_INPUT_PANEL_RETURN_KEY_TYPE_SIGNIN + ctypedef enum Elm_Input_Panel_Return_Key_Type: + pass + + cpdef enum Elm_Scroller_Policy: + ELM_SCROLLER_POLICY_AUTO + ELM_SCROLLER_POLICY_ON + ELM_SCROLLER_POLICY_OFF + ctypedef enum Elm_Scroller_Policy: + pass + + cpdef enum Elm_Text_Format: + ELM_TEXT_FORMAT_PLAIN_UTF8 + ELM_TEXT_FORMAT_MARKUP_UTF8 + ctypedef enum Elm_Text_Format: + pass + + cpdef enum Elm_Wrap_Type: + ELM_WRAP_NONE + ELM_WRAP_CHAR + ELM_WRAP_WORD + ELM_WRAP_MIXED + ctypedef enum Elm_Wrap_Type: + pass + + cpdef enum Elm_Icon_Type: + ELM_ICON_NONE + ELM_ICON_FILE + ELM_ICON_STANDARD + ctypedef enum Elm_Icon_Type: + pass + + ctypedef struct Elm_Entry_Anchor_Info: char *name int button diff --git a/efl/elementary/entry.pyx b/efl/elementary/entry.pyx index 5ea2a56..ede71a6 100644 --- a/efl/elementary/entry.pyx +++ b/efl/elementary/entry.pyx @@ -597,76 +597,6 @@ from efl.utils.deprecated cimport DEPRECATED from scroller cimport elm_scroller_policy_get, elm_scroller_policy_set, \ elm_scroller_bounce_get, elm_scroller_bounce_set, Elm_Scroller_Policy -cimport enums - -ELM_AUTOCAPITAL_TYPE_NONE = enums.ELM_AUTOCAPITAL_TYPE_NONE -ELM_AUTOCAPITAL_TYPE_WORD = enums.ELM_AUTOCAPITAL_TYPE_WORD -ELM_AUTOCAPITAL_TYPE_SENTENCE = enums.ELM_AUTOCAPITAL_TYPE_SENTENCE -ELM_AUTOCAPITAL_TYPE_ALLCHARACTER = enums.ELM_AUTOCAPITAL_TYPE_ALLCHARACTER - -ELM_CNP_MODE_MARKUP = enums.ELM_CNP_MODE_MARKUP -ELM_CNP_MODE_NO_IMAGE = enums.ELM_CNP_MODE_NO_IMAGE -ELM_CNP_MODE_PLAINTEXT = enums.ELM_CNP_MODE_PLAINTEXT - -ELM_INPUT_HINT_NONE = enums.ELM_INPUT_HINT_NONE -ELM_INPUT_HINT_AUTO_COMPLETE = enums.ELM_INPUT_HINT_AUTO_COMPLETE -ELM_INPUT_HINT_SENSITIVE_DATA = enums.ELM_INPUT_HINT_SENSITIVE_DATA - -ELM_INPUT_PANEL_LANG_AUTOMATIC = enums.ELM_INPUT_PANEL_LANG_AUTOMATIC -ELM_INPUT_PANEL_LANG_ALPHABET = enums.ELM_INPUT_PANEL_LANG_ALPHABET - -ELM_INPUT_PANEL_LAYOUT_NORMAL = enums.ELM_INPUT_PANEL_LAYOUT_NORMAL -ELM_INPUT_PANEL_LAYOUT_NUMBER = enums.ELM_INPUT_PANEL_LAYOUT_NUMBER -ELM_INPUT_PANEL_LAYOUT_EMAIL = enums.ELM_INPUT_PANEL_LAYOUT_EMAIL -ELM_INPUT_PANEL_LAYOUT_URL = enums.ELM_INPUT_PANEL_LAYOUT_URL -ELM_INPUT_PANEL_LAYOUT_PHONENUMBER = enums.ELM_INPUT_PANEL_LAYOUT_PHONENUMBER -ELM_INPUT_PANEL_LAYOUT_IP = enums.ELM_INPUT_PANEL_LAYOUT_IP -ELM_INPUT_PANEL_LAYOUT_MONTH = enums.ELM_INPUT_PANEL_LAYOUT_MONTH -ELM_INPUT_PANEL_LAYOUT_NUMBERONLY = enums.ELM_INPUT_PANEL_LAYOUT_NUMBERONLY -ELM_INPUT_PANEL_LAYOUT_INVALID = enums.ELM_INPUT_PANEL_LAYOUT_INVALID -ELM_INPUT_PANEL_LAYOUT_HEX = enums.ELM_INPUT_PANEL_LAYOUT_HEX -ELM_INPUT_PANEL_LAYOUT_TERMINAL = enums.ELM_INPUT_PANEL_LAYOUT_TERMINAL -ELM_INPUT_PANEL_LAYOUT_PASSWORD = enums.ELM_INPUT_PANEL_LAYOUT_PASSWORD -ELM_INPUT_PANEL_LAYOUT_DATETIME = enums.ELM_INPUT_PANEL_LAYOUT_DATETIME -ELM_INPUT_PANEL_LAYOUT_EMOTICON = enums.ELM_INPUT_PANEL_LAYOUT_EMOTICON - -ELM_INPUT_PANEL_LAYOUT_NORMAL_VARIATION_NORMAL = enums.ELM_INPUT_PANEL_LAYOUT_NORMAL_VARIATION_NORMAL -ELM_INPUT_PANEL_LAYOUT_NORMAL_VARIATION_FILENAME = enums.ELM_INPUT_PANEL_LAYOUT_NORMAL_VARIATION_FILENAME -ELM_INPUT_PANEL_LAYOUT_NORMAL_VARIATION_PERSON_NAME = enums.ELM_INPUT_PANEL_LAYOUT_NORMAL_VARIATION_PERSON_NAME - -ELM_INPUT_PANEL_LAYOUT_NUMBERONLY_VARIATION_NORMAL = enums.ELM_INPUT_PANEL_LAYOUT_NUMBERONLY_VARIATION_NORMAL -ELM_INPUT_PANEL_LAYOUT_NUMBERONLY_VARIATION_SIGNED = enums.ELM_INPUT_PANEL_LAYOUT_NUMBERONLY_VARIATION_SIGNED -ELM_INPUT_PANEL_LAYOUT_NUMBERONLY_VARIATION_DECIMAL = enums.ELM_INPUT_PANEL_LAYOUT_NUMBERONLY_VARIATION_DECIMAL -ELM_INPUT_PANEL_LAYOUT_NUMBERONLY_VARIATION_SIGNED_AND_DECIMAL = enums.ELM_INPUT_PANEL_LAYOUT_NUMBERONLY_VARIATION_SIGNED_AND_DECIMAL - -ELM_INPUT_PANEL_LAYOUT_PASSWORD_VARIATION_NORMAL = enums.ELM_INPUT_PANEL_LAYOUT_PASSWORD_VARIATION_NORMAL -ELM_INPUT_PANEL_LAYOUT_PASSWORD_VARIATION_NUMBERONLY = enums.ELM_INPUT_PANEL_LAYOUT_PASSWORD_VARIATION_NUMBERONLY - -ELM_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT = enums.ELM_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT -ELM_INPUT_PANEL_RETURN_KEY_TYPE_DONE = enums.ELM_INPUT_PANEL_RETURN_KEY_TYPE_DONE -ELM_INPUT_PANEL_RETURN_KEY_TYPE_GO = enums.ELM_INPUT_PANEL_RETURN_KEY_TYPE_GO -ELM_INPUT_PANEL_RETURN_KEY_TYPE_JOIN = enums.ELM_INPUT_PANEL_RETURN_KEY_TYPE_JOIN -ELM_INPUT_PANEL_RETURN_KEY_TYPE_LOGIN = enums.ELM_INPUT_PANEL_RETURN_KEY_TYPE_LOGIN -ELM_INPUT_PANEL_RETURN_KEY_TYPE_NEXT = enums.ELM_INPUT_PANEL_RETURN_KEY_TYPE_NEXT -ELM_INPUT_PANEL_RETURN_KEY_TYPE_SEARCH = enums.ELM_INPUT_PANEL_RETURN_KEY_TYPE_SEARCH -ELM_INPUT_PANEL_RETURN_KEY_TYPE_SEND = enums.ELM_INPUT_PANEL_RETURN_KEY_TYPE_SEND -ELM_INPUT_PANEL_RETURN_KEY_TYPE_SIGNIN = enums.ELM_INPUT_PANEL_RETURN_KEY_TYPE_SIGNIN - -ELM_SCROLLER_POLICY_AUTO = enums.ELM_SCROLLER_POLICY_AUTO -ELM_SCROLLER_POLICY_ON = enums.ELM_SCROLLER_POLICY_ON -ELM_SCROLLER_POLICY_OFF = enums.ELM_SCROLLER_POLICY_OFF - -ELM_TEXT_FORMAT_PLAIN_UTF8 = enums.ELM_TEXT_FORMAT_PLAIN_UTF8 -ELM_TEXT_FORMAT_MARKUP_UTF8 = enums.ELM_TEXT_FORMAT_MARKUP_UTF8 - -ELM_WRAP_NONE = enums.ELM_WRAP_NONE -ELM_WRAP_CHAR = enums.ELM_WRAP_CHAR -ELM_WRAP_WORD = enums.ELM_WRAP_WORD -ELM_WRAP_MIXED = enums.ELM_WRAP_MIXED - -ELM_ICON_NONE = enums.ELM_ICON_NONE -ELM_ICON_FILE = enums.ELM_ICON_FILE -ELM_ICON_STANDARD = enums.ELM_ICON_STANDARD import traceback @@ -1409,7 +1339,7 @@ cdef class Entry(LayoutClass): """ elm_entry_context_menu_clear(self.obj) - def context_menu_item_add(self, label = None, icon_file = None, Elm_Icon_Type icon_type = enums.ELM_ICON_NONE, func = None, *args, **kwargs): + def context_menu_item_add(self, label = None, icon_file = None, Elm_Icon_Type icon_type = ELM_ICON_NONE, func = None, *args, **kwargs): """This adds an item to the entry's contextual menu. A longpress on an entry will make the contextual menu show up, if this @@ -1634,7 +1564,7 @@ cdef class Entry(LayoutClass): if isinstance(a1, unicode): a1 = PyUnicode_AsUTF8String(a1) if not elm_entry_file_set(self.obj, <const char *>a1 if a1 is not None else NULL, - a2 if a2 is not None else enums.ELM_TEXT_FORMAT_PLAIN_UTF8): + a2 if a2 is not None else ELM_TEXT_FORMAT_PLAIN_UTF8): raise RuntimeError("Could not set file") def file_set(self, file_name, file_format): @@ -1643,7 +1573,7 @@ cdef class Entry(LayoutClass): if isinstance(a1, unicode): a1 = PyUnicode_AsUTF8String(a1) if not elm_entry_file_set(self.obj, <const char *>a1 if a1 is not None else NULL, - a2 if a2 is not None else enums.ELM_TEXT_FORMAT_PLAIN_UTF8): + a2 if a2 is not None else ELM_TEXT_FORMAT_PLAIN_UTF8): raise RuntimeError("Could not set file") def file_get(self): cdef const char *file diff --git a/efl/elementary/enums.pxd b/efl/elementary/enums.pxd deleted file mode 100644 index 958bb2f..0000000 --- a/efl/elementary/enums.pxd +++ /dev/null @@ -1,654 +0,0 @@ -ctypedef enum Elm_Box_CLayout: - ELM_BOX_LAYOUT_HORIZONTAL - ELM_BOX_LAYOUT_VERTICAL - ELM_BOX_LAYOUT_HOMOGENEOUS_VERTICAL - ELM_BOX_LAYOUT_HOMOGENEOUS_HORIZONTAL - ELM_BOX_LAYOUT_HOMOGENEOUS_MAX_SIZE_HORIZONTAL - ELM_BOX_LAYOUT_HOMOGENEOUS_MAX_SIZE_VERTICAL - ELM_BOX_LAYOUT_FLOW_HORIZONTAL - ELM_BOX_LAYOUT_FLOW_VERTICAL - ELM_BOX_LAYOUT_STACK - -cdef extern from "Elementary.h": - - ctypedef enum Elm_Actionslider_Pos: - ELM_ACTIONSLIDER_NONE - ELM_ACTIONSLIDER_LEFT - ELM_ACTIONSLIDER_CENTER - ELM_ACTIONSLIDER_RIGHT - ELM_ACTIONSLIDER_ALL - - ctypedef enum Elm_Autocapital_Type: - ELM_AUTOCAPITAL_TYPE_NONE - ELM_AUTOCAPITAL_TYPE_WORD - ELM_AUTOCAPITAL_TYPE_SENTENCE - ELM_AUTOCAPITAL_TYPE_ALLCHARACTER - - ctypedef enum Elm_Bg_Option: - ELM_BG_OPTION_CENTER - ELM_BG_OPTION_SCALE - ELM_BG_OPTION_STRETCH - ELM_BG_OPTION_TILE - ELM_BG_OPTION_LAST - - ctypedef enum Elm_Bubble_Pos: - ELM_BUBBLE_POS_TOP_LEFT - ELM_BUBBLE_POS_TOP_RIGHT - ELM_BUBBLE_POS_BOTTOM_LEFT - ELM_BUBBLE_POS_BOTTOM_RIGHT - - ctypedef enum Elm_Calendar_Mark_Repeat_Type: - ELM_CALENDAR_UNIQUE - ELM_CALENDAR_DAILY - ELM_CALENDAR_WEEKLY - ELM_CALENDAR_MONTHLY - ELM_CALENDAR_ANNUALLY - ELM_CALENDAR_LAST_DAY_OF_MONTH - - ctypedef enum Elm_Calendar_Select_Mode: - ELM_CALENDAR_SELECT_MODE_DEFAULT - ELM_CALENDAR_SELECT_MODE_ALWAYS - ELM_CALENDAR_SELECT_MODE_NONE - ELM_CALENDAR_SELECT_MODE_ONDEMAND - - ctypedef enum Elm_Calendar_Selectable: - ELM_CALENDAR_SELECTABLE_NONE - ELM_CALENDAR_SELECTABLE_YEAR - ELM_CALENDAR_SELECTABLE_MONTH - ELM_CALENDAR_SELECTABLE_DAY - - ctypedef enum Elm_Calendar_Weekday: - ELM_DAY_SUNDAY - ELM_DAY_MONDAY - ELM_DAY_TUESDAY - ELM_DAY_WEDNESDAY - ELM_DAY_THURSDAY - ELM_DAY_FRIDAY - ELM_DAY_SATURDAY - ELM_DAY_LAST - - ctypedef enum Elm_Clock_Edit_Mode: - ELM_CLOCK_EDIT_DEFAULT - ELM_CLOCK_EDIT_HOUR_DECIMAL - ELM_CLOCK_EDIT_HOUR_UNIT - ELM_CLOCK_EDIT_MIN_DECIMAL - ELM_CLOCK_EDIT_MIN_UNIT - ELM_CLOCK_EDIT_SEC_DECIMAL - ELM_CLOCK_EDIT_SEC_UNIT - ELM_CLOCK_EDIT_ALL - - ctypedef enum Elm_Cnp_Mode: - ELM_CNP_MODE_MARKUP - ELM_CNP_MODE_NO_IMAGE - ELM_CNP_MODE_PLAINTEXT - - ctypedef enum Elm_Colorselector_Mode: - ELM_COLORSELECTOR_PALETTE - ELM_COLORSELECTOR_COMPONENTS - ELM_COLORSELECTOR_BOTH - - ctypedef enum Elm_Ctxpopup_Direction: - ELM_CTXPOPUP_DIRECTION_DOWN - ELM_CTXPOPUP_DIRECTION_RIGHT - ELM_CTXPOPUP_DIRECTION_LEFT - ELM_CTXPOPUP_DIRECTION_UP - ELM_CTXPOPUP_DIRECTION_UNKNOWN - - ctypedef enum Elm_Datetime_Field_Type: - ELM_DATETIME_YEAR = 0 - ELM_DATETIME_MONTH = 1 - ELM_DATETIME_DATE = 2 - ELM_DATETIME_HOUR = 3 - ELM_DATETIME_MINUTE = 4 - ELM_DATETIME_AMPM = 5 - - ctypedef enum Elm_Dayselector_Day: - ELM_DAYSELECTOR_SUN = 0 - ELM_DAYSELECTOR_MON - ELM_DAYSELECTOR_TUE - ELM_DAYSELECTOR_WED - ELM_DAYSELECTOR_THU - ELM_DAYSELECTOR_FRI - ELM_DAYSELECTOR_SAT - ELM_DAYSELECTOR_MAX - - ctypedef enum Elm_Fileselector_Mode: - ELM_FILESELECTOR_LIST - ELM_FILESELECTOR_GRID - - ctypedef enum Elm_Fileselector_Sort: - ELM_FILESELECTOR_SORT_BY_FILENAME_ASC - ELM_FILESELECTOR_SORT_BY_FILENAME_DESC - ELM_FILESELECTOR_SORT_BY_TYPE_ASC - ELM_FILESELECTOR_SORT_BY_TYPE_DESC - ELM_FILESELECTOR_SORT_BY_SIZE_ASC - ELM_FILESELECTOR_SORT_BY_SIZE_DESC - ELM_FILESELECTOR_SORT_BY_MODIFIED_ASC - ELM_FILESELECTOR_SORT_BY_MODIFIED_DESC - ELM_FILESELECTOR_SORT_LAST - - ctypedef enum Elm_Flip_Direction: - ELM_FLIP_DIRECTION_UP - ELM_FLIP_DIRECTION_DOWN - ELM_FLIP_DIRECTION_LEFT - ELM_FLIP_DIRECTION_RIGHT - - ctypedef enum Elm_Flip_Interaction: - ELM_FLIP_INTERACTION_NONE - ELM_FLIP_INTERACTION_ROTATE - ELM_FLIP_INTERACTION_CUBE - ELM_FLIP_INTERACTION_PAGE - - ctypedef enum Elm_Flip_Mode: - ELM_FLIP_ROTATE_Y_CENTER_AXIS - ELM_FLIP_ROTATE_X_CENTER_AXIS - ELM_FLIP_ROTATE_XZ_CENTER_AXIS - ELM_FLIP_ROTATE_YZ_CENTER_AXIS - ELM_FLIP_CUBE_LEFT - ELM_FLIP_CUBE_RIGHT - ELM_FLIP_CUBE_UP - ELM_FLIP_CUBE_DOWN - ELM_FLIP_PAGE_LEFT - ELM_FLIP_PAGE_RIGHT - ELM_FLIP_PAGE_UP - ELM_FLIP_PAGE_DOWN - - ctypedef enum Elm_Focus_Direction: - ELM_FOCUS_PREVIOUS - ELM_FOCUS_NEXT - ELM_FOCUS_UP - ELM_FOCUS_DOWN - ELM_FOCUS_RIGHT - ELM_FOCUS_LEFT - - ctypedef enum Elm_Focus_Move_Policy: - ELM_FOCUS_MOVE_POLICY_CLICK - ELM_FOCUS_MOVE_POLICY_IN - - ctypedef enum Elm_Focus_Autoscroll_Mode: - ELM_FOCUS_AUTOSCROLL_MODE_SHOW - ELM_FOCUS_AUTOSCROLL_MODE_NONE - ELM_FOCUS_AUTOSCROLL_MODE_BRING_IN - - ctypedef enum Elm_Gengrid_Reorder_Type: - ELM_GENGRID_REORDER_TYPE_NORMAL - ELM_GENGRID_REORDER_TYPE_SWAP - - ctypedef enum Elm_Genlist_Item_Type: - ELM_GENLIST_ITEM_NONE - ELM_GENLIST_ITEM_TREE - ELM_GENLIST_ITEM_GROUP - ELM_GENLIST_ITEM_MAX - - ctypedef enum Elm_Genlist_Item_Field_Type: - ELM_GENLIST_ITEM_FIELD_ALL - ELM_GENLIST_ITEM_FIELD_TEXT - ELM_GENLIST_ITEM_FIELD_CONTENT - ELM_GENLIST_ITEM_FIELD_STATE - - ctypedef enum Elm_Genlist_Item_Scrollto_Type: - ELM_GENLIST_ITEM_SCROLLTO_NONE - ELM_GENLIST_ITEM_SCROLLTO_IN - ELM_GENLIST_ITEM_SCROLLTO_TOP - ELM_GENLIST_ITEM_SCROLLTO_MIDDLE - - ctypedef enum Elm_Glob_Match_Flags: - ELM_GLOB_MATCH_NO_ESCAPE - ELM_GLOB_MATCH_PATH - ELM_GLOB_MATCH_PERIOD - ELM_GLOB_MATCH_NOCASE - - ctypedef enum Elm_Gesture_State: - ELM_GESTURE_STATE_UNDEFINED - ELM_GESTURE_STATE_START - ELM_GESTURE_STATE_MOVE - ELM_GESTURE_STATE_END - ELM_GESTURE_STATE_ABORT - - ctypedef enum Elm_Gesture_Type: - ELM_GESTURE_FIRST - ELM_GESTURE_N_TAPS - ELM_GESTURE_N_LONG_TAPS - ELM_GESTURE_N_DOUBLE_TAPS - ELM_GESTURE_N_TRIPLE_TAPS - ELM_GESTURE_MOMENTUM - ELM_GESTURE_N_LINES - ELM_GESTURE_N_FLICKS - ELM_GESTURE_ZOOM - ELM_GESTURE_ROTATE - ELM_GESTURE_LAST - - ctypedef enum Elm_GLView_Mode: - ELM_GLVIEW_NONE - ELM_GLVIEW_ALPHA - ELM_GLVIEW_DEPTH - ELM_GLVIEW_STENCIL - ELM_GLVIEW_DIRECT - - ctypedef enum Elm_GLView_Resize_Policy: - ELM_GLVIEW_RESIZE_POLICY_RECREATE - ELM_GLVIEW_RESIZE_POLICY_SCALE - - ctypedef enum Elm_GLView_Render_Policy: - ELM_GLVIEW_RENDER_POLICY_ON_DEMAND - ELM_GLVIEW_RENDER_POLICY_ALWAYS - - ctypedef enum Elm_Hover_Axis: - ELM_HOVER_AXIS_NONE - ELM_HOVER_AXIS_HORIZONTAL - ELM_HOVER_AXIS_VERTICAL - ELM_HOVER_AXIS_BOTH - - ctypedef enum Elm_Icon_Lookup_Order: - ELM_ICON_LOOKUP_FDO_THEME - ELM_ICON_LOOKUP_THEME_FDO - ELM_ICON_LOOKUP_FDO - ELM_ICON_LOOKUP_THEME - - ctypedef enum Elm_Icon_Type: - ELM_ICON_NONE - ELM_ICON_FILE - ELM_ICON_STANDARD - - ctypedef enum Elm_Illume_Command: - ELM_ILLUME_COMMAND_FOCUS_BACK - ELM_ILLUME_COMMAND_FOCUS_FORWARD - ELM_ILLUME_COMMAND_FOCUS_HOME - ELM_ILLUME_COMMAND_CLOSE - - ctypedef enum Elm_Image_Orient: - ELM_IMAGE_ORIENT_NONE - ELM_IMAGE_ROTATE_0 - ELM_IMAGE_ROTATE_90 - ELM_IMAGE_ROTATE_180 - ELM_IMAGE_ROTATE_270 - ELM_IMAGE_FLIP_HORIZONTAL - ELM_IMAGE_FLIP_VERTICAL - ELM_IMAGE_FLIP_TRANSPOSE - ELM_IMAGE_FLIP_TRANSVERSE - - ctypedef enum Elm_Input_Hints: - ELM_INPUT_HINT_NONE - ELM_INPUT_HINT_AUTO_COMPLETE - ELM_INPUT_HINT_SENSITIVE_DATA - - ctypedef enum Elm_Input_Panel_Lang: - ELM_INPUT_PANEL_LANG_AUTOMATIC - ELM_INPUT_PANEL_LANG_ALPHABET - - ctypedef enum Elm_Input_Panel_Layout: - ELM_INPUT_PANEL_LAYOUT_NORMAL - ELM_INPUT_PANEL_LAYOUT_NUMBER - ELM_INPUT_PANEL_LAYOUT_EMAIL - ELM_INPUT_PANEL_LAYOUT_URL - ELM_INPUT_PANEL_LAYOUT_PHONENUMBER - ELM_INPUT_PANEL_LAYOUT_IP - ELM_INPUT_PANEL_LAYOUT_MONTH - ELM_INPUT_PANEL_LAYOUT_NUMBERONLY - ELM_INPUT_PANEL_LAYOUT_INVALID - ELM_INPUT_PANEL_LAYOUT_HEX - ELM_INPUT_PANEL_LAYOUT_TERMINAL - ELM_INPUT_PANEL_LAYOUT_PASSWORD - ELM_INPUT_PANEL_LAYOUT_DATETIME - ELM_INPUT_PANEL_LAYOUT_EMOTICON - - ctypedef enum Elm_Input_Panel_Layout_Normal_Variation: - ELM_INPUT_PANEL_LAYOUT_NORMAL_VARIATION_NORMAL - ELM_INPUT_PANEL_LAYOUT_NORMAL_VARIATION_FILENAME - ELM_INPUT_PANEL_LAYOUT_NORMAL_VARIATION_PERSON_NAME - - ctypedef enum Elm_Input_Panel_Layout_Numberonly_Variation: - ELM_INPUT_PANEL_LAYOUT_NUMBERONLY_VARIATION_NORMAL - ELM_INPUT_PANEL_LAYOUT_NUMBERONLY_VARIATION_SIGNED - ELM_INPUT_PANEL_LAYOUT_NUMBERONLY_VARIATION_DECIMAL - ELM_INPUT_PANEL_LAYOUT_NUMBERONLY_VARIATION_SIGNED_AND_DECIMAL - - ctypedef enum Elm_Input_Panel_Layout_Password_Variation: - ELM_INPUT_PANEL_LAYOUT_PASSWORD_VARIATION_NORMAL - ELM_INPUT_PANEL_LAYOUT_PASSWORD_VARIATION_NUMBERONLY - - ctypedef enum Elm_Input_Panel_Return_Key_Type: - ELM_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT - ELM_INPUT_PANEL_RETURN_KEY_TYPE_DONE - ELM_INPUT_PANEL_RETURN_KEY_TYPE_GO - ELM_INPUT_PANEL_RETURN_KEY_TYPE_JOIN - ELM_INPUT_PANEL_RETURN_KEY_TYPE_LOGIN - ELM_INPUT_PANEL_RETURN_KEY_TYPE_NEXT - ELM_INPUT_PANEL_RETURN_KEY_TYPE_SEARCH - ELM_INPUT_PANEL_RETURN_KEY_TYPE_SEND - ELM_INPUT_PANEL_RETURN_KEY_TYPE_SIGNIN - - ctypedef enum Elm_Label_Slide_Mode: - ELM_LABEL_SLIDE_MODE_NONE - ELM_LABEL_SLIDE_MODE_AUTO - ELM_LABEL_SLIDE_MODE_ALWAYS - - ctypedef enum Elm_List_Mode: - ELM_LIST_COMPRESS - ELM_LIST_SCROLL - ELM_LIST_LIMIT - ELM_LIST_EXPAND - - ctypedef enum Elm_Map_Overlay_Type: - ELM_MAP_OVERLAY_TYPE_NONE - ELM_MAP_OVERLAY_TYPE_DEFAULT - ELM_MAP_OVERLAY_TYPE_CLASS - ELM_MAP_OVERLAY_TYPE_GROUP - ELM_MAP_OVERLAY_TYPE_BUBBLE - ELM_MAP_OVERLAY_TYPE_ROUTE - ELM_MAP_OVERLAY_TYPE_LINE - ELM_MAP_OVERLAY_TYPE_POLYGON - ELM_MAP_OVERLAY_TYPE_CIRCLE - ELM_MAP_OVERLAY_TYPE_SCALE - - ctypedef enum Elm_Map_Route_Method: - ELM_MAP_ROUTE_METHOD_FASTEST - ELM_MAP_ROUTE_METHOD_SHORTEST - ELM_MAP_ROUTE_METHOD_LAST - - ctypedef enum Elm_Map_Route_Type: - ELM_MAP_ROUTE_TYPE_MOTOCAR - ELM_MAP_ROUTE_TYPE_BICYCLE - ELM_MAP_ROUTE_TYPE_FOOT - ELM_MAP_ROUTE_TYPE_LAST - - ctypedef enum Elm_Map_Source_Type: - ELM_MAP_SOURCE_TYPE_TILE - ELM_MAP_SOURCE_TYPE_ROUTE - ELM_MAP_SOURCE_TYPE_NAME - ELM_MAP_SOURCE_TYPE_LAST - - ctypedef enum Elm_Map_Zoom_Mode: - ELM_MAP_ZOOM_MODE_MANUAL - ELM_MAP_ZOOM_MODE_AUTO_FIT - ELM_MAP_ZOOM_MODE_AUTO_FILL - ELM_MAP_ZOOM_MODE_LAST - - ctypedef enum Elm_Notify_Orient: - ELM_NOTIFY_ORIENT_TOP - ELM_NOTIFY_ORIENT_CENTER - ELM_NOTIFY_ORIENT_BOTTOM - ELM_NOTIFY_ORIENT_LEFT - ELM_NOTIFY_ORIENT_RIGHT - ELM_NOTIFY_ORIENT_TOP_LEFT - ELM_NOTIFY_ORIENT_TOP_RIGHT - ELM_NOTIFY_ORIENT_BOTTOM_LEFT - ELM_NOTIFY_ORIENT_BOTTOM_RIGHT - ELM_NOTIFY_ORIENT_LAST - - ctypedef enum Elm_Object_Select_Mode: - ELM_OBJECT_SELECT_MODE_DEFAULT - ELM_OBJECT_SELECT_MODE_ALWAYS - ELM_OBJECT_SELECT_MODE_NONE - ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY - ELM_OBJECT_SELECT_MODE_MAX - - ctypedef enum Elm_Object_Multi_Select_Mode: - ELM_OBJECT_MULTI_SELECT_MODE_DEFAULT # default multiple select mode - ELM_OBJECT_MULTI_SELECT_MODE_WITH_CONTROL # disallow mutiple selection when clicked without control key pressed - ELM_OBJECT_MULTI_SELECT_MODE_MAX - - ctypedef enum Elm_Panel_Orient: - ELM_PANEL_ORIENT_TOP - ELM_PANEL_ORIENT_BOTTOM - ELM_PANEL_ORIENT_LEFT - ELM_PANEL_ORIENT_RIGHT - - ctypedef enum Elm_Photocam_Zoom_Mode: - ELM_PHOTOCAM_ZOOM_MODE_MANUAL - ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT - ELM_PHOTOCAM_ZOOM_MODE_AUTO_FILL - ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT_IN - ELM_PHOTOCAM_ZOOM_MODE_LAST - - ctypedef enum Elm_Policy: - ELM_POLICY_QUIT - ELM_POLICY_EXIT - ELM_POLICY_THROTTLE - ELM_POLICY_LAST - - ctypedef enum Elm_Policy_Quit: - ELM_POLICY_QUIT_NONE - ELM_POLICY_QUIT_LAST_WINDOW_CLOSED - - ctypedef enum Elm_Policy_Exit: - ELM_POLICY_EXIT_NONE - ELM_POLICY_EXIT_WINDOWS_DEL - - ctypedef enum Elm_Policy_Throttle: - ELM_POLICY_THROTTLE_CONFIG - ELM_POLICY_THROTTLE_HIDDEN_ALWAYS - ELM_POLICY_THROTTLE_NEVER - - ctypedef enum Elm_Popup_Orient: - ELM_POPUP_ORIENT_TOP - ELM_POPUP_ORIENT_CENTER - ELM_POPUP_ORIENT_BOTTOM - ELM_POPUP_ORIENT_LEFT - ELM_POPUP_ORIENT_RIGHT - ELM_POPUP_ORIENT_TOP_LEFT - ELM_POPUP_ORIENT_TOP_RIGHT - ELM_POPUP_ORIENT_BOTTOM_LEFT - ELM_POPUP_ORIENT_BOTTOM_RIGHT - ELM_POPUP_ORIENT_LAST - - ctypedef enum Elm_Process_State: - ELM_PROCESS_STATE_FOREGROUND - ELM_PROCESS_STATE_BACKGROUND - - ctypedef enum Elm_Scroller_Policy: - ELM_SCROLLER_POLICY_AUTO - ELM_SCROLLER_POLICY_ON - ELM_SCROLLER_POLICY_OFF - - ctypedef enum Elm_Scroller_Single_Direction: - ELM_SCROLLER_SINGLE_DIRECTION_NONE - ELM_SCROLLER_SINGLE_DIRECTION_SOFT - ELM_SCROLLER_SINGLE_DIRECTION_HARD - ELM_SCROLLER_SINGLE_DIRECTION_LAST - - ctypedef enum Elm_Scroller_Movement_Block: - ELM_SCROLLER_MOVEMENT_NO_BLOCK # Do not block movements - ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL # Block vertical movements - ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL # Block horizontal movements - - ctypedef enum Elm_Sel_Format: - ELM_SEL_FORMAT_TARGETS - ELM_SEL_FORMAT_NONE - ELM_SEL_FORMAT_TEXT - ELM_SEL_FORMAT_MARKUP - ELM_SEL_FORMAT_IMAGE - ELM_SEL_FORMAT_VCARD - ELM_SEL_FORMAT_HTML - - ctypedef enum Elm_Sel_Type: - ELM_SEL_TYPE_PRIMARY - ELM_SEL_TYPE_SECONDARY - ELM_SEL_TYPE_XDND - ELM_SEL_TYPE_CLIPBOARD - - ctypedef enum Elm_Softcursor_Mode: - ELM_SOFTCURSOR_MODE_AUTO - ELM_SOFTCURSOR_MODE_ON - ELM_SOFTCURSOR_MODE_OFF - - ctypedef enum Elm_Store_Item_Mapping_Type: - ELM_STORE_ITEM_MAPPING_NONE - ELM_STORE_ITEM_MAPPING_LABEL - ELM_STORE_ITEM_MAPPING_STATE - ELM_STORE_ITEM_MAPPING_ICON - ELM_STORE_ITEM_MAPPING_PHOTO - ELM_STORE_ITEM_MAPPING_CUSTOM - ELM_STORE_ITEM_MAPPING_LAST - - ctypedef enum Elm_Sys_Notify_Closed_Reason: - ELM_SYS_NOTIFY_CLOSED_EXPIRED # The notification expired. - ELM_SYS_NOTIFY_CLOSED_DISMISSED # The notification was dismissed by the user. - ELM_SYS_NOTIFY_CLOSED_REQUESTED # The notification was closed by a call to CloseNotification method. - ELM_SYS_NOTIFY_CLOSED_UNDEFINED # Undefined/reserved reasons. - - ctypedef enum Elm_Sys_Notify_Urgency: - ELM_SYS_NOTIFY_URGENCY_LOW - ELM_SYS_NOTIFY_URGENCY_NORMAL - ELM_SYS_NOTIFY_URGENCY_CRITICAL - - int ELM_EVENT_SYS_NOTIFY_NOTIFICATION_CLOSED - int ELM_EVENT_SYS_NOTIFY_ACTION_INVOKED - - ctypedef enum Elm_Text_Format: - ELM_TEXT_FORMAT_PLAIN_UTF8 - ELM_TEXT_FORMAT_MARKUP_UTF8 - - ctypedef enum Elm_Thumb_Animation_Setting: - ELM_THUMB_ANIMATION_START - ELM_THUMB_ANIMATION_LOOP - ELM_THUMB_ANIMATION_STOP - ELM_THUMB_ANIMATION_LAST - - ctypedef enum Ethumb_Thumb_FDO_Size: - ETHUMB_THUMB_NORMAL # 128x128 as defined by FreeDesktop.Org standard - ETHUMB_THUMB_LARGE # 256x256 as defined by FreeDesktop.Org standard - - ctypedef enum Ethumb_Thumb_Format: - ETHUMB_THUMB_FDO # PNG as defined by FreeDesktop.Org standard - ETHUMB_THUMB_JPEG # JPEGs are often smaller and faster to read/write - ETHUMB_THUMB_EET # EFL's own storage system, supports key parameter - - ctypedef enum Ethumb_Thumb_Aspect: - ETHUMB_THUMB_KEEP_ASPECT # keep original proportion between width and height - ETHUMB_THUMB_IGNORE_ASPECT # ignore aspect and foce it to match thumbnail's width and height - ETHUMB_THUMB_CROP # keep aspect but crop (cut) the largest dimension - - ctypedef enum Ethumb_Thumb_Orientation: - ETHUMB_THUMB_ORIENT_NONE # keep orientation as pixel data is - ETHUMB_THUMB_ROTATE_90_CW # rotate 90° clockwise - ETHUMB_THUMB_ROTATE_180 # rotate 180° - ETHUMB_THUMB_ROTATE_90_CCW # rotate 90° counter-clockwise - ETHUMB_THUMB_FLIP_HORIZONTAL # flip horizontally - ETHUMB_THUMB_FLIP_VERTICAL # flip vertically - ETHUMB_THUMB_FLIP_TRANSPOSE # transpose - ETHUMB_THUMB_FLIP_TRANSVERSE # transverse - ETHUMB_THUMB_ORIENT_ORIGINAL # use orientation from metadata (EXIF-only currently) - - ctypedef enum Elm_Toolbar_Item_Scrollto_Type: - ELM_TOOLBAR_ITEM_SCROLLTO_NONE - ELM_TOOLBAR_ITEM_SCROLLTO_IN - ELM_TOOLBAR_ITEM_SCROLLTO_FIRST - ELM_TOOLBAR_ITEM_SCROLLTO_MIDDLE - ELM_TOOLBAR_ITEM_SCROLLTO_LAST - - ctypedef enum Elm_Toolbar_Shrink_Mode: - ELM_TOOLBAR_SHRINK_NONE - ELM_TOOLBAR_SHRINK_HIDE - ELM_TOOLBAR_SHRINK_SCROLL - ELM_TOOLBAR_SHRINK_MENU - ELM_TOOLBAR_SHRINK_EXPAND - ELM_TOOLBAR_SHRINK_LAST - - ctypedef enum Elm_Transit_Effect_Flip_Axis: - ELM_TRANSIT_EFFECT_FLIP_AXIS_X - ELM_TRANSIT_EFFECT_FLIP_AXIS_Y - - ctypedef enum Elm_Transit_Effect_Wipe_Dir: - ELM_TRANSIT_EFFECT_WIPE_DIR_LEFT - ELM_TRANSIT_EFFECT_WIPE_DIR_RIGHT - ELM_TRANSIT_EFFECT_WIPE_DIR_UP - ELM_TRANSIT_EFFECT_WIPE_DIR_DOWN - - ctypedef enum Elm_Transit_Effect_Wipe_Type: - ELM_TRANSIT_EFFECT_WIPE_TYPE_HIDE - ELM_TRANSIT_EFFECT_WIPE_TYPE_SHOW - - ctypedef enum Elm_Transit_Tween_Mode: - ELM_TRANSIT_TWEEN_MODE_LINEAR - ELM_TRANSIT_TWEEN_MODE_SINUSOIDAL - ELM_TRANSIT_TWEEN_MODE_DECELERATE - ELM_TRANSIT_TWEEN_MODE_ACCELERATE - - ctypedef enum Elm_Web_Window_Feature_Flag: - ELM_WEB_WINDOW_FEATURE_TOOLBAR - ELM_WEB_WINDOW_FEATURE_STATUSBAR - ELM_WEB_WINDOW_FEATURE_SCROLLBARS - ELM_WEB_WINDOW_FEATURE_MENUBAR - ELM_WEB_WINDOW_FEATURE_LOCATIONBAR - ELM_WEB_WINDOW_FEATURE_FULLSCREEN - - ctypedef enum Elm_Web_Zoom_Mode: - ELM_WEB_ZOOM_MODE_MANUAL - ELM_WEB_ZOOM_MODE_AUTO_FIT - ELM_WEB_ZOOM_MODE_AUTO_FILL - - ctypedef enum Elm_Win_Type: - ELM_WIN_UNKNOWN - ELM_WIN_BASIC - ELM_WIN_DIALOG_BASIC - ELM_WIN_DESKTOP - ELM_WIN_DOCK - ELM_WIN_TOOLBAR - ELM_WIN_MENU - ELM_WIN_UTILITY - ELM_WIN_SPLASH - ELM_WIN_DROPDOWN_MENU - ELM_WIN_POPUP_MENU - ELM_WIN_TOOLTIP - ELM_WIN_NOTIFICATION - ELM_WIN_COMBO - ELM_WIN_DND - ELM_WIN_INLINED_IMAGE - ELM_WIN_SOCKET_IMAGE - - ctypedef enum Elm_Win_Indicator_Mode: - ELM_WIN_INDICATOR_UNKNOWN - ELM_WIN_INDICATOR_HIDE - ELM_WIN_INDICATOR_SHOW - - ctypedef enum Elm_Win_Indicator_Opacity_Mode: - ELM_WIN_INDICATOR_OPACITY_UNKNOWN - ELM_WIN_INDICATOR_OPAQUE - ELM_WIN_INDICATOR_TRANSLUCENT - ELM_WIN_INDICATOR_TRANSPARENT - - ctypedef enum Elm_Win_Keyboard_Mode: - ELM_WIN_KEYBOARD_UNKNOWN - ELM_WIN_KEYBOARD_OFF - ELM_WIN_KEYBOARD_ON - ELM_WIN_KEYBOARD_ALPHA - ELM_WIN_KEYBOARD_NUMERIC - ELM_WIN_KEYBOARD_PIN - ELM_WIN_KEYBOARD_PHONE_NUMBER - ELM_WIN_KEYBOARD_HEX - ELM_WIN_KEYBOARD_TERMINAL - ELM_WIN_KEYBOARD_PASSWORD - ELM_WIN_KEYBOARD_IP - ELM_WIN_KEYBOARD_HOST - ELM_WIN_KEYBOARD_FILE - ELM_WIN_KEYBOARD_URL - ELM_WIN_KEYBOARD_KEYPAD - ELM_WIN_KEYBOARD_J2ME - - ctypedef enum Elm_Wrap_Type: - ELM_WRAP_NONE - ELM_WRAP_CHAR - ELM_WRAP_WORD - ELM_WRAP_MIXED - - ctypedef enum Elm_Xdnd_Action: - ELM_XDND_ACTION_UNKNOWN - ELM_XDND_ACTION_COPY - ELM_XDND_ACTION_MOVE - ELM_XDND_ACTION_PRIVATE - ELM_XDND_ACTION_ASK - ELM_XDND_ACTION_LIST - ELM_XDND_ACTION_LINK - ELM_XDND_ACTION_DESCRIPTION - -cdef extern from "Edje.h": - ctypedef enum Edje_Channel: - EDJE_CHANNEL_EFFECT # Standard audio effects - EDJE_CHANNEL_BACKGROUND # Background audio sounds - EDJE_CHANNEL_MUSIC # Music audio - EDJE_CHANNEL_FOREGROUND # Foreground audio sounds - EDJE_CHANNEL_INTERFACE # Sounds related to the interface - EDJE_CHANNEL_INPUT # Sounds related to regular input - EDJE_CHANNEL_ALERT # Sounds for major alerts - EDJE_CHANNEL_ALL # All audio channels (convenience) diff --git a/efl/elementary/fileselector.pxd b/efl/elementary/fileselector.pxd index 33372a2..4749f3e 100644 --- a/efl/elementary/fileselector.pxd +++ b/efl/elementary/fileselector.pxd @@ -1,8 +1,29 @@ from efl.eina cimport Eina_Bool, Eina_List from efl.evas cimport Evas_Object, Evas_Coord -from enums cimport Elm_Fileselector_Mode, Elm_Fileselector_Sort + cdef extern from "Elementary.h": + + cpdef enum Elm_Fileselector_Mode: + ELM_FILESELECTOR_LIST + ELM_FILESELECTOR_GRID + ctypedef enum Elm_Fileselector_Mode: + pass + + cpdef enum Elm_Fileselector_Sort: + ELM_FILESELECTOR_SORT_BY_FILENAME_ASC + ELM_FILESELECTOR_SORT_BY_FILENAME_DESC + ELM_FILESELECTOR_SORT_BY_TYPE_ASC + ELM_FILESELECTOR_SORT_BY_TYPE_DESC + ELM_FILESELECTOR_SORT_BY_SIZE_ASC + ELM_FILESELECTOR_SORT_BY_SIZE_DESC + ELM_FILESELECTOR_SORT_BY_MODIFIED_ASC + ELM_FILESELECTOR_SORT_BY_MODIFIED_DESC + ELM_FILESELECTOR_SORT_LAST + ctypedef enum Elm_Fileselector_Sort: + pass + + ctypedef Eina_Bool (*Elm_Fileselector_Filter_Func)(const char *path, Eina_Bool dir, void *data) Evas_Object * elm_fileselector_add(Evas_Object *parent) diff --git a/efl/elementary/fileselector.pyx b/efl/elementary/fileselector.pyx index cf44cc0..0a239b2 100644 --- a/efl/elementary/fileselector.pyx +++ b/efl/elementary/fileselector.pyx @@ -146,22 +146,8 @@ from efl.utils.conversions cimport _ctouni, eina_list_strings_to_python_list from efl.evas cimport Object as evasObject from layout_class cimport LayoutClass -cimport enums - import traceback -ELM_FILESELECTOR_LIST = enums.ELM_FILESELECTOR_LIST -ELM_FILESELECTOR_GRID = enums.ELM_FILESELECTOR_GRID - -ELM_FILESELECTOR_SORT_BY_FILENAME_ASC = enums.ELM_FILESELECTOR_SORT_BY_FILENAME_ASC -ELM_FILESELECTOR_SORT_BY_FILENAME_DESC = enums.ELM_FILESELECTOR_SORT_BY_FILENAME_DESC -ELM_FILESELECTOR_SORT_BY_TYPE_ASC = enums.ELM_FILESELECTOR_SORT_BY_TYPE_ASC -ELM_FILESELECTOR_SORT_BY_TYPE_DESC = enums.ELM_FILESELECTOR_SORT_BY_TYPE_DESC -ELM_FILESELECTOR_SORT_BY_SIZE_ASC = enums.ELM_FILESELECTOR_SORT_BY_SIZE_ASC -ELM_FILESELECTOR_SORT_BY_SIZE_DESC = enums.ELM_FILESELECTOR_SORT_BY_SIZE_DESC -ELM_FILESELECTOR_SORT_BY_MODIFIED_ASC = enums.ELM_FILESELECTOR_SORT_BY_MODIFIED_ASC -ELM_FILESELECTOR_SORT_BY_MODIFIED_DESC = enums.ELM_FILESELECTOR_SORT_BY_MODIFIED_DESC -ELM_FILESELECTOR_SORT_LAST = enums.ELM_FILESELECTOR_SORT_LAST def _cb_string_conv(uintptr_t addr): cdef const char *s = <const char *>addr diff --git a/efl/elementary/flip.pxd b/efl/elementary/flip.pxd index fb75dc5..0cc1e1f 100644 --- a/efl/elementary/flip.pxd +++ b/efl/elementary/flip.pxd @@ -1,7 +1,41 @@ from efl.evas cimport Eina_Bool, Evas_Object, Evas_Coord -from enums cimport Elm_Flip_Direction, Elm_Flip_Interaction, Elm_Flip_Mode + cdef extern from "Elementary.h": + + cpdef enum Elm_Flip_Direction: + ELM_FLIP_DIRECTION_UP + ELM_FLIP_DIRECTION_DOWN + ELM_FLIP_DIRECTION_LEFT + ELM_FLIP_DIRECTION_RIGHT + ctypedef enum Elm_Flip_Direction: + pass + + cpdef enum Elm_Flip_Interaction: + ELM_FLIP_INTERACTION_NONE + ELM_FLIP_INTERACTION_ROTATE + ELM_FLIP_INTERACTION_CUBE + ELM_FLIP_INTERACTION_PAGE + ctypedef enum Elm_Flip_Interaction: + pass + + cpdef enum Elm_Flip_Mode: + ELM_FLIP_ROTATE_Y_CENTER_AXIS + ELM_FLIP_ROTATE_X_CENTER_AXIS + ELM_FLIP_ROTATE_XZ_CENTER_AXIS + ELM_FLIP_ROTATE_YZ_CENTER_AXIS + ELM_FLIP_CUBE_LEFT + ELM_FLIP_CUBE_RIGHT + ELM_FLIP_CUBE_UP + ELM_FLIP_CUBE_DOWN + ELM_FLIP_PAGE_LEFT + ELM_FLIP_PAGE_RIGHT + ELM_FLIP_PAGE_UP + ELM_FLIP_PAGE_DOWN + ctypedef enum Elm_Flip_Mode: + pass + + Evas_Object *elm_flip_add(Evas_Object *parent) Eina_Bool elm_flip_front_visible_get(const Evas_Object *obj) void elm_flip_perspective_set(Evas_Object *obj, Evas_Coord foc, Evas_Coord x, Evas_Coord y) diff --git a/efl/elementary/flip.pyx b/efl/elementary/flip.pyx index 91ed6f4..72234c9 100644 --- a/efl/elementary/flip.pyx +++ b/efl/elementary/flip.pyx @@ -177,30 +177,6 @@ from efl.eo cimport _object_mapping_register from efl.evas cimport Object as evasObject from object cimport Object -cimport enums - -ELM_FLIP_DIRECTION_UP = enums.ELM_FLIP_DIRECTION_UP -ELM_FLIP_DIRECTION_DOWN = enums.ELM_FLIP_DIRECTION_DOWN -ELM_FLIP_DIRECTION_LEFT = enums.ELM_FLIP_DIRECTION_LEFT -ELM_FLIP_DIRECTION_RIGHT = enums.ELM_FLIP_DIRECTION_RIGHT - -ELM_FLIP_INTERACTION_NONE = enums.ELM_FLIP_INTERACTION_NONE -ELM_FLIP_INTERACTION_ROTATE = enums.ELM_FLIP_INTERACTION_ROTATE -ELM_FLIP_INTERACTION_CUBE = enums.ELM_FLIP_INTERACTION_CUBE -ELM_FLIP_INTERACTION_PAGE = enums.ELM_FLIP_INTERACTION_PAGE - -ELM_FLIP_ROTATE_Y_CENTER_AXIS = enums.ELM_FLIP_ROTATE_Y_CENTER_AXIS -ELM_FLIP_ROTATE_X_CENTER_AXIS = enums.ELM_FLIP_ROTATE_X_CENTER_AXIS -ELM_FLIP_ROTATE_XZ_CENTER_AXIS = enums.ELM_FLIP_ROTATE_XZ_CENTER_AXIS -ELM_FLIP_ROTATE_YZ_CENTER_AXIS = enums.ELM_FLIP_ROTATE_YZ_CENTER_AXIS -ELM_FLIP_CUBE_LEFT = enums.ELM_FLIP_CUBE_LEFT -ELM_FLIP_CUBE_RIGHT = enums.ELM_FLIP_CUBE_RIGHT -ELM_FLIP_CUBE_UP = enums.ELM_FLIP_CUBE_UP -ELM_FLIP_CUBE_DOWN = enums.ELM_FLIP_CUBE_DOWN -ELM_FLIP_PAGE_LEFT = enums.ELM_FLIP_PAGE_LEFT -ELM_FLIP_PAGE_RIGHT = enums.ELM_FLIP_PAGE_RIGHT -ELM_FLIP_PAGE_UP = enums.ELM_FLIP_PAGE_UP -ELM_FLIP_PAGE_DOWN = enums.ELM_FLIP_PAGE_DOWN cdef class Flip(Object): """ diff --git a/efl/elementary/general.pxd b/efl/elementary/general.pxd index 2957337..8145036 100644 --- a/efl/elementary/general.pxd +++ b/efl/elementary/general.pxd @@ -19,8 +19,7 @@ from efl.evas cimport Eina_List, Eina_Bool from efl.evas cimport Evas_Object, Evas_Font_Size, Evas_Coord from efl.evas cimport Evas_Callback_Type -from enums cimport Elm_Sys_Notify_Closed_Reason, Elm_Sys_Notify_Urgency, \ - Elm_Process_State + cdef extern from "time.h": struct tm: @@ -44,6 +43,69 @@ cdef extern from "Edje.h": ctypedef void (*Edje_Signal_Cb)(void *data, Evas_Object *obj, const char *emission, const char *source) cdef extern from "Elementary.h": + + #define + cpdef enum: + ELM_EVENT_SYS_NOTIFY_NOTIFICATION_CLOSED + ELM_EVENT_SYS_NOTIFY_ACTION_INVOKED + + #enums + cpdef enum Elm_Policy: + ELM_POLICY_QUIT + ELM_POLICY_EXIT + ELM_POLICY_THROTTLE + ELM_POLICY_LAST + ctypedef enum Elm_Policy: + pass + + cpdef enum Elm_Policy_Quit: + ELM_POLICY_QUIT_NONE + ELM_POLICY_QUIT_LAST_WINDOW_CLOSED + ctypedef enum Elm_Policy_Quit: + pass + + cpdef enum Elm_Policy_Exit: + ELM_POLICY_EXIT_NONE + ELM_POLICY_EXIT_WINDOWS_DEL + ctypedef enum Elm_Policy_Exit: + pass + + cpdef enum Elm_Policy_Throttle: + ELM_POLICY_THROTTLE_CONFIG + ELM_POLICY_THROTTLE_HIDDEN_ALWAYS + ELM_POLICY_THROTTLE_NEVER + ctypedef enum Elm_Policy_Throttle: + pass + + cpdef enum Elm_Sys_Notify_Closed_Reason: + ELM_SYS_NOTIFY_CLOSED_EXPIRED + ELM_SYS_NOTIFY_CLOSED_DISMISSED + ELM_SYS_NOTIFY_CLOSED_REQUESTED + ELM_SYS_NOTIFY_CLOSED_UNDEFINED + ctypedef enum Elm_Sys_Notify_Closed_Reason: + pass + + cpdef enum Elm_Sys_Notify_Urgency: + ELM_SYS_NOTIFY_URGENCY_LOW + ELM_SYS_NOTIFY_URGENCY_NORMAL + ELM_SYS_NOTIFY_URGENCY_CRITICAL + ctypedef enum Elm_Sys_Notify_Urgency: + pass + + cpdef enum Elm_Glob_Match_Flags: + ELM_GLOB_MATCH_NO_ESCAPE + ELM_GLOB_MATCH_PATH + ELM_GLOB_MATCH_PERIOD + ELM_GLOB_MATCH_NOCASE + ctypedef enum Elm_Glob_Match_Flags: + pass + + cpdef enum Elm_Process_State: + ELM_PROCESS_STATE_FOREGROUND + ELM_PROCESS_STATE_BACKGROUND + ctypedef enum Elm_Process_State: + pass + #colors ctypedef struct Elm_Color_RGBA: unsigned int r diff --git a/efl/elementary/general.pyx b/efl/elementary/general.pyx index fc1635a..19addcc 100644 --- a/efl/elementary/general.pyx +++ b/efl/elementary/general.pyx @@ -241,8 +241,7 @@ from libc.string cimport memcpy from efl.evas cimport Object as evasObject from efl.utils.conversions cimport _touni, _ctouni, \ - python_list_strings_to_eina_list, \ - eina_list_strings_to_python_list + python_list_strings_to_eina_list, eina_list_strings_to_python_list from efl.utils.logger cimport add_logger @@ -250,48 +249,9 @@ from efl.eina cimport EINA_LOG_DOM_DBG, EINA_LOG_DOM_INFO, \ EINA_LOG_DOM_WARN, EINA_LOG_DOM_ERR, EINA_LOG_DOM_CRIT from efl.ecore cimport Event, EventHandler, _event_mapping_register - from efl.elementary.need cimport elm_need_sys_notify -cimport enums -from enums cimport Elm_Policy - import sys - -ELM_POLICY_QUIT = enums.ELM_POLICY_QUIT -ELM_POLICY_EXIT = enums.ELM_POLICY_EXIT -ELM_POLICY_THROTTLE = enums.ELM_POLICY_THROTTLE - -ELM_POLICY_QUIT_NONE = enums.ELM_POLICY_QUIT_NONE -ELM_POLICY_QUIT_LAST_WINDOW_CLOSED = enums.ELM_POLICY_QUIT_LAST_WINDOW_CLOSED - -ELM_POLICY_EXIT_NONE = enums.ELM_POLICY_EXIT_NONE -ELM_POLICY_EXIT_WINDOWS_DEL = enums.ELM_POLICY_EXIT_WINDOWS_DEL - -ELM_POLICY_THROTTLE_CONFIG = enums.ELM_POLICY_THROTTLE_CONFIG -ELM_POLICY_THROTTLE_HIDDEN_ALWAYS = enums.ELM_POLICY_THROTTLE_HIDDEN_ALWAYS -ELM_POLICY_THROTTLE_NEVER = enums.ELM_POLICY_THROTTLE_NEVER - -ELM_SYS_NOTIFY_CLOSED_EXPIRED = enums.ELM_SYS_NOTIFY_CLOSED_EXPIRED -ELM_SYS_NOTIFY_CLOSED_DISMISSED = enums.ELM_SYS_NOTIFY_CLOSED_DISMISSED -ELM_SYS_NOTIFY_CLOSED_REQUESTED = enums.ELM_SYS_NOTIFY_CLOSED_REQUESTED -ELM_SYS_NOTIFY_CLOSED_UNDEFINED = enums.ELM_SYS_NOTIFY_CLOSED_UNDEFINED - -ELM_SYS_NOTIFY_URGENCY_LOW = enums.ELM_SYS_NOTIFY_URGENCY_LOW -ELM_SYS_NOTIFY_URGENCY_NORMAL = enums.ELM_SYS_NOTIFY_URGENCY_NORMAL -ELM_SYS_NOTIFY_URGENCY_CRITICAL = enums.ELM_SYS_NOTIFY_URGENCY_CRITICAL - -ELM_EVENT_SYS_NOTIFY_NOTIFICATION_CLOSED = enums.ELM_EVENT_SYS_NOTIFY_NOTIFICATION_CLOSED -ELM_EVENT_SYS_NOTIFY_ACTION_INVOKED = enums.ELM_EVENT_SYS_NOTIFY_ACTION_INVOKED - -ELM_GLOB_MATCH_NO_ESCAPE = enums.ELM_GLOB_MATCH_NO_ESCAPE -ELM_GLOB_MATCH_PATH = enums.ELM_GLOB_MATCH_PATH -ELM_GLOB_MATCH_PERIOD = enums.ELM_GLOB_MATCH_PERIOD -ELM_GLOB_MATCH_NOCASE = enums.ELM_GLOB_MATCH_NOCASE - -ELM_PROCESS_STATE_FOREGROUND = enums.ELM_PROCESS_STATE_FOREGROUND -ELM_PROCESS_STATE_BACKGROUND = enums.ELM_PROCESS_STATE_BACKGROUND - import traceback cdef void py_elm_sys_notify_send_cb(void *data, unsigned int id): @@ -367,23 +327,23 @@ cdef class SysNotifyActionInvoked(Event): if elm_need_sys_notify(): _event_mapping_register( - enums.ELM_EVENT_SYS_NOTIFY_NOTIFICATION_CLOSED, + ELM_EVENT_SYS_NOTIFY_NOTIFICATION_CLOSED, SysNotifyNotificationClosed ) def on_sys_notify_notification_closed(func, *args, **kargs): return EventHandler( - enums.ELM_EVENT_SYS_NOTIFY_NOTIFICATION_CLOSED, func, *args, **kargs + ELM_EVENT_SYS_NOTIFY_NOTIFICATION_CLOSED, func, *args, **kargs ) _event_mapping_register( - enums.ELM_EVENT_SYS_NOTIFY_ACTION_INVOKED, + ELM_EVENT_SYS_NOTIFY_ACTION_INVOKED, SysNotifyActionInvoked ) def on_sys_notify_action_invoked(func, *args, **kargs): return EventHandler( - enums.ELM_EVENT_SYS_NOTIFY_NOTIFICATION_CLOSED, func, *args, **kargs + ELM_EVENT_SYS_NOTIFY_NOTIFICATION_CLOSED, func, *args, **kargs ) cdef class FontProperties(object): @@ -739,7 +699,7 @@ def sys_notify_close(unsigned int id): def sys_notify_send( unsigned int replaces_id=0, icon=None, summary=None, body=None, - Elm_Sys_Notify_Urgency urgency=enums.ELM_SYS_NOTIFY_URGENCY_NORMAL, + Elm_Sys_Notify_Urgency urgency=ELM_SYS_NOTIFY_URGENCY_NORMAL, int timeout=-1, cb=None, cb_data=None ): """Sends a notification to the notification server. diff --git a/efl/elementary/gengrid.pxd b/efl/elementary/gengrid.pxd index 07e6f04..a053a7a 100644 --- a/efl/elementary/gengrid.pxd +++ b/efl/elementary/gengrid.pxd @@ -3,11 +3,44 @@ from efl.evas cimport Eina_Bool, Eina_List, Evas_Object, Evas_Smart_Cb, \ from efl.c_eo cimport Eo from object_item cimport Elm_Object_Item from general cimport Elm_Tooltip_Item_Content_Cb -from enums cimport Elm_Genlist_Item_Scrollto_Type, Elm_Object_Select_Mode, \ - Elm_Object_Multi_Select_Mode, Elm_Glob_Match_Flags, Elm_Gengrid_Reorder_Type +from efl.elementary.general cimport Elm_Glob_Match_Flags + from efl.ecore cimport Ecore_Pos_Map + cdef extern from "Elementary.h": + + cpdef enum Elm_Genlist_Item_Scrollto_Type: + ELM_GENLIST_ITEM_SCROLLTO_NONE + ELM_GENLIST_ITEM_SCROLLTO_IN + ELM_GENLIST_ITEM_SCROLLTO_TOP + ELM_GENLIST_ITEM_SCROLLTO_MIDDLE + ctypedef enum Elm_Genlist_Item_Scrollto_Type: + pass + + cpdef enum Elm_Object_Select_Mode: + ELM_OBJECT_SELECT_MODE_DEFAULT + ELM_OBJECT_SELECT_MODE_ALWAYS + ELM_OBJECT_SELECT_MODE_NONE + ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY + ELM_OBJECT_SELECT_MODE_MAX + ctypedef enum Elm_Object_Select_Mode: + pass + + cpdef enum Elm_Object_Multi_Select_Mode: + ELM_OBJECT_MULTI_SELECT_MODE_DEFAULT + ELM_OBJECT_MULTI_SELECT_MODE_WITH_CONTROL + ELM_OBJECT_MULTI_SELECT_MODE_MAX + ctypedef enum Elm_Object_Multi_Select_Mode: + pass + + cpdef enum Elm_Gengrid_Reorder_Type: + ELM_GENGRID_REORDER_TYPE_NORMAL + ELM_GENGRID_REORDER_TYPE_SWAP + ctypedef enum Elm_Gengrid_Reorder_Type: + pass + + ctypedef char *(*GengridItemLabelGetFunc) (void *data, Evas_Object *obj, const char *part) ctypedef Evas_Object *(*GengridItemIconGetFunc) (void *data, Evas_Object *obj, const char *part) ctypedef Eina_Bool (*GengridItemStateGetFunc) (void *data, Evas_Object *obj, const char *part) diff --git a/efl/elementary/gengrid.pyx b/efl/elementary/gengrid.pyx index 98e58ba..9d02196 100644 --- a/efl/elementary/gengrid.pyx +++ b/efl/elementary/gengrid.pyx @@ -337,7 +337,6 @@ from object cimport Object from object_item cimport ObjectItem, _object_item_to_python, \ elm_object_item_widget_get, _object_item_from_python, \ _object_item_list_to_python, elm_object_item_data_get -cimport enums import traceback @@ -346,18 +345,6 @@ from scroller cimport elm_scroller_policy_get, elm_scroller_policy_set, \ elm_scroller_bounce_get, elm_scroller_bounce_set, Elm_Scroller_Policy -ELM_GENLIST_ITEM_SCROLLTO_NONE = enums.ELM_GENLIST_ITEM_SCROLLTO_NONE -ELM_GENLIST_ITEM_SCROLLTO_IN = enums.ELM_GENLIST_ITEM_SCROLLTO_IN -ELM_GENLIST_ITEM_SCROLLTO_TOP = enums.ELM_GENLIST_ITEM_SCROLLTO_TOP -ELM_GENLIST_ITEM_SCROLLTO_MIDDLE = enums.ELM_GENLIST_ITEM_SCROLLTO_MIDDLE - -ELM_OBJECT_MULTI_SELECT_MODE_DEFAULT = enums.ELM_OBJECT_MULTI_SELECT_MODE_DEFAULT -ELM_OBJECT_MULTI_SELECT_MODE_WITH_CONTROL = enums.ELM_OBJECT_MULTI_SELECT_MODE_WITH_CONTROL -ELM_OBJECT_MULTI_SELECT_MODE_MAX = enums.ELM_OBJECT_MULTI_SELECT_MODE_MAX - -ELM_GENGRID_REORDER_TYPE_NORMAL = enums.ELM_GENGRID_REORDER_TYPE_NORMAL -ELM_GENGRID_REORDER_TYPE_SWAP = enums.ELM_GENGRID_REORDER_TYPE_SWAP - def _cb_object_item_conv(uintptr_t addr): cdef Elm_Object_Item *it = <Elm_Object_Item *>addr return _object_item_to_python(it) diff --git a/efl/elementary/genlist.pxd b/efl/elementary/genlist.pxd index 0d8d367..ea42da3 100644 --- a/efl/elementary/genlist.pxd +++ b/efl/elementary/genlist.pxd @@ -2,11 +2,72 @@ from efl.evas cimport Eina_Bool, Eina_List, Eina_Compare_Cb, \ Evas_Object, Evas_Smart_Cb, Evas_Coord from object_item cimport Elm_Object_Item from general cimport Elm_Tooltip_Item_Content_Cb -from enums cimport Elm_List_Mode, Elm_Object_Select_Mode, \ - Elm_Genlist_Item_Type, Elm_Genlist_Item_Scrollto_Type, \ - Elm_Genlist_Item_Field_Type, Elm_Glob_Match_Flags +from efl.elementary.general cimport Elm_Glob_Match_Flags + cdef extern from "Elementary.h": + + cpdef enum Elm_Genlist_Item_Type: + ELM_GENLIST_ITEM_NONE + ELM_GENLIST_ITEM_TREE + ELM_GENLIST_ITEM_GROUP + ELM_GENLIST_ITEM_MAX + ctypedef enum Elm_Genlist_Item_Type: + pass + + cpdef enum Elm_Genlist_Item_Field_Type: + ELM_GENLIST_ITEM_FIELD_ALL + ELM_GENLIST_ITEM_FIELD_TEXT + ELM_GENLIST_ITEM_FIELD_CONTENT + ELM_GENLIST_ITEM_FIELD_STATE + ctypedef enum Elm_Genlist_Item_Field_Type: + pass + + cpdef enum Elm_Genlist_Item_Scrollto_Type: + ELM_GENLIST_ITEM_SCROLLTO_NONE + ELM_GENLIST_ITEM_SCROLLTO_IN + ELM_GENLIST_ITEM_SCROLLTO_TOP + ELM_GENLIST_ITEM_SCROLLTO_MIDDLE + ctypedef enum Elm_Genlist_Item_Scrollto_Type: + pass + + cpdef enum Elm_List_Mode: + ELM_LIST_COMPRESS + ELM_LIST_SCROLL + ELM_LIST_LIMIT + ELM_LIST_EXPAND + ctypedef enum Elm_List_Mode: + pass + + cpdef enum Elm_Object_Select_Mode: + ELM_OBJECT_SELECT_MODE_DEFAULT + ELM_OBJECT_SELECT_MODE_ALWAYS + ELM_OBJECT_SELECT_MODE_NONE + ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY + ELM_OBJECT_SELECT_MODE_MAX + ctypedef enum Elm_Object_Select_Mode: + pass + + cpdef enum Elm_Sel_Format: + ELM_SEL_FORMAT_TARGETS + ELM_SEL_FORMAT_NONE + ELM_SEL_FORMAT_TEXT + ELM_SEL_FORMAT_MARKUP + ELM_SEL_FORMAT_IMAGE + ELM_SEL_FORMAT_VCARD + ELM_SEL_FORMAT_HTML + ctypedef enum Elm_Sel_Format: + pass + + cpdef enum Elm_Sel_Type: + ELM_SEL_TYPE_PRIMARY + ELM_SEL_TYPE_SECONDARY + ELM_SEL_TYPE_XDND + ELM_SEL_TYPE_CLIPBOARD + ctypedef enum Elm_Sel_Type: + pass + + ctypedef char *(*GenlistItemLabelGetFunc) (void *data, Evas_Object *obj, const char *part) ctypedef Evas_Object *(*GenlistItemIconGetFunc) (void *data, Evas_Object *obj, const char *part) ctypedef Eina_Bool (*GenlistItemStateGetFunc) (void *data, Evas_Object *obj, const char *part) diff --git a/efl/elementary/genlist.pyx b/efl/elementary/genlist.pyx index 0d96eef..2ad1550 100644 --- a/efl/elementary/genlist.pyx +++ b/efl/elementary/genlist.pyx @@ -531,49 +531,9 @@ from general cimport PY_EFL_ELM_LOG_DOMAIN from efl.eina cimport EINA_LOG_DOM_DBG, EINA_LOG_DOM_INFO, EINA_LOG_DOM_WARN, \ EINA_LOG_DOM_ERR, EINA_LOG_DOM_CRIT -cimport enums - import traceback import logging -ELM_GENLIST_ITEM_NONE = enums.ELM_GENLIST_ITEM_NONE -ELM_GENLIST_ITEM_TREE = enums.ELM_GENLIST_ITEM_TREE -ELM_GENLIST_ITEM_GROUP = enums.ELM_GENLIST_ITEM_GROUP -ELM_GENLIST_ITEM_MAX = enums.ELM_GENLIST_ITEM_MAX - -ELM_GENLIST_ITEM_FIELD_ALL = enums.ELM_GENLIST_ITEM_FIELD_ALL -ELM_GENLIST_ITEM_FIELD_TEXT = enums.ELM_GENLIST_ITEM_FIELD_TEXT -ELM_GENLIST_ITEM_FIELD_CONTENT = enums.ELM_GENLIST_ITEM_FIELD_CONTENT -ELM_GENLIST_ITEM_FIELD_STATE = enums.ELM_GENLIST_ITEM_FIELD_STATE - -ELM_GENLIST_ITEM_SCROLLTO_NONE = enums.ELM_GENLIST_ITEM_SCROLLTO_NONE -ELM_GENLIST_ITEM_SCROLLTO_IN = enums.ELM_GENLIST_ITEM_SCROLLTO_IN -ELM_GENLIST_ITEM_SCROLLTO_TOP = enums.ELM_GENLIST_ITEM_SCROLLTO_TOP -ELM_GENLIST_ITEM_SCROLLTO_MIDDLE = enums.ELM_GENLIST_ITEM_SCROLLTO_MIDDLE - -ELM_LIST_COMPRESS = enums.ELM_LIST_COMPRESS -ELM_LIST_SCROLL = enums.ELM_LIST_SCROLL -ELM_LIST_LIMIT = enums.ELM_LIST_LIMIT -ELM_LIST_EXPAND = enums.ELM_LIST_EXPAND - -ELM_OBJECT_SELECT_MODE_DEFAULT = enums.ELM_OBJECT_SELECT_MODE_DEFAULT -ELM_OBJECT_SELECT_MODE_ALWAYS = enums.ELM_OBJECT_SELECT_MODE_ALWAYS -ELM_OBJECT_SELECT_MODE_NONE = enums.ELM_OBJECT_SELECT_MODE_NONE -ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY = enums.ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY -ELM_OBJECT_SELECT_MODE_MAX = enums.ELM_OBJECT_SELECT_MODE_MAX - -ELM_SEL_FORMAT_TARGETS = enums.ELM_SEL_FORMAT_TARGETS -ELM_SEL_FORMAT_NONE = enums.ELM_SEL_FORMAT_NONE -ELM_SEL_FORMAT_TEXT = enums.ELM_SEL_FORMAT_TEXT -ELM_SEL_FORMAT_MARKUP = enums.ELM_SEL_FORMAT_MARKUP -ELM_SEL_FORMAT_IMAGE = enums.ELM_SEL_FORMAT_IMAGE -ELM_SEL_FORMAT_VCARD = enums.ELM_SEL_FORMAT_VCARD -ELM_SEL_FORMAT_HTML = enums.ELM_SEL_FORMAT_HTML - -ELM_SEL_TYPE_PRIMARY = enums.ELM_SEL_TYPE_PRIMARY -ELM_SEL_TYPE_SECONDARY = enums.ELM_SEL_TYPE_SECONDARY -ELM_SEL_TYPE_XDND = enums.ELM_SEL_TYPE_XDND -ELM_SEL_TYPE_CLIPBOARD = enums.ELM_SEL_TYPE_CLIPBOARD def _cb_object_item_conv(uintptr_t addr): cdef Elm_Object_Item *it = <Elm_Object_Item *>addr diff --git a/efl/elementary/genlist_item.pxi b/efl/elementary/genlist_item.pxi index 32e0335..430b0d4 100644 --- a/efl/elementary/genlist_item.pxi +++ b/efl/elementary/genlist_item.pxi @@ -13,7 +13,7 @@ cdef class GenlistItem(ObjectItem): def __init__(self, GenlistItemClass item_class not None, item_data=None, GenlistItem parent_item=None, - Elm_Genlist_Item_Type flags=enums.ELM_GENLIST_ITEM_NONE, + Elm_Genlist_Item_Type flags=ELM_GENLIST_ITEM_NONE, func=None, func_data=None, *args, **kwargs): """GenlistItem(...) @@ -321,7 +321,7 @@ cdef class GenlistItem(ObjectItem): cdef bint ret = elm_genlist_item_selected_get(self.item) return ret - def show(self, scrollto_type = enums.ELM_GENLIST_ITEM_SCROLLTO_IN): + def show(self, scrollto_type = ELM_GENLIST_ITEM_SCROLLTO_IN): """This causes genlist to jump to the item and show it (by jumping to that position), if it is not fully visible. @@ -332,7 +332,7 @@ cdef class GenlistItem(ObjectItem): """ elm_genlist_item_show(self.item, scrollto_type) - def bring_in(self, scrollto_type = enums.ELM_GENLIST_ITEM_SCROLLTO_IN): + def bring_in(self, scrollto_type = ELM_GENLIST_ITEM_SCROLLTO_IN): """This causes genlist to jump to the item and show it (by animatedly scrolling), if it is not fully visible. This may use animation and take a some time to do so. diff --git a/efl/elementary/gesture_layer.pxd b/efl/elementary/gesture_layer.pxd index 6fac603..da2d250 100644 --- a/efl/elementary/gesture_layer.pxd +++ b/efl/elementary/gesture_layer.pxd @@ -1,7 +1,33 @@ from efl.evas cimport Eina_Bool, Evas_Object, Evas_Coord, Evas_Event_Flags -from enums cimport Elm_Gesture_State, Elm_Gesture_Type + cdef extern from "Elementary.h": + + cpdef enum Elm_Gesture_State: + ELM_GESTURE_STATE_UNDEFINED + ELM_GESTURE_STATE_START + ELM_GESTURE_STATE_MOVE + ELM_GESTURE_STATE_END + ELM_GESTURE_STATE_ABORT + ctypedef enum Elm_Gesture_State: + pass + + cpdef enum Elm_Gesture_Type: + ELM_GESTURE_FIRST + ELM_GESTURE_N_TAPS + ELM_GESTURE_N_LONG_TAPS + ELM_GESTURE_N_DOUBLE_TAPS + ELM_GESTURE_N_TRIPLE_TAPS + ELM_GESTURE_MOMENTUM + ELM_GESTURE_N_LINES + ELM_GESTURE_N_FLICKS + ELM_GESTURE_ZOOM + ELM_GESTURE_ROTATE + ELM_GESTURE_LAST + ctypedef enum Elm_Gesture_Type: + pass + + ctypedef struct Elm_Gesture_Taps_Info: Evas_Coord x, y unsigned int n diff --git a/efl/elementary/gesture_layer.pyx b/efl/elementary/gesture_layer.pyx index ca2c010..25679d2 100644 --- a/efl/elementary/gesture_layer.pyx +++ b/efl/elementary/gesture_layer.pyx @@ -167,26 +167,6 @@ import traceback from efl.evas import EVAS_EVENT_FLAG_NONE -cimport enums - -ELM_GESTURE_STATE_UNDEFINED = enums.ELM_GESTURE_STATE_UNDEFINED -ELM_GESTURE_STATE_START = enums.ELM_GESTURE_STATE_START -ELM_GESTURE_STATE_MOVE = enums.ELM_GESTURE_STATE_MOVE -ELM_GESTURE_STATE_END = enums.ELM_GESTURE_STATE_END -ELM_GESTURE_STATE_ABORT = enums.ELM_GESTURE_STATE_ABORT - -ELM_GESTURE_FIRST = enums.ELM_GESTURE_FIRST -ELM_GESTURE_N_TAPS = enums.ELM_GESTURE_N_TAPS -ELM_GESTURE_N_LONG_TAPS = enums.ELM_GESTURE_N_LONG_TAPS -ELM_GESTURE_N_DOUBLE_TAPS = enums.ELM_GESTURE_N_DOUBLE_TAPS -ELM_GESTURE_N_TRIPLE_TAPS = enums.ELM_GESTURE_N_TRIPLE_TAPS -ELM_GESTURE_MOMENTUM = enums.ELM_GESTURE_MOMENTUM -ELM_GESTURE_N_LINES = enums.ELM_GESTURE_N_LINES -ELM_GESTURE_N_FLICKS = enums.ELM_GESTURE_N_FLICKS -ELM_GESTURE_ZOOM = enums.ELM_GESTURE_ZOOM -ELM_GESTURE_ROTATE = enums.ELM_GESTURE_ROTATE -ELM_GESTURE_LAST = enums.ELM_GESTURE_LAST - cdef class GestureTapsInfo(object): """GestureTapsInfo(...) @@ -574,19 +554,19 @@ cdef class GestureLayer(Object): if not callable(callback): raise TypeError("callback is not callable") - if idx == enums.ELM_GESTURE_N_TAPS or \ - idx == enums.ELM_GESTURE_N_LONG_TAPS or \ - idx == enums.ELM_GESTURE_N_DOUBLE_TAPS or \ - idx == enums.ELM_GESTURE_N_TRIPLE_TAPS: + if idx == <int>ELM_GESTURE_N_TAPS or \ + idx == <int>ELM_GESTURE_N_LONG_TAPS or \ + idx == <int>ELM_GESTURE_N_DOUBLE_TAPS or \ + idx == <int>ELM_GESTURE_N_TRIPLE_TAPS: cb = _gesture_layer_taps_event_cb - elif idx == enums.ELM_GESTURE_MOMENTUM: + elif idx == <int>ELM_GESTURE_MOMENTUM: cb = _gesture_layer_momentum_event_cb - elif idx == enums.ELM_GESTURE_N_LINES or \ - idx == enums.ELM_GESTURE_N_FLICKS: + elif idx == <int>ELM_GESTURE_N_LINES or \ + idx == <int>ELM_GESTURE_N_FLICKS: cb = _gesture_layer_line_event_cb - elif idx == enums.ELM_GESTURE_ZOOM: + elif idx == <int>ELM_GESTURE_ZOOM: cb = _gesture_layer_zoom_event_cb - elif idx == enums.ELM_GESTURE_ROTATE: + elif idx == <int>ELM_GESTURE_ROTATE: cb = _gesture_layer_rotate_event_cb else: raise TypeError("Unknown gesture type") diff --git a/efl/elementary/glview.pxd b/efl/elementary/glview.pxd index d68904e..5023a01 100644 --- a/efl/elementary/glview.pxd +++ b/efl/elementary/glview.pxd @@ -1,9 +1,31 @@ from efl.eina cimport Eina_Bool from efl.evas cimport Evas_Object, Evas_Coord -from enums cimport Elm_GLView_Mode, Elm_GLView_Resize_Policy, \ - Elm_GLView_Render_Policy + cdef extern from "Elementary.h": + + cpdef enum Elm_GLView_Mode: + ELM_GLVIEW_NONE + ELM_GLVIEW_ALPHA + ELM_GLVIEW_DEPTH + ELM_GLVIEW_STENCIL + ELM_GLVIEW_DIRECT + ctypedef enum Elm_GLView_Mode: + pass + + cpdef enum Elm_GLView_Resize_Policy: + ELM_GLVIEW_RESIZE_POLICY_RECREATE + ELM_GLVIEW_RESIZE_POLICY_SCALE + ctypedef enum Elm_GLView_Resize_Policy: + pass + + cpdef enum Elm_GLView_Render_Policy: + ELM_GLVIEW_RENDER_POLICY_ON_DEMAND + ELM_GLVIEW_RENDER_POLICY_ALWAYS + ctypedef enum Elm_GLView_Render_Policy: + pass + + ctypedef struct Evas_GL_API ctypedef void (*Elm_GLView_Func_Cb)(Evas_Object *obj) diff --git a/efl/elementary/glview.pyx b/efl/elementary/glview.pyx index cab7190..e4166cb 100644 --- a/efl/elementary/glview.pyx +++ b/efl/elementary/glview.pyx @@ -118,19 +118,6 @@ from layout_class cimport LayoutClass import traceback -cimport enums - -ELM_GLVIEW_NONE = enums.ELM_GLVIEW_NONE -ELM_GLVIEW_ALPHA = enums.ELM_GLVIEW_ALPHA -ELM_GLVIEW_DEPTH = enums.ELM_GLVIEW_DEPTH -ELM_GLVIEW_STENCIL = enums.ELM_GLVIEW_STENCIL -ELM_GLVIEW_DIRECT = enums.ELM_GLVIEW_DIRECT - -ELM_GLVIEW_RESIZE_POLICY_RECREATE = enums.ELM_GLVIEW_RESIZE_POLICY_RECREATE -ELM_GLVIEW_RESIZE_POLICY_SCALE = enums.ELM_GLVIEW_RESIZE_POLICY_SCALE - -ELM_GLVIEW_RENDER_POLICY_ON_DEMAND = enums.ELM_GLVIEW_RENDER_POLICY_ON_DEMAND -ELM_GLVIEW_RENDER_POLICY_ALWAYS = enums.ELM_GLVIEW_RENDER_POLICY_ALWAYS cdef void py_elm_glview_init_func_cb(Evas_Object *obj): assert obj != NULL diff --git a/efl/elementary/hover.pxd b/efl/elementary/hover.pxd index a90d806..05edfd8 100644 --- a/efl/elementary/hover.pxd +++ b/efl/elementary/hover.pxd @@ -1,8 +1,17 @@ from efl.evas cimport Evas_Object from layout_class cimport LayoutClass -from enums cimport Elm_Hover_Axis + cdef extern from "Elementary.h": + + cpdef enum Elm_Hover_Axis: + ELM_HOVER_AXIS_NONE + ELM_HOVER_AXIS_HORIZONTAL + ELM_HOVER_AXIS_VERTICAL + ELM_HOVER_AXIS_BOTH + ctypedef enum Elm_Hover_Axis: + pass + Evas_Object *elm_hover_add(Evas_Object *parent) void elm_hover_target_set(Evas_Object *obj, Evas_Object *target) Evas_Object *elm_hover_target_get(const Evas_Object *obj) diff --git a/efl/elementary/hover.pyx b/efl/elementary/hover.pyx index 7579f79..09e53da 100644 --- a/efl/elementary/hover.pyx +++ b/efl/elementary/hover.pyx @@ -116,12 +116,6 @@ from efl.eo cimport _object_mapping_register, object_from_instance from efl.utils.conversions cimport _ctouni from efl.evas cimport Object as evasObject -cimport enums - -ELM_HOVER_AXIS_NONE = enums.ELM_HOVER_AXIS_NONE -ELM_HOVER_AXIS_HORIZONTAL = enums.ELM_HOVER_AXIS_HORIZONTAL -ELM_HOVER_AXIS_VERTICAL = enums.ELM_HOVER_AXIS_VERTICAL -ELM_HOVER_AXIS_BOTH = enums.ELM_HOVER_AXIS_BOTH cdef class Hover(LayoutClass): """ diff --git a/efl/elementary/hoversel.pxd b/efl/elementary/hoversel.pxd index bfac361..8439b72 100644 --- a/efl/elementary/hoversel.pxd +++ b/efl/elementary/hoversel.pxd @@ -1,8 +1,16 @@ from efl.evas cimport Eina_Bool, Eina_List, Evas_Object, Evas_Smart_Cb from object_item cimport Elm_Object_Item -from enums cimport Elm_Icon_Type + cdef extern from "Elementary.h": + + cpdef enum Elm_Icon_Type: + ELM_ICON_NONE + ELM_ICON_FILE + ELM_ICON_STANDARD + ctypedef enum Elm_Icon_Type: + pass + Evas_Object *elm_hoversel_add(Evas_Object *parent) void elm_hoversel_horizontal_set(Evas_Object *obj, Eina_Bool horizontal) Eina_Bool elm_hoversel_horizontal_get(const Evas_Object *obj) diff --git a/efl/elementary/hoversel.pyx b/efl/elementary/hoversel.pyx index c9e9dbb..28d4632 100644 --- a/efl/elementary/hoversel.pyx +++ b/efl/elementary/hoversel.pyx @@ -85,11 +85,6 @@ from object_item cimport ObjectItem, _object_item_callback, \ _object_item_list_to_python, _object_item_to_python, _object_item_callback2 from button cimport Button -cimport enums - -ELM_ICON_NONE = enums.ELM_ICON_NONE -ELM_ICON_FILE = enums.ELM_ICON_FILE -ELM_ICON_STANDARD = enums.ELM_ICON_STANDARD def _cb_object_item_conv(uintptr_t addr): cdef Elm_Object_Item *it = <Elm_Object_Item *>addr diff --git a/efl/elementary/icon.pxd b/efl/elementary/icon.pxd index bd1ea42..d850fd0 100644 --- a/efl/elementary/icon.pxd +++ b/efl/elementary/icon.pxd @@ -1,7 +1,24 @@ from efl.evas cimport Eina_Bool, Evas_Object -from enums cimport Elm_Icon_Lookup_Order + cdef extern from "Elementary.h": + + cpdef enum Elm_Icon_Lookup_Order: + ELM_ICON_LOOKUP_FDO_THEME + ELM_ICON_LOOKUP_THEME_FDO + ELM_ICON_LOOKUP_FDO + ELM_ICON_LOOKUP_THEME + ctypedef enum Elm_Icon_Lookup_Order: + pass + + cpdef enum Elm_Icon_Type: + ELM_ICON_NONE + ELM_ICON_FILE + ELM_ICON_STANDARD + ctypedef enum Elm_Icon_Type: + pass + + Evas_Object * elm_icon_add(Evas_Object *parent) void elm_icon_thumb_set(Evas_Object *obj, const char *file, const char *group) Eina_Bool elm_icon_standard_set(Evas_Object *obj, const char *name) diff --git a/efl/elementary/icon.pyx b/efl/elementary/icon.pyx index 7360d1c..a648658 100644 --- a/efl/elementary/icon.pyx +++ b/efl/elementary/icon.pyx @@ -194,16 +194,6 @@ from efl.utils.conversions cimport _ctouni from efl.evas cimport Object as evasObject from image cimport Image -cimport enums - -ELM_ICON_LOOKUP_FDO_THEME = enums.ELM_ICON_LOOKUP_FDO_THEME -ELM_ICON_LOOKUP_THEME_FDO = enums.ELM_ICON_LOOKUP_THEME_FDO -ELM_ICON_LOOKUP_FDO = enums.ELM_ICON_LOOKUP_FDO -ELM_ICON_LOOKUP_THEME = enums.ELM_ICON_LOOKUP_THEME - -ELM_ICON_NONE = enums.ELM_ICON_NONE -ELM_ICON_FILE = enums.ELM_ICON_FILE -ELM_ICON_STANDARD = enums.ELM_ICON_STANDARD cdef class Icon(Image): """ diff --git a/efl/elementary/image.pxd b/efl/elementary/image.pxd index 449e3e8..517be44 100644 --- a/efl/elementary/image.pxd +++ b/efl/elementary/image.pxd @@ -1,8 +1,23 @@ from efl.evas cimport Eina_Bool, Evas_Object from object cimport Object -from enums cimport Elm_Image_Orient + cdef extern from "Elementary.h": + + cpdef enum Elm_Image_Orient: + ELM_IMAGE_ORIENT_NONE + ELM_IMAGE_ORIENT_0 + ELM_IMAGE_ROTATE_90 + ELM_IMAGE_ROTATE_180 + ELM_IMAGE_ROTATE_270 + ELM_IMAGE_FLIP_HORIZONTAL + ELM_IMAGE_FLIP_VERTICAL + ELM_IMAGE_FLIP_TRANSPOSE + ELM_IMAGE_FLIP_TRANSVERSE + ctypedef enum Elm_Image_Orient: + pass + + ctypedef struct Elm_Image_Progress: double now double total diff --git a/efl/elementary/image.pyx b/efl/elementary/image.pyx index f0adc2e..d07fc7e 100644 --- a/efl/elementary/image.pyx +++ b/efl/elementary/image.pyx @@ -62,7 +62,11 @@ Image manipulation types .. data:: ELM_IMAGE_ORIENT_NONE - No change + No orientation change + +.. data:: ELM_IMAGE_ORIENT_0 + + No orientation change .. data:: ELM_IMAGE_ROTATE_90 @@ -101,21 +105,12 @@ from efl.eo cimport _object_mapping_register, object_from_instance from efl.utils.conversions cimport _ctouni from efl.evas cimport Object as evasObject -cimport enums - -ELM_IMAGE_ORIENT_NONE = enums.ELM_IMAGE_ORIENT_NONE -ELM_IMAGE_ROTATE_90 = enums.ELM_IMAGE_ROTATE_90 -ELM_IMAGE_ROTATE_180 = enums.ELM_IMAGE_ROTATE_180 -ELM_IMAGE_ROTATE_270 = enums.ELM_IMAGE_ROTATE_270 -ELM_IMAGE_FLIP_HORIZONTAL = enums.ELM_IMAGE_FLIP_HORIZONTAL -ELM_IMAGE_FLIP_VERTICAL = enums.ELM_IMAGE_FLIP_VERTICAL -ELM_IMAGE_FLIP_TRANSPOSE = enums.ELM_IMAGE_FLIP_TRANSPOSE -ELM_IMAGE_FLIP_TRANSVERSE = enums.ELM_IMAGE_FLIP_TRANSVERSE def _cb_string_conv(uintptr_t addr): cdef const char *s = <const char *>addr return _ctouni(s) if s is not NULL else None + class ImageProgressInfo(object): """ImageProgressInfo(...) diff --git a/efl/elementary/label.pxd b/efl/elementary/label.pxd index 3ae4b5e..b39b0de 100644 --- a/efl/elementary/label.pxd +++ b/efl/elementary/label.pxd @@ -1,7 +1,23 @@ from efl.evas cimport Eina_Bool, Evas_Object, Evas_Coord -from enums cimport Elm_Wrap_Type, Elm_Label_Slide_Mode + cdef extern from "Elementary.h": + + cpdef enum Elm_Wrap_Type: + ELM_WRAP_NONE + ELM_WRAP_CHAR + ELM_WRAP_WORD + ELM_WRAP_MIXED + ctypedef enum Elm_Wrap_Type: + pass + + cpdef enum Elm_Label_Slide_Mode: + ELM_LABEL_SLIDE_MODE_NONE + ELM_LABEL_SLIDE_MODE_AUTO + ELM_LABEL_SLIDE_MODE_ALWAYS + ctypedef enum Elm_Label_Slide_Mode: + pass + Evas_Object *elm_label_add(Evas_Object *parent) void elm_label_line_wrap_set(Evas_Object *obj, Elm_Wrap_Type wrap) Elm_Wrap_Type elm_label_line_wrap_get(const Evas_Object *obj) diff --git a/efl/elementary/label.pyx b/efl/elementary/label.pyx index 4d77a55..58ec7ef 100644 --- a/efl/elementary/label.pyx +++ b/efl/elementary/label.pyx @@ -100,17 +100,6 @@ from efl.evas cimport Object as evasObject from layout_class cimport LayoutClass from efl.utils.deprecated cimport DEPRECATED -cimport enums - -ELM_WRAP_NONE = enums.ELM_WRAP_NONE -ELM_WRAP_CHAR = enums.ELM_WRAP_CHAR -ELM_WRAP_WORD = enums.ELM_WRAP_WORD -ELM_WRAP_MIXED = enums.ELM_WRAP_MIXED - -ELM_LABEL_SLIDE_MODE_NONE = enums.ELM_LABEL_SLIDE_MODE_NONE -ELM_LABEL_SLIDE_MODE_AUTO = enums.ELM_LABEL_SLIDE_MODE_AUTO -ELM_LABEL_SLIDE_MODE_ALWAYS = enums.ELM_LABEL_SLIDE_MODE_ALWAYS - cdef class Label(LayoutClass): """ @@ -194,26 +183,25 @@ cdef class Label(LayoutClass): def ellipsis_get(self): return elm_label_ellipsis_get(self.obj) - property slide: - """ - - .. deprecated:: 1.8 - Use :py:attr:`slide_mode` instead. - - """ - def __get__(self): - return self.slide_get() - - def __set__(self, slide): - self.slide_set(ELM_LABEL_SLIDE_MODE_ALWAYS if slide else ELM_LABEL_SLIDE_MODE_NONE) - - @DEPRECATED("1.8", "Use :py:attr:`slide_mode` instead.") - def slide_set(self, bint slide): - elm_label_slide_mode_set(self.obj, - ELM_LABEL_SLIDE_MODE_ALWAYS if slide else ELM_LABEL_SLIDE_MODE_NONE) - @DEPRECATED("1.8", "Use :py:attr:`slide_mode` instead.") - def slide_get(self): - return bool(elm_label_slide_mode_get(self.obj)) +# property slide: +# """ +# +# .. deprecated:: 1.8 +# Use :py:attr:`slide_mode` instead. +# +# """ +# def __get__(self): +# return self.slide_get() +# +# def __set__(self, slide): +# self.slide_set(True if slide else False) +# +# @DEPRECATED("1.8", "Use :py:attr:`slide_mode` instead.") +# def slide_set(self, bint slide): +# elm_label_slide_mode_set(self.obj, 2 if slide else 0) +# @DEPRECATED("1.8", "Use :py:attr:`slide_mode` instead.") +# def slide_get(self): +# return bool(elm_label_slide_mode_get(self.obj)) property slide_duration: """The duration time in moving text from slide begin position to diff --git a/efl/elementary/list.pxd b/efl/elementary/list.pxd index 1ea88b6..bc15c9d 100644 --- a/efl/elementary/list.pxd +++ b/efl/elementary/list.pxd @@ -1,9 +1,34 @@ from efl.evas cimport Eina_Bool, Eina_List, Eina_Compare_Cb, \ Evas_Object, Evas_Smart_Cb, Evas_Coord from object_item cimport Elm_Object_Item -from enums cimport Elm_List_Mode, Elm_Object_Select_Mode + cdef extern from "Elementary.h": + + cpdef enum Elm_List_Mode: + ELM_LIST_COMPRESS + ELM_LIST_SCROLL + ELM_LIST_LIMIT + ELM_LIST_EXPAND + ctypedef enum Elm_List_Mode: + pass + + cpdef enum Elm_Object_Select_Mode: + ELM_OBJECT_SELECT_MODE_DEFAULT + ELM_OBJECT_SELECT_MODE_ALWAYS + ELM_OBJECT_SELECT_MODE_NONE + ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY + ELM_OBJECT_SELECT_MODE_MAX + ctypedef enum Elm_Object_Select_Mode: + pass + + cpdef enum Elm_Scroller_Policy: + ELM_SCROLLER_POLICY_AUTO + ELM_SCROLLER_POLICY_ON + ELM_SCROLLER_POLICY_OFF + ctypedef enum Elm_Scroller_Policy: + pass + Evas_Object *elm_list_add(Evas_Object *parent) void elm_list_go(Evas_Object *obj) void elm_list_multi_select_set(Evas_Object *obj, Eina_Bool multi) diff --git a/efl/elementary/list.pyx b/efl/elementary/list.pyx index 6057972..a7df255 100644 --- a/efl/elementary/list.pyx +++ b/efl/elementary/list.pyx @@ -173,22 +173,6 @@ from efl.utils.deprecated cimport DEPRECATED from scroller cimport elm_scroller_policy_get, elm_scroller_policy_set, \ elm_scroller_bounce_get, elm_scroller_bounce_set, Elm_Scroller_Policy -cimport enums - -ELM_LIST_COMPRESS = enums.ELM_LIST_COMPRESS -ELM_LIST_SCROLL = enums.ELM_LIST_SCROLL -ELM_LIST_LIMIT = enums.ELM_LIST_LIMIT -ELM_LIST_EXPAND = enums.ELM_LIST_EXPAND - -ELM_OBJECT_SELECT_MODE_DEFAULT = enums.ELM_OBJECT_SELECT_MODE_DEFAULT -ELM_OBJECT_SELECT_MODE_ALWAYS = enums.ELM_OBJECT_SELECT_MODE_ALWAYS -ELM_OBJECT_SELECT_MODE_NONE = enums.ELM_OBJECT_SELECT_MODE_NONE -ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY = enums.ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY -ELM_OBJECT_SELECT_MODE_MAX = enums.ELM_OBJECT_SELECT_MODE_MAX - -ELM_SCROLLER_POLICY_AUTO = enums.ELM_SCROLLER_POLICY_AUTO -ELM_SCROLLER_POLICY_ON = enums.ELM_SCROLLER_POLICY_ON -ELM_SCROLLER_POLICY_OFF = enums.ELM_SCROLLER_POLICY_OFF def _cb_object_item_conv(uintptr_t addr): cdef Elm_Object_Item *it = <Elm_Object_Item *>addr diff --git a/efl/elementary/map.pxd b/efl/elementary/map.pxd index b577866..1110f2a 100644 --- a/efl/elementary/map.pxd +++ b/efl/elementary/map.pxd @@ -1,8 +1,54 @@ from efl.evas cimport Eina_Bool, Eina_List, Evas_Object, Evas_Coord -from enums cimport Elm_Map_Overlay_Type, Elm_Map_Route_Method, \ - Elm_Map_Route_Type, Elm_Map_Source_Type, Elm_Map_Zoom_Mode + cdef extern from "Elementary.h": + + cpdef enum Elm_Map_Overlay_Type: + ELM_MAP_OVERLAY_TYPE_NONE + ELM_MAP_OVERLAY_TYPE_DEFAULT + ELM_MAP_OVERLAY_TYPE_CLASS + ELM_MAP_OVERLAY_TYPE_GROUP + ELM_MAP_OVERLAY_TYPE_BUBBLE + ELM_MAP_OVERLAY_TYPE_ROUTE + ELM_MAP_OVERLAY_TYPE_LINE + ELM_MAP_OVERLAY_TYPE_POLYGON + ELM_MAP_OVERLAY_TYPE_CIRCLE + ELM_MAP_OVERLAY_TYPE_SCALE + ctypedef enum Elm_Map_Overlay_Type: + pass + + cpdef enum Elm_Map_Route_Method: + ELM_MAP_ROUTE_METHOD_FASTEST + ELM_MAP_ROUTE_METHOD_SHORTEST + ELM_MAP_ROUTE_METHOD_LAST + ctypedef enum Elm_Map_Route_Method: + pass + + cpdef enum Elm_Map_Route_Type: + ELM_MAP_ROUTE_TYPE_MOTOCAR + ELM_MAP_ROUTE_TYPE_BICYCLE + ELM_MAP_ROUTE_TYPE_FOOT + ELM_MAP_ROUTE_TYPE_LAST + ctypedef enum Elm_Map_Route_Type: + pass + + cpdef enum Elm_Map_Source_Type: + ELM_MAP_SOURCE_TYPE_TILE + ELM_MAP_SOURCE_TYPE_ROUTE + ELM_MAP_SOURCE_TYPE_NAME + ELM_MAP_SOURCE_TYPE_LAST + ctypedef enum Elm_Map_Source_Type: + pass + + cpdef enum Elm_Map_Zoom_Mode: + ELM_MAP_ZOOM_MODE_MANUAL + ELM_MAP_ZOOM_MODE_AUTO_FIT + ELM_MAP_ZOOM_MODE_AUTO_FILL + ELM_MAP_ZOOM_MODE_LAST + ctypedef enum Elm_Map_Zoom_Mode: + pass + + ctypedef void *Elm_Map_Overlay ctypedef void *Elm_Map_Route ctypedef void *Elm_Map_Name diff --git a/efl/elementary/map.pyx b/efl/elementary/map.pyx index 33101be..ca4a3c0 100644 --- a/efl/elementary/map.pyx +++ b/efl/elementary/map.pyx @@ -219,37 +219,6 @@ from efl.utils.deprecated cimport DEPRECATED from scroller cimport elm_scroller_policy_get, elm_scroller_policy_set, \ elm_scroller_bounce_get, elm_scroller_bounce_set, Elm_Scroller_Policy -cimport enums - -ELM_MAP_OVERLAY_TYPE_NONE = enums.ELM_MAP_OVERLAY_TYPE_NONE -ELM_MAP_OVERLAY_TYPE_DEFAULT = enums.ELM_MAP_OVERLAY_TYPE_DEFAULT -ELM_MAP_OVERLAY_TYPE_CLASS = enums.ELM_MAP_OVERLAY_TYPE_CLASS -ELM_MAP_OVERLAY_TYPE_GROUP = enums.ELM_MAP_OVERLAY_TYPE_GROUP -ELM_MAP_OVERLAY_TYPE_BUBBLE = enums.ELM_MAP_OVERLAY_TYPE_BUBBLE -ELM_MAP_OVERLAY_TYPE_ROUTE = enums.ELM_MAP_OVERLAY_TYPE_ROUTE -ELM_MAP_OVERLAY_TYPE_LINE = enums.ELM_MAP_OVERLAY_TYPE_LINE -ELM_MAP_OVERLAY_TYPE_POLYGON = enums.ELM_MAP_OVERLAY_TYPE_POLYGON -ELM_MAP_OVERLAY_TYPE_CIRCLE = enums.ELM_MAP_OVERLAY_TYPE_CIRCLE -ELM_MAP_OVERLAY_TYPE_SCALE = enums.ELM_MAP_OVERLAY_TYPE_SCALE - -ELM_MAP_ROUTE_METHOD_FASTEST = enums.ELM_MAP_ROUTE_METHOD_FASTEST -ELM_MAP_ROUTE_METHOD_SHORTEST = enums.ELM_MAP_ROUTE_METHOD_SHORTEST -ELM_MAP_ROUTE_METHOD_LAST = enums.ELM_MAP_ROUTE_METHOD_LAST - -ELM_MAP_ROUTE_TYPE_MOTOCAR = enums.ELM_MAP_ROUTE_TYPE_MOTOCAR -ELM_MAP_ROUTE_TYPE_BICYCLE = enums.ELM_MAP_ROUTE_TYPE_BICYCLE -ELM_MAP_ROUTE_TYPE_FOOT = enums.ELM_MAP_ROUTE_TYPE_FOOT -ELM_MAP_ROUTE_TYPE_LAST = enums.ELM_MAP_ROUTE_TYPE_LAST - -ELM_MAP_SOURCE_TYPE_TILE = enums.ELM_MAP_SOURCE_TYPE_TILE -ELM_MAP_SOURCE_TYPE_ROUTE = enums.ELM_MAP_SOURCE_TYPE_ROUTE -ELM_MAP_SOURCE_TYPE_NAME = enums.ELM_MAP_SOURCE_TYPE_NAME -ELM_MAP_SOURCE_TYPE_LAST = enums.ELM_MAP_SOURCE_TYPE_LAST - -ELM_MAP_ZOOM_MODE_MANUAL = enums.ELM_MAP_ZOOM_MODE_MANUAL -ELM_MAP_ZOOM_MODE_AUTO_FIT = enums.ELM_MAP_ZOOM_MODE_AUTO_FIT -ELM_MAP_ZOOM_MODE_AUTO_FILL = enums.ELM_MAP_ZOOM_MODE_AUTO_FILL -ELM_MAP_ZOOM_MODE_LAST = enums.ELM_MAP_ZOOM_MODE_LAST cdef object _elm_map_overlay_to_python(Elm_Map_Overlay *ov): diff --git a/efl/elementary/notify.pxd b/efl/elementary/notify.pxd index 795c29a..d4e3f93 100644 --- a/efl/elementary/notify.pxd +++ b/efl/elementary/notify.pxd @@ -1,6 +1,22 @@ from efl.evas cimport Eina_Bool, Evas_Object cdef extern from "Elementary.h": + + cpdef enum Elm_Notify_Orient: + ELM_NOTIFY_ORIENT_TOP + ELM_NOTIFY_ORIENT_CENTER + ELM_NOTIFY_ORIENT_BOTTOM + ELM_NOTIFY_ORIENT_LEFT + ELM_NOTIFY_ORIENT_RIGHT + ELM_NOTIFY_ORIENT_TOP_LEFT + ELM_NOTIFY_ORIENT_TOP_RIGHT + ELM_NOTIFY_ORIENT_BOTTOM_LEFT + ELM_NOTIFY_ORIENT_BOTTOM_RIGHT + ELM_NOTIFY_ORIENT_LAST + ctypedef enum Elm_Notify_Orient: + pass + + Evas_Object *elm_notify_add(Evas_Object *parent) void elm_notify_parent_set(Evas_Object *obj, Evas_Object *parent) Evas_Object *elm_notify_parent_get(const Evas_Object *obj) diff --git a/efl/elementary/notify.pyx b/efl/elementary/notify.pyx index ec4defc..75f5402 100644 --- a/efl/elementary/notify.pyx +++ b/efl/elementary/notify.pyx @@ -59,18 +59,6 @@ from efl.evas cimport Object as evasObject from object cimport Object from efl.utils.deprecated cimport DEPRECATED -cimport enums - -ELM_NOTIFY_ORIENT_TOP = enums.ELM_NOTIFY_ORIENT_TOP -ELM_NOTIFY_ORIENT_CENTER = enums.ELM_NOTIFY_ORIENT_CENTER -ELM_NOTIFY_ORIENT_BOTTOM = enums.ELM_NOTIFY_ORIENT_BOTTOM -ELM_NOTIFY_ORIENT_LEFT = enums.ELM_NOTIFY_ORIENT_LEFT -ELM_NOTIFY_ORIENT_RIGHT = enums.ELM_NOTIFY_ORIENT_RIGHT -ELM_NOTIFY_ORIENT_TOP_LEFT = enums.ELM_NOTIFY_ORIENT_TOP_LEFT -ELM_NOTIFY_ORIENT_TOP_RIGHT = enums.ELM_NOTIFY_ORIENT_TOP_RIGHT -ELM_NOTIFY_ORIENT_BOTTOM_LEFT = enums.ELM_NOTIFY_ORIENT_BOTTOM_LEFT -ELM_NOTIFY_ORIENT_BOTTOM_RIGHT = enums.ELM_NOTIFY_ORIENT_BOTTOM_RIGHT -ELM_NOTIFY_ORIENT_LAST = enums.ELM_NOTIFY_ORIENT_LAST ELM_NOTIFY_ALIGN_FILL = -1.0 diff --git a/efl/elementary/object.pxd b/efl/elementary/object.pxd index 475d661..d503243 100644 --- a/efl/elementary/object.pxd +++ b/efl/elementary/object.pxd @@ -18,13 +18,68 @@ from efl.evas cimport Eina_Bool, Eina_List, Evas_Object, Evas_Smart_Cb, \ Evas_Coord, Evas_Callback_Type, Object as evasObject, Canvas as evasCanvas -from enums cimport Elm_Focus_Direction, Elm_Sel_Format, Elm_Sel_Type, \ - Elm_Xdnd_Action cdef extern from "Edje.h": ctypedef void (*Edje_Signal_Cb)(void *data, Evas_Object *obj, const char *emission, const char *source) + cdef extern from "Elementary.h": + + cpdef enum Elm_Focus_Direction: + ELM_FOCUS_PREVIOUS + ELM_FOCUS_NEXT + ELM_FOCUS_UP + ELM_FOCUS_DOWN + ELM_FOCUS_RIGHT + ELM_FOCUS_LEFT + ctypedef enum Elm_Focus_Direction: + pass + + cpdef enum Elm_Focus_Move_Policy: + ELM_FOCUS_MOVE_POLICY_CLICK + ELM_FOCUS_MOVE_POLICY_IN + ctypedef enum Elm_Focus_Move_Policy: + pass + + cpdef enum Elm_Focus_Autoscroll_Mode: + ELM_FOCUS_AUTOSCROLL_MODE_SHOW + ELM_FOCUS_AUTOSCROLL_MODE_NONE + ELM_FOCUS_AUTOSCROLL_MODE_BRING_IN + ctypedef enum Elm_Focus_Autoscroll_Mode: + pass + + cpdef enum Elm_Sel_Type: + ELM_SEL_TYPE_PRIMARY + ELM_SEL_TYPE_SECONDARY + ELM_SEL_TYPE_XDND + ELM_SEL_TYPE_CLIPBOARD + ctypedef enum Elm_Sel_Type: + pass + + cpdef enum Elm_Sel_Format: + ELM_SEL_FORMAT_TARGETS + ELM_SEL_FORMAT_NONE + ELM_SEL_FORMAT_TEXT + ELM_SEL_FORMAT_MARKUP + ELM_SEL_FORMAT_IMAGE + ELM_SEL_FORMAT_VCARD + ELM_SEL_FORMAT_HTML + ctypedef enum Elm_Sel_Format: + pass + + cpdef enum Elm_Xdnd_Action: + ELM_XDND_ACTION_UNKNOWN + ELM_XDND_ACTION_COPY + ELM_XDND_ACTION_MOVE + ELM_XDND_ACTION_PRIVATE + ELM_XDND_ACTION_ASK + ELM_XDND_ACTION_LIST + ELM_XDND_ACTION_LINK + ELM_XDND_ACTION_DESCRIPTION + ctypedef enum Elm_Xdnd_Action: + pass + + ctypedef struct Elm_Theme ctypedef struct Elm_Object_Item diff --git a/efl/elementary/object.pyx b/efl/elementary/object.pyx index af26829..80a6f47 100644 --- a/efl/elementary/object.pyx +++ b/efl/elementary/object.pyx @@ -282,43 +282,6 @@ import logging log = logging.getLogger("elementary") import traceback -cimport enums - -ELM_FOCUS_PREVIOUS = enums.ELM_FOCUS_PREVIOUS -ELM_FOCUS_NEXT = enums.ELM_FOCUS_NEXT -ELM_FOCUS_UP = enums.ELM_FOCUS_UP -ELM_FOCUS_DOWN = enums.ELM_FOCUS_DOWN -ELM_FOCUS_RIGHT = enums.ELM_FOCUS_RIGHT -ELM_FOCUS_LEFT = enums.ELM_FOCUS_LEFT - -ELM_FOCUS_MOVE_POLICY_CLICK = enums.ELM_FOCUS_MOVE_POLICY_CLICK -ELM_FOCUS_MOVE_POLICY_IN = enums.ELM_FOCUS_MOVE_POLICY_IN - -ELM_FOCUS_AUTOSCROLL_MODE_SHOW = enums.ELM_FOCUS_AUTOSCROLL_MODE_SHOW -ELM_FOCUS_AUTOSCROLL_MODE_NONE = enums.ELM_FOCUS_AUTOSCROLL_MODE_NONE -ELM_FOCUS_AUTOSCROLL_MODE_BRING_IN = enums.ELM_FOCUS_AUTOSCROLL_MODE_BRING_IN - -ELM_SEL_TYPE_PRIMARY = enums.ELM_SEL_TYPE_PRIMARY -ELM_SEL_TYPE_SECONDARY = enums.ELM_SEL_TYPE_SECONDARY -ELM_SEL_TYPE_XDND = enums.ELM_SEL_TYPE_XDND -ELM_SEL_TYPE_CLIPBOARD = enums.ELM_SEL_TYPE_CLIPBOARD - -ELM_SEL_FORMAT_TARGETS = enums.ELM_SEL_FORMAT_TARGETS -ELM_SEL_FORMAT_NONE = enums.ELM_SEL_FORMAT_NONE -ELM_SEL_FORMAT_TEXT = enums.ELM_SEL_FORMAT_TEXT -ELM_SEL_FORMAT_MARKUP = enums.ELM_SEL_FORMAT_MARKUP -ELM_SEL_FORMAT_IMAGE = enums.ELM_SEL_FORMAT_IMAGE -ELM_SEL_FORMAT_VCARD = enums.ELM_SEL_FORMAT_VCARD -ELM_SEL_FORMAT_HTML = enums.ELM_SEL_FORMAT_HTML - -ELM_XDND_ACTION_UNKNOWN = enums.ELM_XDND_ACTION_UNKNOWN -ELM_XDND_ACTION_COPY = enums.ELM_XDND_ACTION_COPY -ELM_XDND_ACTION_MOVE = enums.ELM_XDND_ACTION_MOVE -ELM_XDND_ACTION_PRIVATE = enums.ELM_XDND_ACTION_PRIVATE -ELM_XDND_ACTION_ASK = enums.ELM_XDND_ACTION_ASK -ELM_XDND_ACTION_LIST = enums.ELM_XDND_ACTION_LIST -ELM_XDND_ACTION_LINK = enums.ELM_XDND_ACTION_LINK -ELM_XDND_ACTION_DESCRIPTION = enums.ELM_XDND_ACTION_DESCRIPTION cdef void _object_callback(void *data, Evas_Object *o, void *event_info) with gil: diff --git a/efl/elementary/panel.pxd b/efl/elementary/panel.pxd index ba8556f..0b1ac43 100644 --- a/efl/elementary/panel.pxd +++ b/efl/elementary/panel.pxd @@ -1,7 +1,16 @@ from efl.evas cimport Eina_Bool, Evas_Object -from enums cimport Elm_Panel_Orient + cdef extern from "Elementary.h": + + cpdef enum Elm_Panel_Orient: + ELM_PANEL_ORIENT_TOP + ELM_PANEL_ORIENT_BOTTOM + ELM_PANEL_ORIENT_LEFT + ELM_PANEL_ORIENT_RIGHT + ctypedef enum Elm_Panel_Orient: + pass + Evas_Object *elm_panel_add(Evas_Object *parent) void elm_panel_orient_set(Evas_Object *obj, Elm_Panel_Orient orient) Elm_Panel_Orient elm_panel_orient_get(const Evas_Object *obj) diff --git a/efl/elementary/panel.pyx b/efl/elementary/panel.pyx index 388f5e2..83f5676 100644 --- a/efl/elementary/panel.pyx +++ b/efl/elementary/panel.pyx @@ -75,12 +75,6 @@ from efl.eo cimport _object_mapping_register from efl.evas cimport Object as evasObject from layout_class cimport LayoutClass -cimport enums - -ELM_PANEL_ORIENT_TOP = enums.ELM_PANEL_ORIENT_TOP -ELM_PANEL_ORIENT_BOTTOM = enums.ELM_PANEL_ORIENT_BOTTOM -ELM_PANEL_ORIENT_LEFT = enums.ELM_PANEL_ORIENT_LEFT -ELM_PANEL_ORIENT_RIGHT = enums.ELM_PANEL_ORIENT_RIGHT cdef class Panel(LayoutClass): """ diff --git a/efl/elementary/photocam.pxd b/efl/elementary/photocam.pxd index 739c5bb..da5b5b8 100644 --- a/efl/elementary/photocam.pxd +++ b/efl/elementary/photocam.pxd @@ -1,7 +1,18 @@ from efl.evas cimport Eina_Bool, Evas_Object, Evas_Load_Error -from enums cimport Elm_Photocam_Zoom_Mode + cdef extern from "Elementary.h": + + cpdef enum Elm_Photocam_Zoom_Mode: + ELM_PHOTOCAM_ZOOM_MODE_MANUAL + ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT + ELM_PHOTOCAM_ZOOM_MODE_AUTO_FILL + ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT_IN + ELM_PHOTOCAM_ZOOM_MODE_LAST + ctypedef enum Elm_Photocam_Zoom_Mode: + pass + + ctypedef struct Elm_Photocam_Progress: double now double total diff --git a/efl/elementary/photocam.pyx b/efl/elementary/photocam.pyx index ae6233c..db749dc 100644 --- a/efl/elementary/photocam.pyx +++ b/efl/elementary/photocam.pyx @@ -111,14 +111,6 @@ from efl.utils.deprecated cimport DEPRECATED from scroller cimport elm_scroller_policy_get, elm_scroller_policy_set, \ elm_scroller_bounce_get, elm_scroller_bounce_set, Elm_Scroller_Policy -cimport enums - -ELM_PHOTOCAM_ZOOM_MODE_MANUAL = enums.ELM_PHOTOCAM_ZOOM_MODE_MANUAL -ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT = enums.ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT -ELM_PHOTOCAM_ZOOM_MODE_AUTO_FILL = enums.ELM_PHOTOCAM_ZOOM_MODE_AUTO_FILL -ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT_IN = enums.ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT_IN -ELM_PHOTOCAM_ZOOM_MODE_LAST = enums.ELM_PHOTOCAM_ZOOM_MODE_LAST - class PhotocamProgressInfo(object): """PhotocamProgressInfo(...) diff --git a/efl/elementary/popup.pxd b/efl/elementary/popup.pxd index ce988dc..bc9c215 100644 --- a/efl/elementary/popup.pxd +++ b/efl/elementary/popup.pxd @@ -1,8 +1,32 @@ from efl.evas cimport Eina_Bool, Evas_Object, Evas_Smart_Cb from object_item cimport Elm_Object_Item -from enums cimport Elm_Wrap_Type, Elm_Popup_Orient + cdef extern from "Elementary.h": + + cpdef enum Elm_Popup_Orient: + ELM_POPUP_ORIENT_TOP + ELM_POPUP_ORIENT_CENTER + ELM_POPUP_ORIENT_BOTTOM + ELM_POPUP_ORIENT_LEFT + ELM_POPUP_ORIENT_RIGHT + ELM_POPUP_ORIENT_TOP_LEFT + ELM_POPUP_ORIENT_TOP_RIGHT + ELM_POPUP_ORIENT_BOTTOM_LEFT + ELM_POPUP_ORIENT_BOTTOM_RIGHT + ELM_POPUP_ORIENT_LAST + ctypedef enum Elm_Popup_Orient: + pass + + cpdef enum Elm_Wrap_Type: + ELM_WRAP_NONE + ELM_WRAP_CHAR + ELM_WRAP_WORD + ELM_WRAP_MIXED + ctypedef enum Elm_Wrap_Type: + pass + + Evas_Object *elm_popup_add(Evas_Object *parent) Elm_Object_Item *elm_popup_item_append(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Smart_Cb func, void *data) void elm_popup_content_text_wrap_type_set(Evas_Object *obj, Elm_Wrap_Type wrap) diff --git a/efl/elementary/popup.pyx b/efl/elementary/popup.pyx index 71a0352..4a15cf5 100644 --- a/efl/elementary/popup.pyx +++ b/efl/elementary/popup.pyx @@ -190,24 +190,6 @@ from layout_class cimport LayoutClass from object_item cimport _object_item_callback, _object_item_callback2, \ ObjectItem, _object_item_to_python -cimport enums - -ELM_POPUP_ORIENT_TOP = enums.ELM_POPUP_ORIENT_TOP -ELM_POPUP_ORIENT_CENTER = enums.ELM_POPUP_ORIENT_CENTER -ELM_POPUP_ORIENT_BOTTOM = enums.ELM_POPUP_ORIENT_BOTTOM -ELM_POPUP_ORIENT_LEFT = enums.ELM_POPUP_ORIENT_LEFT -ELM_POPUP_ORIENT_RIGHT = enums.ELM_POPUP_ORIENT_RIGHT -ELM_POPUP_ORIENT_TOP_LEFT = enums.ELM_POPUP_ORIENT_TOP_LEFT -ELM_POPUP_ORIENT_TOP_RIGHT = enums.ELM_POPUP_ORIENT_TOP_RIGHT -ELM_POPUP_ORIENT_BOTTOM_LEFT = enums.ELM_POPUP_ORIENT_BOTTOM_LEFT -ELM_POPUP_ORIENT_BOTTOM_RIGHT = enums.ELM_POPUP_ORIENT_BOTTOM_RIGHT -ELM_POPUP_ORIENT_LAST = enums.ELM_POPUP_ORIENT_LAST - -ELM_WRAP_NONE = enums.ELM_WRAP_NONE -ELM_WRAP_CHAR = enums.ELM_WRAP_CHAR -ELM_WRAP_WORD = enums.ELM_WRAP_WORD -ELM_WRAP_MIXED = enums.ELM_WRAP_MIXED - def _cb_object_item_conv(uintptr_t addr): cdef Elm_Object_Item *it = <Elm_Object_Item *>addr diff --git a/efl/elementary/scroller.pxd b/efl/elementary/scroller.pxd index 229a703..e0de8c8 100644 --- a/efl/elementary/scroller.pxd +++ b/efl/elementary/scroller.pxd @@ -1,9 +1,32 @@ from efl.evas cimport Eina_Bool, Evas_Object, Evas_Coord -from enums cimport Elm_Scroller_Policy, Elm_Scroller_Single_Direction, \ - Elm_Scroller_Movement_Block from object cimport Object + cdef extern from "Elementary.h": + + cpdef enum Elm_Scroller_Policy: + ELM_SCROLLER_POLICY_AUTO + ELM_SCROLLER_POLICY_ON + ELM_SCROLLER_POLICY_OFF + ctypedef enum Elm_Scroller_Policy: + pass + + cpdef enum Elm_Scroller_Single_Direction: + ELM_SCROLLER_SINGLE_DIRECTION_NONE + ELM_SCROLLER_SINGLE_DIRECTION_SOFT + ELM_SCROLLER_SINGLE_DIRECTION_HARD + ELM_SCROLLER_SINGLE_DIRECTION_LAST + ctypedef enum Elm_Scroller_Single_Direction: + pass + + cpdef enum Elm_Scroller_Movement_Block: + ELM_SCROLLER_MOVEMENT_NO_BLOCK + ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL + ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL + ctypedef enum Elm_Scroller_Movement_Block: + pass + + Evas_Object *elm_scroller_add(Evas_Object *parent) void elm_scroller_custom_widget_base_theme_set(Evas_Object *obj, const char *widget, const char *base) void elm_scroller_content_min_limit(Evas_Object *obj, Eina_Bool w, Eina_Bool h) diff --git a/efl/elementary/scroller.pyx b/efl/elementary/scroller.pyx index 66be273..41a21b2 100644 --- a/efl/elementary/scroller.pyx +++ b/efl/elementary/scroller.pyx @@ -149,19 +149,6 @@ from object cimport Object from layout_class cimport LayoutClass from efl.utils.deprecated cimport DEPRECATED -cimport enums - -ELM_SCROLLER_POLICY_AUTO = enums.ELM_SCROLLER_POLICY_AUTO -ELM_SCROLLER_POLICY_ON = enums.ELM_SCROLLER_POLICY_ON -ELM_SCROLLER_POLICY_OFF = enums.ELM_SCROLLER_POLICY_OFF - -ELM_SCROLLER_SINGLE_DIRECTION_NONE = enums.ELM_SCROLLER_SINGLE_DIRECTION_NONE -ELM_SCROLLER_SINGLE_DIRECTION_SOFT = enums.ELM_SCROLLER_SINGLE_DIRECTION_SOFT -ELM_SCROLLER_SINGLE_DIRECTION_HARD = enums.ELM_SCROLLER_SINGLE_DIRECTION_HARD - -ELM_SCROLLER_MOVEMENT_NO_BLOCK = enums.ELM_SCROLLER_MOVEMENT_NO_BLOCK -ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL = enums.ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL -ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL = enums.ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL cdef class Scrollable(Object): """ diff --git a/efl/elementary/store.pxd b/efl/elementary/store.pxd index c49cd73..34d6f9a 100644 --- a/efl/elementary/store.pxd +++ b/efl/elementary/store.pxd @@ -7,7 +7,21 @@ from object_item cimport Elm_Object_Item cdef extern from "Python.h": void PyEval_InitThreads() + cdef extern from "Elementary.h": + + cpdef enum Elm_Store_Item_Mapping_Type: + ELM_STORE_ITEM_MAPPING_NONE + ELM_STORE_ITEM_MAPPING_LABEL + ELM_STORE_ITEM_MAPPING_STATE + ELM_STORE_ITEM_MAPPING_ICON + ELM_STORE_ITEM_MAPPING_PHOTO + ELM_STORE_ITEM_MAPPING_CUSTOM + ELM_STORE_ITEM_MAPPING_LAST + ctypedef enum Elm_Store_Item_Mapping_Type: + pass + + struct _Elm_Store: pass diff --git a/efl/elementary/thumb.pxd b/efl/elementary/thumb.pxd index 87d39c3..5d0bf2a 100644 --- a/efl/elementary/thumb.pxd +++ b/efl/elementary/thumb.pxd @@ -1,9 +1,50 @@ from efl.evas cimport Eina_Bool, Evas_Object -from enums cimport Elm_Thumb_Animation_Setting, Ethumb_Thumb_Aspect, \ - Ethumb_Thumb_Format, Ethumb_Thumb_Orientation, \ - Ethumb_Thumb_FDO_Size + cdef extern from "Elementary.h": + + cpdef enum Elm_Thumb_Animation_Setting: + ELM_THUMB_ANIMATION_START + ELM_THUMB_ANIMATION_LOOP + ELM_THUMB_ANIMATION_STOP + ELM_THUMB_ANIMATION_LAST + ctypedef enum Elm_Thumb_Animation_Setting: + pass + + cpdef enum Ethumb_Thumb_FDO_Size: + ETHUMB_THUMB_NORMAL + ETHUMB_THUMB_LARGE + ctypedef enum Ethumb_Thumb_FDO_Size: + pass + + cpdef enum Ethumb_Thumb_Format: + ETHUMB_THUMB_FDO + ETHUMB_THUMB_JPEG + ETHUMB_THUMB_EET + ctypedef enum Ethumb_Thumb_Format: + pass + + cpdef enum Ethumb_Thumb_Aspect: + ETHUMB_THUMB_KEEP_ASPECT + ETHUMB_THUMB_IGNORE_ASPECT + ETHUMB_THUMB_CROP + ctypedef enum Ethumb_Thumb_Aspect: + pass + + cpdef enum Ethumb_Thumb_Orientation: + ETHUMB_THUMB_ORIENT_NONE + ETHUMB_THUMB_ROTATE_90_CW + ETHUMB_THUMB_ROTATE_180 + ETHUMB_THUMB_ROTATE_90_CCW + ETHUMB_THUMB_FLIP_HORIZONTAL + ETHUMB_THUMB_FLIP_VERTICAL + ETHUMB_THUMB_FLIP_TRANSPOSE + ETHUMB_THUMB_FLIP_TRANSVERSE + ETHUMB_THUMB_ORIENT_ORIGINAL + ctypedef enum Ethumb_Thumb_Orientation: + pass + + Evas_Object *elm_thumb_add(Evas_Object *parent) void elm_thumb_reload(Evas_Object *obj) void elm_thumb_file_set(Evas_Object *obj, const char *file, const char *key) diff --git a/efl/elementary/thumb.pyx b/efl/elementary/thumb.pyx index 8858683..467e3a4 100644 --- a/efl/elementary/thumb.pyx +++ b/efl/elementary/thumb.pyx @@ -180,34 +180,6 @@ from efl.utils.conversions cimport _ctouni from efl.evas cimport Object as evasObject from object cimport Object -cimport enums - -ELM_THUMB_ANIMATION_START = enums.ELM_THUMB_ANIMATION_START -ELM_THUMB_ANIMATION_LOOP = enums.ELM_THUMB_ANIMATION_LOOP -ELM_THUMB_ANIMATION_STOP = enums.ELM_THUMB_ANIMATION_STOP -ELM_THUMB_ANIMATION_LAST = enums.ELM_THUMB_ANIMATION_LAST - -ETHUMB_THUMB_NORMAL = enums.ETHUMB_THUMB_NORMAL -ETHUMB_THUMB_LARGE = enums.ETHUMB_THUMB_LARGE - -ETHUMB_THUMB_FDO = enums.ETHUMB_THUMB_FDO -ETHUMB_THUMB_JPEG = enums.ETHUMB_THUMB_JPEG -ETHUMB_THUMB_EET = enums.ETHUMB_THUMB_EET - -ETHUMB_THUMB_KEEP_ASPECT = enums.ETHUMB_THUMB_KEEP_ASPECT -ETHUMB_THUMB_IGNORE_ASPECT = enums.ETHUMB_THUMB_IGNORE_ASPECT -ETHUMB_THUMB_CROP = enums.ETHUMB_THUMB_CROP - -ETHUMB_THUMB_ORIENT_NONE = enums.ETHUMB_THUMB_ORIENT_NONE -ETHUMB_THUMB_ROTATE_90_CW = enums.ETHUMB_THUMB_ROTATE_90_CW -ETHUMB_THUMB_ROTATE_180 = enums.ETHUMB_THUMB_ROTATE_180 -ETHUMB_THUMB_ROTATE_90_CCW = enums.ETHUMB_THUMB_ROTATE_90_CCW -ETHUMB_THUMB_FLIP_HORIZONTAL = enums.ETHUMB_THUMB_FLIP_HORIZONTAL -ETHUMB_THUMB_FLIP_VERTICAL = enums.ETHUMB_THUMB_FLIP_VERTICAL -ETHUMB_THUMB_FLIP_TRANSPOSE = enums.ETHUMB_THUMB_FLIP_TRANSPOSE -ETHUMB_THUMB_FLIP_TRANSVERSE = enums.ETHUMB_THUMB_FLIP_TRANSVERSE -ETHUMB_THUMB_ORIENT_ORIGINAL = enums.ETHUMB_THUMB_ORIENT_ORIGINAL - cdef class Thumb(Object): """ diff --git a/efl/elementary/toolbar.pxd b/efl/elementary/toolbar.pxd index 5c50051..a70b6f6 100644 --- a/efl/elementary/toolbar.pxd +++ b/efl/elementary/toolbar.pxd @@ -1,10 +1,46 @@ from efl.evas cimport Eina_Bool, Evas_Object, Evas_Smart_Cb from object_item cimport Elm_Object_Item -from enums cimport Elm_Object_Select_Mode, Elm_Toolbar_Shrink_Mode, \ - Elm_Icon_Lookup_Order, Elm_Toolbar_Item_Scrollto_Type + cdef extern from "Elementary.h": + cpdef enum Elm_Icon_Lookup_Order: + ELM_ICON_LOOKUP_FDO_THEME + ELM_ICON_LOOKUP_THEME_FDO + ELM_ICON_LOOKUP_FDO + ELM_ICON_LOOKUP_THEME + ctypedef enum Elm_Icon_Lookup_Order: + pass + + cpdef enum Elm_Object_Select_Mode: + ELM_OBJECT_SELECT_MODE_DEFAULT + ELM_OBJECT_SELECT_MODE_ALWAYS + ELM_OBJECT_SELECT_MODE_NONE + ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY + ELM_OBJECT_SELECT_MODE_MAX + ctypedef enum Elm_Object_Select_Mode: + pass + + cpdef enum Elm_Toolbar_Item_Scrollto_Type: + ELM_TOOLBAR_ITEM_SCROLLTO_NONE + ELM_TOOLBAR_ITEM_SCROLLTO_IN + ELM_TOOLBAR_ITEM_SCROLLTO_FIRST + ELM_TOOLBAR_ITEM_SCROLLTO_MIDDLE + ELM_TOOLBAR_ITEM_SCROLLTO_LAST + ctypedef enum Elm_Toolbar_Item_Scrollto_Type: + pass + + cpdef enum Elm_Toolbar_Shrink_Mode: + ELM_TOOLBAR_SHRINK_NONE + ELM_TOOLBAR_SHRINK_HIDE + ELM_TOOLBAR_SHRINK_SCROLL + ELM_TOOLBAR_SHRINK_MENU + ELM_TOOLBAR_SHRINK_EXPAND + ELM_TOOLBAR_SHRINK_LAST + ctypedef enum Elm_Toolbar_Shrink_Mode: + pass + + ctypedef struct Elm_Toolbar_Item_State: pass diff --git a/efl/elementary/toolbar.pyx b/efl/elementary/toolbar.pyx index 26c8ef0..22006a7 100644 --- a/efl/elementary/toolbar.pyx +++ b/efl/elementary/toolbar.pyx @@ -180,35 +180,9 @@ from efl.utils.deprecated cimport DEPRECATED from scroller cimport elm_scroller_policy_get, elm_scroller_policy_set, \ elm_scroller_bounce_get, elm_scroller_bounce_set, Elm_Scroller_Policy -cimport enums - -ELM_ICON_LOOKUP_FDO_THEME = enums.ELM_ICON_LOOKUP_FDO_THEME -ELM_ICON_LOOKUP_THEME_FDO = enums.ELM_ICON_LOOKUP_THEME_FDO -ELM_ICON_LOOKUP_FDO = enums.ELM_ICON_LOOKUP_FDO -ELM_ICON_LOOKUP_THEME = enums.ELM_ICON_LOOKUP_THEME - -ELM_OBJECT_SELECT_MODE_DEFAULT = enums.ELM_OBJECT_SELECT_MODE_DEFAULT -ELM_OBJECT_SELECT_MODE_ALWAYS = enums.ELM_OBJECT_SELECT_MODE_ALWAYS -ELM_OBJECT_SELECT_MODE_NONE = enums.ELM_OBJECT_SELECT_MODE_NONE -ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY = enums.ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY -ELM_OBJECT_SELECT_MODE_MAX = enums.ELM_OBJECT_SELECT_MODE_MAX - -ELM_TOOLBAR_SHRINK_NONE = enums.ELM_TOOLBAR_SHRINK_NONE -ELM_TOOLBAR_SHRINK_HIDE = enums.ELM_TOOLBAR_SHRINK_HIDE -ELM_TOOLBAR_SHRINK_SCROLL = enums.ELM_TOOLBAR_SHRINK_SCROLL -ELM_TOOLBAR_SHRINK_MENU = enums.ELM_TOOLBAR_SHRINK_MENU -ELM_TOOLBAR_SHRINK_EXPAND = enums.ELM_TOOLBAR_SHRINK_EXPAND -ELM_TOOLBAR_SHRINK_LAST = enums.ELM_TOOLBAR_SHRINK_LAST - -ELM_TOOLBAR_ITEM_SCROLLTO_NONE = enums.ELM_TOOLBAR_ITEM_SCROLLTO_NONE -ELM_TOOLBAR_ITEM_SCROLLTO_IN = enums.ELM_TOOLBAR_ITEM_SCROLLTO_IN -ELM_TOOLBAR_ITEM_SCROLLTO_FIRST = enums.ELM_TOOLBAR_ITEM_SCROLLTO_FIRST -ELM_TOOLBAR_ITEM_SCROLLTO_MIDDLE = enums.ELM_TOOLBAR_ITEM_SCROLLTO_MIDDLE -ELM_TOOLBAR_ITEM_SCROLLTO_LAST = enums.ELM_TOOLBAR_ITEM_SCROLLTO_LAST - - import traceback + def _cb_object_item_conv(uintptr_t addr): cdef Elm_Object_Item *it = <Elm_Object_Item *>addr return _object_item_to_python(it) diff --git a/efl/elementary/transit.pxd b/efl/elementary/transit.pxd index 41b0fd4..e9a86e8 100644 --- a/efl/elementary/transit.pxd +++ b/efl/elementary/transit.pxd @@ -1,9 +1,37 @@ from efl.evas cimport Eina_Bool, Eina_List, Evas_Object, Evas_Coord -from enums cimport Elm_Transit_Effect_Flip_Axis, Elm_Transit_Effect_Wipe_Dir, \ - Elm_Transit_Effect_Wipe_Type, Elm_Transit_Tween_Mode + cdef extern from "Elementary.h": + cpdef enum Elm_Transit_Effect_Flip_Axis: + ELM_TRANSIT_EFFECT_FLIP_AXIS_X + ELM_TRANSIT_EFFECT_FLIP_AXIS_Y + ctypedef enum Elm_Transit_Effect_Flip_Axis: + pass + + cpdef enum Elm_Transit_Effect_Wipe_Dir: + ELM_TRANSIT_EFFECT_WIPE_DIR_LEFT + ELM_TRANSIT_EFFECT_WIPE_DIR_RIGHT + ELM_TRANSIT_EFFECT_WIPE_DIR_UP + ELM_TRANSIT_EFFECT_WIPE_DIR_DOWN + ctypedef enum Elm_Transit_Effect_Wipe_Dir: + pass + + cpdef enum Elm_Transit_Effect_Wipe_Type: + ELM_TRANSIT_EFFECT_WIPE_TYPE_HIDE + ELM_TRANSIT_EFFECT_WIPE_TYPE_SHOW + ctypedef enum Elm_Transit_Effect_Wipe_Type: + pass + + cpdef enum Elm_Transit_Tween_Mode: + ELM_TRANSIT_TWEEN_MODE_LINEAR + ELM_TRANSIT_TWEEN_MODE_SINUSOIDAL + ELM_TRANSIT_TWEEN_MODE_DECELERATE + ELM_TRANSIT_TWEEN_MODE_ACCELERATE + ctypedef enum Elm_Transit_Tween_Mode: + pass + + ctypedef struct Elm_Transit ctypedef void Elm_Transit_Effect diff --git a/efl/elementary/transit.pyx b/efl/elementary/transit.pyx index b9766a2..c9b4d90 100644 --- a/efl/elementary/transit.pyx +++ b/efl/elementary/transit.pyx @@ -150,26 +150,9 @@ from efl.evas cimport Object as evasObject from efl.utils.conversions cimport eina_list_objects_to_python_list, \ python_list_strings_to_eina_list -cimport enums - -ELM_TRANSIT_EFFECT_FLIP_AXIS_X = enums.ELM_TRANSIT_EFFECT_FLIP_AXIS_X -ELM_TRANSIT_EFFECT_FLIP_AXIS_Y = enums.ELM_TRANSIT_EFFECT_FLIP_AXIS_Y - -ELM_TRANSIT_EFFECT_WIPE_DIR_LEFT = enums.ELM_TRANSIT_EFFECT_WIPE_DIR_LEFT -ELM_TRANSIT_EFFECT_WIPE_DIR_RIGHT = enums.ELM_TRANSIT_EFFECT_WIPE_DIR_RIGHT -ELM_TRANSIT_EFFECT_WIPE_DIR_UP = enums.ELM_TRANSIT_EFFECT_WIPE_DIR_UP -ELM_TRANSIT_EFFECT_WIPE_DIR_DOWN = enums.ELM_TRANSIT_EFFECT_WIPE_DIR_DOWN - -ELM_TRANSIT_EFFECT_WIPE_TYPE_HIDE = enums.ELM_TRANSIT_EFFECT_WIPE_TYPE_HIDE -ELM_TRANSIT_EFFECT_WIPE_TYPE_SHOW = enums.ELM_TRANSIT_EFFECT_WIPE_TYPE_SHOW - -ELM_TRANSIT_TWEEN_MODE_LINEAR = enums.ELM_TRANSIT_TWEEN_MODE_LINEAR -ELM_TRANSIT_TWEEN_MODE_SINUSOIDAL = enums.ELM_TRANSIT_TWEEN_MODE_SINUSOIDAL -ELM_TRANSIT_TWEEN_MODE_DECELERATE = enums.ELM_TRANSIT_TWEEN_MODE_DECELERATE -ELM_TRANSIT_TWEEN_MODE_ACCELERATE = enums.ELM_TRANSIT_TWEEN_MODE_ACCELERATE - import traceback + cdef class TransitCustomEffect(object): """TransitCustomEffect(...) diff --git a/efl/elementary/web.pxd b/efl/elementary/web.pxd index 0b05091..5d2e422 100644 --- a/efl/elementary/web.pxd +++ b/efl/elementary/web.pxd @@ -1,8 +1,26 @@ from efl.evas cimport Eina_Bool, Eina_List, Evas_Object, Evas_Coord -from enums cimport Elm_Web_Window_Feature_Flag, Elm_Web_Zoom_Mode + cdef extern from "Elementary.h": + cpdef enum Elm_Web_Window_Feature_Flag: + ELM_WEB_WINDOW_FEATURE_TOOLBAR + ELM_WEB_WINDOW_FEATURE_STATUSBAR + ELM_WEB_WINDOW_FEATURE_SCROLLBARS + ELM_WEB_WINDOW_FEATURE_MENUBAR + ELM_WEB_WINDOW_FEATURE_LOCATIONBAR + ELM_WEB_WINDOW_FEATURE_FULLSCREEN + ctypedef enum Elm_Web_Window_Feature_Flag: + pass + + cpdef enum Elm_Web_Zoom_Mode: + ELM_WEB_ZOOM_MODE_MANUAL + ELM_WEB_ZOOM_MODE_AUTO_FIT + ELM_WEB_ZOOM_MODE_AUTO_FILL + ctypedef enum Elm_Web_Zoom_Mode: + pass + + ctypedef struct Elm_Web_Frame_Load_Error: int code Eina_Bool is_cancellation diff --git a/efl/elementary/web.pyx b/efl/elementary/web.pyx index ce1e02b..d97b5f6 100644 --- a/efl/elementary/web.pyx +++ b/efl/elementary/web.pyx @@ -156,18 +156,6 @@ from object cimport Object import traceback -cimport enums - -ELM_WEB_WINDOW_FEATURE_TOOLBAR = enums.ELM_WEB_WINDOW_FEATURE_TOOLBAR -ELM_WEB_WINDOW_FEATURE_STATUSBAR = enums.ELM_WEB_WINDOW_FEATURE_STATUSBAR -ELM_WEB_WINDOW_FEATURE_SCROLLBARS = enums.ELM_WEB_WINDOW_FEATURE_SCROLLBARS -ELM_WEB_WINDOW_FEATURE_MENUBAR = enums.ELM_WEB_WINDOW_FEATURE_MENUBAR -ELM_WEB_WINDOW_FEATURE_LOCATIONBAR = enums.ELM_WEB_WINDOW_FEATURE_LOCATIONBAR -ELM_WEB_WINDOW_FEATURE_FULLSCREEN = enums.ELM_WEB_WINDOW_FEATURE_FULLSCREEN - -ELM_WEB_ZOOM_MODE_MANUAL = enums.ELM_WEB_ZOOM_MODE_MANUAL -ELM_WEB_ZOOM_MODE_AUTO_FIT = enums.ELM_WEB_ZOOM_MODE_AUTO_FIT -ELM_WEB_ZOOM_MODE_AUTO_FILL = enums.ELM_WEB_ZOOM_MODE_AUTO_FILL def _cb_string_conv(uintptr_t addr): cdef const char *s = <const char *>addr diff --git a/efl/elementary/window.pxd b/efl/elementary/window.pxd index a1bd1b4..5747189 100644 --- a/efl/elementary/window.pxd +++ b/efl/elementary/window.pxd @@ -1,9 +1,73 @@ from efl.evas cimport Eina_Bool, Evas_Object -from enums cimport Elm_Illume_Command, Elm_Win_Type, Elm_Win_Indicator_Mode, \ - Elm_Win_Indicator_Opacity_Mode, Elm_Win_Keyboard_Mode cdef extern from "Elementary.h": + + cpdef enum Elm_Win_Type: + ELM_WIN_UNKNOWN + ELM_WIN_BASIC + ELM_WIN_DIALOG_BASIC + ELM_WIN_DESKTOP + ELM_WIN_DOCK + ELM_WIN_TOOLBAR + ELM_WIN_MENU + ELM_WIN_UTILITY + ELM_WIN_SPLASH + ELM_WIN_DROPDOWN_MENU + ELM_WIN_POPUP_MENU + ELM_WIN_TOOLTIP + ELM_WIN_NOTIFICATION + ELM_WIN_COMBO + ELM_WIN_DND + ELM_WIN_INLINED_IMAGE + ELM_WIN_SOCKET_IMAGE + ctypedef enum Elm_Win_Type: + pass + + cpdef enum Elm_Win_Indicator_Mode: + ELM_WIN_INDICATOR_UNKNOWN + ELM_WIN_INDICATOR_HIDE + ELM_WIN_INDICATOR_SHOW + ctypedef enum Elm_Win_Indicator_Mode: + pass + + cpdef enum Elm_Win_Indicator_Opacity_Mode: + ELM_WIN_INDICATOR_OPACITY_UNKNOWN + ELM_WIN_INDICATOR_OPAQUE + ELM_WIN_INDICATOR_TRANSLUCENT + ELM_WIN_INDICATOR_TRANSPARENT + ctypedef enum Elm_Win_Indicator_Opacity_Mode: + pass + + cpdef enum Elm_Win_Keyboard_Mode: + ELM_WIN_KEYBOARD_UNKNOWN + ELM_WIN_KEYBOARD_OFF + ELM_WIN_KEYBOARD_ON + ELM_WIN_KEYBOARD_ALPHA + ELM_WIN_KEYBOARD_NUMERIC + ELM_WIN_KEYBOARD_PIN + ELM_WIN_KEYBOARD_PHONE_NUMBER + ELM_WIN_KEYBOARD_HEX + ELM_WIN_KEYBOARD_TERMINAL + ELM_WIN_KEYBOARD_PASSWORD + ELM_WIN_KEYBOARD_IP + ELM_WIN_KEYBOARD_HOST + ELM_WIN_KEYBOARD_FILE + ELM_WIN_KEYBOARD_URL + ELM_WIN_KEYBOARD_KEYPAD + ELM_WIN_KEYBOARD_J2ME + ctypedef enum Elm_Win_Keyboard_Mode: + pass + + cpdef enum Elm_Illume_Command: + ELM_ILLUME_COMMAND_FOCUS_BACK + ELM_ILLUME_COMMAND_FOCUS_FORWARD + ELM_ILLUME_COMMAND_FOCUS_HOME + ELM_ILLUME_COMMAND_CLOSE + ctypedef enum Elm_Illume_Command: + pass + + Evas_Object *elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type) Evas_Object *elm_win_util_standard_add(const char *name, const char *title) Evas_Object *elm_win_util_dialog_add(Evas_Object *parent, const char *name, const char *title) diff --git a/efl/elementary/window.pyx b/efl/elementary/window.pyx index a9a380b..e9ce037 100644 --- a/efl/elementary/window.pyx +++ b/efl/elementary/window.pyx @@ -364,56 +364,6 @@ from efl.utils.conversions cimport python_list_strings_to_array_of_strings, \ array_of_strings_to_python_list, python_list_ints_to_array_of_ints, \ array_of_ints_to_python_list -cimport enums - -ELM_WIN_UNKNOWN = enums.ELM_WIN_UNKNOWN -ELM_WIN_BASIC = enums.ELM_WIN_BASIC -ELM_WIN_DIALOG_BASIC = enums.ELM_WIN_DIALOG_BASIC -ELM_WIN_DESKTOP = enums.ELM_WIN_DESKTOP -ELM_WIN_DOCK = enums.ELM_WIN_DOCK -ELM_WIN_TOOLBAR = enums.ELM_WIN_TOOLBAR -ELM_WIN_MENU = enums.ELM_WIN_MENU -ELM_WIN_UTILITY = enums.ELM_WIN_UTILITY -ELM_WIN_SPLASH = enums.ELM_WIN_SPLASH -ELM_WIN_DROPDOWN_MENU = enums.ELM_WIN_DROPDOWN_MENU -ELM_WIN_POPUP_MENU = enums.ELM_WIN_POPUP_MENU -ELM_WIN_TOOLTIP = enums.ELM_WIN_TOOLTIP -ELM_WIN_NOTIFICATION = enums.ELM_WIN_NOTIFICATION -ELM_WIN_COMBO = enums.ELM_WIN_COMBO -ELM_WIN_DND = enums.ELM_WIN_DND -ELM_WIN_INLINED_IMAGE = enums.ELM_WIN_INLINED_IMAGE -ELM_WIN_SOCKET_IMAGE = enums.ELM_WIN_SOCKET_IMAGE - -ELM_WIN_INDICATOR_UNKNOWN = enums.ELM_WIN_INDICATOR_UNKNOWN -ELM_WIN_INDICATOR_HIDE = enums.ELM_WIN_INDICATOR_HIDE -ELM_WIN_INDICATOR_SHOW = enums.ELM_WIN_INDICATOR_SHOW - -ELM_WIN_INDICATOR_OPACITY_UNKNOWN = enums.ELM_WIN_INDICATOR_OPACITY_UNKNOWN -ELM_WIN_INDICATOR_OPAQUE = enums.ELM_WIN_INDICATOR_OPAQUE -ELM_WIN_INDICATOR_TRANSLUCENT = enums.ELM_WIN_INDICATOR_TRANSLUCENT -ELM_WIN_INDICATOR_TRANSPARENT = enums.ELM_WIN_INDICATOR_TRANSPARENT - -ELM_WIN_KEYBOARD_UNKNOWN = enums.ELM_WIN_KEYBOARD_UNKNOWN -ELM_WIN_KEYBOARD_OFF = enums.ELM_WIN_KEYBOARD_OFF -ELM_WIN_KEYBOARD_ON = enums.ELM_WIN_KEYBOARD_ON -ELM_WIN_KEYBOARD_ALPHA = enums.ELM_WIN_KEYBOARD_ALPHA -ELM_WIN_KEYBOARD_NUMERIC = enums.ELM_WIN_KEYBOARD_NUMERIC -ELM_WIN_KEYBOARD_PIN = enums.ELM_WIN_KEYBOARD_PIN -ELM_WIN_KEYBOARD_PHONE_NUMBER = enums.ELM_WIN_KEYBOARD_PHONE_NUMBER -ELM_WIN_KEYBOARD_HEX = enums.ELM_WIN_KEYBOARD_HEX -ELM_WIN_KEYBOARD_TERMINAL = enums.ELM_WIN_KEYBOARD_TERMINAL -ELM_WIN_KEYBOARD_PASSWORD = enums.ELM_WIN_KEYBOARD_PASSWORD -ELM_WIN_KEYBOARD_IP = enums.ELM_WIN_KEYBOARD_IP -ELM_WIN_KEYBOARD_HOST = enums.ELM_WIN_KEYBOARD_HOST -ELM_WIN_KEYBOARD_FILE = enums.ELM_WIN_KEYBOARD_FILE -ELM_WIN_KEYBOARD_URL = enums.ELM_WIN_KEYBOARD_URL -ELM_WIN_KEYBOARD_KEYPAD = enums.ELM_WIN_KEYBOARD_KEYPAD -ELM_WIN_KEYBOARD_J2ME = enums.ELM_WIN_KEYBOARD_J2ME - -ELM_ILLUME_COMMAND_FOCUS_BACK = enums.ELM_ILLUME_COMMAND_FOCUS_BACK -ELM_ILLUME_COMMAND_FOCUS_FORWARD = enums.ELM_ILLUME_COMMAND_FOCUS_FORWARD -ELM_ILLUME_COMMAND_FOCUS_HOME = enums.ELM_ILLUME_COMMAND_FOCUS_HOME -ELM_ILLUME_COMMAND_CLOSE = enums.ELM_ILLUME_COMMAND_CLOSE cdef class Window(Object): """ --
