bump version to 1.4.23

contact/ui/contact_ui.py

@@ -22,7 +22,6 @@ from contact.utilities.singleton import ui_state, interface_state, menu_state
 MIN_COL = 1  # "effectively zero" without breaking curses
 RESIZE_DEBOUNCE_MS = 250
 root_win = None
-nodes_pad = None
 
 
 # Draw arrows for a specific window id (0=channel,1=messages,2=nodes).
@@ -65,72 +64,6 @@ def paint_frame(win, selected: bool) -> None:
     win.refresh()
 
 
-def get_channel_row_color(index: int) -> int:
-    if index == ui_state.selected_channel:
-        if ui_state.current_window == 0:
-            return get_color("channel_list", reverse=True)
-        return get_color("channel_selected")
-    return get_color("channel_list")
-
-
-def get_node_row_color(index: int, highlight: bool = False) -> int:
-    node_num = ui_state.node_list[index]
-    node = interface_state.interface.nodesByNum.get(node_num, {})
-    color = "node_list"
-    if node.get("isFavorite"):
-        color = "node_favorite"
-    if node.get("isIgnored"):
-        color = "node_ignored"
-    reverse = index == ui_state.selected_node and (ui_state.current_window == 2 or highlight)
-    return get_color(color, reverse=reverse)
-
-
-def refresh_node_selection(old_index: int = -1, highlight: bool = False) -> None:
-    if nodes_pad is None or not ui_state.node_list:
-        return
-
-    width = max(0, nodes_pad.getmaxyx()[1] - 4)
-
-    if 0 <= old_index < len(ui_state.node_list):
-        try:
-            nodes_pad.chgat(old_index, 1, width, get_node_row_color(old_index, highlight=highlight))
-        except curses.error:
-            pass
-
-    if 0 <= ui_state.selected_node < len(ui_state.node_list):
-        try:
-            nodes_pad.chgat(ui_state.selected_node, 1, width, get_node_row_color(ui_state.selected_node, highlight=highlight))
-        except curses.error:
-            pass
-
-    ui_state.start_index[2] = max(0, ui_state.selected_node - (nodes_win.getmaxyx()[0] - 3))
-    refresh_pad(2)
-    draw_window_arrows(2)
-
-
-def refresh_main_window(window_id: int, selected: bool) -> None:
-    if window_id == 0:
-        paint_frame(channel_win, selected=selected)
-        if ui_state.channel_list:
-            width = max(0, channel_pad.getmaxyx()[1] - 4)
-            channel_pad.chgat(ui_state.selected_channel, 1, width, get_channel_row_color(ui_state.selected_channel))
-        refresh_pad(0)
-    elif window_id == 1:
-        paint_frame(messages_win, selected=selected)
-        refresh_pad(1)
-    elif window_id == 2:
-        paint_frame(nodes_win, selected=selected)
-        if ui_state.node_list and nodes_pad is not None:
-            width = max(0, nodes_pad.getmaxyx()[1] - 4)
-            nodes_pad.chgat(ui_state.selected_node, 1, width, get_node_row_color(ui_state.selected_node))
-        refresh_pad(2)
-
-
-def get_node_display_name(node_num: int, node: dict) -> str:
-    user = node.get("user") or {}
-    return user.get("longName") or get_name_from_database(node_num, "long")
-
-
 def handle_resize(stdscr: curses.window, firstrun: bool) -> None:
     """Handle terminal resize events and redraw the UI accordingly."""
     global messages_pad, messages_win, nodes_pad, nodes_win, channel_pad, channel_win, packetlog_win, entry_win
@@ -427,16 +360,31 @@ def handle_leftright(char: int) -> None:
     delta = -1 if char == curses.KEY_LEFT else 1
     old_window = ui_state.current_window
     ui_state.current_window = (ui_state.current_window + delta) % 3
-    if ui_state.single_pane_mode:
-        handle_resize(root_win, False)
-        return
+    handle_resize(root_win, False)
 
-    refresh_main_window(old_window, selected=False)
+    if old_window == 0:
+        paint_frame(channel_win, selected=False)
+        refresh_pad(0)
+    if old_window == 1:
+        paint_frame(messages_win, selected=False)
+        refresh_pad(1)
+    elif old_window == 2:
+        paint_frame(nodes_win, selected=False)
+        refresh_pad(2)
 
     if not ui_state.single_pane_mode:
         draw_window_arrows(old_window)
 
