From 58defb3c05ce9e98ff1ebc81d7a34b6b68f35b43 Mon Sep 17 00:00:00 2001 From: Steven Brown Date: Fri, 13 Oct 2017 11:23:06 +1300 Subject: [PATCH 1/3] fixed scrolling --- display_centre.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/display_centre.py b/display_centre.py index 351485b..d819808 100644 --- a/display_centre.py +++ b/display_centre.py @@ -139,8 +139,9 @@ def move_browser_selection_up(): global browser_index global browser_start_index if browser_index == 0: - browser_start_index = browser_start_index - 1 - refresh_display() + if(browser_start_index > 0): + browser_start_index = browser_start_index - 1 + refresh_display() return display.tag_remove("SELECT", ROW_OFFSET + browser_index, ROW_OFFSET + SELECTOR_WIDTH + browser_index) @@ -157,8 +158,9 @@ def move_browser_selection_down(): last_index = len(data_object.get_browser_data_for_display()) - 1 if browser_index >= last_index: return - - if browser_index >= MAX_LINES -1: + if browser_index + browser_start_index >= last_index: + return + if browser_index >= MAX_LINES - 1: browser_start_index = browser_start_index + 1 refresh_display() return From 4ddbc0b68d6ae3b59900121d4c448a21dc0de3a9 Mon Sep 17 00:00:00 2001 From: Steven Brown Date: Fri, 13 Oct 2017 11:42:29 +1300 Subject: [PATCH 2/3] added switching between browser and looper --- display_centre.py | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/display_centre.py b/display_centre.py index d819808..2b63756 100644 --- a/display_centre.py +++ b/display_centre.py @@ -143,11 +143,9 @@ def move_browser_selection_up(): browser_start_index = browser_start_index - 1 refresh_display() return - display.tag_remove("SELECT", ROW_OFFSET + browser_index, - ROW_OFFSET + SELECTOR_WIDTH + browser_index) + deselect_current_browser_index() browser_index = browser_index - 1 - display.tag_add("SELECT", ROW_OFFSET + browser_index, - ROW_OFFSET + SELECTOR_WIDTH + browser_index) + select_current_browser_index() def move_browser_selection_down(): @@ -164,22 +162,24 @@ def move_browser_selection_down(): browser_start_index = browser_start_index + 1 refresh_display() return - display.tag_remove("SELECT", ROW_OFFSET + browser_index, - ROW_OFFSET + SELECTOR_WIDTH + browser_index) + deselect_current_browser_index() browser_index = browser_index + 1 - display.tag_add("SELECT", ROW_OFFSET + browser_index, - ROW_OFFSET + SELECTOR_WIDTH + browser_index) + select_current_browser_index() def select_current_browser_index(): display.tag_add("SELECT", ROW_OFFSET + browser_index, ROW_OFFSET + SELECTOR_WIDTH + browser_index) +def deselect_current_browser_index(): + display.tag_remove("SELECT", ROW_OFFSET + browser_index, + ROW_OFFSET + SELECTOR_WIDTH + browser_index) def refresh_display(): display.delete(1.0, END) load_display(display) - select_current_browser_index() + if display_mode == "BROWSER": + select_current_browser_index() display = Text(tk) @@ -222,6 +222,13 @@ def down_key(event): print "values at end of down:" print "browser index: {} browerser_start_index {}".format(browser_index, browser_start_index) +def num_lock_key(event): + global display_mode + if display_mode == "BROWSER": + display_mode = "LOOPER" + else: + display_mode = "BROWSER" + refresh_display() def backspace_key(event): global browser_index @@ -252,6 +259,7 @@ frame.bind("", key) frame.bind("", up_key) frame.bind("", down_key) frame.bind("", backspace_key) +frame.bind("", num_lock_key) frame.pack() From 5942162acc39629169a56a2fa86870142fe655ee Mon Sep 17 00:00:00 2001 From: Steven Brown Date: Fri, 13 Oct 2017 12:00:11 +1300 Subject: [PATCH 3/3] blah --- display_centre.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/display_centre.py b/display_centre.py index 2b63756..743f63d 100644 --- a/display_centre.py +++ b/display_centre.py @@ -69,6 +69,8 @@ def load_display(display): def load_title(display): display.insert(END, '======== r_e_c_u_r ======== \n') + display.tag_add("TITLE", 1.9, 1.18) + def load_divider(display): @@ -77,8 +79,13 @@ def load_divider(display): def load_player(display): text, banner = get_text_for_video_display() + end_of_text = float("3." + str(len(text))) + end_of_banner = float("3." + str(len(banner))) display.insert(END, text + '\n') + display.tag_add("PLAYER_INFO", 3.0, end_of_text) display.insert(END, banner + '\n') + display.tag_add("PLAYER_INFO", 4.0, end_of_banner) + def load_looper(display): @@ -181,9 +188,10 @@ def refresh_display(): if display_mode == "BROWSER": select_current_browser_index() -display = Text(tk) - -display.tag_configure("SELECT", background="black", foreground="white") +display = Text(tk, bg="black", fg="white") +display.tag_configure("SELECT", background="white", foreground="black") +display.tag_configure("TITLE", background="black", foreground="red") +display.tag_configure("PLAYER_INFO", background="black", foreground="yellow") load_display(display)