From 63c685dc207023630a50576f1c22694ff38f6be3 Mon Sep 17 00:00:00 2001 From: Marek Ventur Date: Sun, 26 Aug 2018 11:39:04 +0100 Subject: [PATCH] Update dialogs to ugfx changes --- lib/dialogs.py | 16 ++++++++-------- lib/test_dialogs.py | 3 +++ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/lib/dialogs.py b/lib/dialogs.py index f348ae2..dc56854 100644 --- a/lib/dialogs.py +++ b/lib/dialogs.py @@ -139,7 +139,7 @@ def prompt_option(options, index=0, text = "Please select one of the following:" options_list.add_item(option["title"]) else: options_list.add_item(str(option)) - options_list.set_selected_index(index) + options_list.selected_index(index) select_text = "A: " + select_text if none_text: @@ -153,14 +153,14 @@ def prompt_option(options, index=0, text = "Please select one of the following:" sleep.wfi() ugfx.poll() # todo: temporary hack - if (buttons.is_triggered(buttons.Buttons.JOY_Up)): - index = max(index - 1, 0) - options_list.set_selected_index(index) - if (buttons.is_triggered(buttons.Buttons.JOY_Down)): - index = min(index + 1, len(options) - 1) - options_list.set_selected_index(index) + #if (buttons.is_triggered(buttons.Buttons.JOY_Up)): + # index = max(index - 1, 0) + # options_list.selected_index(index) + #if (buttons.is_triggered(buttons.Buttons.JOY_Down)): + # index = min(index + 1, len(options) - 1) + # options_list.selected_index(index) - if buttons.is_triggered(buttons.Buttons.BTN_A): return options[options_list.get_selected_index()] + if buttons.is_triggered(buttons.Buttons.BTN_A): return options[options_list.selected_index()] if button_none and buttons.is_triggered(buttons.Buttons.BTN_B): return None if button_none and buttons.is_triggered(buttons.Buttons.BTN_Menu): return None diff --git a/lib/test_dialogs.py b/lib/test_dialogs.py index a4f1679..25ee20c 100644 --- a/lib/test_dialogs.py +++ b/lib/test_dialogs.py @@ -29,6 +29,9 @@ class TestDialogs(unittest.TestCase): def test_(self): prompt_text("description") + def test_option(self): + print(prompt_option(["foo", "bar", "baz"])) + if __name__ == '__main__':