aniani/toot
1
0
Fork 0
mirror of https://github.com/ihabunek/toot.git synced 2024-12-04 14:46:33 -05:00
Code

Housekeeping

Browse Source
This commit is contained in:
Ivan Habunek 2019-08-29 10:43:56 +02:00
parent ab1fc6961b
commit 9c74c1d9e6
No known key found for this signature in database
GPG Key ID: CDBD63C43A30BB95
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
toot/tui/compose.py
View File

@ -48,7 +48,6 @@ class StatusComposer(urwid.Frame):
self.cancel_button = Button("Cancel", on_press=self.close) self.cancel_button = Button("Cancel", on_press=self.close)
contents = list(self.generate_list_items()) contents = list(self.generate_list_items())
logger.info(contents)
self.walker = urwid.SimpleListWalker(contents) self.walker = urwid.SimpleListWalker(contents)
self.listbox = urwid.ListBox(self.walker) self.listbox = urwid.ListBox(self.walker)
return super().__init__(self.listbox) return super().__init__(self.listbox)

18
toot/tui/timeline.py
View File

@ -47,7 +47,6 @@ class Timeline(urwid.Columns):
def build_list_item(self, status): def build_list_item(self, status):
item = StatusListItem(status) item = StatusListItem(status)
urwid.connect_signal(item, "click", self.status_activated)
return urwid.AttrMap(item, None, focus_map={ return urwid.AttrMap(item, None, focus_map={
"blue": "green_selected", "blue": "green_selected",
"green": "green_selected", "green": "green_selected",
@ -58,13 +57,12 @@ class Timeline(urwid.Columns):
def get_focused_status(self): def get_focused_status(self):
return self.statuses[self.status_list.body.focus] return self.statuses[self.status_list.body.focus]
def status_activated(self, *args):
"""Called when a status is clicked, or Enter is pressed."""
status = self.get_focused_status()
self._emit("status_activated", [status])
def get_focused_status_with_counts(self): def get_focused_status_with_counts(self):
"""Returns status, status index in list and number of statuses""" """Returns a tuple of:
* focused status
* focused status' index in the status list
* length of the status list
"""
return ( return (
self.get_focused_status(), self.get_focused_status(),
self.status_list.body.focus, self.status_list.body.focus,
@ -84,12 +82,13 @@ class Timeline(urwid.Columns):
def draw_status_details(self, status): def draw_status_details(self, status):
self.status_details = StatusDetails(status, self.is_thread) self.status_details = StatusDetails(status, self.is_thread)
self.contents[2] = self.status_details, ("weight", 50, False) self.contents[2] = self.status_details, ("weight", 60, False)
def keypress(self, size, key): def keypress(self, size, key):
command = self._command_map[key]
# If down is pressed on last status in list emit a signal to load more. # If down is pressed on last status in list emit a signal to load more.
# TODO: Consider pre-loading statuses earlier # TODO: Consider pre-loading statuses earlier
command = self._command_map[key]
if command in [urwid.CURSOR_DOWN, urwid.CURSOR_PAGE_DOWN]: if command in [urwid.CURSOR_DOWN, urwid.CURSOR_PAGE_DOWN]:
index = self.status_list.body.focus + 1 index = self.status_list.body.focus + 1
count = len(self.statuses) count = len(self.statuses)
@ -123,6 +122,7 @@ class Timeline(urwid.Columns):
status = self.get_focused_status() status = self.get_focused_status()
if status.data["url"]: if status.data["url"]:
webbrowser.open(status.data["url"]) webbrowser.open(status.data["url"])
return
if key in ("u", "U"): if key in ("u", "U"):
status = self.get_focused_status() status = self.get_focused_status()