[or-cvs] r23818: {arm} Displaying SETCONF errors until a key is pressed. (arm/trunk/src/interface)
Damian Johnson
atagar1 at gmail.com
Wed Nov 17 17:05:31 UTC 2010
Author: atagar
Date: 2010-11-17 17:05:30 +0000 (Wed, 17 Nov 2010)
New Revision: 23818
Modified:
arm/trunk/src/interface/controller.py
Log:
Displaying SETCONF errors until a key is pressed.
Modified: arm/trunk/src/interface/controller.py
===================================================================
--- arm/trunk/src/interface/controller.py 2010-11-17 07:09:55 UTC (rev 23817)
+++ arm/trunk/src/interface/controller.py 2010-11-17 17:05:30 UTC (rev 23818)
@@ -1604,9 +1604,14 @@
# common validation error prefix
excStr = excStr[31:]
- panels["control"].setMsg("Invalid value: %s" % excStr, curses.A_STANDOUT)
+ errorMsg = "%s (press any key)" % excStr
+ maxMsgLength = panels["control"].getPreferredSize()[1]
+ panels["control"].setMsg(uiTools.cropStr(errorMsg, maxMsgLength), curses.A_STANDOUT)
panels["control"].redraw(True)
- time.sleep(2)
+
+ curses.cbreak() # wait indefinitely for key presses (no timeout)
+ stdscr.getch()
+ curses.halfdelay(REFRESH_RATE * 10)
panels["control"].setMsg(CTL_PAUSED if isPaused else CTL_HELP)
setPauseState(panels, isPaused, page)
More information about the tor-commits
mailing list