davemds pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=eb60fbc01ea31fb3ad9e48c33d7f14aef51db8ae
commit eb60fbc01ea31fb3ad9e48c33d7f14aef51db8ae Author: Dave Andreoli <d...@gurumeditation.it> Date: Tue Apr 14 22:55:20 2015 +0200 Fix elm.Video test to work again also put in a forgotten change from last commit --- efl/elementary/layout_class.pxd | 1 + examples/elementary/test_video.py | 33 ++++++--------------------------- 2 files changed, 7 insertions(+), 27 deletions(-) diff --git a/efl/elementary/layout_class.pxd b/efl/elementary/layout_class.pxd index 94cbf57..f9a8a42 100644 --- a/efl/elementary/layout_class.pxd +++ b/efl/elementary/layout_class.pxd @@ -28,6 +28,7 @@ cdef extern from "Elementary.h": Eina_Bool elm_layout_text_set(Evas_Object *obj, const char *part, const char *text) const char * elm_layout_text_get(const Evas_Object *obj, const char *part) Eina_Bool elm_layout_file_set(Evas_Object *obj, const char *file, const char *group) + void elm_layout_file_get(Evas_Object *obj, const char **file, const char **group) int elm_layout_freeze(Evas_Object *obj) int elm_layout_thaw(Evas_Object *obj) Eina_Bool elm_layout_theme_set(Evas_Object *obj, const char *clas, const char *group, const char *style) diff --git a/examples/elementary/test_video.py b/examples/elementary/test_video.py index 795b58d..20bdab3 100644 --- a/examples/elementary/test_video.py +++ b/examples/elementary/test_video.py @@ -1,13 +1,11 @@ #!/usr/bin/env python # encoding: utf-8 -from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EXPAND_BOTH, FILL_BOTH, \ - EVAS_CALLBACK_MOUSE_MOVE, EVAS_CALLBACK_MOUSE_IN, EVAS_CALLBACK_MOUSE_OUT +from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, EXPAND_BOTH, FILL_BOTH from efl import elementary from efl.elementary.window import StandardWindow from efl.elementary.box import Box from efl.elementary.button import Button -from efl.elementary.notify import Notify, ELM_NOTIFY_ORIENT_BOTTOM from efl.elementary.fileselector_button import FileselectorButton from efl.elementary.table import Table from efl.elementary.video import Video, Player @@ -20,46 +18,27 @@ def my_bt_open(bt, vfile, video): print(video.file) print(video.file_get()) -def notify_show(video, event, no): - no.show() - -def notify_block(video, event, no): - no.timeout = 0.0 - no.show() - -def notify_unblock(video, event, no): - no.timeout = 3.0 - no.show() - def video_clicked(obj): win = StandardWindow("video", "video", autodel=True, size=(800, 600)) win.alpha = True # Needed to turn video fast path on video = Video(win, size_hint_weight=EXPAND_BOTH) - win.resize_object_add(video) - video.show() - player = Player(win, content=video) + player = Player(win, content=video, size_hint_weight=EXPAND_BOTH) + win.resize_object_add(player) player.show() - notify = Notify(win, orient=ELM_NOTIFY_ORIENT_BOTTOM, timeout=3.0) - notify.content = player - tb = Table(win, size_hint_weight=EXPAND_BOTH) win.resize_object_add(tb) + tb.show() bt = FileselectorButton(win, text="Select Video", - size_hint_weight=EXPAND_BOTH, size_hint_align=(0.5, 0.1)) + size_hint_weight=EXPAND_BOTH, + size_hint_align=(0.5, 0.1)) bt.callback_file_chosen_add(my_bt_open, video) tb.pack(bt, 0, 0, 1, 1) bt.show() - tb.show() - - video.event_callback_add(EVAS_CALLBACK_MOUSE_MOVE, notify_show, notify) - video.event_callback_add(EVAS_CALLBACK_MOUSE_IN, notify_block, notify) - video.event_callback_add(EVAS_CALLBACK_MOUSE_OUT, notify_unblock, notify) - win.show() --