kuuko pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=b3f501b387b2ebad838f90c9da8d7fbfd287134c
commit b3f501b387b2ebad838f90c9da8d7fbfd287134c Author: Kai Huuhko <kai.huu...@gmail.com> Date: Wed Oct 30 04:28:55 2013 +0200 Elementary: Start making examples more examplary. --- examples/elementary/test.py | 99 ++++++------ examples/elementary/test_3d.py | 121 ++++++--------- examples/elementary/test_access.py | 47 +++--- examples/elementary/test_actionslider.py | 100 ++++++------- examples/elementary/test_bg.py | 68 ++++----- examples/elementary/test_box.py | 250 +++++++------------------------ 6 files changed, 239 insertions(+), 446 deletions(-) diff --git a/examples/elementary/test.py b/examples/elementary/test.py index c05682b..42e0587 100755 --- a/examples/elementary/test.py +++ b/examples/elementary/test.py @@ -3,7 +3,7 @@ import logging elog = logging.getLogger("efl") -elog.setLevel(logging.DEBUG) +elog.setLevel(logging.INFO) elog_form = logging.Formatter("[%(name)s] %(levelname)s - %(message)s") elog_hdlr = logging.StreamHandler() @@ -12,15 +12,15 @@ elog_hdlr.setFormatter(elog_form) elog.addHandler(elog_hdlr) eolog = logging.getLogger("efl.eo") -eolog.setLevel(logging.DEBUG) +eolog.setLevel(logging.INFO) import os -from efl import evas +from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL from efl import elementary -from efl.elementary.window import Window +from efl.elementary.window import StandardWindow from efl.elementary.background import Background -from efl.elementary.box import Box +from efl.elementary.box import Box, ELM_BOX_LAYOUT_FLOW_HORIZONTAL from efl.elementary.button import Button from efl.elementary.frame import Frame from efl.elementary.label import Label @@ -28,7 +28,10 @@ from efl.elementary.check import Check from efl.elementary.entry import Entry from efl.elementary.scroller import Scroller -elog.setLevel(logging.INFO) +elog.setLevel(logging.DEBUG) + +EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND +FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL items = [ ("Core Libs", [ @@ -204,25 +207,24 @@ def selected_cb(o, mod, func): def menu_create(search, win): tbx.clear() for category in items: - frame = Frame(win) - frame.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) - frame.size_hint_align_set(evas.EVAS_HINT_FILL, evas.EVAS_HINT_FILL) - frame.text = category[0] + frame = Frame(win, + size_hint_weight=EXPAND_BOTH, size_hint_align=FILL_BOTH, + text=category[0] + ) frame.show() tbx.pack_end(frame) - tbx2 = Box(win) - tbx2.layout_set(elementary.ELM_BOX_LAYOUT_FLOW_HORIZONTAL) - tbx2.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0) - tbx2.size_hint_align_set(evas.EVAS_HINT_FILL, 0.0) + tbx2 = Box(win, layout=ELM_BOX_LAYOUT_FLOW_HORIZONTAL, + size_hint_weight=(EVAS_HINT_EXPAND, 0.0), + size_hint_align=(EVAS_HINT_FILL, 0.0) + ) frame.content_set(tbx2) tbx2.show() cnt = 0 for test in category[1]: if (search == None) or (test[0].lower().find(search.lower()) > -1): - bt = Button(win) - bt.text = test[0] + bt = Button(win, text=test[0]) bt.callback_clicked_add(selected_cb, test[1], test[2]) bt.show() tbx2.pack_end(bt) @@ -245,71 +247,58 @@ def cb_filter(en, win): if __name__ == "__main__": elementary.init() - win = Window("test", elementary.ELM_WIN_BASIC) - win.title_set("python-elementary test application") + win = StandardWindow("test", "python-elementary test application") win.callback_delete_request_add(destroy, "test1", "test2", str3="test3", str4="test4") - bg = Background(win) - win.resize_object_add(bg) - bg.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) - bg.show() - - box0 = Box(win) - box0.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) + box0 = Box(win, size_hint_weight=EXPAND_BOTH) win.resize_object_add(box0) box0.show() - fr = Frame(win) - fr.text_set("Information") - box0.pack_end(fr) - fr.show() - lb = Label(win) - lb.text_set("Please select a test from the list below<br>" - "by clicking the test button to show the<br>" - "test window.") - fr.content_set(lb) + lb.text = "Please select a test from the list below<br>" \ + "by clicking the test button to show the<br>" \ + "test window." lb.show() - tg = Check(win) - tg.style = "toggle" - tg.text = "UI-Mirroring:" + fr = Frame(win, text="Information", content=lb) + box0.pack_end(fr) + fr.show() + + tg = Check(win, style="toggle", text="UI-Mirroring:") tg.callback_changed_add(cb_mirroring) box0.pack_end(tg) tg.show() - bx1 = Box(win) - bx1.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0) - bx1.size_hint_align_set(evas.EVAS_HINT_FILL, 0.0) - bx1.horizontal_set(True) + bx1 = Box(win, + size_hint_weight=(EVAS_HINT_EXPAND, 0.0), + size_hint_align=(EVAS_HINT_FILL, 0.0), + horizontal=True + ) box0.pack_end(bx1) bx1.show() - lb = Label(win) - lb.text_set("Filter:") + lb = Label(win, text="Filter:") bx1.pack_end(lb) lb.show() - en = Entry(win) - en.single_line_set(True) - en.scrollable_set(True) - en.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) - en.size_hint_align_set(evas.EVAS_HINT_FILL, evas.EVAS_HINT_FILL) + en = Entry(win, single_line=True, scrollable=True, + size_hint_weight=EXPAND_BOTH, size_hint_align=FILL_BOTH + ) en.callback_changed_add(cb_filter, win) bx1.pack_end(en) en.show() en.focus_set(True) - sc = Scroller(win) - sc.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) - sc.size_hint_align_set(evas.EVAS_HINT_FILL, evas.EVAS_HINT_FILL) - sc.bounce_set(False, True) + sc = Scroller(win, size_hint_weight=EXPAND_BOTH, size_hint_align=FILL_BOTH, + bounce=(False, True) + ) sc.show() box0.pack_end(sc) - tbx = Box(win) - tbx.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0) - tbx.size_hint_align_set(evas.EVAS_HINT_FILL, 0.0) + tbx = Box(win, + size_hint_weight=(EVAS_HINT_EXPAND, 0.0), + size_hint_align=(EVAS_HINT_FILL, 0.0) + ) sc.content_set(tbx) tbx.show() diff --git a/examples/elementary/test_3d.py b/examples/elementary/test_3d.py index fd9fc96..502dd8b 100644 --- a/examples/elementary/test_3d.py +++ b/examples/elementary/test_3d.py @@ -1,18 +1,15 @@ #!/usr/bin/env python # encoding: utf-8 -from efl import evas +from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL, Image, Map from efl import elementary -from efl.elementary.window import Window -from efl.elementary.background import Background +from efl.elementary.window import StandardWindow from efl.elementary.box import Box -# from efl.elementary.button import Button -# from efl.elementary.frame import Frame -# from efl.elementary.label import Label -# from efl.elementary.check import Check -# from efl.elementary.entry import Entry from efl.elementary.slider import Slider +EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND +FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL +FILL_HORIZ = EVAS_HINT_FILL, 0.5 class Point(object): def __init__(self, x, y, z, u, v): @@ -28,11 +25,11 @@ class Side(object): self.obj = None self.points = [] - img = evas.Image(eva) - img.file_set("images/rock_02.jpg") - img.fill_set(0, 0, 256, 256) + img = Image(eva) + img.file = "images/rock_02.jpg", + img.fill = (0, 0, 256, 256) + img.smooth_scale = False img.resize(256, 256) - img.smooth_scale_set(False) img.show() self.obj = img @@ -56,7 +53,7 @@ class Cube(object): w -= (w / 2) h -= (h / 2) d -= (d / 2) - + self.sides[0].points.append(Point(-w, -h, -d, 0, 0)) self.sides[0].points.append(Point( w, -h, -d, 256, 0)) self.sides[0].points.append(Point( w, h, -d, 256, 256)) @@ -101,7 +98,7 @@ class Cube(object): foc = self.z0v z0 = self.focv - m = evas.Map(4) + m = Map(4) m.smooth = True for i in range(6): @@ -112,7 +109,7 @@ class Cube(object): m.point_image_uv_set(j, self.sides[i].points[j].u, self.sides[i].points[j].v) m.point_color_set(j, 255, 255, 255, 255) - + m.util_3d_rotate(dx, dy, dz, x, y, z) m.util_3d_lighting(-1000, -1000, -1000, 255, 255, 255, @@ -158,101 +155,69 @@ def ch_z0(sl, cube): cube.update() def evas3d_clicked(obj, item=None): - win = Window("evas3d", elementary.ELM_WIN_BASIC) - win.title_set("Evas 3d test") + win = StandardWindow("evas3d", "Evas 3d test") win.autodel_set(True) if obj is None: win.callback_delete_request_add(lambda o: elementary.exit()) - bg = Background(win) - win.resize_object_add(bg) - bg.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) - bg.show() - cube = Cube(win, 240, 240, 240) - - vbox = Box(win) - vbox.size_hint_weight = (evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) + + vbox = Box(win, size_hint_weight=EXPAND_BOTH) win.resize_object_add(vbox) vbox.show() - sl = Slider(win) - sl.text = "Rot X" - sl.unit_format = "%1.0f units" - sl.span_size = 360 - sl.min_max = (0, 360) - sl.size_hint_align = (evas.EVAS_HINT_FILL, 0.5) - sl.size_hint_weight = (evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) + sl = Slider(win, text="Rot X", unit_format="%1.0f units", span_size=360, + min_max=(0, 360), + size_hint_align=FILL_HORIZ, size_hint_weight=EXPAND_BOTH + ) vbox.pack_end(sl) sl.callback_changed_add(ch_rot_x, cube) sl.show() - sl = Slider(win) - sl.text = "Rot Y" - sl.unit_format = "%1.0f units" - sl.span_size = 360 - sl.min_max = (0, 360) - sl.size_hint_align = (evas.EVAS_HINT_FILL, 0.5) - sl.size_hint_weight = (evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) + sl = Slider(win, text="Rot Y", unit_format="%1.0f units", span_size=360, + min_max=(0, 360), + size_hint_align=FILL_HORIZ, size_hint_weight=EXPAND_BOTH + ) vbox.pack_end(sl) sl.callback_changed_add(ch_rot_y, cube) sl.show() - sl = Slider(win) - sl.text = "Rot Z" - sl.unit_format = "%1.0f units" - sl.span_size = 360 - sl.min_max = (0, 360) - sl.size_hint_align = (evas.EVAS_HINT_FILL, 0.5) - sl.size_hint_weight = (evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) + sl = Slider(win, text="Rot Z", unit_format="%1.0f units", span_size=360, + min_max=(0, 360), + size_hint_align=FILL_HORIZ, size_hint_weight=EXPAND_BOTH + ) vbox.pack_end(sl) sl.callback_changed_add(ch_rot_z, cube) sl.show() - sl = Slider(win) - sl.text = "CX Off" - sl.unit_format = "%1.0f units" - sl.span_size = 360 - sl.min_max = (-320, 320) - sl.value = cube.cxo - sl.size_hint_align = (evas.EVAS_HINT_FILL, 0.5) - sl.size_hint_weight = (evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) + sl = Slider(win, text="CX Off", unit_format="%1.0f units", span_size=360, + min_max=(-320, 320), value=cube.cxo, + size_hint_align=FILL_HORIZ, size_hint_weight=EXPAND_BOTH + ) vbox.pack_end(sl) sl.callback_changed_add(ch_cx, cube) sl.show() - sl = Slider(win) - sl.text = "CY Off" - sl.unit_format = "%1.0f units" - sl.span_size = 360 - sl.min_max = (-320, 320) - sl.value = cube.cyo - sl.size_hint_align = (evas.EVAS_HINT_FILL, 0.5) - sl.size_hint_weight = (evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) + sl = Slider(win, text="CY Off", unit_format="%1.0f units", span_size=360, + min_max=(-320, 320), value=cube.cyo, + size_hint_align=FILL_HORIZ, size_hint_weight=EXPAND_BOTH + ) vbox.pack_end(sl) sl.callback_changed_add(ch_cy, cube) sl.show() - sl = Slider(win) - sl.text = "Foc" - sl.unit_format = "%1.0f units" - sl.span_size = 360 - sl.min_max = (1, 2000) - sl.value = cube.focv - sl.size_hint_align = (evas.EVAS_HINT_FILL, 0.5) - sl.size_hint_weight = (evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) + sl = Slider(win, text="Foc", unit_format="%1.0f units", span_size=360, + min_max=(1, 2000), value=cube.focv, + size_hint_align=FILL_HORIZ, size_hint_weight=EXPAND_BOTH + ) vbox.pack_end(sl) sl.callback_changed_add(ch_foc, cube) sl.show() - sl = Slider(win) - sl.text = "Z0" - sl.unit_format = "%1.0f units" - sl.span_size = 360 - sl.min_max = (-2000, 2000) - sl.value = cube.z0v - sl.size_hint_align = (evas.EVAS_HINT_FILL, 0.5) - sl.size_hint_weight = (evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) + sl = Slider(win, text="Z0", unit_format="%1.0f units", span_size=360, + min_max=(-2000, 2000), value=cube.z0v, + size_hint_align=FILL_HORIZ, size_hint_weight=EXPAND_BOTH + ) vbox.pack_end(sl) sl.callback_changed_add(ch_z0, cube) sl.show() diff --git a/examples/elementary/test_access.py b/examples/elementary/test_access.py index 6c9484e..9bf6718 100644 --- a/examples/elementary/test_access.py +++ b/examples/elementary/test_access.py @@ -17,6 +17,9 @@ from efl.elementary.label import Label from efl.elementary.list import List from efl.elementary.icon import Icon +EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND +FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL + config = Configuration() @@ -29,14 +32,13 @@ class GLItC1(GenlistItemClass): def content_get(self, gl, part, data): if not part == "elm.swallow.end": - bt = Button(gl) - bt.size_hint_align = EVAS_HINT_FILL, EVAS_HINT_FILL - bt.size_hint_weight = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND - bt.text = "OK" + bt = Button(gl, text="OK", + size_hint_align=FILL_BOTH, size_hint_weight=EXPAND_BOTH, + ) else: - bt = Icon(gl) - bt.file = "images/logo_small.png" - bt.size_hint_aspect = EVAS_ASPECT_CONTROL_VERTICAL, 1, 1 + bt = Icon(gl, file="images/logo_small.png", + size_hint_aspect=(EVAS_ASPECT_CONTROL_VERTICAL, 1, 1) + ) return bt @@ -44,12 +46,10 @@ class GLItC2(GenlistItemClass): def content_get(self, gl, part, data): if part != "elm.swallow.content": return - grid = Gengrid(gl) - grid.item_size = config.scale * 100, config.scale * 100 - grid.horizontal = False - grid.reorder_mode = True - grid.size_hint_weight = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND - grid.size_hint_align = EVAS_HINT_FILL, EVAS_HINT_FILL + grid = Gengrid(gl, horizontal=False, reorder_mode=True, + item_size=(config.scale * 100, config.scale * 100), + size_hint_weight=EXPAND_BOTH, size_hint_align=FILL_BOTH + ) gic = GGItC(item_style="default") @@ -68,12 +68,10 @@ class GLItC2(GenlistItemClass): class GGItC(GengridItemClass): def content_get(self, gg, part, data): if not part == "elm.swallow.icon": - ic = Icon(gg) - ic.scale = 0.5 - ic.file = "images/icon_%02i.png" % (data % 4) - ic.resizable = 0, 0 - ic.size_hint_weight = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND - ic.size_hint_align = 0.5, 0.5 + ic = Icon(gg, scale=0.5, file="images/icon_%02i.png" % (data % 4), + resizable=(0, 0), + size_hint_weight=EXPAND_BOTH, size_hint_align=(0.5, 0.5) + ) ic.show() return ic @@ -108,16 +106,13 @@ def access_clicked(obj, item=None): config.access = True - bx = Box(win) - bx.size_hint_weight = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND - bx.homogeneous = True - bx.horizontal = True + bx = Box(win, size_hint_weight=EXPAND_BOTH, homogeneous=True, + horizontal=True + ) win.resize_object_add(bx) bx.show() - gl = Genlist(win) - gl.size_hint_weight = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND - gl.size_hint_align = EVAS_HINT_FILL, EVAS_HINT_FILL + gl = Genlist(win, size_hint_weight=EXPAND_BOTH, size_hint_align=FILL_BOTH) bx.pack_end(gl) gl.show() diff --git a/examples/elementary/test_actionslider.py b/examples/elementary/test_actionslider.py index 326c0ee..5af6446 100644 --- a/examples/elementary/test_actionslider.py +++ b/examples/elementary/test_actionslider.py @@ -1,12 +1,17 @@ #!/usr/bin/env python # encoding: utf-8 -from efl import evas +from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL from efl import elementary -from efl.elementary.actionslider import * -from efl.elementary.background import Background +from efl.elementary.actionslider import Actionslider, ELM_ACTIONSLIDER_NONE, \ + ELM_ACTIONSLIDER_ALL, ELM_ACTIONSLIDER_LEFT, ELM_ACTIONSLIDER_CENTER, \ + ELM_ACTIONSLIDER_RIGHT from efl.elementary.box import Box -from efl.elementary.window import Window, ELM_WIN_BASIC +from efl.elementary.window import StandardWindow + +EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND +EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0 +FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL positions = { ELM_ACTIONSLIDER_NONE: "none", @@ -25,7 +30,7 @@ def _pos_selected_cb(obj, event_info): iposs = [] mposs = [] eposs = [] - for k, v in positions.iteritems(): + for k, v in positions.items(): if k == ELM_ACTIONSLIDER_NONE or k == ELM_ACTIONSLIDER_ALL: if k == ipos: iposs = [v,] @@ -46,67 +51,58 @@ def _pos_selected_cb(obj, event_info): def _position_change_magnetic_cb(obj, event_info): if event_info == "left": - obj.magnet_pos_set(ELM_ACTIONSLIDER_LEFT) + obj.magnet_pos = ELM_ACTIONSLIDER_LEFT elif event_info == "right": - obj.magnet_pos_set(ELM_ACTIONSLIDER_RIGHT) + obj.magnet_pos = ELM_ACTIONSLIDER_RIGHT def _magnet_enable_disable_cb(obj, event_info): if event_info == "left": - obj.magnet_pos_set(ELM_ACTIONSLIDER_CENTER) + obj.magnet_pos = ELM_ACTIONSLIDER_CENTER elif event_info == "right": - obj.magnet_pos_set(ELM_ACTIONSLIDER_NONE) + obj.magnet_pos = ELM_ACTIONSLIDER_NONE def actionslider_clicked(obj): - win = Window("actionslider", ELM_WIN_BASIC) - win.title_set("Actionslider") + win = StandardWindow("actionslider", "Actionslider") win.autodel_set(True) if obj is None: win.callback_delete_request_add(lambda o: elementary.exit()) - bg = Background(win) - bg.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) - win.resize_object_add(bg) - bg.show() - - bx = Box(win) - bx.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) + bx = Box(win, size_hint_weight=EXPAND_BOTH) win.resize_object_add(bx) bx.show() - acts = Actionslider(win) - acts.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0) - acts.size_hint_align_set(evas.EVAS_HINT_FILL, 0.0) - acts.indicator_pos_set(ELM_ACTIONSLIDER_RIGHT) - acts.magnet_pos_set(ELM_ACTIONSLIDER_RIGHT) + acts = Actionslider(win, + size_hint_weight=EXPAND_HORIZ, size_hint_align=(EVAS_HINT_FILL, 0.0), + indicator_pos=ELM_ACTIONSLIDER_RIGHT, magnet_pos=ELM_ACTIONSLIDER_RIGHT, + enabled_pos=(ELM_ACTIONSLIDER_LEFT | ELM_ACTIONSLIDER_RIGHT) + ) acts.part_text_set("left", "Snooze") acts.part_text_set("center", "") acts.part_text_set("right", "Stop") - acts.enabled_pos_set(ELM_ACTIONSLIDER_LEFT | ELM_ACTIONSLIDER_RIGHT) acts.callback_pos_changed_add(_position_change_magnetic_cb) acts.callback_selected_add(_pos_selected_cb) bx.pack_end(acts) acts.show() - acts = Actionslider(win) - acts.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0) - acts.size_hint_align_set(evas.EVAS_HINT_FILL, 0.0) - acts.indicator_pos_set(ELM_ACTIONSLIDER_CENTER) - acts.magnet_pos_set(ELM_ACTIONSLIDER_CENTER) + acts = Actionslider(win, + size_hint_weight=EXPAND_HORIZ, size_hint_align=(EVAS_HINT_FILL, 0.0), + indicator_pos=ELM_ACTIONSLIDER_CENTER, + magnet_pos=ELM_ACTIONSLIDER_CENTER, + enabled_pos=(ELM_ACTIONSLIDER_LEFT | ELM_ACTIONSLIDER_RIGHT) + ) acts.part_text_set("left", "Snooze") acts.part_text_set("center", "") acts.part_text_set("right", "Stop") - acts.enabled_pos_set(ELM_ACTIONSLIDER_LEFT | ELM_ACTIONSLIDER_RIGHT) acts.callback_selected_add(_pos_selected_cb) bx.pack_end(acts) acts.show() - acts = Actionslider(win) - acts.style_set("bar") - acts.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0) - acts.size_hint_align_set(evas.EVAS_HINT_FILL, 0.0) - acts.indicator_pos_set(ELM_ACTIONSLIDER_LEFT) - acts.magnet_pos_set(ELM_ACTIONSLIDER_CENTER | ELM_ACTIONSLIDER_RIGHT) - acts.enabled_pos_set(ELM_ACTIONSLIDER_CENTER | ELM_ACTIONSLIDER_RIGHT) + acts = Actionslider(win, style="bar", + size_hint_weight=EXPAND_HORIZ, size_hint_align=(EVAS_HINT_FILL, 0.0), + indicator_pos=ELM_ACTIONSLIDER_LEFT, + magnet_pos=(ELM_ACTIONSLIDER_CENTER | ELM_ACTIONSLIDER_RIGHT), + enabled_pos=(ELM_ACTIONSLIDER_CENTER | ELM_ACTIONSLIDER_RIGHT) + ) acts.part_text_set("left", "") acts.part_text_set("center", "Accept") acts.part_text_set("right", "Reject") @@ -114,26 +110,22 @@ def actionslider_clicked(obj): bx.pack_end(acts) acts.show() - acts = Actionslider(win) - acts.style_set("bar") - acts.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0) - acts.size_hint_align_set(evas.EVAS_HINT_FILL, 0.0) - acts.indicator_pos_set(ELM_ACTIONSLIDER_LEFT) - acts.magnet_pos_set(ELM_ACTIONSLIDER_LEFT) + acts = Actionslider(win, style="bar", text="Go", + size_hint_weight=EXPAND_HORIZ, size_hint_align=(EVAS_HINT_FILL, 0.0), + indicator_pos=ELM_ACTIONSLIDER_LEFT, magnet_pos=ELM_ACTIONSLIDER_LEFT, + ) acts.part_text_set("left", "") acts.part_text_set("center", "Accept") acts.part_text_set("right", "Reject") - acts.text_set("Go") acts.callback_pos_changed_add(_position_change_magnetic_cb) acts.callback_selected_add(_pos_selected_cb) bx.pack_end(acts) acts.show() - acts = Actionslider(win) - acts.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0) - acts.size_hint_align_set(evas.EVAS_HINT_FILL, 0.0) - acts.indicator_pos_set(ELM_ACTIONSLIDER_LEFT) - acts.magnet_pos_set(ELM_ACTIONSLIDER_ALL) + acts = Actionslider(win, + size_hint_weight=EXPAND_HORIZ, size_hint_align=(EVAS_HINT_FILL, 0.0), + indicator_pos=ELM_ACTIONSLIDER_LEFT, magnet_pos=ELM_ACTIONSLIDER_ALL + ) acts.part_text_set("left", "Left") acts.part_text_set("center", "Center") acts.part_text_set("right", "Right") @@ -142,11 +134,11 @@ def actionslider_clicked(obj): bx.pack_end(acts) acts.show() - acts = Actionslider(win) - acts.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0) - acts.size_hint_align_set(evas.EVAS_HINT_FILL, 0.0) - acts.indicator_pos_set(ELM_ACTIONSLIDER_CENTER) - acts.magnet_pos_set(ELM_ACTIONSLIDER_CENTER) + acts = Actionslider(win, + size_hint_weight=EXPAND_HORIZ, size_hint_align=(EVAS_HINT_FILL, 0.0), + indicator_pos=ELM_ACTIONSLIDER_CENTER, + magnet_pos=ELM_ACTIONSLIDER_CENTER + ) acts.part_text_set("left", "Enable") acts.part_text_set("center", "Magnet") acts.part_text_set("right", "Disable") diff --git a/examples/elementary/test_bg.py b/examples/elementary/test_bg.py index 5e18d10..7e22053 100644 --- a/examples/elementary/test_bg.py +++ b/examples/elementary/test_bg.py @@ -2,45 +2,41 @@ # encoding: utf-8 -from efl import evas +from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL from efl import elementary -from efl.elementary.window import Window -from efl.elementary.background import Background +from efl.elementary.window import StandardWindow, Window, ELM_WIN_BASIC +from efl.elementary.background import Background, ELM_BG_OPTION_SCALE from efl.elementary.box import Box from efl.elementary.frame import Frame from efl.elementary.label import Label from efl.elementary.list import List +EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND +FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL def bg_plain_clicked(obj, item=None): - win = Window("bg plain", elementary.ELM_WIN_BASIC) - win.title_set("Bg Plain") - win.autodel_set(True) + win = Window("bg plain", ELM_WIN_BASIC, title="Bg Plain", autodel=True, + size=(320, 320) + ) - bg = Background(win) + bg = Background(win, size_hint_weight=EXPAND_BOTH) win.resize_object_add(bg) - bg.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) bg.show() - win.resize(320, 320) win.show() def bg_image_clicked(obj, item=None): - win = Window("bg-image", elementary.ELM_WIN_BASIC) - win.title_set("Bg Image") - win.autodel_set(True) + win = Window("bg-image", ELM_WIN_BASIC, title="Bg Image", autodel=True, + size=(320, 320), size_hint_min=(160, 160), size_hint_max=(320,320) + ) - bg = Background(win) + bg = Background(win, file="images/plant_01.jpg", option=ELM_BG_OPTION_SCALE, + size_hint_weight=EXPAND_BOTH + ) win.resize_object_add(bg) - bg.file_set("images/plant_01.jpg") - bg.option_set(elementary.ELM_BG_OPTION_SCALE) - bg.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) bg.show() - win.size_hint_min_set(160, 160) - win.size_hint_max_set(320, 320) - win.resize(320, 320) win.show() (filename, group) = bg.file_get() @@ -53,38 +49,29 @@ if __name__ == "__main__": elementary.exit() elementary.init() - win = Window("test", elementary.ELM_WIN_BASIC) - win.title_set("python-elementary test application") + win = StandardWindow("test", "python-elementary test application", + size=(320,520) + ) win.callback_delete_request_add(destroy) - bg = Background(win) - win.resize_object_add(bg) - bg.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) - bg.show() - - box0 = Box(win) - box0.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) + box0 = Box(win, size_hint_weight=EXPAND_BOTH) win.resize_object_add(box0) box0.show() - fr = Frame(win) - fr.text_set("Information") - box0.pack_end(fr) - fr.show() - lb = Label(win) - lb.text_set("Please select a test from the list below<br>" - "by clicking the test button to show the<br>" - "test window.") - fr.content_set(lb) + lb.text = "Please select a test from the list below<br>" \ + "by clicking the test button to show the<br>" \ + "test window." lb.show() + fr = Frame(win, text="Information", content=lb) + box0.pack_end(fr) + fr.show() + items = [("Bg Plain", bg_plain_clicked), ("Bg Image", bg_image_clicked)] - li = List(win) - li.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) - li.size_hint_align_set(evas.EVAS_HINT_FILL, evas.EVAS_HINT_FILL) + li = List(win, size_hint_weight=EXPAND_BOTH, size_hint_align=FILL_BOTH) box0.pack_end(li) li.show() @@ -93,7 +80,6 @@ if __name__ == "__main__": li.go() - win.resize(320,520) win.show() elementary.run() elementary.shutdown() diff --git a/examples/elementary/test_box.py b/examples/elementary/test_box.py index b1df880..534d817 100644 --- a/examples/elementary/test_box.py +++ b/examples/elementary/test_box.py @@ -1,11 +1,10 @@ #!/usr/bin/env python # encoding: utf-8 -from efl import evas +from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL from efl import elementary -from efl.elementary.window import Window -from efl.elementary.background import Background -from efl.elementary.box import Box +from efl.elementary.window import StandardWindow +from efl.elementary.box import Box, ELM_BOX_LAYOUT_HORIZONTAL from efl.elementary.button import Button from efl.elementary.frame import Frame from efl.elementary.label import Label @@ -13,42 +12,21 @@ from efl.elementary.list import List from efl.elementary.icon import Icon from efl.elementary.separator import Separator +EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND +FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL +ic_file = "images/logo_small.png" def box_vert_clicked(obj, item=None): - win = Window("box-vert", elementary.ELM_WIN_BASIC) - win.title_set("Box Vert") - win.autodel_set(True) + win = StandardWindow("box-vert", "Box Vert", autodel=True) - bg = Background(win) - win.resize_object_add(bg) - bg.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) - bg.show() - - bx = Box(win) + bx = Box(win, size_hint_weight=EXPAND_BOTH) win.resize_object_add(bx) - bx.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) bx.show() - ic = Icon(win) - ic.file_set("images/logo_small.png") - ic.resizable_set(0, 0) - ic.size_hint_align_set(0.5, 0.5) - bx.pack_end(ic) - ic.show() - - ic = Icon(win) - ic.file_set("images/logo_small.png") - ic.resizable_set(0, 0) - ic.size_hint_align_set(0.0, 0.5) - bx.pack_end(ic) - ic.show() - - ic = Icon(win) - ic.file_set("images/logo_small.png") - ic.resizable_set(0, 0) - ic.size_hint_align_set(evas.EVAS_HINT_EXPAND, 0.5) - bx.pack_end(ic) - ic.show() + for align in ((0.5, 0.5), (0.0, 0.5), (EVAS_HINT_EXPAND, 0.5)): + ic = Icon(win, file=ic_file, resizable=(0, 0), size_hint_align=align) + bx.pack_end(ic) + ic.show() win.show() @@ -58,98 +36,33 @@ def boxvert2_del_cb(bt, bx): bt.color_set(128, 64, 0, 128) def box_vert2_clicked(obj, item=None): - win = Window("box-vert2", elementary.ELM_WIN_BASIC) - win.title_set("Box Vert 2") - win.autodel_set(True) + win = StandardWindow("box-vert2", "Box Vert 2", autodel=True) - bg = Background(win) - win.resize_object_add(bg) - bg.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) - bg.show() - - bx = Box(win) + bx = Box(win, size_hint_weight=(0.0, 0.0)) win.resize_object_add(bx) - bx.size_hint_weight_set(0.0, 0.0) bx.show() - bt = Button(win) - bt.text_set("Button 1") - bt.size_hint_align_set(evas.EVAS_HINT_FILL, evas.EVAS_HINT_FILL) - bt.size_hint_weight_set(0.0, 0.0) - bt.callback_clicked_add(boxvert2_del_cb, bx) - bx.pack_end(bt) - bt.show() - - bt = Button(win) - bt.text_set("Button 2") - bt.size_hint_align_set(evas.EVAS_HINT_FILL, evas.EVAS_HINT_FILL) - bt.size_hint_weight_set(0.0, 0.0) - bt.callback_clicked_add(boxvert2_del_cb, bx) - bx.pack_end(bt) - bt.show() - - bt = Button(win) - bt.text_set("Button 3") - bt.size_hint_align_set(evas.EVAS_HINT_FILL, evas.EVAS_HINT_FILL) - bt.size_hint_weight_set(0.0, 0.0) - bt.callback_clicked_add(boxvert2_del_cb, bx) - bx.pack_end(bt) - bt.show() - - bt = Button(win) - bt.text_set("Button 4") - bt.size_hint_align_set(evas.EVAS_HINT_FILL, evas.EVAS_HINT_FILL) - bt.size_hint_weight_set(0.0, 0.0) - bt.callback_clicked_add(boxvert2_del_cb, bx) - bx.pack_end(bt) - bt.show() - - bt = Button(win) - bt.text_set("Button 5") - bt.size_hint_align_set(evas.EVAS_HINT_FILL, evas.EVAS_HINT_FILL) - bt.size_hint_weight_set(0.0, 0.0) - bt.callback_clicked_add(boxvert2_del_cb, bx) - bx.pack_end(bt) - bt.show() + for i in range(5): + bt = Button(win, text="Button %d" % i, + size_hint_align=FILL_BOTH, size_hint_weight=(0.0, 0.0) + ) + bt.callback_clicked_add(boxvert2_del_cb, bx) + bx.pack_end(bt) + bt.show() win.show() def box_horiz_clicked(obj, item=None): - win = Window("box-horiz", elementary.ELM_WIN_BASIC) - win.title_set("Box Horiz") - win.autodel_set(True) + win = StandardWindow("box-horiz", "Box Horiz", autodel=True) - bg = Background(win) - win.resize_object_add(bg) - bg.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) - bg.show() - - bx = Box(win) - bx.horizontal_set(True) + bx = Box(win, horizontal=True, size_hint_weight=EXPAND_BOTH) win.resize_object_add(bx) - bx.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) bx.show() - ic = Icon(win) - ic.file_set("images/logo_small.png") - ic.resizable_set(0, 0) - ic.size_hint_align_set(0.5, 0.5) - bx.pack_end(ic) - ic.show() - - ic = Icon(win) - ic.file_set("images/logo_small.png") - ic.resizable_set(0, 0) - ic.size_hint_align_set(0.5, 0.0) - bx.pack_end(ic) - ic.show() - - ic = Icon(win) - ic.file_set("images/logo_small.png") - ic.resizable_set(0, 0) - ic.size_hint_align_set(0.0, evas.EVAS_HINT_EXPAND) - bx.pack_end(ic) - ic.show() + for align in ((0.5, 0.5), (0.5, 0.0), (0.0, EVAS_HINT_EXPAND)): + ic = Icon(win, file=ic_file, resizable=(0, 0), size_hint_align=align) + bx.pack_end(ic) + ic.show() win.show() @@ -157,7 +70,7 @@ def box_horiz_clicked(obj, item=None): layout_list = ["horizontal","vertical","homogeneous_vertical", "homogeneous_horizontal", "homogeneous_max_size_horizontal", "homogeneous_max_size_vertical", "flow_horizontal", "flow_vertical", "stack"] -current_layout = elementary.ELM_BOX_LAYOUT_HORIZONTAL +current_layout = ELM_BOX_LAYOUT_HORIZONTAL def box_layout_button_cb(obj, box): @@ -170,58 +83,37 @@ def box_layout_button_cb(obj, box): box.layout_set(current_layout) def box_layout_clicked(obj, item=None): - win = Window("box-layout", elementary.ELM_WIN_BASIC) - win.title_set("Box Layout") - win.autodel_set(True) + win = StandardWindow("box-layout", "Box Layout", autodel=True) - bg = Background(win) - win.resize_object_add(bg) - bg.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) - bg.show() - - vbox = Box(win) + vbox = Box(win, size_hint_weight=EXPAND_BOTH, size_hint_align=FILL_BOTH) win.resize_object_add(vbox) - vbox.size_hint_align_set(evas.EVAS_HINT_FILL, evas.EVAS_HINT_FILL) - vbox.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) vbox.show() - bx = Box(win) - bx.layout_set(elementary.ELM_BOX_LAYOUT_HORIZONTAL) - bx.size_hint_align_set(evas.EVAS_HINT_FILL, evas.EVAS_HINT_FILL) - bx.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) + bx = Box(win, layout=ELM_BOX_LAYOUT_HORIZONTAL, + size_hint_align=FILL_BOTH, size_hint_weight=EXPAND_BOTH + ) vbox.pack_end(bx) bx.show() - sep = Separator(win) - sep.horizontal_set(True) + sep = Separator(win, horizontal=True) vbox.pack_end(sep) sep.show() - bt = Button(win) - bt.text_set("layout: %s" % layout_list[current_layout]) + bt = Button(win, text="layout: %s" % layout_list[current_layout]) bt.callback_clicked_add(box_layout_button_cb, bx) vbox.pack_end(bt) bt.show() for i in range(5): - ic = Icon(win) - ic.file_set("images/logo_small.png") - ic.resizable_set(0, 0) - ic.size_hint_align_set(0.5, 0.5) + ic = Icon(win, file=ic_file, resizable=(0, 0), size_hint_align=(0.5, 0.5)) bx.pack_end(ic) ic.show() - ic = Icon(win) - ic.file_set("images/logo_small.png") - ic.resizable_set(0, 0) - ic.size_hint_align_set(1.0, 1.0) + ic = Icon(win, file=ic_file, resizable=(0, 0), size_hint_align=(1.0, 1.0)) bx.pack_end(ic) ic.show() - ic = Icon(win) - ic.file_set("images/logo_small.png") - ic.resizable_set(0, 0) - ic.size_hint_align_set(0.0, 0.0) + ic = Icon(win, file=ic_file, resizable=(0, 0), size_hint_align=(0.0, 0.0)) bx.pack_end(ic) ic.show() @@ -239,48 +131,34 @@ def box_transition_button_cb(obj, box): box.layout_transition(0.4, from_ly, current_layout) def box_transition_clicked(obj, item=None): - win = Window("box-layout-transition", elementary.ELM_WIN_BASIC) - win.title_set("Box Layout Transition") - win.autodel_set(True) - - bg = Background(win) - win.resize_object_add(bg) - bg.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) - bg.show() + win = StandardWindow("box-layout-transition", "Box Layout Transition", + autodel=True + ) - vbox = Box(win) + vbox = Box(win, size_hint_align=FILL_BOTH, size_hint_weight=EXPAND_BOTH) win.resize_object_add(vbox) - vbox.size_hint_align_set(evas.EVAS_HINT_FILL, evas.EVAS_HINT_FILL) - vbox.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) vbox.show() - bx = Box(win) - bx.layout_set(elementary.ELM_BOX_LAYOUT_HORIZONTAL) - bx.size_hint_align_set(evas.EVAS_HINT_FILL, evas.EVAS_HINT_FILL) - bx.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) + bx = Box(win, layout=ELM_BOX_LAYOUT_HORIZONTAL, + size_hint_align=FILL_BOTH, size_hint_weight=EXPAND_BOTH + ) vbox.pack_end(bx) bx.show() - sep = Separator(win) - sep.horizontal_set(True) + sep = Separator(win, horizontal=True) vbox.pack_end(sep) sep.show() - bt = Button(win) - bt.text_set("layout: %s" % layout_list[current_layout]) + bt = Button(win, text="layout: %s" % layout_list[current_layout]) bt.callback_clicked_add(box_transition_button_cb, bx) vbox.pack_end(bt) bt.show() for i in range(4): - ic = Icon(win) - ic.file_set("images/logo_small.png") - ic.resizable_set(0, 0) - ic.size_hint_align_set(0.5, 0.5) + ic = Icon(win, file=ic_file, resizable=(0, 0), size_hint_align=(0.5, 0.5)) bx.pack_end(ic) ic.show() - win.show() @@ -289,41 +167,30 @@ if __name__ == "__main__": elementary.exit() elementary.init() - win = Window("test", elementary.ELM_WIN_BASIC) - win.title_set("python-elementary test application") + win = StandardWindow("test", "python-elementary test application", size=(320,520)) win.callback_delete_request_add(destroy) - bg = Background(win) - win.resize_object_add(bg) - bg.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) - bg.show() - - box0 = Box(win) - box0.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) + box0 = Box(win, size_hint_weight=EXPAND_BOTH) win.resize_object_add(box0) box0.show() - fr = Frame(win) - fr.text_set("Information") - box0.pack_end(fr) - fr.show() - lb = Label(win) - lb.text_set("Please select a test from the list below<br>" - "by clicking the test button to show the<br>" - "test window.") - fr.content_set(lb) + lb.text = "Please select a test from the list below<br>" \ + "by clicking the test button to show the<br>" \ + "test window." lb.show() + fr = Frame(win, text="Information", content=lb) + box0.pack_end(fr) + fr.show() + items = [("Box Vert", box_vert_clicked), ("Box Vert 2", box_vert2_clicked), ("Box Horiz", box_horiz_clicked), ("Box Layout", box_layout_clicked), ("Box Layout Transition", box_transition_clicked)] - li = List(win) - li.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) - li.size_hint_align_set(evas.EVAS_HINT_FILL, evas.EVAS_HINT_FILL) + li = List(win, size_hint_weight=EXPAND_BOTH, size_hint_align=FILL_BOTH) box0.pack_end(li) li.show() @@ -332,7 +199,6 @@ if __name__ == "__main__": li.go() - win.resize(320,520) win.show() elementary.run() elementary.shutdown() --