Git-Mirrors/NomadNet
1
0
Fork 0
mirror of https://github.com/markqvist/NomadNet.git synced 2024-12-27 16:19:33 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved dialog navigation

Browse Source
This commit is contained in:
Mark Qvist 2022-07-04 14:34:34 +02:00
parent 27dc1b5fb5
commit f75b4d0b57
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nomadnet/ui/TextUI.py
View File

@ -210,7 +210,8 @@ class TextUI:
self.screen.reset_default_terminal_palette() self.screen.reset_default_terminal_palette()
def unhandled_input(self, key): def unhandled_input(self, key):
pass if key == "ctrl q":
raise urwid.ExitMainLoop
def display_main(self, loop, user_data): def display_main(self, loop, user_data):
self.loop.widget = self.main_display.widget self.loop.widget = self.main_display.widget

32
nomadnet/ui/textui/Network.py
View File

@ -51,6 +51,13 @@ class ListEntry(urwid.Text):
class AnnounceInfo(urwid.WidgetWrap): class AnnounceInfo(urwid.WidgetWrap):
def keypress(self, size, key):
if key == "esc":
options = self.parent.left_pile.options(height_type="weight", height_amount=1)
self.parent.left_pile.contents[0] = (self.parent.announce_stream_display, options)
else:
return super(AnnounceInfo, self).keypress(size, key)
def __init__(self, announce, parent, app): def __init__(self, announce, parent, app):
self.app = nomadnet.NomadNetworkApp.get_shared_instance() self.app = nomadnet.NomadNetworkApp.get_shared_instance()
self.parent = self.app.ui.main_display.sub_displays.network_display self.parent = self.app.ui.main_display.sub_displays.network_display
@ -387,6 +394,13 @@ class ListDialogLineBox(urwid.LineBox):
return super(ListDialogLineBox, self).keypress(size, key) return super(ListDialogLineBox, self).keypress(size, key)
class KnownNodeInfo(urwid.WidgetWrap): class KnownNodeInfo(urwid.WidgetWrap):
def keypress(self, size, key):
if key == "esc":
options = self.parent.left_pile.options(height_type="weight", height_amount=1)
self.parent.left_pile.contents[0] = (self.parent.known_nodes_display, options)
else:
return super(KnownNodeInfo, self).keypress(size, key)
def __init__(self, node_hash): def __init__(self, node_hash):
self.app = nomadnet.NomadNetworkApp.get_shared_instance() self.app = nomadnet.NomadNetworkApp.get_shared_instance()
self.parent = self.app.ui.main_display.sub_displays.network_display self.parent = self.app.ui.main_display.sub_displays.network_display
@ -567,6 +581,10 @@ class KnownNodeInfo(urwid.WidgetWrap):
pile_widgets.insert(4, operator_entry) pile_widgets.insert(4, operator_entry)
pile = urwid.Pile(pile_widgets) pile = urwid.Pile(pile_widgets)
pile.focus_position = len(pile.contents)-1
button_columns.focus_position = 0
self.display_widget = urwid.Filler(pile, valign="top", height="pack") self.display_widget = urwid.Filler(pile, valign="top", height="pack")
@ -1257,6 +1275,8 @@ class NetworkLeftPile(urwid.Pile):
def keypress(self, size, key): def keypress(self, size, key):
if key == "ctrl l": if key == "ctrl l":
self.parent.toggle_list() self.parent.toggle_list()
elif key == "ctrl e":
self.parent.selected_node_info()
elif key == "ctrl p": elif key == "ctrl p":
self.parent.reinit_lxmf_peers() self.parent.reinit_lxmf_peers()
self.parent.show_peers() self.parent.show_peers()
@ -1332,6 +1352,18 @@ class NetworkDisplay():
else: else:
self.list_display = 1 self.list_display = 1
def selected_node_info(self):
if self.list_display == 1:
parent = self.app.ui.main_display.sub_displays.network_display
selected_node_entry = parent.known_nodes_display.ilb.get_selected_item()
if selected_node_entry != None:
selected_node_hash = selected_node_entry._get_base_widget().display_widget.source_hash
if selected_node_hash != None:
info_widget = KnownNodeInfo(selected_node_hash)
options = parent.left_pile.options(height_type="weight", height_amount=1)
parent.left_pile.contents[0] = (info_widget, options)
def focus_lists(self): def focus_lists(self):
self.columns.focus_position = 0 self.columns.focus_position = 0