Git-Mirrors/NomadNet
1
0
Fork 0
mirror of https://github.com/markqvist/NomadNet.git synced 2024-10-01 01:26:07 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Check browser destination before displaying save dialog. Fixes #35.

Browse Source
This commit is contained in:
Mark Qvist 2024-02-29 18:42:47 +01:00
parent e695cce3ba
commit 6026f42f34
1 changed files with 43 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
nomadnet/ui/textui/Browser.py
View File

@ -664,52 +664,56 @@ class Browser:
self.delegate.columns.focus_position = 1 self.delegate.columns.focus_position = 1
def save_node_dialog(self): def save_node_dialog(self):
def dismiss_dialog(sender): if self.destination_hash != None:
self.close_dialogs() try:
def dismiss_dialog(sender):
self.close_dialogs()
display_name = RNS.Identity.recall_app_data(self.destination_hash) display_name = RNS.Identity.recall_app_data(self.destination_hash)
disp_str = "" disp_str = ""
if display_name != None: if display_name != None:
display_name = display_name.decode("utf-8") display_name = display_name.decode("utf-8")
disp_str = " \""+display_name+"\"" disp_str = " \""+display_name+"\""
def confirmed(sender): def confirmed(sender):
node_entry = DirectoryEntry(self.destination_hash, display_name=display_name, hosts_node=True) node_entry = DirectoryEntry(self.destination_hash, display_name=display_name, hosts_node=True)
self.app.directory.remember(node_entry) self.app.directory.remember(node_entry)
self.app.ui.main_display.sub_displays.network_display.directory_change_callback() self.app.ui.main_display.sub_displays.network_display.directory_change_callback()
self.close_dialogs() self.close_dialogs()
dialog = UrlDialogLineBox( dialog = UrlDialogLineBox(
urwid.Pile([ urwid.Pile([
urwid.Text("Save connected node"+disp_str+" "+RNS.prettyhexrep(self.destination_hash)+" to Known Nodes?\n"), urwid.Text("Save connected node"+disp_str+" "+RNS.prettyhexrep(self.destination_hash)+" to Known Nodes?\n"),
urwid.Columns([ urwid.Columns([
(urwid.WEIGHT, 0.45, urwid.Button("Cancel", on_press=dismiss_dialog)), (urwid.WEIGHT, 0.45, urwid.Button("Cancel", on_press=dismiss_dialog)),
(urwid.WEIGHT, 0.1, urwid.Text("")), (urwid.WEIGHT, 0.1, urwid.Text("")),
(urwid.WEIGHT, 0.45, urwid.Button("Save", on_press=confirmed)), (urwid.WEIGHT, 0.45, urwid.Button("Save", on_press=confirmed)),
]) ])
]), title="Save Node" ]), title="Save Node"
) )
dialog.confirmed = confirmed dialog.confirmed = confirmed
dialog.delegate = self dialog.delegate = self
bottom = self.display_widget bottom = self.display_widget
overlay = urwid.Overlay( overlay = urwid.Overlay(
dialog, dialog,
bottom, bottom,
align=urwid.CENTER, align=urwid.CENTER,
width=(urwid.RELATIVE, 50), width=(urwid.RELATIVE, 50),
valign=urwid.MIDDLE, valign=urwid.MIDDLE,
height=urwid.PACK, height=urwid.PACK,
left=2, left=2,
right=2, right=2,
) )
options = self.delegate.columns.options(urwid.WEIGHT, self.delegate.right_area_width) options = self.delegate.columns.options(urwid.WEIGHT, self.delegate.right_area_width)
self.delegate.columns.contents[1] = (overlay, options) self.delegate.columns.contents[1] = (overlay, options)
self.delegate.columns.focus_position = 1 self.delegate.columns.focus_position = 1
except Exception as e:
pass
def load_page(self): def load_page(self):
if self.request_data == None: if self.request_data == None: