[vidalia-svn] r2087: When the user clicks the Help button in the Settings dialog, (in trunk: . src/gui/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-10-24 20:32:31 -0400 (Wed, 24 Oct 2007)
New Revision: 2087

Modified:
   trunk/
   trunk/CHANGELOG
   trunk/src/gui/config/configdialog.cpp
   trunk/src/gui/config/configdialog.h
Log:
 r2232@lysithea:  edmanm | 2007-10-24 20:32:26 -0400
 When the user clicks the Help button in the Settings dialog, take them
 directly to the help topic for whichever settings page they are currently
 viewing.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r2232] on dc66be73-d13e-47ba-a267-8dc7cda68c65

Modified: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	2007-10-25 00:15:02 UTC (rev 2086)
+++ trunk/CHANGELOG	2007-10-25 00:32:31 UTC (rev 2087)
@@ -65,6 +65,9 @@
   o Add some information to the help browser about the new network settings
     and bridge relay configuration, as well as the new authentication
     settings in 0.0.14.
+  o When the user clicks the Help button in the Settings dialog, take them 
+    directly to the help topic for whichever settings page they are currently
+    viewing.
   o Disable enable-edit-actions, enable-remote-toggle, and
     enable-remote-http-toggle in the bundled Privoxy configuration. Suggested
     by Greg Fleischer.

Modified: trunk/src/gui/config/configdialog.cpp
===================================================================
--- trunk/src/gui/config/configdialog.cpp	2007-10-25 00:15:02 UTC (rev 2086)
+++ trunk/src/gui/config/configdialog.cpp	2007-10-25 00:32:31 UTC (rev 2087)
@@ -230,10 +230,29 @@
   }
 }
 
-/** Shows help information about the configuration dialog. */
+/** Shows help information for whichever settings page the user is currently
+ * viewing. */
 void
 ConfigDialog::help()
 {
-  Vidalia::help("config");
+  Page currentPage = static_cast<Page>(ui.stackPages->currentIndex());
+
+  switch (currentPage) {
+    case Network:
+      Vidalia::help("config.network");
+      break;
+    case Server:
+      Vidalia::help("server");
+      break;
+    case Appearance:
+      Vidalia::help("config.appearance");
+      break;
+    case Advanced:
+      Vidalia::help("config.advanced");
+      break;
+    default:
+      Vidalia::help("config.general");
+      break;
+  }
 }
 

Modified: trunk/src/gui/config/configdialog.h
===================================================================
--- trunk/src/gui/config/configdialog.h	2007-10-25 00:15:02 UTC (rev 2086)
+++ trunk/src/gui/config/configdialog.h	2007-10-25 00:32:31 UTC (rev 2087)
@@ -74,8 +74,8 @@
    * SAVECONF is successful, then all settings are considered to be
    * applied. */
   void saveConf();
-  
-  /** Called when user clicks "Help" */
+  /** Shows help information for whichever settings page the user is currently
+   * viewing. */
   void help();
 
 private: