gryf/tuir
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed submission refresh, changed some coloring.

Browse Source
This commit is contained in:
Michael Lazar
2015-02-11 20:29:02 -08:00
parent c2dc8df29f
commit 1b8b25fd8b
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtv/content.py
View File

@@ -269,9 +269,9 @@ class SubmissionContent(BaseContent):
elif data['type'] == 'MoreComments': elif data['type'] == 'MoreComments':
with self._loader(): with self._loader():
comments = data['object'].comments() comments = data['object'].comments()
comments = self.flatten_comments(comments, root_level=data['level']) comments = self.flatten_comments(comments, root_level=data['level'])
comment_data = [self.strip_praw_comment(c) for c in comments] comment_data = [self.strip_praw_comment(c) for c in comments]
self._comment_data[index:index+1] = comment_data self._comment_data[index:index+1] = comment_data
else: else:
raise ValueError('% type not recognized' % data['type']) raise ValueError('% type not recognized' % data['type'])

2
rtv/page.py
View File

@@ -148,7 +148,7 @@ class BasePage(object):
n_rows, n_cols = self._header_window.getmaxyx() n_rows, n_cols = self._header_window.getmaxyx()
self._header_window.erase() self._header_window.erase()
attr = curses.A_REVERSE | curses.A_BOLD | Color.RED attr = curses.A_REVERSE | curses.A_BOLD | Color.CYAN
self._header_window.addnstr(0, 0, self.content.name, n_cols-1, attr) self._header_window.addnstr(0, 0, self.content.name, n_cols-1, attr)
self._header_window.refresh() self._header_window.refresh()

3
rtv/submission.py
View File

@@ -66,7 +66,8 @@ class SubmissionPage(BasePage):
def refresh_content(self): def refresh_content(self):
self.content.reset() self.content.reset()
self.stdscr.clear() self.nav.page_index, self.nav.cursor_index = -1, 0
self.nav.inverted = False
self.draw() self.draw()
def draw_item(self, win, data, inverted=False): def draw_item(self, win, data, inverted=False):

7
rtv/subreddit.py
View File

@@ -35,7 +35,6 @@ class SubredditPage(BasePage):
# View submission # View submission
elif cmd in (curses.KEY_RIGHT, curses.KEY_ENTER, ord(' '), 10): elif cmd in (curses.KEY_RIGHT, curses.KEY_ENTER, ord(' '), 10):
self.open_submission() self.open_submission()
self.draw()
# Enter edit mode to change subreddit # Enter edit mode to change subreddit
elif cmd == ord('/'): elif cmd == ord('/'):
@@ -44,6 +43,7 @@ class SubredditPage(BasePage):
# Refresh page # Refresh page
elif cmd in (curses.KEY_F5, ord('r')): elif cmd in (curses.KEY_F5, ord('r')):
self.refresh_content() self.refresh_content()
self.draw()
elif cmd == curses.KEY_RESIZE: elif cmd == curses.KEY_RESIZE:
self.draw() self.draw()
@@ -71,16 +71,17 @@ class SubredditPage(BasePage):
self.nav.inverted = False self.nav.inverted = False
self.name = name self.name = name
#self.stdscr.clear()
self.draw() self.draw()
def prompt_subreddit(self): def prompt_subreddit(self):
attr = curses.A_BOLD | Color.MAGENTA
prompt = 'Enter Subreddit: /r/' prompt = 'Enter Subreddit: /r/'
n_rows, n_cols = self.stdscr.getmaxyx() n_rows, n_cols = self.stdscr.getmaxyx()
self.stdscr.addstr(n_rows-1, 0, prompt) self.stdscr.addstr(n_rows-1, 0, prompt, attr)
self.stdscr.refresh() self.stdscr.refresh()
window = self.stdscr.derwin(n_rows-1, len(prompt)) window = self.stdscr.derwin(n_rows-1, len(prompt))
window.attrset(attr)
out = text_input(window) out = text_input(window)
if out is None: if out is None: