From 2a6a1ff798465d0c7136ad2d7c74097adb327579 Mon Sep 17 00:00:00 2001 From: pdxlocations Date: Thu, 30 Jan 2025 12:06:56 -0800 Subject: [PATCH] rm globlas that i think we don't need --- message_handlers/rx_handler.py | 1 - settings.py | 14 ++++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/message_handlers/rx_handler.py b/message_handlers/rx_handler.py index dbe428b..74e330c 100644 --- a/message_handlers/rx_handler.py +++ b/message_handlers/rx_handler.py @@ -10,7 +10,6 @@ import globals from datetime import datetime def on_receive(packet, interface): - global nodes_win # Update packet log globals.packet_buffer.append(packet) diff --git a/settings.py b/settings.py index eab26e2..98af97c 100644 --- a/settings.py +++ b/settings.py @@ -15,7 +15,6 @@ save_option = "Save Changes" sensitive_settings = ["Reboot", "Reset Node DB", "Shutdown", "Factory Reset"] def display_menu(current_menu, menu_path, selected_index, show_save_option): - global menu_win, menu_pad # Calculate the dynamic height based on the number of menu items num_items = len(current_menu) + (1 if show_save_option else 0) # Add 1 for the "Save Changes" option if applicable @@ -63,8 +62,11 @@ def display_menu(current_menu, menu_path, selected_index, show_save_option): menu_pad.refresh(0, 0, menu_win.getbegyx()[0] + 3, menu_win.getbegyx()[1] + 4, menu_win.getbegyx()[0] + 3 + menu_win.getmaxyx()[0] - 5 - (2 if show_save_option else 0), menu_win.getbegyx()[1] + menu_win.getmaxyx()[1] - 8) + + return menu_win, menu_pad -def move_highlight(old_idx, new_idx, options, show_save_option, menu_win): + +def move_highlight(old_idx, new_idx, options, show_save_option, menu_win, menu_pad): if(old_idx == new_idx): # no-op return @@ -113,7 +115,7 @@ def settings_menu(stdscr, interface): ) # Display the menu - display_menu(current_menu, menu_path, selected_index, show_save_option) + menu_win, menu_pad = display_menu(current_menu, menu_path, selected_index, show_save_option) need_redraw = False @@ -125,17 +127,17 @@ def settings_menu(stdscr, interface): if key == curses.KEY_UP: old_selected_index = selected_index selected_index = max_index if selected_index == 0 else selected_index - 1 - move_highlight(old_selected_index, selected_index, options, show_save_option, menu_win) + move_highlight(old_selected_index, selected_index, options, show_save_option, menu_win, menu_pad) elif key == curses.KEY_DOWN: old_selected_index = selected_index selected_index = 0 if selected_index == max_index else selected_index + 1 - move_highlight(old_selected_index, selected_index, options, show_save_option, menu_win) + move_highlight(old_selected_index, selected_index, options, show_save_option, menu_win, menu_pad) elif key == ord("\t") and show_save_option: old_selected_index = selected_index selected_index = max_index - move_highlight(old_selected_index, selected_index, options, show_save_option, menu_win) + move_highlight(old_selected_index, selected_index, options, show_save_option, menu_win, menu_pad) elif key == curses.KEY_RIGHT or key == ord('\n'): need_redraw = True