From: Enlightenment S. <no-...@en...> - 2012-06-09 11:03:50
|
Log: python-elementary: get/set/del -> props in Clock, Button, Bubble, Colorselector, Ctxpopup, Check. Author: kuuko Date: 2012-06-09 04:03:42 -0700 (Sat, 09 Jun 2012) New Revision: 71881 Trac: http://trac.enlightenment.org/e/changeset/71881 Modified: trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_bubble.pxi trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_button.pxi trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_check.pxi trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_clock.pxi trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_colorselector.pxi trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_ctxpopup.pxi Modified: trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_bubble.pxi =================================================================== --- trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_bubble.pxi 2012-06-09 10:43:07 UTC (rev 71880) +++ trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_bubble.pxi 2012-06-09 11:03:42 UTC (rev 71881) @@ -101,10 +101,10 @@ """ def __get__(self): - return self.pos_get() + return elm_bubble_pos_get(self.obj) def __set__(self, value): - self.pos_set(value) + elm_bubble_pos_set(self.obj, value) def callback_clicked_add(self, func, *args, **kwargs): """This is called when a user has clicked the bubble.""" Modified: trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_button.pxi =================================================================== --- trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_button.pxi 2012-06-09 10:43:07 UTC (rev 71880) +++ trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_button.pxi 2012-06-09 11:03:42 UTC (rev 71881) @@ -99,9 +99,9 @@ """ def __get__(self): - return self.autorepeat_get() + return bool(elm_button_autorepeat_get(self.obj)) def __set__(self, on): - self.autorepeat_set(on) + elm_button_autorepeat_set(self.obj, on) def autorepeat_initial_timeout_set(self, t): """Set the initial timeout before the autorepeat event is generated @@ -146,9 +146,9 @@ """ def __get__(self): - return self.autorepeat_initial_timeout_get() + return elm_button_autorepeat_initial_timeout_get(self.obj) def __set__(self, t): - self.autorepeat_initial_timeout_set(t) + elm_button_autorepeat_initial_timeout_set(self.obj, t) def autorepeat_gap_timeout_set(self, t): """Set the interval between each generated autorepeat event @@ -185,9 +185,9 @@ """ def __get__(self): - return self.autorepeat_gap_timeout_get() + return elm_button_autorepeat_gap_timeout_get(self.obj) def __set__(self, t): - self.autorepeat_gap_timeout_set(t) + elm_button_autorepeat_gap_timeout_set(self.obj, t) def callback_clicked_add(self, func, *args, **kwargs): """The user clicked the button (press/release).""" Modified: trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_check.pxi =================================================================== --- trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_check.pxi 2012-06-09 10:43:07 UTC (rev 71880) +++ trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_check.pxi 2012-06-09 11:03:42 UTC (rev 71881) @@ -83,10 +83,10 @@ """ def __get__(self): - return self.state_get() + return bool(elm_check_state_get(self.obj)) def __set__(self, value): - self.state_set(value) + elm_check_state_set(self.obj, value) def callback_changed_add(self, func, *args, **kwargs): """This is called whenever the user changes the state of the check Modified: trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_clock.pxi =================================================================== --- trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_clock.pxi 2012-06-09 10:43:07 UTC (rev 71880) +++ trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_clock.pxi 2012-06-09 11:03:42 UTC (rev 71881) @@ -110,10 +110,14 @@ """ def __get__(self): - return self.time_get() + cdef int hrs, min, sec + elm_clock_time_get(self.obj, &hrs, &min, &sec) + return (hrs, min, sec) def __set__(self, value): - self.time_set(*value) + cdef int hrs, min, sec + hrs, min, sec = value + elm_clock_time_set(self.obj, hrs, min, sec) def edit_set(self, edit): """Set whether a given clock widget is under B{edition mode} or @@ -149,7 +153,7 @@ @rtype: bool """ - return elm_clock_edit_get(self.obj) + return bool(elm_clock_edit_get(self.obj)) property edit: """Whether a given clock widget is under B{edition mode} or under @@ -167,10 +171,10 @@ """ def __get__(self): - return self.edit_get() + return bool(elm_clock_edit_get(self.obj)) - def __set__(self, value): - self.edit_set(value) + def __set__(self, edit): + elm_clock_edit_set(self.obj, edit) def edit_mode_set(self, mode): """Set what digits of the given clock widget should be editable @@ -204,10 +208,10 @@ """ def __get__(self): - return self.edit_mode_get() + return elm_clock_edit_mode_get(self.obj) - def __set__(self, value): - self.edit_mode_set(value) + def __set__(self, mode): + elm_clock_edit_mode_set(self.obj, mode) def show_am_pm_set(self, am_pm): """Set if the given clock widget must show hours in military or @@ -253,10 +257,10 @@ """ def __get__(self): - return self.show_am_pm_get() + return elm_clock_show_am_pm_get(self.obj) - def __set__(self, value): - self.show_am_pm_set(value) + def __set__(self, am_pm): + elm_clock_show_am_pm_set(self.obj, am_pm) def show_seconds_set(self, seconds): """Set if the given clock widget must show time with seconds or not @@ -293,10 +297,10 @@ """ def __get__(self): - return self.show_seconds_get() + return elm_clock_show_seconds_get(self.obj) - def __set__(self, value): - self.show_seconds_set(value) + def __set__(self, seconds): + elm_clock_show_seconds_set(self.obj, seconds) def first_interval_set(self, interval): """Set the first interval on time updates for a user mouse button hold @@ -360,10 +364,10 @@ """ def __get__(self): - return self.first_interval_get() + return elm_clock_first_interval_get(self.obj) - def __set__(self, value): - self.first_interval_set(value) + def __set__(self, interval): + elm_clock_first_interval_set(self.obj, interval) def callback_changed_add(self, func, *args, **kwargs): """The clock's user changed the time""" Modified: trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_colorselector.pxi =================================================================== --- trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_colorselector.pxi 2012-06-09 10:43:07 UTC (rev 71880) +++ trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_colorselector.pxi 2012-06-09 11:03:42 UTC (rev 71881) @@ -29,10 +29,19 @@ elm_colorselector_palette_item_color_set(self.item, r, g, b, a) property color: + """The palette item's color. + + @type: tuple of ints + + """ def __get__(self): - return self.color_get() + cdef int r, g, b, a + elm_colorselector_palette_item_color_get(self.item, &r, &g, &b, &a) + return (r, g, b, a) def __set__(self, value): - self.color_set(value) + cdef int r, g, b, a + r, g, b, a = value + elm_colorselector_palette_item_color_set(self.item, r, g, b, a) def _colorselector_item_conv(long addr): cdef Elm_Object_Item *it = <Elm_Object_Item *>addr @@ -102,9 +111,13 @@ """ def __get__(self): - return self.color_get() + cdef int r, g, b, a + elm_colorselector_color_get(self.obj, &r, &g, &b, &a) + return (r, g, b, a) def __set__(self, value): - self.color_set(value) + cdef int r, g, b, a + r, g, b, a = value + elm_colorselector_color_set(self.obj, r, g, b, a) def mode_set(self, mode): """Set Colorselector's mode. @@ -135,9 +148,9 @@ """ def __get__(self): - return self.mode_get() + return elm_colorselector_mode_get(self.obj) def __set__(self, mode): - self.mode_set(mode) + elm_colorselector_mode_set(self.obj, mode) def palette_color_add(self, r, g, b, a): """Add a new color item to palette. @@ -196,9 +209,9 @@ """ def __get__(self): - return self.palette_name_get() + return elm_colorselector_palette_name_get(self.obj) def __set__(self, palette_name): - self.palette_name_set(palette_name) + elm_colorselector_palette_name_set(self.obj, palette_name) def callback_selected_add(self, func, *args, **kwargs): """When the color value changes on selector""" Modified: trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_ctxpopup.pxi =================================================================== --- trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_ctxpopup.pxi 2012-06-09 10:43:07 UTC (rev 71880) +++ trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_ctxpopup.pxi 2012-06-09 11:03:42 UTC (rev 71881) @@ -99,6 +99,18 @@ cdef Evas_Object *obj = elm_ctxpopup_hover_parent_get(self.obj) return evas.c_evas._Object_from_instance(<long> obj) + property parent: + """Ctxpopup's parent + + @type: L{Object} + + """ + def __get__(self): + cdef Evas_Object *obj = elm_ctxpopup_hover_parent_get(self.obj) + return evas.c_evas._Object_from_instance(<long> obj) + def __set__(self, c_evas.Object parent): + elm_ctxpopup_hover_parent_set(self.obj, parent.obj) + def clear(self): """Clear all items in the given ctxpopup object.""" elm_ctxpopup_clear(self.obj) @@ -130,9 +142,9 @@ """ def __get__(self): - return self.horizontal_get() + return bool(elm_ctxpopup_horizontal_get(self.obj)) def __set__(self, horizontal): - self.horizontal_set(horizontal) + elm_ctxpopup_horizontal_set(self.obj, horizontal) def item_append(self, label, c_evas.Object icon, func, *args, **kwargs): """Add a new item to a ctxpopup object. @@ -187,6 +199,25 @@ elm_ctxpopup_direction_priority_get(self.obj, &first, &second, &third, &fourth) return (first, second, third, fourth) + property direction_priority: + """The direction priority order of a ctxpopup. + + This functions gives a chance to user to set the priority of ctxpopup + showing direction. This doesn't guarantee the ctxpopup will appear + in the requested direction. + + @type: tuple of Elm_Ctxpopup_Direction + + """ + def __get__(self): + cdef Elm_Ctxpopup_Direction first, second, third, fourth + elm_ctxpopup_direction_priority_get(self.obj, &first, &second, &third, &fourth) + return (first, second, third, fourth) + def __set__(self, priority): + cdef Elm_Ctxpopup_Direction first, second, third, fourth + first, second, third, fourth = priority + elm_ctxpopup_direction_priority_set(self.obj, first, second, third, fourth) + def direction_get(self): """Get the current direction of a ctxpopup. @@ -199,6 +230,19 @@ """ return elm_ctxpopup_direction_get(self.obj) + property direction: + """Get the current direction of a ctxpopup. + + @warning: Only once the ctxpopup is shown can the direction be + determined + + @return: current direction of a ctxpopup + @rtype: Elm_Ctxpopup_Direction + + """ + def __get__(self): + return elm_ctxpopup_direction_get(self.obj) + def dismiss(self): """Dismiss a ctxpopup object |