-- Martin 'JaMa' Jansa jabber: [email protected]
From f8dc086f9c9c7f5adc6a4384b539577ffe0d92e3 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Sun, 18 Mar 2012 13:55:08 +0100 Subject: [PATCH] python-elementary: drop deprecated pager API and add bindings for naviframe
Signed-off-by: Martin Jansa <[email protected]> --- BINDINGS/python/python-elementary/Makefile.am | 2 +- .../python-elementary/elementary/__init__.py | 2 +- .../elementary/elementary.c_elementary.pyx | 2 +- .../elementary.c_elementary_naviframe.pxi | 61 ++++++++++++++++++ .../elementary/elementary.c_elementary_pager.pxi | 67 -------------------- 5 files changed, 64 insertions(+), 70 deletions(-) create mode 100644 BINDINGS/python/python-elementary/elementary/elementary.c_elementary_naviframe.pxi delete mode 100644 BINDINGS/python/python-elementary/elementary/elementary.c_elementary_pager.pxi diff --git a/BINDINGS/python/python-elementary/Makefile.am b/BINDINGS/python/python-elementary/Makefile.am index 6937af4..d1200b3 100644 --- a/BINDINGS/python/python-elementary/Makefile.am +++ b/BINDINGS/python/python-elementary/Makefile.am @@ -39,7 +39,7 @@ c_elementary_deps = \ elementary/elementary.c_elementary_menu.pxi \ elementary/elementary.c_elementary_notify.pxi \ elementary/elementary.c_elementary_object.pxi \ - elementary/elementary.c_elementary_pager.pxi \ + elementary/elementary.c_elementary_naviframe.pxi \ elementary/elementary.c_elementary_panel.pxi \ elementary/elementary.c_elementary_photo.pxi \ elementary/elementary.c_elementary_progressbar.pxi \ diff --git a/BINDINGS/python/python-elementary/elementary/__init__.py b/BINDINGS/python/python-elementary/elementary/__init__.py index 9d3561b..9d9dc5f 100644 --- a/BINDINGS/python/python-elementary/elementary/__init__.py +++ b/BINDINGS/python/python-elementary/elementary/__init__.py @@ -20,7 +20,7 @@ from c_elementary import Object, Window, Background, Icon, \ Box, Button, Scroller, Label, Frame, Flip, Table, \ Clock, Layout, Hover, Entry, Bubble, \ Photo, Hoversel, Toolbar, ToolbarItem, List, ListItem, Slider, \ - Radio, Check, Pager, InnerWindow, Image, Spinner, Fileselector, FileselectorEntry, Notify, \ + Radio, Check, Naviframe, InnerWindow, Image, Spinner, Fileselector, FileselectorEntry, Notify, \ Separator, Progressbar, Menu, MenuItem, MenuItemSeparator, Panel, \ Genlist, GenlistItem, GenlistItemClass, WidgetItem, ScrolledEntry, \ Gengrid, GengridItem, GengridItemClass, \ diff --git a/BINDINGS/python/python-elementary/elementary/elementary.c_elementary.pyx b/BINDINGS/python/python-elementary/elementary/elementary.c_elementary.pyx index 2b14f8e..f5e6202 100644 --- a/BINDINGS/python/python-elementary/elementary/elementary.c_elementary.pyx +++ b/BINDINGS/python/python-elementary/elementary/elementary.c_elementary.pyx @@ -212,7 +212,7 @@ include "elementary.c_elementary_hoversel.pxi" include "elementary.c_elementary_toolbar.pxi" include "elementary.c_elementary_list.pxi" include "elementary.c_elementary_slider.pxi" -include "elementary.c_elementary_pager.pxi" +include "elementary.c_elementary_naviframe.pxi" include "elementary.c_elementary_radio.pxi" include "elementary.c_elementary_check.pxi" include "elementary.c_elementary_image.pxi" diff --git a/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_naviframe.pxi b/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_naviframe.pxi new file mode 100644 index 0000000..da15755 --- /dev/null +++ b/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_naviframe.pxi @@ -0,0 +1,61 @@ +# Copyright (c) 2008-2009 Simon Busch +# Copyright (c) 2010-2010 ProFUSION embedded systems +# +# This file is part of python-elementary. +# +# python-elementary is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# python-elementary is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with python-elementary. If not, see <http://www.gnu.org/licenses/>. +# + +cdef class Naviframe(Object): + def __init__(self, c_evas.Object parent): + Object.__init__(self, parent.evas) + self._set_obj(elm_naviframe_add(parent.obj)) + + def item_simple_push(self, c_evas.Object content): + elm_naviframe_item_simple_push(self.obj, content.obj); + + def item_pop(self): + elm_naviframe_item_pop(self.obj) + + def item_simple_promote(self, c_evas.Object content): + elm_naviframe_item_simple_promote(self.obj, content.obj) + + def bottom_item_get(self): + cdef c_evas.Evas_Object* o + cdef Object obj + cdef Elm_Object_Item *it + + it = elm_naviframe_bottom_item_get(self.obj) + o = elm_object_item_part_content_get(it, NULL) + if o == NULL: + return None + obj = <Object>c_evas.evas_object_data_get(o, "python-evas") + + return obj + + def top_item_get(self): + cdef c_evas.Evas_Object* o + cdef Object obj + cdef Elm_Object_Item *it + + it = elm_naviframe_top_item_get(self.obj) + o = elm_object_item_part_content_get(it, NULL) + if o == NULL: + return None + obj = <Object>c_evas.evas_object_data_get(o, "python-evas") + + return obj + + +_elm_widget_type_register("naviframe", Naviframe) diff --git a/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_pager.pxi b/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_pager.pxi deleted file mode 100644 index d0d14c5..0000000 --- a/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_pager.pxi +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright (c) 2008-2009 Simon Busch -# Copyright (c) 2010-2010 ProFUSION embedded systems -# -# This file is part of python-elementary. -# -# python-elementary is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# python-elementary is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with python-elementary. If not, see <http://www.gnu.org/licenses/>. -# - -cdef class Pager(Object): - def __init__(self, c_evas.Object parent): - _METHOD_DEPRECATED(self, "Naviframe", "use Naviframe instead") - Object.__init__(self, parent.evas) - self._set_obj(elm_naviframe_add(parent.obj)) - - def content_push(self, c_evas.Object content): - _METHOD_DEPRECATED(self, "Naviframe", "use Naviframe instead") - elm_naviframe_item_simple_push(self.obj, content.obj); - - def content_pop(self): - _METHOD_DEPRECATED(self, "Naviframe", "use Naviframe instead") - elm_naviframe_item_pop(self.obj) - - def content_promote(self, c_evas.Object content): - _METHOD_DEPRECATED(self, "Naviframe", "use Naviframe instead") - elm_naviframe_item_simple_promote(self.obj, content.obj) - - def bottom_get(self): - _METHOD_DEPRECATED(self, "Naviframe", "use Naviframe instead") - cdef c_evas.Evas_Object* o - cdef Object obj - cdef Elm_Object_Item *it - - it = elm_naviframe_bottom_item_get(self.obj) - o = elm_object_item_part_content_get(it, NULL) - if o == NULL: - return None - obj = <Object>c_evas.evas_object_data_get(o, "python-evas") - - return obj - - def top_get(self): - _METHOD_DEPRECATED(self, "Naviframe", "use Naviframe instead") - cdef c_evas.Evas_Object* o - cdef Object obj - cdef Elm_Object_Item *it - - it = elm_naviframe_top_item_get(self.obj) - o = elm_object_item_part_content_get(it, NULL) - if o == NULL: - return None - obj = <Object>c_evas.evas_object_data_get(o, "python-evas") - - return obj - - -_elm_widget_type_register("pager", Pager) -- 1.7.8.5
signature.asc
Description: Digital signature
------------------------------------------------------------------------------ This SF email is sponsosred by: Try Windows Azure free for 90 days Click Here http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
