Curses: nicer status bar

pull/39/head
Ivan Habunek 2018-01-04 13:13:29 +01:00
rodzic 0ef5a9e41e
commit 19888ea2f3
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: CDBD63C43A30BB95
1 zmienionych plików z 36 dodań i 0 usunięć

Wyświetl plik

@ -20,6 +20,8 @@ class Color:
curses.init_pair(1, curses.COLOR_BLUE, curses.COLOR_BLACK) curses.init_pair(1, curses.COLOR_BLUE, curses.COLOR_BLACK)
curses.init_pair(2, curses.COLOR_GREEN, curses.COLOR_BLACK) curses.init_pair(2, curses.COLOR_GREEN, curses.COLOR_BLACK)
curses.init_pair(3, curses.COLOR_YELLOW, curses.COLOR_BLACK) curses.init_pair(3, curses.COLOR_YELLOW, curses.COLOR_BLACK)
curses.init_pair(4, curses.COLOR_RED, curses.COLOR_BLACK)
curses.init_pair(5, curses.COLOR_WHITE, curses.COLOR_BLUE)
@staticmethod @staticmethod
def blue(): def blue():
@ -33,6 +35,14 @@ class Color:
def yellow(): def yellow():
return curses.color_pair(3) return curses.color_pair(3)
@staticmethod
def red():
return curses.color_pair(4)
@staticmethod
def white_on_blue():
return curses.color_pair(5)
class TimelineApp: class TimelineApp:
def __init__(self, status_generator): def __init__(self, status_generator):
@ -95,7 +105,10 @@ class TimelineApp:
def select_previous(self): def select_previous(self):
"""Move to the previous status in the timeline.""" """Move to the previous status in the timeline."""
self.clear_bottom_message()
if self.selected == 0: if self.selected == 0:
self.draw_bottom_message("Cannot move beyond first toot.", Color.green())
return return
old_index = self.selected old_index = self.selected
@ -106,7 +119,10 @@ class TimelineApp:
def select_next(self): def select_next(self):
"""Move to the next status in the timeline.""" """Move to the next status in the timeline."""
self.clear_bottom_message()
if self.selected + 1 >= len(self.statuses): if self.selected + 1 >= len(self.statuses):
self.draw_bottom_message("Cannot move beyond last toot.", Color.green())
return return
old_index = self.selected old_index = self.selected
@ -123,6 +139,7 @@ class TimelineApp:
self.draw_status_row(self.left, old_status, 3 * old_index - 1, False) self.draw_status_row(self.left, old_status, 3 * old_index - 1, False)
self.draw_status_row(self.left, new_status, 3 * new_index - 1, True) self.draw_status_row(self.left, new_status, 3 * new_index - 1, True)
self.draw_status_details(self.right, new_status) self.draw_status_details(self.right, new_status)
self.draw_bottom_status(self.bottom, new_index, len(self.statuses))
def fetch_next(self): def fetch_next(self):
try: try:
@ -151,6 +168,7 @@ class TimelineApp:
self.draw_statuses(self.left) self.draw_statuses(self.left)
self.draw_status_details(self.right, self.get_selected_status()) self.draw_status_details(self.right, self.get_selected_status())
self.draw_usage(self.bottom) self.draw_usage(self.bottom)
self.draw_bottom_status(self.bottom, self.selected, len(self.statuses))
screen_height, screen_width = self.stdscr.getmaxyx() screen_height, screen_width = self.stdscr.getmaxyx()
self.left.refresh(0, 0, 2, 0, screen_height - 3, self.left_width) self.left.refresh(0, 0, 2, 0, screen_height - 3, self.left_width)
@ -245,6 +263,24 @@ class TimelineApp:
window.refresh() window.refresh()
def clear_bottom_message(self):
_, width = self.bottom.getmaxyx()
self.bottom.addstr(1, 0, " " * (width - 1))
self.bottom.refresh()
def draw_bottom_message(self, text, color=0):
_, width = self.bottom.getmaxyx()
text = trunc(text, width - 1)
self.bottom.addstr(1, 0, text, color)
self.bottom.refresh()
def draw_bottom_status(self, window, index, count):
_, width = self.bottom.getmaxyx()
text = "Showing toot {} of {}".format(index + 1, count)
text = trunc(text, width - 1).ljust(width - 1)
window.addstr(0, 0, text, Color.white_on_blue() | curses.A_BOLD)
window.refresh()
def parse_status(status): def parse_status(status):
_status = status.get('reblog') or status _status = status.get('reblog') or status