diff --git a/contact/__main__.py b/contact/__main__.py index c075de2..3e71db9 100644 --- a/contact/__main__.py +++ b/contact/__main__.py @@ -21,7 +21,7 @@ import threading from contact.utilities.db_handler import init_nodedb, load_messages_from_db from contact.message_handlers.rx_handler import on_receive from contact.settings import set_region -from contact.ui.curses_ui import main_ui +from contact.ui.contact_ui import main_ui from contact.ui.colors import setup_colors from contact.ui.splash import draw_splash import contact.ui.default_config as config diff --git a/contact/message_handlers/rx_handler.py b/contact/message_handlers/rx_handler.py index 74cc5f9..dd8c746 100644 --- a/contact/message_handlers/rx_handler.py +++ b/contact/message_handlers/rx_handler.py @@ -2,7 +2,7 @@ import logging import time from contact.utilities.utils import refresh_node_list from datetime import datetime -from contact.ui.curses_ui import draw_packetlog_win, draw_node_list, draw_messages_window, draw_channel_list, add_notification +from contact.ui.contact_ui import draw_packetlog_win, draw_node_list, draw_messages_window, draw_channel_list, add_notification from contact.utilities.db_handler import save_message_to_db, maybe_store_nodeinfo_in_db, get_name_from_database, update_node_info_in_db import contact.ui.default_config as config import contact.globals as globals diff --git a/contact/message_handlers/tx_handler.py b/contact/message_handlers/tx_handler.py index 45cfc13..50b83f1 100644 --- a/contact/message_handlers/tx_handler.py +++ b/contact/message_handlers/tx_handler.py @@ -12,7 +12,7 @@ ack_naks = {} # Note "onAckNak" has special meaning to the API, thus the nonstandard naming convention # See https://github.com/meshtastic/python/blob/master/meshtastic/mesh_interface.py#L462 def onAckNak(packet): - from contact.ui.curses_ui import draw_messages_window + from contact.ui.contact_ui import draw_messages_window request = packet['decoded']['requestId'] if(request not in ack_naks): return @@ -43,7 +43,7 @@ def onAckNak(packet): def on_response_traceroute(packet): """on response for trace route""" - from contact.ui.curses_ui import draw_channel_list, draw_messages_window, add_notification + from contact.ui.contact_ui import draw_channel_list, draw_messages_window, add_notification refresh_channels = False refresh_messages = False diff --git a/contact/ui/curses_ui.py b/contact/ui/contact_ui.py similarity index 100% rename from contact/ui/curses_ui.py rename to contact/ui/contact_ui.py diff --git a/contact/ui/control_ui.py b/contact/ui/control_ui.py index 57c5cb9..268cec6 100644 --- a/contact/ui/control_ui.py +++ b/contact/ui/control_ui.py @@ -99,7 +99,7 @@ def display_menu(state): state.start_index[-1], 0, menu_win.getbegyx()[0] + 3, menu_win.getbegyx()[1] + 4, menu_win.getbegyx()[0] + 3 + menu_win.getmaxyx()[0] - 5 - (2 if state.show_save_option else 0), - menu_win.getbegyx()[1] + menu_win.getmaxyx()[1] - 8 + menu_win.getbegyx()[1] + menu_win.getmaxyx()[1] - 4 ) max_index = num_items + (1 if state.show_save_option else 0) - 1