[vidalia-svn] r2997: Make the Tor status label and Vidalia tray icon tooltip disp (vidalia/trunk/src/vidalia)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-08-19 00:42:55 -0400 (Tue, 19 Aug 2008)
New Revision: 2997

Modified:
   vidalia/trunk/src/vidalia/mainwindow.cpp
   vidalia/trunk/src/vidalia/mainwindow.h
Log:
Make the Tor status label and Vidalia tray icon tooltip display the same
text after a circuit is established. Fixes ticket #390.


Modified: vidalia/trunk/src/vidalia/mainwindow.cpp
===================================================================
--- vidalia/trunk/src/vidalia/mainwindow.cpp	2008-08-19 04:09:27 UTC (rev 2996)
+++ vidalia/trunk/src/vidalia/mainwindow.cpp	2008-08-19 04:42:55 UTC (rev 2997)
@@ -675,12 +675,11 @@
       ui.lblStartStopTor->setStatusTip(statusText);
       setStartupProgressVisible(true);
       setStartupProgress(STARTUP_PROGRESS_STARTING, statusText);
-      //ui.lblStartStopTor->setAnimation(QPixmap(ANIM_PROCESS_WORKING));
   } else if (status == CircuitEstablished) {
-      statusText = tr("Tor is Running");
+      statusText = tr("Connected to the Tor network!");
       trayIconFile = IMG_TOR_RUNNING;
       statusIconFile = IMG_TOR_RUNNING_48;
-      QTimer::singleShot(3000, this, SLOT(hideStartupProgress()));
+      setStartupProgressVisible(false);
   }
 
   /* Update the tray icon */
@@ -727,13 +726,6 @@
   }
 }
 
-/** Hides the startup status text and progress bar. */
-void
-MainWindow::hideStartupProgress()
-{
-  setStartupProgressVisible(false);
-}
-
 /** Sets the progress bar completion value to <b>progressValue</b> and sets
  * the status text to <b>description</b>. */
 void

Modified: vidalia/trunk/src/vidalia/mainwindow.h
===================================================================
--- vidalia/trunk/src/vidalia/mainwindow.h	2008-08-19 04:09:27 UTC (rev 2996)
+++ vidalia/trunk/src/vidalia/mainwindow.h	2008-08-19 04:42:55 UTC (rev 2997)
@@ -110,8 +110,6 @@
   void onIMFailed(QString errmsg);
   /** Called when the proxy server fails to start */
   void onProxyFailed(QString errmsg);
-  /** Hides the startup status text and progress bar. */
-  void hideStartupProgress();
 
 #if defined(USE_MINIUPNPC)
   /** Called when a UPnP error occurs. */