Follow Eo class name changes.

See commits c7addf40839c85cf2568f322a34220e8082d26f0 and
7b10fdb8f39c3b36f575dd22d26a1efe6ecd28ec
This commit is contained in:
Kai Huuhko 2013-11-07 16:45:02 +02:00
parent af72b465e2
commit d623a30032
77 changed files with 85 additions and 75 deletions

1
TODO
View File

@ -26,6 +26,7 @@ TODO
* Add more logging
* Evas: SmartObject needs testing, work. Make it inheritable by extension
classes?
* Add missing Eo type mappings, mostly in Ecore
Elementary
==========

View File

@ -1322,4 +1322,4 @@ def on_text_change(func):
return func
_object_mapping_register("edje", Edje)
_object_mapping_register("Edje", Edje)

View File

@ -140,4 +140,4 @@ cdef class Accessible(Object):
"""
elm_access_highlight_set(self.obj)
_object_mapping_register("elm_access", Accessible)
_object_mapping_register("Elm_Access", Accessible)

View File

@ -194,4 +194,4 @@ cdef class Actionslider(LayoutClass):
self._callback_del_full("pos_changed", _cb_string_conv, func)
_object_mapping_register("elm_actionslider", Actionslider)
_object_mapping_register("Elm_Actionslider", Actionslider)

View File

@ -219,4 +219,4 @@ cdef class Background(LayoutClass):
def load_size_set(self, w, h):
elm_bg_load_size_set(self.obj, w, h)
_object_mapping_register("elm_bg", Background)
_object_mapping_register("Elm_Bg", Background)

View File

@ -487,4 +487,4 @@ cdef class Box(Object):
elm_box_transition_free)
_object_mapping_register("elm_box", Box)
_object_mapping_register("Elm_Box", Box)

View File

@ -159,4 +159,4 @@ cdef class Bubble(LayoutClass):
def callback_unfocused_del(self, func):
self._callback_del("unfocused", func)
_object_mapping_register("elm_bubble", Bubble)
_object_mapping_register("Elm_Bubble", Bubble)

View File

@ -193,4 +193,4 @@ cdef class Button(LayoutClass):
def callback_unfocused_del(self, func):
self._callback_del("unfocused", func)
_object_mapping_register("elm_button", Button)
_object_mapping_register("Elm_Button", Button)

View File

@ -581,4 +581,4 @@ cdef class Calendar(LayoutClass):
def callback_unfocused_del(self, func):
self._callback_del("unfocused", func)
_object_mapping_register("elm_calendar", Calendar)
_object_mapping_register("Elm_Calendar", Calendar)

View File

@ -112,4 +112,4 @@ cdef class Check(LayoutClass):
def callback_unfocused_del(self, func):
self._callback_del("unfocused", func)
_object_mapping_register("elm_check", Check)
_object_mapping_register("Elm_Check", Check)

View File

@ -307,4 +307,4 @@ cdef class Clock(LayoutClass):
def callback_unfocused_del(self, func):
self._callback_del("unfocused", func)
_object_mapping_register("elm_clock", Clock)
_object_mapping_register("Elm_Clock", Clock)

View File

@ -265,4 +265,4 @@ cdef class Colorselector(LayoutClass):
def callback_unfocused_del(self, func):
self._callback_del("unfocused", func)
_object_mapping_register("elm_colorselector", Colorselector)
_object_mapping_register("Elm_Colorselector", Colorselector)

View File

@ -97,4 +97,4 @@ cdef class Conformant(LayoutClass):
self._callback_del("clipboard,state,off", func)
_object_mapping_register("elm_conformant", Conformant)
_object_mapping_register("Elm_Conformant", Conformant)

View File

@ -314,4 +314,4 @@ cdef class Ctxpopup(LayoutClass):
def callback_unfocused_del(self, func):
self._callback_del("unfocused", func)
_object_mapping_register("elm_ctxpopup", Ctxpopup)
_object_mapping_register("Elm_Ctxpopup", Ctxpopup)

View File

@ -612,4 +612,4 @@ cdef class Datetime(Object):
def callback_unfocused_del(self, func):
self._callback_del("unfocused", func)
_object_mapping_register("elm_datetime", Datetime)
_object_mapping_register("Elm_Datetime", Datetime)

View File

@ -243,4 +243,4 @@ cdef class Dayselector(LayoutClass):
self._callback_del("language,changed", func)
_object_mapping_register("elm_dayselector", Dayselector)
_object_mapping_register("Elm_Dayselector", Dayselector)

View File

@ -500,4 +500,4 @@ cdef class Diskselector(Object):
return (h, v)
_object_mapping_register("elm_diskselector", Diskselector)
_object_mapping_register("Elm_Diskselector", Diskselector)

View File

@ -2194,4 +2194,4 @@ cdef class Entry(Object):
return (h, v)
_object_mapping_register("elm_entry", Entry)
_object_mapping_register("Elm_Entry", Entry)

View File

@ -352,4 +352,4 @@ cdef class Fileselector(LayoutClass):
self._callback_del_full("done", _cb_string_conv, func)
_object_mapping_register("elm_fileselector", Fileselector)
_object_mapping_register("Elm_Fileselector", Fileselector)

View File

@ -284,4 +284,4 @@ cdef class FileselectorButton(Button):
self._callback_del_full("file,chosen", _cb_string_conv, func)
_object_mapping_register("elm_fileselector_button", FileselectorButton)
_object_mapping_register("Elm_Fileselector_Button", FileselectorButton)

View File

@ -411,4 +411,4 @@ cdef class FileselectorEntry(Object):
self._callback_del_full("file,chosen", _cb_string_conv, func)
_object_mapping_register("elm_fileselector_entry", FileselectorEntry)
_object_mapping_register("Elm_Fileselector_Entry", FileselectorEntry)

View File

@ -390,4 +390,4 @@ cdef class Flip(Object):
self._callback_del("animate,done", func)
_object_mapping_register("elm_flip", Flip)
_object_mapping_register("Elm_Flip", Flip)

View File

@ -409,4 +409,4 @@ cdef class FlipSelector(Object):
def callback_unfocused_del(self, func):
self._callback_del("unfocused", func)
_object_mapping_register("elm_flipselector", FlipSelector)
_object_mapping_register("Elm_Flipselector", FlipSelector)

View File

@ -129,4 +129,4 @@ cdef class Frame(LayoutClass):
self._callback_del("clicked", func)
_object_mapping_register("elm_frame", Frame)
_object_mapping_register("Elm_Frame", Frame)

View File

@ -1839,4 +1839,4 @@ cdef class Gengrid(Object):
return (h, v)
_object_mapping_register("elm_gengrid", Gengrid)
_object_mapping_register("Elm_Gengrid", Gengrid)

View File

@ -721,4 +721,4 @@ include "genlist_widget.pxi"
#class Genlist(GenlistWidget, ScrollableInterface):
#pass
_object_mapping_register("elm_genlist", Genlist)
_object_mapping_register("Elm_Genlist", Genlist)

View File

@ -861,4 +861,4 @@ cdef class GestureLayer(Object):
# """
# elm_gesture_layer_tap_longpress_cb_del(self.obj, Elm_Gesture_State state, Elm_Gesture_Event_Cb cb, void *data)
_object_mapping_register("elm_gesture_layer", GestureLayer)
_object_mapping_register("Elm_Gesture_Layer", GestureLayer)

