[tor-commits] [arm/master] Dropping unused config switcher function

atagar at torproject.org atagar at torproject.org
Mon May 9 16:59:19 UTC 2011


commit 18905474729b648a45b5052e7a7751d6c5ea9723
Author: Damian Johnson <atagar at torproject.org>
Date:   Sat May 7 22:45:27 2011 -0700

    Dropping unused config switcher function
    
    Once upon a time the config panel showed both tor and arm configuration
    options. However, arm doesn't yet have a counterpart for SETCONF so I dropped
    the arm config from the interface.
    
    I'll probably re-introduce this at some point, but for now this is just dead
    code and the back-end needs some more work before it's useful to users. Since
    the showMenu function is being refactored this dead code would, as is, be
    broken so dropping it.
---
 src/cli/controller.py |   23 -----------------------
 1 files changed, 0 insertions(+), 23 deletions(-)

diff --git a/src/cli/controller.py b/src/cli/controller.py
index 09e3575..a195c15 100644
--- a/src/cli/controller.py
+++ b/src/cli/controller.py
@@ -1190,29 +1190,6 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode):
       if selection != -1 and options[selection] != panels["conn"]._listingType:
         panels["conn"].setListingType(options[selection])
         panels["conn"].redraw(True)
-    elif page == 2 and (key == ord('c') or key == ord('C')) and False:
-      # TODO: disabled for now (probably gonna be going with separate pages
-      # rather than popup menu)
-      # provides menu to pick config being displayed
-      #options = [confPanel.CONFIG_LABELS[confType] for confType in range(4)]
-      options = []
-      initialSelection = panels["torrc"].configType
-      
-      # hides top label of the graph panel and pauses panels
-      panels["torrc"].showLabel = False
-      panels["torrc"].redraw(True)
-      setPauseState(panels, isPaused, page, True)
-      
-      selection = showMenu(stdscr, panels["popup"], "Configuration:", options, initialSelection)
-      
-      # reverts changes made for popup
-      panels["torrc"].showLabel = True
-      setPauseState(panels, isPaused, page)
-      
-      # applies new setting
-      if selection != -1: panels["torrc"].setConfigType(selection)
-      
-      selectiveRefresh(panels, page)
     elif page == 2 and (key == ord('w') or key == ord('W')):
       # display a popup for saving the current configuration
       panel.CURSES_LOCK.acquire()





More information about the tor-commits mailing list