[tor-commits] [arm/release] Hiding unimplemented wizard options

[atagar at torproject.org]

commit 98c0230194d1575f42759e3515354a3a2c30ab35
Author: Damian Johnson <atagar at torproject.org>
Date:   Sun Jul 10 16:27:51 2011 -0700

    Hiding unimplemented wizard options
    
    The 'run at startup' and 'tor weather notificaitons' wizard options won't be
    implemented for this next release so hiding them in the wizard.
---
 src/cli/wizard.py |    3 ++-
 src/settings.cfg  |    4 ++++
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/cli/wizard.py b/src/cli/wizard.py
index be7ac8a..6539a82 100644
--- a/src/cli/wizard.py
+++ b/src/cli/wizard.py
@@ -85,6 +85,7 @@ CONFIG = {"wizard.message.role": "",
           "wizard.message.bridge": "",
           "wizard.message.client": "",
           "wizard.toggle": {},
+          "wizard.disabled": [],
           "wizard.suboptions": [],
           "wizard.default": {},
           "wizard.blankValue": {},
@@ -377,7 +378,7 @@ def promptConfigOptions(relayType, config):
   
   topContent = _splitStr(CONFIG.get("wizard.message.%s" % relayType.lower(), ""), 54)
   
-  options = [config[opt] for opt in RelayOptions[relayType]]
+  options = [config[opt] for opt in RelayOptions[relayType] if not opt in CONFIG["wizard.disabled"]]
   options.append(Options.DIVIDER)
   options.append(ConfigOption(BACK, "general", "(to role selection)"))
   options.append(ConfigOption(NEXT, "general", "(to confirm options)"))
diff --git a/src/settings.cfg b/src/settings.cfg
index 4551b43..2734c4a 100644
--- a/src/settings.cfg
+++ b/src/settings.cfg
@@ -362,6 +362,10 @@ wizard.toggle Plaintext => Allow, Block
 wizard.toggle Distribute => Automated, Manual
 wizard.toggle Bridged => Yes, No
 
+# the following options haven't been implemented yet
+wizard.disabled Notify
+wizard.disabled Startup
+
 wizard.suboptions Websites
 wizard.suboptions Email
 wizard.suboptions Im