kuuko pushed a commit to branch master.
http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=3e99eb5fe93d157e485ae713031055462ccbad6d
commit 3e99eb5fe93d157e485ae713031055462ccbad6d
Author: Kai Huuhko <kai.huu...@gmail.com>
Date: Fri Oct 25 03:13:46 2013 +0300
Elementary: Document more scrollables
---
efl/elementary/diskselector.pyx | 4 ++--
efl/elementary/entry.pyx | 4 ++--
efl/elementary/gengrid.pyx | 4 ++--
efl/elementary/genlist.pyx | 4 ++--
efl/elementary/list.pyx | 4 ++--
efl/elementary/map.pyx | 13 +++++++++++++
efl/elementary/photocam.pyx | 13 +++++++++++++
efl/elementary/toolbar.pyx | 13 +++++++++++++
efl/utils/deprecated.pyx | 6 ++++--
9 files changed, 53 insertions(+), 12 deletions(-)
diff --git a/efl/elementary/diskselector.pyx b/efl/elementary/diskselector.pyx
index de66796..8f35e66 100644
--- a/efl/elementary/diskselector.pyx
+++ b/efl/elementary/diskselector.pyx
@@ -55,8 +55,8 @@ Default text parts of the diskselector items that you can use
for are:
.. note:: The "scroll,anim,*" and "scroll,drag,*" signals are only emitted
by user intervention.
-Scollable Interface
-===================
+Scrollable Interface
+====================
This widget supports the scrollable interface.
diff --git a/efl/elementary/entry.pyx b/efl/elementary/entry.pyx
index ed66a9a..82c13dd 100644
--- a/efl/elementary/entry.pyx
+++ b/efl/elementary/entry.pyx
@@ -39,8 +39,8 @@ Other features include password mode, filtering of inserted
text with
:py:func:`markup_filter_append()` and related functions, inline "items" and
formatted markup text.
-Scollable Interface
-===================
+Scrollable Interface
+====================
This widget supports the scrollable interface.
diff --git a/efl/elementary/gengrid.pyx b/efl/elementary/gengrid.pyx
index 9cad723..19fd4aa 100644
--- a/efl/elementary/gengrid.pyx
+++ b/efl/elementary/gengrid.pyx
@@ -33,8 +33,8 @@ clicking on items to select them and clicking on the grid's
viewport and
swiping to pan the whole view) or via the keyboard, navigating through
item with the arrow keys.
-Scollable Interface
-===================
+Scrollable Interface
+====================
This widget supports the scrollable interface.
diff --git a/efl/elementary/genlist.pyx b/efl/elementary/genlist.pyx
index 5a4cc56..2b6278f 100644
--- a/efl/elementary/genlist.pyx
+++ b/efl/elementary/genlist.pyx
@@ -221,8 +221,8 @@ per application with elm_theme_extension_add(). If you
absolutely must
have a specific style that overrides any theme the user or system sets up
you can use elm_theme_overlay_add() to add such a file.
-Scollable Interface
-===================
+Scrollable Interface
+====================
This widget supports the scrollable interface.
diff --git a/efl/elementary/list.pyx b/efl/elementary/list.pyx
index 4eda88e..f12d342 100644
--- a/efl/elementary/list.pyx
+++ b/efl/elementary/list.pyx
@@ -70,8 +70,8 @@ Default text parts of the list items that you can use for are:
- "default" - label in the list item
-Scollable Interface
-===================
+Scrollable Interface
+====================
This widget supports the scrollable interface.
diff --git a/efl/elementary/map.pyx b/efl/elementary/map.pyx
index 210aec9..48fe2e1 100644
--- a/efl/elementary/map.pyx
+++ b/efl/elementary/map.pyx
@@ -70,6 +70,19 @@ Signals you can listen to
- ``focused`` - When the map has received focus. (since 1.8)
- ``unfocused`` - When the map has lost focus. (since 1.8)
+Scrollable Interface
+====================
+
+This widget supports the scrollable interface.
+
+If you wish to control the scolling behaviour using these functions,
+inherit both the widget class and the
+:py:class:`Scrollable<efl.elementary.scroller.Scrollable>` class
+using multiple inheritance, for example::
+
+ class ScrollableGenlist(Genlist, Scrollable):
+ def __init__(self, canvas, *args, **kwargs):
+ Genlist.__init__(self, canvas)
Enumerations
------------
diff --git a/efl/elementary/photocam.pyx b/efl/elementary/photocam.pyx
index 9bf5bdf..316d441 100644
--- a/efl/elementary/photocam.pyx
+++ b/efl/elementary/photocam.pyx
@@ -57,6 +57,19 @@ Signals that you can add callbacks for are:
- ``focused`` - When the photocam has received focus. (since 1.8)
- ``unfocused`` - When the photocam has lost focus. (since 1.8)
+Scrollable Interface
+====================
+
+This widget supports the scrollable interface.
+
+If you wish to control the scolling behaviour using these functions,
+inherit both the widget class and the
+:py:class:`Scrollable<efl.elementary.scroller.Scrollable>` class
+using multiple inheritance, for example::
+
+ class ScrollableGenlist(Genlist, Scrollable):
+ def __init__(self, canvas, *args, **kwargs):
+ Genlist.__init__(self, canvas)
Enumerations
------------
diff --git a/efl/elementary/toolbar.pyx b/efl/elementary/toolbar.pyx
index e52eaf5..78a401d 100644
--- a/efl/elementary/toolbar.pyx
+++ b/efl/elementary/toolbar.pyx
@@ -48,6 +48,19 @@ Default text parts of the toolbar items that you can use for
are:
- "default" - label of the toolbar item
+Scrollable Interface
+====================
+
+This widget supports the scrollable interface.
+
+If you wish to control the scolling behaviour using these functions,
+inherit both the widget class and the
+:py:class:`Scrollable<efl.elementary.scroller.Scrollable>` class
+using multiple inheritance, for example::
+
+ class ScrollableGenlist(Genlist, Scrollable):
+ def __init__(self, canvas, *args, **kwargs):
+ Genlist.__init__(self, canvas)
Enumerations
------------
diff --git a/efl/utils/deprecated.pyx b/efl/utils/deprecated.pyx
index 1a44bb6..9cf46b4 100644
--- a/efl/utils/deprecated.pyx
+++ b/efl/utils/deprecated.pyx
@@ -19,7 +19,8 @@ cdef class DEPRECATED(object):
assignments.append("__module__")
update_wrapper(wrapper, f, assigned=assignments)
- if wrapper.__doc__ is not None:
+ # Version is required for the deprecated directive
+ if wrapper.__doc__ is not None and self.version is not None:
wrapper.__doc__ += "\n\n.. deprecated:: %s\n %s\n" %
(self.version, self.message)
return wrapper
@@ -54,7 +55,8 @@ class WRAPPER(object):
msg = "Deprecated function %s called in %s:%s." % \
(self.f.__name__, caller_module, caller_line)
- msg += " " + self.message
+ if self.message is not None:
+ msg += " " + self.message
EINA_LOG_DOM_WARN(PY_EFL_LOG_DOMAIN, msg, NULL)
--
