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

Implemented minimal/full editor

Browse Source
This commit is contained in:
Mark Qvist 2021-05-14 15:13:17 +02:00
parent 51c9d98e4c
commit d9fe743b90
2 changed files with 44 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nomadnet/Conversation.py
View File

@ -137,7 +137,7 @@ class Conversation:
if self.send_destination: if self.send_destination:
dest = self.send_destination dest = self.send_destination
source = self.app.lxmf_destination source = self.app.lxmf_destination
lxm = LXMF.LXMessage(dest, source, content, desired_method=LXMF.LXMessage.DIRECT) lxm = LXMF.LXMessage(dest, source, content, title=title, desired_method=LXMF.LXMessage.DIRECT)
lxm.register_delivery_callback(self.message_notification) lxm.register_delivery_callback(self.message_notification)
lxm.register_failed_callback(self.message_notification) lxm.register_failed_callback(self.message_notification)
self.app.message_router.handle_outbound(lxm) self.app.message_router.handle_outbound(lxm)

50
nomadnet/ui/textui/Conversations.py
View File

@ -18,7 +18,7 @@ class ConversationDisplayShortcuts():
def __init__(self, app): def __init__(self, app):
self.app = app self.app = app
self.widget = urwid.AttrMap(urwid.Text("[C-d] Send [C-k] Clear [C-t] Add Title [C-w] Close Conversation [C-p] Purge Failed"), "shortcutbar") self.widget = urwid.AttrMap(urwid.Text("[C-d] Send [C-k] Clear [C-t] Toggle Editor [C-w] Close Conversation [C-p] Purge Failed"), "shortcutbar")
class ConversationsArea(urwid.LineBox): class ConversationsArea(urwid.LineBox):
def keypress(self, size, key): def keypress(self, size, key):
@ -407,19 +407,43 @@ class ConversationWidget(urwid.WidgetWrap):
self.conversation.register_changed_callback(self.conversation_changed) self.conversation.register_changed_callback(self.conversation_changed)
msg_editor = MessageEdit(caption="\u270E", edit_text="", multiline=True) #title_editor = MessageEdit(caption="\u270E", edit_text="", multiline=False)
title_editor = MessageEdit(caption="", edit_text="", multiline=False)
title_editor.delegate = self
#msg_editor = MessageEdit(caption="\u270E", edit_text="", multiline=True)
msg_editor = MessageEdit(caption="", edit_text="", multiline=True)
msg_editor.delegate = self msg_editor.delegate = self
header = None header = None
if self.conversation.trust_level == DirectoryEntry.UNTRUSTED: if self.conversation.trust_level == DirectoryEntry.UNTRUSTED:
header = urwid.AttrMap(urwid.Padding(urwid.Text("\u26A0 Warning: Conversation with untrusted peer \u26A0", align="center")), "msg_warning_untrusted") header = urwid.AttrMap(urwid.Padding(urwid.Text("\u26A0 Warning: Conversation with untrusted peer \u26A0", align="center")), "msg_warning_untrusted")
self.editor = msg_editor self.minimal_editor = urwid.AttrMap(msg_editor, "msg_editor")
title_columns = urwid.Columns([
(8, urwid.Text("Title")),
urwid.AttrMap(title_editor, "msg_editor"),
])
content_columns = urwid.Columns([
(8, urwid.Text("Content")),
urwid.AttrMap(msg_editor, "msg_editor")
])
self.full_editor = urwid.Pile([
title_columns,
content_columns
])
self.content_editor = msg_editor
self.title_editor = title_editor
self.full_editor_active = False
self.frame = urwid.Frame( self.frame = urwid.Frame(
self.messagelist, self.messagelist,
header=header, header=header,
footer=urwid.AttrMap(msg_editor, "msg_editor") footer=self.minimal_editor
) )
self.display_widget = urwid.LineBox( self.display_widget = urwid.LineBox(
@ -428,12 +452,22 @@ class ConversationWidget(urwid.WidgetWrap):
urwid.WidgetWrap.__init__(self, self.display_widget) urwid.WidgetWrap.__init__(self, self.display_widget)
def toggle_editor(self):
if self.full_editor_active:
self.frame.contents["footer"] = (self.minimal_editor, None)
self.full_editor_active = False
else:
self.frame.contents["footer"] = (self.full_editor, None)
self.full_editor_active = True
def keypress(self, size, key): def keypress(self, size, key):
if key == "ctrl w": if key == "ctrl w":
self.close() self.close()
elif key == "ctrl p": elif key == "ctrl p":
self.conversation.purge_failed() self.conversation.purge_failed()
self.conversation_changed(None) self.conversation_changed(None)
elif key == "ctrl t":
self.toggle_editor()
else: else:
return super(ConversationWidget, self).keypress(size, key) return super(ConversationWidget, self).keypress(size, key)
@ -467,12 +501,14 @@ class ConversationWidget(urwid.WidgetWrap):
def clear_editor(self): def clear_editor(self):
self.editor.set_edit_text("") self.content_editor.set_edit_text("")
self.title_editor.set_edit_text("")
def send_message(self): def send_message(self):
content = self.editor.get_edit_text() content = self.content_editor.get_edit_text()
title = self.title_editor.get_edit_text()
if not content == "": if not content == "":
self.conversation.send(content) self.conversation.send(content, title)
self.clear_editor() self.clear_editor()
def close(self): def close(self):