[tor-commits] [arm/master] fix: Help dialog inaccurate for config/torrc pages

[atagar at torproject.org]

commit 3461c620e5fd16aea0fc40b9041cddc038718a8c
Author: Damian Johnson <atagar at torproject.org>
Date:   Wed May 4 09:46:46 2011 -0700

    fix: Help dialog inaccurate for config/torrc pages
    
    Somehow while shuffling the pages the config page's help options were dropped
    and the torrc's was assigned to another page. Reassigned pages and filled in
    missing options.
---
 src/cli/controller.py |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/cli/controller.py b/src/cli/controller.py
index 08d7b17..91c34df 100644
--- a/src/cli/controller.py
+++ b/src/cli/controller.py
@@ -969,6 +969,15 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode):
           popup.addfstr(1, 41, "<b>down arrow</b>: scroll down a line")
           popup.addfstr(2, 2, "<b>page up</b>: scroll up a page")
           popup.addfstr(2, 41, "<b>page down</b>: scroll down a page")
+          popup.addfstr(3, 2, "<b>enter</b>: edit configuration option")
+          popup.addfstr(3, 41, "<b>w</b>: save configuration")
+          popup.addfstr(4, 2, "<b>a</b>: toggle option filtering")
+          popup.addfstr(4, 41, "<b>s</b>: sort ordering")
+        elif page == 3:
+          popup.addfstr(1, 2, "<b>up arrow</b>: scroll up a line")
+          popup.addfstr(1, 41, "<b>down arrow</b>: scroll down a line")
+          popup.addfstr(2, 2, "<b>page up</b>: scroll up a page")
+          popup.addfstr(2, 41, "<b>page down</b>: scroll down a page")
           
           strippingLabel = "on" if panels["torrc"].stripComments else "off"
           popup.addfstr(3, 2, "<b>s</b>: comment stripping (<b>%s</b>)" % strippingLabel)
@@ -978,12 +987,6 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode):
           
           popup.addfstr(4, 2, "<b>r</b>: reload torrc")
           popup.addfstr(4, 41, "<b>x</b>: reset tor (issue sighup)")
-        elif page == 3:
-          popup.addfstr(1, 2, "<b>up arrow</b>: scroll up a line")
-          popup.addfstr(1, 41, "<b>down arrow</b>: scroll down a line")
-          popup.addfstr(2, 2, "<b>page up</b>: scroll up a page")
-          popup.addfstr(2, 41, "<b>page down</b>: scroll down a page")
-          popup.addfstr(3, 2, "<b>enter</b>: connection details")
         
         popup.addstr(7, 2, "Press any key...")
         popup.refresh()