From e7d285bd13d8fd87c9f3fc7fe0299d83742d11e9 Mon Sep 17 00:00:00 2001 From: Michael Lazar Date: Sun, 8 Mar 2015 21:35:07 -0700 Subject: [PATCH] Aliged key definitions between submission and subreddit. --- rtv/submission.py | 20 +++++++++++--------- rtv/subreddit.py | 14 ++++++++------ 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/rtv/submission.py b/rtv/submission.py index c23e637..ac51281 100644 --- a/rtv/submission.py +++ b/rtv/submission.py @@ -26,6 +26,7 @@ class SubmissionPage(BasePage): def loop(self): self.draw() + while True: cmd = self.stdscr.getch() @@ -37,30 +38,31 @@ class SubmissionPage(BasePage): self.move_cursor_down() self.clear_input_queue() - elif cmd in (curses.KEY_F5, ord('r')): - self.refresh_content() - self.draw() - elif cmd in (curses.KEY_RIGHT, curses.KEY_ENTER, ord('l')): self.toggle_comment() self.draw() elif cmd == ord('o'): self.open_link() - - elif cmd == curses.KEY_RESIZE: self.draw() - elif cmd in (ESCAPE, curses.KEY_LEFT, ord('h')): - break + elif cmd in (curses.KEY_F5, ord('r')): + self.refresh_content() + self.draw() elif cmd == ord('?'): display_help(self.stdscr) self.draw() - + elif cmd == ord('q'): sys.exit() + elif cmd == curses.KEY_RESIZE: + self.draw() + + elif cmd in (ESCAPE, curses.KEY_LEFT, ord('h')): + break + else: curses.beep() diff --git a/rtv/subreddit.py b/rtv/subreddit.py index e81e5c0..a859546 100644 --- a/rtv/subreddit.py +++ b/rtv/subreddit.py @@ -23,6 +23,7 @@ class SubredditPage(BasePage): def loop(self): self.draw() + while True: cmd = self.stdscr.getch() @@ -40,18 +41,12 @@ class SubredditPage(BasePage): elif cmd == ord('o'): self.open_link() - - elif cmd == ord('/'): - self.prompt_subreddit() self.draw() elif cmd in (curses.KEY_F5, ord('r')): self.refresh_content() self.draw() - elif cmd == curses.KEY_RESIZE: - self.draw() - elif cmd == ord('?'): display_help(self.stdscr) self.draw() @@ -59,6 +54,13 @@ class SubredditPage(BasePage): elif cmd == ord('q'): sys.exit() + elif cmd == curses.KEY_RESIZE: + self.draw() + + elif cmd == ord('/'): + self.prompt_subreddit() + self.draw() + else: curses.beep()