[vidalia-svn] r3152: Add a helpRequested() signal to the control password prompt, (vidalia/trunk/src/vidalia)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-09-25 01:02:19 -0400 (Thu, 25 Sep 2008)
New Revision: 3152

Modified:
   vidalia/trunk/src/vidalia/controlpasswordinputdialog.cpp
   vidalia/trunk/src/vidalia/controlpasswordinputdialog.h
   vidalia/trunk/src/vidalia/mainwindow.cpp
Log:
Add a helpRequested() signal to the control password prompt, and display the
troubleshooting topic on control passwords when the "Help" button is clicked.


Modified: vidalia/trunk/src/vidalia/controlpasswordinputdialog.cpp
===================================================================
--- vidalia/trunk/src/vidalia/controlpasswordinputdialog.cpp	2008-09-25 04:58:06 UTC (rev 3151)
+++ vidalia/trunk/src/vidalia/controlpasswordinputdialog.cpp	2008-09-25 05:02:19 UTC (rev 3152)
@@ -86,7 +86,7 @@
       break;
 
     case QDialogButtonBox::Help:
-      /* TODO: Display some help relevant to control passwords. */
+      emit helpRequested("troubleshooting.password");
       break;
 
     default:

Modified: vidalia/trunk/src/vidalia/controlpasswordinputdialog.h
===================================================================
--- vidalia/trunk/src/vidalia/controlpasswordinputdialog.h	2008-09-25 04:58:06 UTC (rev 3151)
+++ vidalia/trunk/src/vidalia/controlpasswordinputdialog.h	2008-09-25 05:02:19 UTC (rev 3152)
@@ -48,6 +48,11 @@
    */
   void setResetEnabled(bool enabled);
 
+signals:
+  /** Emitted when the user clicks on the "Help" dialog button.
+   */
+  void helpRequested(const QString &topic);
+
 protected slots:
   /** Called when one of the QDialogButtonBox's buttons is clicked. The dialog
    * is closed if <b>button</b> is the "Ok", "Cancel", or "Reset" button, and

Modified: vidalia/trunk/src/vidalia/mainwindow.cpp
===================================================================
--- vidalia/trunk/src/vidalia/mainwindow.cpp	2008-09-25 04:58:06 UTC (rev 3151)
+++ vidalia/trunk/src/vidalia/mainwindow.cpp	2008-09-25 05:02:19 UTC (rev 3152)
@@ -1157,6 +1157,9 @@
   /* Parsing log messages is evil, but we're left with little option */
   if (errmsg.contains("Password did not match")) {
     ControlPasswordInputDialog dlg;
+    connect(&dlg, SIGNAL(helpRequested(QString)),
+            this, SLOT(showHelpDialog(QString)));
+
     qint64 torPid = 0;
 
 #if defined(Q_OS_WIN32)