mirror of
https://github.com/pdxlocations/contact.git
synced 2026-07-05 17:31:47 +02:00
Add App Settings Menu (#89)
* init * working changes * working changes * working changes * working changes * not working changes * almost working changes * working changes * working changes * broke save and nested menus * working better * changes * working changes * scrolling text input * allow wide char input * set pad bg colors * add empty color for bg * reload colors on save * tab to save changes * cleanup on isle edit_value * dynamically create theme options
This commit is contained in:
+26
-19
@@ -142,27 +142,34 @@ def initialize_config():
|
||||
|
||||
return loaded_config
|
||||
|
||||
def assign_config_variables(loaded_config):
|
||||
# Assign values to local variables
|
||||
|
||||
global db_file_path, log_file_path, message_prefix, sent_message_prefix
|
||||
global notification_symbol, ack_implicit_str, ack_str, nak_str, ack_unknown_str
|
||||
global theme, COLOR_CONFIG
|
||||
|
||||
db_file_path = loaded_config["db_file_path"]
|
||||
log_file_path = loaded_config["log_file_path"]
|
||||
message_prefix = loaded_config["message_prefix"]
|
||||
sent_message_prefix = loaded_config["sent_message_prefix"]
|
||||
notification_symbol = loaded_config["notification_symbol"]
|
||||
ack_implicit_str = loaded_config["ack_implicit_str"]
|
||||
ack_str = loaded_config["ack_str"]
|
||||
nak_str = loaded_config["nak_str"]
|
||||
ack_unknown_str = loaded_config["ack_unknown_str"]
|
||||
theme = loaded_config["theme"]
|
||||
if theme == "dark":
|
||||
COLOR_CONFIG = loaded_config["COLOR_CONFIG_DARK"]
|
||||
elif theme == "light":
|
||||
COLOR_CONFIG = loaded_config["COLOR_CONFIG_LIGHT"]
|
||||
elif theme == "green":
|
||||
COLOR_CONFIG = loaded_config["COLOR_CONFIG_GREEN"]
|
||||
|
||||
|
||||
# Call the function when the script is imported
|
||||
loaded_config = initialize_config()
|
||||
|
||||
# Assign values to local variables
|
||||
db_file_path = loaded_config["db_file_path"]
|
||||
log_file_path = loaded_config["log_file_path"]
|
||||
message_prefix = loaded_config["message_prefix"]
|
||||
sent_message_prefix = loaded_config["sent_message_prefix"]
|
||||
notification_symbol = loaded_config["notification_symbol"]
|
||||
ack_implicit_str = loaded_config["ack_implicit_str"]
|
||||
ack_str = loaded_config["ack_str"]
|
||||
nak_str = loaded_config["nak_str"]
|
||||
ack_unknown_str = loaded_config["ack_unknown_str"]
|
||||
theme = loaded_config["theme"]
|
||||
if theme == "dark":
|
||||
COLOR_CONFIG = loaded_config["COLOR_CONFIG_DARK"]
|
||||
elif theme == "light":
|
||||
COLOR_CONFIG = loaded_config["COLOR_CONFIG_LIGHT"]
|
||||
elif theme == "green":
|
||||
COLOR_CONFIG = loaded_config["COLOR_CONFIG_GREEN"]
|
||||
|
||||
assign_config_variables(loaded_config)
|
||||
|
||||
if __name__ == "__main__":
|
||||
logging.basicConfig(
|
||||
|
||||
@@ -7,6 +7,7 @@ from input_handlers import get_bool_selection, get_repeated_input, get_user_inpu
|
||||
from ui.colors import setup_colors, get_color
|
||||
from utilities.arg_parser import setup_parser
|
||||
from utilities.interfaces import initialize_interface
|
||||
from user_config import json_editor
|
||||
import globals
|
||||
|
||||
width = 60
|
||||
@@ -186,6 +187,13 @@ def settings_menu(stdscr, interface):
|
||||
logging.info(f"Factory Reset Requested by menu")
|
||||
break
|
||||
continue
|
||||
elif selected_option == "App Settings":
|
||||
menu_win.clear()
|
||||
menu_win.refresh()
|
||||
json_editor(stdscr) # Open the App Settings menu
|
||||
continue
|
||||
# need_redraw = True
|
||||
|
||||
|
||||
field_info = current_menu.get(selected_option)
|
||||
if isinstance(field_info, tuple):
|
||||
|
||||
+6
-1
@@ -12,16 +12,21 @@ COLOR_MAP = {
|
||||
"white": curses.COLOR_WHITE
|
||||
}
|
||||
|
||||
def setup_colors():
|
||||
def setup_colors(reinit=False):
|
||||
"""
|
||||
Initialize curses color pairs based on the COLOR_CONFIG.
|
||||
"""
|
||||
curses.start_color()
|
||||
if reinit:
|
||||
conf = config.initialize_config()
|
||||
config.assign_config_variables(conf)
|
||||
|
||||
for idx, (category, (fg_name, bg_name)) in enumerate(config.COLOR_CONFIG.items(), start=1):
|
||||
fg = COLOR_MAP.get(fg_name.lower(), curses.COLOR_WHITE)
|
||||
bg = COLOR_MAP.get(bg_name.lower(), curses.COLOR_BLACK)
|
||||
curses.init_pair(idx, fg, bg)
|
||||
config.COLOR_CONFIG[category] = idx
|
||||
print()
|
||||
|
||||
|
||||
def get_color(category, bold=False, reverse=False, underline=False):
|
||||
|
||||
@@ -82,6 +82,9 @@ def generate_menu_from_protobuf(interface):
|
||||
current_module_config = interface.localNode.moduleConfig if interface else None
|
||||
menu_structure["Main Menu"]["Module Settings"] = extract_fields(module, current_module_config)
|
||||
|
||||
# Add App Settings
|
||||
menu_structure["Main Menu"]["App Settings"] = {"Open": "app_settings"}
|
||||
|
||||
# Add additional settings options
|
||||
menu_structure["Main Menu"]["Reboot"] = settings_reboot
|
||||
menu_structure["Main Menu"]["Reset Node DB"] = settings_reset_nodedb
|
||||
|
||||
+385
@@ -0,0 +1,385 @@
|
||||
import curses
|
||||
import json
|
||||
import os
|
||||
from ui.colors import get_color, setup_colors
|
||||
from default_config import format_json_single_line_arrays, loaded_config
|
||||
|
||||
width = 60
|
||||
save_option_text = "Save Changes"
|
||||
|
||||
def edit_color_pair(key, current_value):
|
||||
|
||||
"""
|
||||
Allows the user to select a foreground and background color for a key.
|
||||
"""
|
||||
colors = [" ", "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"]
|
||||
fg_color = select_color_from_list(f"Select Foreground Color for {key}", current_value[0], colors)
|
||||
bg_color = select_color_from_list(f"Select Background Color for {key}", current_value[1], colors)
|
||||
|
||||
return [fg_color, bg_color]
|
||||
|
||||
|
||||
def select_color_from_list(prompt, current_color, colors):
|
||||
"""
|
||||
Displays a scrollable list of colors for the user to choose from using a pad.
|
||||
"""
|
||||
selected_index = colors.index(current_color) if current_color in colors else 0
|
||||
|
||||
height = min(len(colors) + 5, curses.LINES - 2)
|
||||
width = 60
|
||||
start_y = (curses.LINES - height) // 2
|
||||
start_x = (curses.COLS - width) // 2
|
||||
|
||||
color_win = curses.newwin(height, width, start_y, start_x)
|
||||
color_win.bkgd(get_color("background"))
|
||||
color_win.attrset(get_color("window_frame"))
|
||||
color_win.keypad(True)
|
||||
|
||||
color_pad = curses.newpad(len(colors) + 1, width - 8)
|
||||
color_pad.bkgd(get_color("background"))
|
||||
|
||||
# Render header
|
||||
color_win.clear()
|
||||
color_win.border()
|
||||
color_win.addstr(1, 2, prompt, get_color("settings_default", bold=True))
|
||||
|
||||
# Render color options on the pad
|
||||
for idx, color in enumerate(colors):
|
||||
if idx == selected_index:
|
||||
color_pad.addstr(idx, 0, color.ljust(width - 8), get_color("settings_default", reverse=True))
|
||||
else:
|
||||
color_pad.addstr(idx, 0, color.ljust(width - 8), get_color("settings_default"))
|
||||
|
||||
# Initial refresh
|
||||
color_win.refresh()
|
||||
color_pad.refresh(0, 0,
|
||||
color_win.getbegyx()[0] + 3, color_win.getbegyx()[1] + 4,
|
||||
color_win.getbegyx()[0] + color_win.getmaxyx()[0] - 2, color_win.getbegyx()[1] + color_win.getmaxyx()[1] - 4)
|
||||
|
||||
while True:
|
||||
key = color_win.getch()
|
||||
|
||||
if key == curses.KEY_UP:
|
||||
|
||||
if selected_index > 0:
|
||||
selected_index -= 1
|
||||
|
||||
elif key == curses.KEY_DOWN:
|
||||
if selected_index < len(colors) - 1:
|
||||
selected_index += 1
|
||||
|
||||
elif key == curses.KEY_RIGHT or key == ord('\n'):
|
||||
return colors[selected_index]
|
||||
|
||||
elif key == curses.KEY_LEFT or key == 27: # ESC key
|
||||
return current_color
|
||||
|
||||
# Refresh the pad with updated selection and scroll offset
|
||||
for idx, color in enumerate(colors):
|
||||
if idx == selected_index:
|
||||
color_pad.addstr(idx, 0, color.ljust(width - 8), get_color("settings_default", reverse=True))
|
||||
else:
|
||||
color_pad.addstr(idx, 0, color.ljust(width - 8), get_color("settings_default"))
|
||||
|
||||
|
||||
color_win.refresh()
|
||||
color_pad.refresh(0, 0,
|
||||
color_win.getbegyx()[0] + 3, color_win.getbegyx()[1] + 4,
|
||||
color_win.getbegyx()[0] + color_win.getmaxyx()[0] - 2, color_win.getbegyx()[1] + color_win.getmaxyx()[1] - 4)
|
||||
|
||||
def edit_value(key, current_value):
|
||||
width = 60
|
||||
height = 10
|
||||
input_width = width - 16 # Allow space for "New Value: "
|
||||
start_y = (curses.LINES - height) // 2
|
||||
start_x = (curses.COLS - width) // 2
|
||||
|
||||
# Create a centered window
|
||||
edit_win = curses.newwin(height, width, start_y, start_x)
|
||||
edit_win.bkgd(get_color("background"))
|
||||
edit_win.attrset(get_color("window_frame"))
|
||||
edit_win.border()
|
||||
|
||||
# Display instructions
|
||||
edit_win.addstr(1, 2, f"Editing {key}", get_color("settings_default", bold=True))
|
||||
edit_win.addstr(3, 2, "Current Value:", get_color("settings_default"))
|
||||
|
||||
wrap_width = width - 4 # Account for border and padding
|
||||
wrapped_lines = [current_value[i:i+wrap_width] for i in range(0, len(current_value), wrap_width)]
|
||||
|
||||
for i, line in enumerate(wrapped_lines[:4]): # Limit display to fit the window height
|
||||
edit_win.addstr(4 + i, 2, line, get_color("settings_default"))
|
||||
|
||||
edit_win.refresh()
|
||||
|
||||
# Handle theme selection dynamically
|
||||
if key == "theme":
|
||||
# Load theme names dynamically from the JSON
|
||||
theme_options = [k.split("_", 2)[2].lower() for k in loaded_config.keys() if k.startswith("COLOR_CONFIG")]
|
||||
return select_color_from_list("Select Theme", current_value, theme_options)
|
||||
|
||||
# Standard Input Mode (Scrollable)
|
||||
edit_win.addstr(7, 2, "New Value: ", get_color("settings_default"))
|
||||
curses.curs_set(1)
|
||||
|
||||
user_input = ""
|
||||
scroll_offset = 0 # Determines which part of the text is visible
|
||||
|
||||
while True:
|
||||
visible_text = user_input[scroll_offset:scroll_offset + input_width] # Only show what fits
|
||||
edit_win.addstr(7, 13, " " * input_width, get_color("settings_default")) # Clear previous text
|
||||
edit_win.addstr(7, 13, visible_text, get_color("settings_default")) # Display text
|
||||
edit_win.refresh()
|
||||
|
||||
edit_win.move(7, 13 + min(len(user_input) - scroll_offset, input_width)) # Adjust cursor position
|
||||
key = edit_win.get_wch()
|
||||
|
||||
if key in (chr(27), curses.KEY_LEFT): # ESC or Left Arrow
|
||||
curses.curs_set(0)
|
||||
return current_value # Exit without returning a value
|
||||
elif key in (chr(curses.KEY_ENTER), chr(10), chr(13)):
|
||||
break
|
||||
elif key in (curses.KEY_BACKSPACE, chr(127)): # Backspace
|
||||
if user_input: # Only process if there's something to delete
|
||||
user_input = user_input[:-1]
|
||||
if scroll_offset > 0 and len(user_input) < scroll_offset + input_width:
|
||||
scroll_offset -= 1 # Move back if text is shorter than scrolled area
|
||||
else:
|
||||
if isinstance(key, str):
|
||||
user_input += key
|
||||
else:
|
||||
user_input += chr(key)
|
||||
|
||||
if len(user_input) > input_width: # Scroll if input exceeds visible area
|
||||
scroll_offset += 1
|
||||
|
||||
curses.curs_set(0)
|
||||
return user_input if user_input else current_value
|
||||
|
||||
|
||||
def render_menu(current_data, menu_path, selected_index):
|
||||
"""
|
||||
Render the configuration menu with a Save button directly added to the window.
|
||||
"""
|
||||
# Determine menu items based on the type of current_data
|
||||
if isinstance(current_data, dict):
|
||||
options = list(current_data.keys())
|
||||
elif isinstance(current_data, list):
|
||||
options = [f"[{i}]" for i in range(len(current_data))]
|
||||
else:
|
||||
options = [] # Fallback in case of unexpected data types
|
||||
|
||||
# Calculate dynamic dimensions for the menu
|
||||
num_items = len(options)
|
||||
height = min(curses.LINES - 2, num_items + 6) # Include space for borders and Save button
|
||||
start_y = (curses.LINES - height) // 2
|
||||
start_x = (curses.COLS - width) // 2
|
||||
|
||||
# Create the window
|
||||
menu_win = curses.newwin(height, width, start_y, start_x)
|
||||
menu_win.clear()
|
||||
menu_win.bkgd(get_color("background"))
|
||||
menu_win.attrset(get_color("window_frame"))
|
||||
menu_win.border()
|
||||
menu_win.keypad(True)
|
||||
|
||||
# Display the menu path
|
||||
header = " > ".join(menu_path)
|
||||
if len(header) > width - 4:
|
||||
header = header[:width - 7] + "..."
|
||||
menu_win.addstr(1, 2, header, get_color("settings_breadcrumbs", bold=True))
|
||||
|
||||
# Create the pad for scrolling
|
||||
menu_pad = curses.newpad(num_items + 1, width - 8)
|
||||
menu_pad.bkgd(get_color("background"))
|
||||
|
||||
# Populate the pad with menu options
|
||||
for idx, key in enumerate(options):
|
||||
value = current_data[key] if isinstance(current_data, dict) else current_data[int(key.strip("[]"))]
|
||||
display_key = f"{key}"[:width // 2 - 2]
|
||||
display_value = (
|
||||
f"{value}"[:width // 2 - 8]
|
||||
)
|
||||
|
||||
color = get_color("settings_default", reverse=(idx == selected_index))
|
||||
menu_pad.addstr(idx, 0, f"{display_key:<{width // 2 - 2}} {display_value}".ljust(width - 8), color)
|
||||
|
||||
# Add Save button to the main window
|
||||
save_button_position = height - 2
|
||||
menu_win.addstr(
|
||||
save_button_position,
|
||||
(width - len(save_option_text)) // 2,
|
||||
save_option_text,
|
||||
get_color("settings_save", reverse=(selected_index == len(options))),
|
||||
)
|
||||
|
||||
# Refresh menu and pad
|
||||
menu_win.refresh()
|
||||
menu_pad.refresh(
|
||||
0,
|
||||
0,
|
||||
menu_win.getbegyx()[0] + 3,
|
||||
menu_win.getbegyx()[1] + 4,
|
||||
|
||||
menu_win.getbegyx()[0] + menu_win.getmaxyx()[0] - 3,
|
||||
menu_win.getbegyx()[1] + menu_win.getmaxyx()[1] - 4,
|
||||
)
|
||||
|
||||
return menu_win, menu_pad, options
|
||||
|
||||
|
||||
def move_highlight(old_idx, new_idx, options, menu_win, menu_pad):
|
||||
if old_idx == new_idx:
|
||||
return # no-op
|
||||
|
||||
show_save_option = True
|
||||
|
||||
max_index = len(options) + (1 if show_save_option else 0) - 1
|
||||
|
||||
if show_save_option and old_idx == max_index: # special case un-highlight "Save" option
|
||||
menu_win.chgat(menu_win.getmaxyx()[0] - 2, (width - len(save_option_text)) // 2, len(save_option_text), get_color("settings_save"))
|
||||
else:
|
||||
menu_pad.chgat(old_idx, 0, menu_pad.getmaxyx()[1], get_color("settings_default"))
|
||||
|
||||
if show_save_option and new_idx == max_index: # special case highlight "Save" option
|
||||
menu_win.chgat(menu_win.getmaxyx()[0] - 2, (width - len(save_option_text)) // 2, len(save_option_text), get_color("settings_save", reverse = True))
|
||||
else:
|
||||
menu_pad.chgat(new_idx, 0,menu_pad.getmaxyx()[1], get_color("settings_default", reverse = True))
|
||||
|
||||
start_index = max(0, new_idx - (menu_win.getmaxyx()[0] - 6))
|
||||
|
||||
menu_win.refresh()
|
||||
menu_pad.refresh(start_index, 0,
|
||||
menu_win.getbegyx()[0] + 3,
|
||||
menu_win.getbegyx()[1] + 4,
|
||||
menu_win.getbegyx()[0] + menu_win.getmaxyx()[0] - 3,
|
||||
menu_win.getbegyx()[1] + 4 + menu_win.getmaxyx()[1] - 4)
|
||||
|
||||
|
||||
def json_editor(stdscr):
|
||||
menu_path = ["App Settings"]
|
||||
selected_index = 0 # Track the selected option
|
||||
|
||||
file_path = "config.json"
|
||||
show_save_option = True # Always show the Save button
|
||||
|
||||
# Ensure the file exists
|
||||
if not os.path.exists(file_path):
|
||||
with open(file_path, "w") as f:
|
||||
json.dump({}, f)
|
||||
|
||||
# Load JSON data
|
||||
with open(file_path, "r") as f:
|
||||
original_data = json.load(f)
|
||||
|
||||
data = original_data # Reference to the original data
|
||||
current_data = data # Track the current level of the menu
|
||||
|
||||
# Render the menu
|
||||
menu_win, menu_pad, options = render_menu(current_data, menu_path, selected_index)
|
||||
need_redraw = True
|
||||
|
||||
while True:
|
||||
if(need_redraw):
|
||||
menu_win, menu_pad, options = render_menu(current_data, menu_path, selected_index)
|
||||
menu_win.refresh()
|
||||
need_redraw = False
|
||||
|
||||
max_index = len(options) + (1 if show_save_option else 0) - 1
|
||||
key = menu_win.getch()
|
||||
|
||||
|
||||
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, 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, 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, menu_win, menu_pad)
|
||||
|
||||
elif key in (curses.KEY_RIGHT, ord("\n")):
|
||||
|
||||
need_redraw = True
|
||||
menu_win.erase()
|
||||
menu_win.refresh()
|
||||
|
||||
|
||||
if selected_index < len(options): # Handle selection of a menu item
|
||||
selected_key = options[selected_index]
|
||||
|
||||
# Handle nested data
|
||||
if isinstance(current_data, dict):
|
||||
if selected_key in current_data:
|
||||
selected_data = current_data[selected_key]
|
||||
else:
|
||||
continue # Skip invalid key
|
||||
elif isinstance(current_data, list):
|
||||
selected_data = current_data[int(selected_key.strip("[]"))]
|
||||
|
||||
if isinstance(selected_data, list) and len(selected_data) == 2:
|
||||
# Edit color pair
|
||||
new_value = edit_color_pair(
|
||||
selected_key, selected_data)
|
||||
current_data[selected_key] = new_value
|
||||
|
||||
elif isinstance(selected_data, (dict, list)):
|
||||
# Navigate into nested data
|
||||
menu_path.append(str(selected_key))
|
||||
current_data = selected_data
|
||||
selected_index = 0 # Reset the selected index
|
||||
|
||||
else:
|
||||
# General value editing
|
||||
new_value = edit_value(selected_key, selected_data)
|
||||
current_data[selected_key] = new_value
|
||||
need_redraw = True
|
||||
|
||||
else:
|
||||
# Save button selected
|
||||
save_json(file_path, data)
|
||||
stdscr.refresh()
|
||||
continue
|
||||
|
||||
elif key in (27, curses.KEY_LEFT): # Escape or Left Arrow
|
||||
|
||||
need_redraw = True
|
||||
menu_win.erase()
|
||||
menu_win.refresh()
|
||||
|
||||
# Navigate back in the menu
|
||||
if len(menu_path) > 1:
|
||||
menu_path.pop()
|
||||
current_data = data
|
||||
for path in menu_path[1:]:
|
||||
current_data = current_data[path] if isinstance(current_data, dict) else current_data[int(path.strip("[]"))]
|
||||
selected_index = 0
|
||||
else:
|
||||
# Exit the editor
|
||||
menu_win.clear()
|
||||
menu_win.refresh()
|
||||
break
|
||||
|
||||
|
||||
def save_json(file_path, data):
|
||||
formatted_json = format_json_single_line_arrays(data)
|
||||
with open(file_path, "w", encoding="utf-8") as f:
|
||||
f.write(formatted_json)
|
||||
setup_colors(reinit=True)
|
||||
|
||||
def main(stdscr):
|
||||
curses.curs_set(0)
|
||||
stdscr.keypad(True)
|
||||
setup_colors()
|
||||
json_editor(stdscr)
|
||||
|
||||
if __name__ == "__main__":
|
||||
curses.wrapper(main)
|
||||
Reference in New Issue
Block a user