Changeset 2997 for vidalia/trunk

Timestamp:

08/19/08 00:42:55 (3 months ago)

Author:

edmanm

Message:

Make the Tor status label and Vidalia tray icon tooltip display the same
text after a circuit is established. Fixes ticket #390.

Location:

vidalia/trunk/src/vidalia

Files:

• mainwindow.cpp (modified) (2 diffs)
• mainwindow.h (modified) (1 diff)

vidalia/trunk/src/vidalia/mainwindow.cpp

@@ -676 +676 @@
       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);
   }
 
@@ -726 +725 @@
     ui.lblTorStatusImg->setVisible(true);
   }
-}
-
-/** Hides the startup status text and progress bar. */
-void
-MainWindow::hideStartupProgress()
-{
-  setStartupProgressVisible(false);
 }
 

vidalia/trunk/src/vidalia/mainwindow.h

@@ -111 +111 @@
   /** 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)