Git-Mirrors/NomadNet
1
0
Fork 0
mirror of https://github.com/markqvist/NomadNet.git synced 2025-02-02 09:24:58 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added conversation sort option

Browse Source
This commit is contained in:
Mark Qvist 2021-10-08 14:46:20 +02:00
parent cd59f31eba
commit ed7b5de51c
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,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 Editor [C-w] Close [C-t] Editor Type [C-p] Purge [C-x] Clear History"), "shortcutbar") self.widget = urwid.AttrMap(urwid.Text("[C-d] Send [C-k] Clear Editor [C-w] Close [C-t] Editor Type [C-p] Purge [C-x] Clear History [C-o] Sort"), "shortcutbar")
class ConversationsArea(urwid.LineBox): class ConversationsArea(urwid.LineBox):
def keypress(self, size, key): def keypress(self, size, key):
@ -654,6 +654,7 @@ class ConversationWidget(urwid.WidgetWrap):
self.source_hash = source_hash self.source_hash = source_hash
self.conversation = nomadnet.Conversation(source_hash, nomadnet.NomadNetworkApp.get_shared_instance()) self.conversation = nomadnet.Conversation(source_hash, nomadnet.NomadNetworkApp.get_shared_instance())
self.message_widgets = [] self.message_widgets = []
self.sort_by_timestamp = False
self.updating_message_widgets = False self.updating_message_widgets = False
self.update_message_widgets() self.update_message_widgets()
@ -778,6 +779,9 @@ class ConversationWidget(urwid.WidgetWrap):
self.toggle_editor() self.toggle_editor()
elif key == "ctrl x": elif key == "ctrl x":
self.clear_history_dialog() self.clear_history_dialog()
elif key == "ctrl o":
self.sort_by_timestamp ^= True
self.conversation_changed(None)
else: else:
return super(ConversationWidget, self).keypress(size, key) return super(ConversationWidget, self).keypress(size, key)
@ -798,7 +802,10 @@ class ConversationWidget(urwid.WidgetWrap):
message_widget = LXMessageWidget(message) message_widget = LXMessageWidget(message)
self.message_widgets.append(message_widget) self.message_widgets.append(message_widget)
self.message_widgets.sort(key=lambda m: m.sort_timestamp, reverse=False) if self.sort_by_timestamp:
self.message_widgets.sort(key=lambda m: m.timestamp, reverse=False)
else:
self.message_widgets.sort(key=lambda m: m.sort_timestamp, reverse=False)
from nomadnet.vendor.additional_urwid_widgets import IndicativeListBox from nomadnet.vendor.additional_urwid_widgets import IndicativeListBox
self.messagelist = IndicativeListBox(self.message_widgets, position = len(self.message_widgets)-1) self.messagelist = IndicativeListBox(self.message_widgets, position = len(self.message_widgets)-1)