Changeset 90 for trunk/src/gui/mainwindow.cpp

Timestamp:

01/15/06 17:36:23 (3 years ago)

Author:

edmanm

Message:

Check in a bulk of the asynchronous event handling code. Some work remains.

Files:

• trunk/src/gui/mainwindow.cpp (modified) (4 diffs)

trunk/src/gui/mainwindow.cpp

@@ -149 +149 @@
   if (!_torControl->start(&errmsg)) {
     QMessageBox::warning(this, tr("Error Starting Tor"),
-       tr("Vidalia was unable to start Tor.\r\n\r\nError: ") + errmsg,
+       tr("Vidalia was unable to start Tor.\n\nError: ") + errmsg,
        QMessageBox::Ok, QMessageBox::NoButton);
   }
@@ -192 +192 @@
            "\n\nError: ") + errmsg,
         QMessageBox::Ok, QMessageBox::NoButton);
+    } else {
+      if (!_torControl->addEvent(TorEvents::Bandwidth, &errmsg)) {
+      QMessageBox::warning(this, tr("Authentication Error"),
+        tr("Vidalia was unable to authenticate itself to Tor."
+           "Check your authentication information and try again."
+           "\n\nError: ") + errmsg,
+        QMessageBox::Ok, QMessageBox::NoButton);
+      }
     }
   }
@@ -238 +246 @@
     if (!_isIntentionalExit) {
       QMessageBox::warning(this, tr("Tor Crashed"),
-        tr("Vidalia detected that the Tor process crashed.\n"
+        tr("Vidalia detected that the Tor process crashed.\n\n"
             "Please check the message log."),
          QMessageBox::Ok, QMessageBox::NoButton);
@@ -247 +255 @@
      * if this turns out to not be the case. */
     QMessageBox::warning(this, tr("Tor Exited"),
-       tr("Tor exited and returned a non-zero exit code.\n"
+       tr("Tor exited and returned a non-zero exit code.\n\n"
           "Please check the message log."),
        QMessageBox::Ok, QMessageBox::NoButton);