[vidalia-svn] r2707: Hide the startup progress if starting Tor fails. Jump to 100 (in vidalia: . trunk/src/vidalia)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-06-13 01:46:51 -0400 (Fri, 13 Jun 2008)
New Revision: 2707

Modified:
   vidalia/
   vidalia/trunk/src/vidalia/mainwindow.cpp
Log:
 r537@thebe:  edmanm | 2008-06-13 01:47:30 -0400
 Hide the startup progress if starting Tor fails. Jump to 100% if we connect to
 an existing Tor and it already has a circuit established.



Property changes on: vidalia
___________________________________________________________________
 svk:merge ticket from /local/vidalia [r537] on 45a62a8a-8088-484c-baad-c7b3e776dd32

Modified: vidalia/trunk/src/vidalia/mainwindow.cpp
===================================================================
--- vidalia/trunk/src/vidalia/mainwindow.cpp	2008-06-13 05:39:27 UTC (rev 2706)
+++ vidalia/trunk/src/vidalia/mainwindow.cpp	2008-06-13 05:46:51 UTC (rev 2707)
@@ -594,6 +594,7 @@
       QObject::disconnect(ui.lblStartStopTor, SIGNAL(clicked()), this, 0);
       connect(_startStopAct, SIGNAL(triggered()), this, SLOT(start()));
       connect(ui.lblStartStopTor, SIGNAL(clicked()), this, SLOT(start()));
+      setStartupProgressVisible(false);
   } else if (status == Stopping) {
       if (_delayedShutdownStarted) {
         statusText = tr("Your relay is shutting down.\n" 
@@ -1174,6 +1175,8 @@
 MainWindow::circuitEstablished()
 {
   updateTorStatus(CircuitEstablished);
+  setStartupProgress(ui.progressBar->maximum(),
+                     tr("Connected to the Tor network!"));
   startSubprocesses();
 }