-    refresh_main_window(ui_state.current_window, selected=True)
+    if ui_state.current_window == 0:
+        paint_frame(channel_win, selected=True)
+        refresh_pad(0)
+    elif ui_state.current_window == 1:
+        paint_frame(messages_win, selected=True)
+        refresh_pad(1)
+    elif ui_state.current_window == 2:
+        paint_frame(nodes_win, selected=True)
+        refresh_pad(2)
+
     draw_window_arrows(ui_state.current_window)
 
 
@@ -457,16 +405,31 @@ def handle_function_keys(char: int) -> None:
         return
 
     ui_state.current_window = target
-    if ui_state.single_pane_mode:
-        handle_resize(root_win, False)
-        return
+    handle_resize(root_win, False)
 
-    refresh_main_window(old_window, selected=False)
+    if old_window == 0:
+        paint_frame(channel_win, selected=False)
+        refresh_pad(0)
+    elif old_window == 1:
+        paint_frame(messages_win, selected=False)
+        refresh_pad(1)
+    elif old_window == 2:
+        paint_frame(nodes_win, selected=False)
+        refresh_pad(2)
 
     if not ui_state.single_pane_mode:
         draw_window_arrows(old_window)
 
-    refresh_main_window(ui_state.current_window, selected=True)
+    if ui_state.current_window == 0:
+        paint_frame(channel_win, selected=True)
+        refresh_pad(0)
+    elif ui_state.current_window == 1:
+        paint_frame(messages_win, selected=True)
+        refresh_pad(1)
+    elif ui_state.current_window == 2:
+        paint_frame(nodes_win, selected=True)
+        refresh_pad(2)
+
     draw_window_arrows(ui_state.current_window)
 
 
@@ -518,34 +481,34 @@ def handle_enter(input_text: str) -> str:
 
 
 def handle_f5_key(stdscr: curses.window) -> None:
-    if not ui_state.node_list:
-        return
-
-    def build_node_details() -> tuple[str, list[str]]:
+    node = None
+    try:
         node = interface_state.interface.nodesByNum[ui_state.node_list[ui_state.selected_node]]
+
         message_parts = []
 
         message_parts.append("**📋 Basic Information:**")
         message_parts.append(f"• Device: {node.get('user', {}).get('longName', 'Unknown')}")
         message_parts.append(f"• Short name: {node.get('user', {}).get('shortName', 'Unknown')}")
         message_parts.append(f"• Hardware: {node.get('user', {}).get('hwModel', 'Unknown')}")
-        message_parts.append(f"• Role: {node.get('user', {}).get('role', 'Unknown')}")
-        message_parts.append(f"Public key: {node.get('user', {}).get('publicKey')}")
-        message_parts.append(f"• Node ID: {node.get('num', 'Unknown')}")
 
+        role = f"{node.get('user', {}).get('role', 'Unknown')}"
+        message_parts.append(f"• Role: {role}")
+
+        pk = f"{node.get('user', {}).get('publicKey')}"
+        message_parts.append(f"Public key: {pk}")
+
+        message_parts.append(f"• Node ID: {node.get('num', 'Unknown')}")
         if "position" in node:
             pos = node["position"]
-            has_coords = pos.get("latitude") and pos.get("longitude")
-            if has_coords:
+            if pos.get("latitude") and pos.get("longitude"):
                 message_parts.append(f"• Position: {pos['latitude']:.4f}, {pos['longitude']:.4f}")
             if pos.get("altitude"):
                 message_parts.append(f"• Altitude: {pos['altitude']}m")
-            if has_coords:
-                message_parts.append(f"https://maps.google.com/?q={pos['latitude']:.4f},{pos['longitude']:.4f}")
+            message_parts.append(f"https://maps.google.com/?q={pos['latitude']:.4f},{pos['longitude']:.4f}")
 
         if any(key in node for key in ["snr", "hopsAway", "lastHeard"]):
-            message_parts.append("")
-            message_parts.append("**🌐 Network Metrics:**")
+            message_parts.append("\n**🌐 Network Metrics:**")
 
             if "snr" in node:
                 snr = node["snr"]
@@ -565,13 +528,12 @@ def handle_f5_key(stdscr: curses.window) -> None:
                 hop_emoji = "📡" if hops == 0 else "🔄" if hops == 1 else "⏩"
                 message_parts.append(f"• Hops away: {hop_emoji} {hops}")
 
-            if node.get("lastHeard"):
+            if "lastHeard" in node and node["lastHeard"]:
                 message_parts.append(f"• Last heard: 🕐 {get_time_ago(node['lastHeard'])}")
 
         if node.get("deviceMetrics"):
             metrics = node["deviceMetrics"]
-            message_parts.append("")
-            message_parts.append("**📊 Device Metrics:**")
+            message_parts.append("\n**📊 Device Metrics:**")
 
             if "batteryLevel" in metrics:
                 battery = metrics["batteryLevel"]
@@ -592,128 +554,21 @@ def handle_f5_key(stdscr: curses.window) -> None:
                 air_emoji = "🔴" if air_util > 80 else "🟡" if air_util > 50 else "🟢"
                 message_parts.append(f"• Air utilization TX: {air_emoji} {air_util:.2f}%")
 
-        title = t(
-            "ui.dialog.node_details_title",
-            default="📡 Node Details: {name}",
-            name=node.get("user", {}).get("shortName", "Unknown"),
+        message = "\n".join(message_parts)
+
+        contact.ui.dialog.dialog(
+            t(
+                "ui.dialog.node_details_title",
+                default="📡 Node Details: {name}",
+                name=node.get("user", {}).get("shortName", "Unknown"),
+            ),
+            message,
         )
-        return title, message_parts
-
-    previous_window = ui_state.current_window
-    ui_state.current_window = 4
-    scroll_offset = 0
-    dialog_win = None
-
-    curses.curs_set(0)
-    refresh_node_selection(highlight=True)
-
-    try:
-        while True:
-            curses.update_lines_cols()
-            height, width = curses.LINES, curses.COLS
-            title, message_lines = build_node_details()
-
-            max_line_length = max(len(title), *(len(line) for line in message_lines))
-            dialog_width = min(max(max_line_length + 4, 20), max(10, width - 2))
-            dialog_height = min(max(len(message_lines) + 4, 6), max(6, height - 2))
-            x = max(0, (width - dialog_width) // 2)
-            y = max(0, (height - dialog_height) // 2)
-            viewport_h = max(1, dialog_height - 4)
-            max_scroll = max(0, len(message_lines) - viewport_h)
-            scroll_offset = max(0, min(scroll_offset, max_scroll))
-
-            if dialog_win is None:
-                dialog_win = curses.newwin(dialog_height, dialog_width, y, x)
-            else:
-                dialog_win.erase()
-                dialog_win.refresh()
-                dialog_win.resize(dialog_height, dialog_width)
-                dialog_win.mvwin(y, x)
-
-            dialog_win.keypad(True)
-            dialog_win.bkgd(get_color("background"))
-            dialog_win.attrset(get_color("window_frame"))
-            dialog_win.border(0)
-
-            try:
-                dialog_win.addstr(0, 2, title[: max(0, dialog_width - 4)], get_color("settings_default"))
-                hint = f" {ui_state.selected_node + 1}/{len(ui_state.node_list)} "
-                dialog_win.addstr(0, max(2, dialog_width - len(hint) - 2), hint, get_color("commands"))
-            except curses.error:
-                pass
-
-            msg_win = dialog_win.derwin(viewport_h + 2, dialog_width - 2, 1, 1)
-            msg_win.erase()
-
-            for row, line in enumerate(message_lines[scroll_offset : scroll_offset + viewport_h], start=1):
-                trimmed = line[: max(0, dialog_width - 6)]
-                try:
-                    msg_win.addstr(row, 1, trimmed, get_color("settings_default"))
-                except curses.error:
-                    pass
-
-            if len(message_lines) > viewport_h:
-                old_index = ui_state.start_index[4] if len(ui_state.start_index) > 4 else 0
-                while len(ui_state.start_index) <= 4:
-                    ui_state.start_index.append(0)
-                ui_state.start_index[4] = scroll_offset
-                draw_main_arrows(msg_win, len(message_lines) - 1, window=4)
-                ui_state.start_index[4] = old_index
-
-            try:
-                ok_text = " Up/Down: Nodes  PgUp/PgDn: Scroll  Esc: Close "
-                dialog_win.addstr(
-                    dialog_height - 2,
-                    max(1, (dialog_width - len(ok_text)) // 2),
-                    ok_text[: max(0, dialog_width - 2)],
-                    get_color("settings_default", reverse=True),
-                )
-            except curses.error:
-                pass
-
-            dialog_win.refresh()
-            msg_win.noutrefresh()
-            curses.doupdate()
-
-            dialog_win.timeout(200)
-            char = dialog_win.getch()
-
-            if menu_state.need_redraw:
-                menu_state.need_redraw = False
-                continue
-
-            if char in (27, curses.KEY_LEFT, curses.KEY_ENTER, 10, 13, 32):
-                break
-            if char == curses.KEY_UP:
-                old_selected_node = ui_state.selected_node
-                ui_state.selected_node = (ui_state.selected_node - 1) % len(ui_state.node_list)
-                scroll_offset = 0
-                refresh_node_selection(old_selected_node, highlight=True)
-            elif char == curses.KEY_DOWN:
-                old_selected_node = ui_state.selected_node
-                ui_state.selected_node = (ui_state.selected_node + 1) % len(ui_state.node_list)
-                scroll_offset = 0
-                refresh_node_selection(old_selected_node, highlight=True)
-            elif char == curses.KEY_PPAGE:
-                scroll_offset = max(0, scroll_offset - viewport_h)
-            elif char == curses.KEY_NPAGE:
-                scroll_offset = min(max_scroll, scroll_offset + viewport_h)
-            elif char == curses.KEY_HOME:
-                scroll_offset = 0
-            elif char == curses.KEY_END:
-                scroll_offset = max_scroll
-            elif char == curses.KEY_RESIZE:
-                continue
+        curses.curs_set(1)  # Show cursor again
+        handle_resize(stdscr, False)
 
     except KeyError:
         return
-    finally:
-        if dialog_win is not None:
-            dialog_win.erase()
-            dialog_win.refresh()
-        ui_state.current_window = previous_window
-        curses.curs_set(1)
-        handle_resize(stdscr, False)
 
 
 def handle_ctrl_t(stdscr: curses.window) -> None:
@@ -770,7 +625,6 @@ def handle_backtick(stdscr: curses.window) -> None:
     ui_state.current_window = 4
     settings_menu(stdscr, interface_state.interface)
     ui_state.current_window = previous_window
-    ui_state.single_pane_mode = config.single_pane_mode.lower() == "true"
     curses.curs_set(1)
     refresh_node_list()
     handle_resize(stdscr, False)
@@ -1054,8 +908,10 @@ def draw_node_list() -> None:
     if ui_state.current_window != 2 and ui_state.single_pane_mode:
         return
 
-    if nodes_pad is None:
-        nodes_pad = curses.newpad(1, 1)
+    # This didn't work, for some reason an error is thown on startup, so we just create the pad every time
+    # if nodes_pad is None:
+    # nodes_pad = curses.newpad(1, 1)
+    nodes_pad = curses.newpad(1, 1)
 
     try:
         nodes_pad.erase()
@@ -1069,12 +925,28 @@ def draw_node_list() -> None:
         node = interface_state.interface.nodesByNum[node_num]
         secure = "user" in node and "publicKey" in node["user"] and node["user"]["publicKey"]
         status_icon = "🔐" if secure else "🔓"
-        node_name = get_node_display_name(node_num, node)
+        node_name = get_name_from_database(node_num, "long")
+        user_name = node["user"]["shortName"]
+
+        uptime_str = ""
+        if "deviceMetrics" in node and "uptimeSeconds" in node["deviceMetrics"]:
+            uptime_str = f" / Up: {get_readable_duration(node['deviceMetrics']['uptimeSeconds'])}"
+
+        last_heard_str = f"  ■  {get_time_ago(node['lastHeard'])}" if node.get("lastHeard") else ""
+        hops_str = f"  ■  Hops: {node['hopsAway']}" if "hopsAway" in node else ""
+        snr_str = f"  ■  SNR: {node['snr']}dB" if node.get("hopsAway") == 0 and "snr" in node else ""
 
         # Future node name custom formatting possible
         node_str = f"{status_icon} {node_name}"
         node_str = node_str.ljust(box_width - 4)[: box_width - 2]
-        nodes_pad.addstr(i, 1, node_str, get_node_row_color(i))
+        color = "node_list"
+        if "isFavorite" in node and node["isFavorite"]:
+            color = "node_favorite"
+        if "isIgnored" in node and node["isIgnored"]:
+            color = "node_ignored"
+        nodes_pad.addstr(
+            i, 1, node_str, get_color(color, reverse=ui_state.selected_node == i and ui_state.current_window == 2)
+        )
 
     paint_frame(nodes_win, selected=(ui_state.current_window == 2))
     nodes_win.refresh()

contact/ui/user_config.py

@@ -566,7 +566,7 @@ def save_json(file_path: str, data: Dict[str, Any]) -> None:
     formatted_json = config.format_json_single_line_arrays(data)
     with open(file_path, "w", encoding="utf-8") as f:
         f.write(formatted_json)
-    config.reload_config()
+    setup_colors(reinit=True)
     reload_translations(data.get("language"))
 
 

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "contact"
-version = "1.4.22"
+version = "1.4.23"
 description = "This Python curses client for Meshtastic is a terminal-based client designed to manage device settings, enable mesh chat communication, and handle configuration backups and restores."
 authors = [
     {name = "Ben Lipsey",email = "ben@pdxlocations.com"}