[tor-commits] [vidalia/alpha] Revert the disable checkboxes idea for usability issues

[chiiph at torproject.org]

commit c9048aba85c20600242deb934716a366efc76013
Author: Tomas Touceda <chiiph at gentoo.org>
Date:   Tue May 3 16:52:43 2011 -0300

    Revert the disable checkboxes idea for usability issues
    
    The tab is disabled for both bridge and non-exit to be more clear about the fact
    that exit policies don't apply.
---
 src/vidalia/config/ServerPage.cpp |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/vidalia/config/ServerPage.cpp b/src/vidalia/config/ServerPage.cpp
index aeb9125..d04f1dc 100644
--- a/src/vidalia/config/ServerPage.cpp
+++ b/src/vidalia/config/ServerPage.cpp
@@ -238,12 +238,9 @@ ServerPage::serverModeChanged(bool enabled)
   ui.lineDirPort->setEnabled(!bridgeEnabled);
   ui.chkMirrorDirectory->setEnabled(!bridgeEnabled);
 
-  ui.chkWebsites->setEnabled(!bridgeEnabled and !ui.rdoNonExitMode->isChecked());
-  ui.chkSecWebsites->setEnabled(!bridgeEnabled and !ui.rdoNonExitMode->isChecked());
-  ui.chkMail->setEnabled(!bridgeEnabled and !ui.rdoNonExitMode->isChecked());
-  ui.chkIRC->setEnabled(!bridgeEnabled and !ui.rdoNonExitMode->isChecked());
-  ui.chkIM->setEnabled(!bridgeEnabled and !ui.rdoNonExitMode->isChecked());
-  ui.chkMisc->setEnabled(!bridgeEnabled and !ui.rdoNonExitMode->isChecked());
+  /* Disable the Exit Policies tab when bridge or non-exit relay mode is 
+   * selected */
+  ui.tabsMenu->setTabEnabled(2, !bridgeEnabled and !ui.rdoNonExitMode->isChecked());
 }
 
 /** Returns true if the user has changed their server settings since the