kuuko pushed a commit to branch master.
commit f38a3145d1bb8e59183b7ae59a9265edd852749b
Author: Kai Huuhko <[email protected]>
Date: Sat Apr 20 19:48:00 2013 +0000
Silence some compiler warnings.
---
efl/elementary/calendar_elm.pyx | 2 +-
efl/elementary/label.pxd | 2 -
efl/elementary/label.pyx | 10 +++--
efl/elementary/need.pxd | 1 -
efl/elementary/need.pyx | 5 ++-
efl/elementary/scroller.pyx | 93 ++++++++++++++++++++++++++++++++++++++++-
efl/elementary/window.pyx | 4 +-
efl/emotion/efl.emotion.pyx | 2 +-
efl/eo/efl.eo.pyx | 1 +
9 files changed, 106 insertions(+), 14 deletions(-)
diff --git a/efl/elementary/calendar_elm.pyx b/efl/elementary/calendar_elm.pyx
index 7fe151d..a71cb95 100644
--- a/efl/elementary/calendar_elm.pyx
+++ b/efl/elementary/calendar_elm.pyx
@@ -303,7 +303,7 @@ cdef class Calendar(LayoutClass):
"""
def __get__(self):
return convert_array_of_strings_to_python_list(
- elm_calendar_weekdays_names_get(self.obj), 7)
+ <char **>elm_calendar_weekdays_names_get(self.obj), 7)
def __set__(self, weekdays):
elm_calendar_weekdays_names_set(self.obj,
diff --git a/efl/elementary/label.pxd b/efl/elementary/label.pxd
index 83af868..6f263b1 100644
--- a/efl/elementary/label.pxd
+++ b/efl/elementary/label.pxd
@@ -9,8 +9,6 @@ cdef extern from "Elementary.h":
Evas_Coord elm_label_wrap_width_get(Evas_Object *obj)
void elm_label_ellipsis_set(Evas_Object *obj, Eina_Bool
ellipsis)
Eina_Bool elm_label_ellipsis_get(Evas_Object *obj)
- void elm_label_slide_set(Evas_Object *obj, Eina_Bool
slide)#DEP
- Eina_Bool elm_label_slide_get(Evas_Object *obj)#DEP
void elm_label_slide_duration_set(Evas_Object *obj,
double duration)
double elm_label_slide_duration_get(Evas_Object *obj)
void elm_label_slide_area_limit_set(Evas_Object *obj,
Eina_Bool limit)
diff --git a/efl/elementary/label.pyx b/efl/elementary/label.pyx
index e75ee39..8623daa 100644
--- a/efl/elementary/label.pyx
+++ b/efl/elementary/label.pyx
@@ -201,18 +201,20 @@ cdef class Label(LayoutClass):
"""
def __get__(self):
_METHOD_DEPRECATED(self, "Use slide_mode instead.")
- return elm_label_slide_get(self.obj)
+ return bool(elm_label_slide_mode_get(self.obj))
def __set__(self, slide):
_METHOD_DEPRECATED(self, "Use slide_mode instead.")
- elm_label_slide_set(self.obj, slide)
+ elm_label_slide_mode_set(self.obj,
+ ELM_LABEL_SLIDE_MODE_ALWAYS if slide else
ELM_LABEL_SLIDE_MODE_NONE)
def slide_set(self, bint slide):
_METHOD_DEPRECATED(self, "Use slide_mode instead.")
- elm_label_slide_set(self.obj, slide)
+ elm_label_slide_mode_set(self.obj,
+ ELM_LABEL_SLIDE_MODE_ALWAYS if slide else
ELM_LABEL_SLIDE_MODE_NONE)
def slide_get(self):
_METHOD_DEPRECATED(self, "Use slide_mode instead.")
- return elm_label_slide_get(self.obj)
+ 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/need.pxd b/efl/elementary/need.pxd
index 4695f8e..1f737d7 100644
--- a/efl/elementary/need.pxd
+++ b/efl/elementary/need.pxd
@@ -4,7 +4,6 @@ cdef extern from "Elementary.h":
Eina_Bool elm_need_efreet()
Eina_Bool elm_need_systray()
Eina_Bool elm_need_sys_notify()
- Eina_Bool elm_need_e_dbus()
Eina_Bool elm_need_edbus()
Eina_Bool elm_need_elocation()
Eina_Bool elm_need_ethumb()
diff --git a/efl/elementary/need.pyx b/efl/elementary/need.pyx
index dec83c7..53dfbfa 100644
--- a/efl/elementary/need.pyx
+++ b/efl/elementary/need.pyx
@@ -15,6 +15,8 @@
# You should have received a copy of the GNU Lesser General Public License
# along with this Python-EFL. If not, see <http://www.gnu.org/licenses/>.
+from efl.eo cimport _METHOD_DEPRECATED
+
def need_efreet():
"""need_efreet() -> bool
@@ -76,7 +78,8 @@ def need_e_dbus():
deprecated.
"""
- return bool(elm_need_e_dbus())
+ print("need_e_dbus() is deprecated. Use need_edbus instead.")
+ return bool(elm_need_edbus())
def need_edbus():
"""need_edbus() -> bool
diff --git a/efl/elementary/scroller.pyx b/efl/elementary/scroller.pyx
index d944d49..cc1ddda 100644
--- a/efl/elementary/scroller.pyx
+++ b/efl/elementary/scroller.pyx
@@ -31,17 +31,31 @@ object that is contained in the scroller. The scroller will
always have
a small minimum size by default as it won't be limited by the contents
of the scroller.
-Signals that you can add callbacks for are:
+This widget inherits from :py:class:`efl.elementary.layout_class.LayoutClass`,
+so that all the functions acting on it also work for scroller objects.
+
+This widget emits the following signals, besides the ones sent from
+:py:class:`efl.elementary.layout_class.LayoutClass`
- "edge,left" - the left edge of the content has been reached
- "edge,right" - the right edge of the content has been reached
- "edge,top" - the top edge of the content has been reached
- "edge,bottom" - the bottom edge of the content has been reached
- "scroll" - the content has been scrolled (moved)
+- "scroll,left" - the content has been scrolled (moved) leftwards
+- "scroll,right" - the content has been scrolled (moved) rightwards
+- "scroll,up" - the content has been scrolled (moved) upwards
+- "scroll,down" - the content has been scrolled (moved) downwards
- "scroll,anim,start" - scrolling animation has started
- "scroll,anim,stop" - scrolling animation has stopped
- "scroll,drag,start" - dragging the contents around has started
- "scroll,drag,stop" - dragging the contents around has stopped
+- "vbar,drag" - the vertical scroll bar has been dragged
+- "vbar,press" - the vertical scroll bar has been pressed
+- "vbar,unpress" - the vertical scroll bar has been unpressed
+- "hbar,drag" - the horizontal scroll bar has been dragged
+- "hbar,press" - the horizontal scroll bar has been pressed
+- "hbar,unpress" - the horizontal scroll bar has been unpressed
Default content parts of the scroller widget that you can use for are:
@@ -76,6 +90,8 @@ Default content parts of the scroller widget that you can use
for are:
include "widget_header.pxi"
from object cimport Object
+from layout_class cimport LayoutClass
+from efl.eo cimport _METHOD_DEPRECATED
cimport enums
@@ -107,6 +123,7 @@ cdef class ScrollableInterface(Object):
:type base: string
"""
+ _METHOD_DEPRECATED(self, "Use the property 'theme' instead.")
if isinstance(widget, unicode): widget = PyUnicode_AsUTF8String(widget)
if isinstance(base, unicode): base = PyUnicode_AsUTF8String(base)
elm_scroller_custom_widget_base_theme_set(self.obj,
@@ -556,6 +573,35 @@ cdef class ScrollableInterface(Object):
def callback_scroll_del(self, func):
self._callback_del("scroll", func)
+ def callback_scroll_left_add(self, func, *args, **kwargs):
+ """the content has been scrolled (moved) leftwards"""
+ self._callback_add("scroll,left", func, *args, **kwargs)
+
+ def callback_scroll_left_del(self, func):
+ self._callback_del("scroll,left", func)
+
+ def callback_scroll_right_add(self, func, *args, **kwargs):
+ """the content has been scrolled (moved) rightwards"""
+ self._callback_add("scroll,right", func, *args, **kwargs)
+
+ def callback_scroll_right_del(self, func):
+ self._callback_del("scroll,right", func)
+
+ def callback_scroll_up_add(self, func, *args, **kwargs):
+ """the content has been scrolled (moved) upwards"""
+ self._callback_add("scroll,up", func, *args, **kwargs)
+
+ def callback_scroll_up_del(self, func):
+ self._callback_del("scroll,up", func)
+
+ def callback_scroll_down_add(self, func, *args, **kwargs):
+ """the content has been scrolled (moved) downwards"""
+ self._callback_add("scroll,down", func, *args, **kwargs)
+
+ def callback_scroll_down_del(self, func):
+ self._callback_del("scroll,down", func)
+
+
def callback_scroll_anim_start_add(self, func, *args, **kwargs):
"""Scrolling animation has started."""
self._callback_add("scroll,anim,start", func, *args, **kwargs)
@@ -584,7 +630,50 @@ cdef class ScrollableInterface(Object):
def callback_scroll_drag_stop_del(self, func):
self._callback_del("scroll,drag,stop", func)
-cdef class ScrollerWidget(Object):
+ def callback_vbar_drag_add(self, func, *args, **kwargs):
+ """the vertical scroll bar has been dragged"""
+ self._callback_add("vbar,drag", func, *args, **kwargs)
+
+ def callback_vbar_drag_del(self, func):
+ self._callback_del("vbar,drag", func)
+
+ def callback_vbar_press_add(self, func, *args, **kwargs):
+ """the vertical scroll bar has been pressed"""
+ self._callback_add("vbar,press", func, *args, **kwargs)
+
+ def callback_vbar_press_del(self, func):
+ self._callback_del("vbar,press", func)
+
+ def callback_vbar_unpress_add(self, func, *args, **kwargs):
+ """the vertical scroll bar has been unpressed"""
+ self._callback_add("vbar,unpress", func, *args, **kwargs)
+
+ def callback_vbar_unpress_del(self, func):
+ self._callback_del("vbar,unpress", func)
+
+ def callback_hbar_drag_add(self, func, *args, **kwargs):
+ """the horizontal scroll bar has been dragged"""
+ self._callback_add("hbar,drag", func, *args, **kwargs)
+
+ def callback_hbar_drag_del(self, func):
+ self._callback_del("hbar,drag", func)
+
+ def callback_hbar_press_add(self, func, *args, **kwargs):
+ """the horizontal scroll bar has been pressed"""
+ self._callback_add("hbar,press", func, *args, **kwargs)
+
+ def callback_hbar_press_del(self, func):
+ self._callback_del("hbar,press", func)
+
+ def callback_hbar_unpress_add(self, func, *args, **kwargs):
+ """the horizontal scroll bar has been unpressed"""
+ self._callback_add("hbar,unpress", func, *args, **kwargs)
+
+ def callback_hbar_unpress_del(self, func):
+ self._callback_del("hbar,unpress", func)
+
+
+cdef class ScrollerWidget(LayoutClass):
def __init__(self, evasObject parent):
self._set_obj(elm_scroller_add(parent.obj))
diff --git a/efl/elementary/window.pyx b/efl/elementary/window.pyx
index df7ebb5..e4dba33 100644
--- a/efl/elementary/window.pyx
+++ b/efl/elementary/window.pyx
@@ -508,14 +508,14 @@ cdef class Window(Object):
"""
def __get__(self):
- return object_from_instance(elm_win_icon_object_get(self.obj))
+ return object_from_instance(<Evas_Object
*>elm_win_icon_object_get(self.obj))
def __set__(self, evasObject icon):
elm_win_icon_object_set(self.obj, icon.obj)
def icon_object_set(self, evasObject icon):
elm_win_icon_object_set(self.obj, icon.obj)
def icon_object_get(self):
- return object_from_instance(elm_win_icon_object_get(self.obj))
+ return object_from_instance(<Evas_Object
*>elm_win_icon_object_get(self.obj))
property autodel:
"""The window's autodel state.
diff --git a/efl/emotion/efl.emotion.pyx b/efl/emotion/efl.emotion.pyx
index 8d48c22..4a186fa 100644
--- a/efl/emotion/efl.emotion.pyx
+++ b/efl/emotion/efl.emotion.pyx
@@ -111,7 +111,7 @@ def webcams_get():
""" Get a list of active and available webcam.
:return: the list of tuple (webcam name, webcam device)
"""
- cdef Eina_List *lst, *itr
+ cdef const_Eina_List *lst, *itr
cdef Emotion_Webcam *cam
cdef const_char *name, *device
diff --git a/efl/eo/efl.eo.pyx b/efl/eo/efl.eo.pyx
index 5f78445..7e311c2 100644
--- a/efl/eo/efl.eo.pyx
+++ b/efl/eo/efl.eo.pyx
@@ -78,6 +78,7 @@ cdef list convert_array_of_strings_to_python_list(char
**array, int array_length
cdef:
char *string
list ret = list()
+ int i
for i in range(array_length):
string = array[i]
--
------------------------------------------------------------------------------
Precog is a next-generation analytics platform capable of advanced
analytics on semi-structured data. The platform includes APIs for building
apps and a phenomenal toolset for data science. Developers can use
our toolset for easy data analysis & visualization. Get a free account!
http://www2.precog.com/precogplatform/slashdotnewsletter
