kuuko pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=0004c58c9bb69aa30f27376b2ad07e86b653502d
commit 0004c58c9bb69aa30f27376b2ad07e86b653502d Author: Kai Huuhko <[email protected]> Date: Thu Oct 3 07:15:05 2013 +0300 Elementary: Fix tests config and spinner --- examples/elementary/test.edj | Bin 201415 -> 183175 bytes examples/elementary/test_config.py | 9 ++-- examples/elementary/test_spinner.py | 82 +++++++++++++++++++++++++++--------- 3 files changed, 68 insertions(+), 23 deletions(-) diff --git a/examples/elementary/test.edj b/examples/elementary/test.edj index 43b0874..28d1ecb 100644 Binary files a/examples/elementary/test.edj and b/examples/elementary/test.edj differ diff --git a/examples/elementary/test_config.py b/examples/elementary/test_config.py index dc48078..345facd 100644 --- a/examples/elementary/test_config.py +++ b/examples/elementary/test_config.py @@ -13,6 +13,7 @@ from efl.elementary.scroller import Scroller from efl.elementary.box import Box from efl.elementary.frame import Frame from efl.elementary.plug import Plug +from efl.elementary.layout import Layout from efl.elementary.configuration import Configuration elm_conf = Configuration() @@ -179,7 +180,7 @@ def inlined_add(parent): win.resize_object_add(bg) bg.show() - bx = elm_box_add(win); + bx = Box(win) bx.size_hint_weight = EVAS_HINT_EXPAND, 0.0 bx.size_hint_align = EVAS_HINT_FILL, 0.0 bx.show() @@ -189,7 +190,7 @@ def inlined_add(parent): lb = LOG(win, "Profile: <b>N/A</b>") bx.pack_end(lb) - evas_object_data_set(win, "lb", lb); + win.data["lb"] = lb win.pos = 10, 100 win.size = 150, 70 @@ -229,7 +230,7 @@ def socket_add(name): lb = LOG(win, "Profile: <b>N/A</b>") bx.pack_end(lb) - evas_object_data_set(win, "lb", lb) + win.data["lb"] = lb inlined_add(win) @@ -247,7 +248,7 @@ def plug_add(win, bx, name): ly = Layout(win) ly.file = "test.edj", "win_config" ly.size_hint_weight = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND - ly.size_hint_fill = EVAS_HINT_FILL, EVAS_HINT_FILL + ly.size_hint_align = EVAS_HINT_FILL, EVAS_HINT_FILL ly.show() plug.size_hint_weight = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND diff --git a/examples/elementary/test_spinner.py b/examples/elementary/test_spinner.py index 2e8379b..323227d 100644 --- a/examples/elementary/test_spinner.py +++ b/examples/elementary/test_spinner.py @@ -27,37 +27,81 @@ def spinner_clicked(obj): bx.show() sp = Spinner(win) - sp.label_format_set("%1.1f units") - sp.step_set(1.3) - sp.wrap_set(1) - sp.min_max_set(-50.0, 250.0) - sp.size_hint_align_set(evas.EVAS_HINT_FILL, 0.5) - sp.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) + sp.editable = True + sp.label_format = "%1.1f units" + sp.step = 1.3 + sp.wrap = True + sp.min_max = -50.0, 250.0 + sp.size_hint_align = evas.EVAS_HINT_FILL, 0.5 + sp.size_hint_weight = evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND bx.pack_end(sp) sp.show() sp = Spinner(win) - sp.label_format_set("%1.1f units") - sp.step_set(1.3) - sp.wrap_set(1) - sp.style_set("vertical"); - sp.min_max_set(-50.0, 250.0) - sp.size_hint_align_set(evas.EVAS_HINT_FILL, 0.5) - sp.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) + sp.label_format = "Base 5.5, Round 2 : %1.1f" + sp.min_max = -100.0, 100.0 + sp.round = 2 + sp.base = 5.5 + sp.value = 5.5 + sp.size_hint_align = evas.EVAS_HINT_FILL, 0.5 + sp.size_hint_weight = evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND bx.pack_end(sp) sp.show() sp = Spinner(win) - sp.label_format_set("Disabled %.0f") - sp.disabled_set(1) - sp.min_max_set(-50.0, 250.0) - sp.size_hint_align_set(evas.EVAS_HINT_FILL, 0.5) - sp.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND) + sp.label_format = "Percentage %%%1.2f something" + sp.step = 5.0 + sp.min_max = 0.0, 100.0 + sp.size_hint_align = evas.EVAS_HINT_FILL, 0.5 + sp.size_hint_weight = evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND bx.pack_end(sp) sp.show() - win.show() + sp = Spinner(win) + sp.label_format = "%1.1f units" + sp.step = 1.3 + sp.wrap = True + sp.style = "vertical" + sp.min_max = -50.0, 250.0 + sp.size_hint_align = evas.EVAS_HINT_FILL, 0.5 + sp.size_hint_weight = evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND + bx.pack_end(sp) + sp.show() + sp = Spinner(win) + sp.label_format = "Disabled %.0f" + sp.disabled = True + sp.min_max = -50.0, 250.0 + sp.size_hint_align = evas.EVAS_HINT_FILL, 0.5 + sp.size_hint_weight = evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND + bx.pack_end(sp) + sp.show() + + sp = Spinner(win) + sp.wrap = True + sp.min_max = 1, 12 + sp.value = 1 + sp.label_format = "%.0f" + sp.editable = False + sp.special_value_add(1, "January") + sp.special_value_add(2, "February") + sp.special_value_add(3, "March") + sp.special_value_add(4, "April") + sp.special_value_add(5, "May") + sp.special_value_add(6, "June") + sp.special_value_add(7, "July") + sp.special_value_add(8, "August") + sp.special_value_add(9, "September") + sp.special_value_add(10, "October") + sp.special_value_add(11, "November") + sp.special_value_add(12, "December") + sp.size_hint_align = evas.EVAS_HINT_FILL, 0.5 + sp.size_hint_weight = evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND + bx.pack_end(sp) + sp.show() + + win.resize(300, 300) + win.show() if __name__ == "__main__": elementary.init() --
