From 09ed21b75c7bf0291b163b8a72c5da62272b2f12 Mon Sep 17 00:00:00 2001 From: ysakamoto Date: Fri, 6 Mar 2015 14:51:05 -0600 Subject: [PATCH] display_help function added --- rtv/submission.py | 4 ++-- rtv/subreddit.py | 4 ++-- rtv/utils.py | 10 ++++++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/rtv/submission.py b/rtv/submission.py index 2956973..c23e637 100644 --- a/rtv/submission.py +++ b/rtv/submission.py @@ -6,7 +6,7 @@ import six from .content import SubmissionContent from .page import BasePage -from .utils import LoadScreen, Color, ESCAPE, display_message, help_msg +from .utils import LoadScreen, Color, ESCAPE, display_help class SubmissionPage(BasePage): @@ -55,7 +55,7 @@ class SubmissionPage(BasePage): break elif cmd == ord('?'): - display_message(self.stdscr, help_msg) + display_help(self.stdscr) self.draw() elif cmd == ord('q'): diff --git a/rtv/subreddit.py b/rtv/subreddit.py index 0613a58..31bd0d2 100644 --- a/rtv/subreddit.py +++ b/rtv/subreddit.py @@ -7,7 +7,7 @@ from .errors import SubredditNameError from .page import BasePage from .submission import SubmissionPage from .content import SubredditContent -from .utils import LoadScreen, text_input, display_message, Color, ESCAPE, help_msg +from .utils import LoadScreen, text_input, display_message, Color, ESCAPE, display_help class SubredditPage(BasePage): @@ -53,7 +53,7 @@ class SubredditPage(BasePage): self.draw() elif cmd == ord('?'): - display_message(self.stdscr, help_msg) + display_help(self.stdscr) self.draw() elif cmd == ord('q'): diff --git a/rtv/utils.py b/rtv/utils.py index 1e1c11d..0eac40e 100644 --- a/rtv/utils.py +++ b/rtv/utils.py @@ -34,8 +34,6 @@ Submission Mode Left : Exit the submission page and return to the subreddit. """ -help_msg = help_msg.split("\n") - class Color(object): @@ -161,6 +159,14 @@ def display_message(stdscr, message): stdscr.refresh() +def display_help(stdscr): + """Display a help message box at the center of the screen and wait for a + keypress""" + + help_msgs = help_msg.split("\n") + display_message(stdscr, help_msgs) + + class LoadScreen(object): def __init__(self, stdscr):