View File

@ -164,4 +164,4 @@ def grid_pack_get(evasObject subobj):
return (x, y, w, h)
_object_mapping_register("elm_grid", Grid)
_object_mapping_register("Elm_Grid", Grid)

View File

@ -251,4 +251,4 @@ cdef class Hover(LayoutClass):
self._callback_del("unfocused", func)
_object_mapping_register("elm_hover", Hover)
_object_mapping_register("Elm_Hover", Hover)

View File

@ -353,4 +353,4 @@ cdef class Hoversel(Button):
self._callback_del("dismissed", func)
_object_mapping_register("elm_hoversel", Hoversel)
_object_mapping_register("Elm_Hoversel", Hoversel)

View File

@ -268,4 +268,4 @@ cdef class Icon(Image):
self._callback_del("thumb,error", func)
_object_mapping_register("elm_icon", Icon)
_object_mapping_register("Elm_Icon", Icon)

View File

@ -569,4 +569,4 @@ cdef class Image(Object):
self._callback_add_full("download,error", _image_download_error_conv, func)
_object_mapping_register("elm_image", Image)
_object_mapping_register("Elm_Image", Image)

View File

@ -636,4 +636,4 @@ cdef class Index(LayoutClass):
def callback_unfocused_del(self, func):
self._callback_del("unfocused", func)
_object_mapping_register("elm_index", Index)
_object_mapping_register("Elm_Index", Index)

View File

@ -102,4 +102,4 @@ cdef class InnerWindow(LayoutClass):
elm_win_inwin_content_unset(self.obj)
_object_mapping_register("elm_inwin", InnerWindow)
_object_mapping_register("Elm_Inwin", InnerWindow)

View File

@ -276,4 +276,4 @@ cdef class Label(LayoutClass):
def callback_slide_end_del(self, func):
self._callback_del("slide,end", func)
_object_mapping_register("elm_label", Label)
_object_mapping_register("Elm_Label", Label)

View File

@ -252,4 +252,4 @@ cdef class Layout(LayoutClass):
<const_char *>part if part is not None else NULL))
_object_mapping_register("elm_layout", Layout)
_object_mapping_register("Elm_Layout", Layout)

View File

@ -1026,4 +1026,4 @@ cdef class List(Object):
elm_scroller_bounce_get(self.obj, &h, &v)
return (h, v)
_object_mapping_register("elm_list", List)
_object_mapping_register("Elm_List", List)

View File

@ -1887,4 +1887,4 @@ cdef class Map(Object):
elm_scroller_bounce_get(self.obj, &h, &v)
return (h, v)
_object_mapping_register("elm_map", Map)
_object_mapping_register("Elm_Map", Map)

View File

@ -128,4 +128,4 @@ cdef class Mapbuf(Object):
return bool(elm_mapbuf_auto_get(self.obj))
_object_mapping_register("elm_mapbuf", Mapbuf)
_object_mapping_register("Elm_Mapbuf", Mapbuf)

View File

@ -442,4 +442,4 @@ cdef class Menu(Object):
self._callback_del("dismissed", func)
_object_mapping_register("elm_menu", Menu)
_object_mapping_register("Elm_Menu", Menu)

View File

@ -401,4 +401,4 @@ cdef class MultiButtonEntry(Object):
self._callback_del("expand,state,changed", func)
_object_mapping_register("elm_multibuttonentry", MultiButtonEntry)
_object_mapping_register("Elm_Multibuttonentry", MultiButtonEntry)

View File

@ -533,4 +533,4 @@ cdef class Naviframe(LayoutClass):
def callback_unfocused_del(self, func):
self._callback_del("unfocused", func)
_object_mapping_register("elm_naviframe", Naviframe)
_object_mapping_register("Elm_Naviframe", Naviframe)

View File

@ -265,4 +265,4 @@ cdef class Notify(Object):
self._callback_del("block,clicked", func)
_object_mapping_register("elm_notify", Notify)
_object_mapping_register("Elm_Notify", Notify)

View File

@ -1977,3 +1977,6 @@ cdef class Object(evasObject):
# """
# elm_access_highlight_set(self.obj)
# TODO: Check if this is used correctly here
_object_mapping_register("Elm_Widget", Object)

View File

@ -650,6 +650,3 @@ cdef class ObjectItem(object):
# def __del__(self):
# elm_object_item_access_order_unset(self.item)
_object_mapping_register("elm_object_item", ObjectItem)

View File

@ -151,4 +151,4 @@ cdef class Panel(Object):
def callback_unfocused_del(self, func):
self._callback_del("unfocused", func)
_object_mapping_register("elm_panel", Panel)
_object_mapping_register("Elm_Panel", Panel)

View File

@ -168,4 +168,4 @@ cdef class Panes(LayoutClass):
self._callback_del("clicked,double", func)
_object_mapping_register("elm_panes", Panes)
_object_mapping_register("Elm_Panes", Panes)

View File

@ -188,4 +188,4 @@ cdef class Photo(Object):
self._callback_del("drag,end", func)
_object_mapping_register("elm_photo", Photo)
_object_mapping_register("Elm_Photo", Photo)

View File

@ -582,4 +582,4 @@ cdef class Photocam(Object):
elm_scroller_bounce_get(self.obj, &h, &v)
return (h, v)
_object_mapping_register("elm_photocam", Photocam)
_object_mapping_register("Elm_Photocam", Photocam)

View File

@ -126,4 +126,4 @@ cdef class Plug(Object):
# self._callback_del("image,resized", func)
_object_mapping_register("elm_plug", Plug)
_object_mapping_register("Elm_Plug", Plug)

View File

@ -407,4 +407,4 @@ cdef class Popup(Object):
self._callback_del("language,changed", func)
_object_mapping_register("elm_popup", Popup)
_object_mapping_register("Elm_Popup", Popup)

View File

@ -318,4 +318,4 @@ cdef class Progressbar(LayoutClass):
def callback_unfocused_del(self, func):
self._callback_del("unfocused", func)
_object_mapping_register("elm_progressbar", Progressbar)
_object_mapping_register("Elm_Progressbar", Progressbar)

View File

@ -194,4 +194,4 @@ cdef class Radio(LayoutClass):
def callback_unfocused_del(self, func):
self._callback_del("unfocused", func)
_object_mapping_register("elm_radio", Radio)
_object_mapping_register("Elm_Radio", Radio)

View File

@ -859,4 +859,4 @@ class Scroller(Scrollable, ScrollerWidget):
"""
_object_mapping_register("elm_scroller", Scroller)
_object_mapping_register("Elm_Scroller", Scroller)

View File

@ -334,4 +334,4 @@ cdef class SegmentControl(LayoutClass):
self._callback_del_full("changed", _cb_object_item_conv, func)
_object_mapping_register("elm_segment_control", SegmentControl)
_object_mapping_register("Elm_Segment_Control", SegmentControl)

View File

@ -62,4 +62,4 @@ cdef class Separator(LayoutClass):
return elm_separator_horizontal_get(self.obj)
_object_mapping_register("elm_separator", Separator)
_object_mapping_register("Elm_Separator", Separator)

View File

@ -405,4 +405,4 @@ cdef class Slider(LayoutClass):
def callback_unfocused_del(self, func):
self._callback_del("unfocused", func)
_object_mapping_register("elm_slider", Slider)
_object_mapping_register("Elm_Slider", Slider)

View File

@ -740,4 +740,4 @@ cdef class Slideshow(LayoutClass):
def callback_unfocused_del(self, func):
self._callback_del("unfocused", func)
_object_mapping_register("elm_slideshow", Slideshow)
_object_mapping_register("Elm_Slideshow", Slideshow)

View File

@ -434,4 +434,4 @@ cdef class Spinner(LayoutClass):
def callback_unfocused_del(self, func):
self._callback_del("unfocused", func)
_object_mapping_register("elm_spinner", Spinner)
_object_mapping_register("Elm_Spinner", Spinner)

View File

@ -469,6 +469,7 @@ cdef class Store(object):
def sorted_get(self):
return bool(elm_store_sorted_get(self.st))
_object_mapping_register("Elm_Store", Store)
cdef class StoreItem(object):

View File

@ -200,4 +200,4 @@ def table_pack_get(evasObject subobj):
elm_table_pack_get(subobj.obj, &x, &y, &w, &h)
return (x, y, w, h)
_object_mapping_register("elm_table", Table)
_object_mapping_register("Elm_Table", Table)

View File

@ -534,4 +534,4 @@ cdef class Thumb(Object):
self._callback_del("load,error", func)
_object_mapping_register("elm_thumb", Thumb)
_object_mapping_register("Elm_Thumb", Thumb)

View File

@ -1156,4 +1156,4 @@ cdef class Toolbar(Object):
elm_scroller_bounce_get(self.obj, &h, &v)
return (h, v)
_object_mapping_register("elm_toolbar", Toolbar)
_object_mapping_register("Elm_Toolbar", Toolbar)

View File

@ -254,7 +254,7 @@ cdef class Video(LayoutClass):
def callback_unfocused_del(self, func):
self._callback_del("unfocused", func)
_object_mapping_register("elm_video", Video)
_object_mapping_register("Elm_Video", Video)
cdef class Player(LayoutClass):
@ -366,4 +366,4 @@ cdef class Player(LayoutClass):
def callback_unfocused_del(self, func):
self._callback_del("unfocused", func)
_object_mapping_register("elm_player", Player)
_object_mapping_register("Elm_Player", Player)

View File

@ -245,4 +245,4 @@ cdef class Web(Object):
elm_web_console_message_hook_set(self.obj, NULL, NULL)
_object_mapping_register("elm_web", Web)
_object_mapping_register("Elm_Web", Web)

View File

@ -1740,7 +1740,7 @@ cdef class Window(Object):
def callback_unfocused_del(self, func):
self._callback_del("unfocused", func)
_object_mapping_register("elm_win", Window)
_object_mapping_register("Elm_Win", Window)
cdef class StandardWindow(Window):

View File

@ -299,4 +299,4 @@ cdef class Box(Object):
return evas_object_box_remove_all(self.obj, clear)
_object_mapping_register("Evas_Object_Box", Box)
_object_mapping_register("Evas_Box", Box)

View File

@ -153,3 +153,5 @@ cdef class Grid(Object):
list ret = eina_list_objects_to_python_list(lst)
eina_list_free(lst)
return ret
_object_mapping_register("Evas_Grid", Grid)

View File

@ -1330,7 +1330,7 @@ cdef class Image(Object):
self.event_callback_del(EVAS_CALLBACK_IMAGE_UNLOADED, func)
_object_mapping_register("Evas_Object_Image", Image)
_object_mapping_register("Evas_Image", Image)
cdef void _cb_on_filled_image_resize(void *data, Evas *e,
@ -1379,7 +1379,8 @@ cdef class FilledImage(Image):
raise NotImplementedError("FilledImage doesn't support fill_set()")
_object_mapping_register("Evas_Object_FilledImage", FilledImage)
#TODO: Check if this is right
_object_mapping_register("Evas_FilledImage", FilledImage)
def extension_can_load(filename):
"""extension_can_load(unicode filename) -> bool

View File

@ -160,4 +160,4 @@ cdef class Line(Object):
return (x2, y2)
_object_mapping_register("Evas_Object_Line", Line)
_object_mapping_register("Evas_Line", Line)

View File

@ -61,4 +61,4 @@ cdef class Polygon(Object):
evas_object_polygon_points_clear(self.obj)
_object_mapping_register("Evas_Object_Polygon", Polygon)
_object_mapping_register("Evas_Polygon", Polygon)

View File

@ -140,4 +140,4 @@ cdef class Rectangle(Object):
self._set_common_params(**kargs)
_object_mapping_register("Evas_Object_Rectangle", Rectangle)
_object_mapping_register("Evas_Rectangle", Rectangle)

View File

@ -744,7 +744,7 @@ cdef class SmartObject(Object):
# self.member_add(obj)
# return obj
_object_mapping_register("Evas_Object_Smart", SmartObject)
_object_mapping_register("Evas_Smart", SmartObject)
# cdef extern from "Evas.h": # hack to force type to be known
# cdef PyTypeObject PyEvasSmartObject_Type # hack to install metaclass
@ -836,6 +836,7 @@ cdef class ClippedSmartObject(SmartObject):
"""Default implementation that acts on the the clipper."""
evas_object_clip_unset(self.clipper.obj)
_object_mapping_register("Evas_Smart_Clipped", ClippedSmartObject)
# cdef extern from "Evas.h": # hack to force type to be known
# cdef PyTypeObject PyEvasClippedSmartObject_Type # hack to install metaclass

View File

@ -285,3 +285,5 @@ cdef class Table(Object):
"""
return object_from_instance(evas_object_table_child_get(self.obj, col, row))
_object_mapping_register("Evas_Table", Table)

View File

@ -364,4 +364,4 @@ cdef class Text(Object):
return (l, r, t, b)
_object_mapping_register("Evas_Object_Text", Text)
_object_mapping_register("Evas_Text", Text)

View File

@ -205,5 +205,5 @@ cdef class Textblock(Object):
return (l, r, t, b)
_object_mapping_register("Evas_Object_Textblock", Textblock)
_object_mapping_register("Evas_Textblock", Textblock)

View File

@ -477,3 +477,5 @@ cdef class Textgrid(Object):
"""
evas_object_textgrid_update_add(self.obj, x, y, w, h)
_object_mapping_register("Evas_Textgrid", Textgrid)