[vidalia-svn] r1711: When a user stops their Tor server, tell them they can click (in trunk: . src/gui)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-04-13 19:17:48 -0400 (Fri, 13 Apr 2007)
New Revision: 1711

Modified:
   trunk/
   trunk/src/gui/mainwindow.cpp
   trunk/src/gui/mainwindow.ui
Log:
 r1798@adrastea:  edmanm | 2007-04-13 19:11:35 -0400
 When a user stops their Tor server, tell them they can click 
 "Stop Tor" again to make Tor go away now.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /vidalia/local/trunk [r1798] on 54b3572a-7227-0410-958f-53ecd705b71a

Modified: trunk/src/gui/mainwindow.cpp
===================================================================
--- trunk/src/gui/mainwindow.cpp	2007-04-13 17:49:49 UTC (rev 1710)
+++ trunk/src/gui/mainwindow.cpp	2007-04-13 23:17:48 UTC (rev 1711)
@@ -371,11 +371,16 @@
       ui.lblStartStopTor->setPixmap(QPixmap(IMG_START_TOR_48));
       ui.lblStartStopTor->setStatusTip(actionText);
   } else if (status == Stopping) {
-      statusText = tr("Tor is shutting down");
+      if (_delayedShutdownStarted) {
+        statusText = tr("Your Tor server is shutting down.\r\n" 
+                        "Click 'Stop Tor' again to force Tor to stop now.");
+      } else {
+        statusText = tr("Tor is shutting down");
+      }
       trayIconFile = IMG_TOR_STOPPING;
       statusIconFile = IMG_TOR_STOPPING_48;
       ui.lblNewIdentity->setEnabled(false);
-      ui.lblStartStopTor->setStatusTip(statusText);
+      ui.lblStartStopTor->setStatusTip(tr("Stop Tor Now"));
   } else if (status == Running) {
       statusText = tr("Tor is running");
       actionText = tr("Stop Tor");

Modified: trunk/src/gui/mainwindow.ui
===================================================================
--- trunk/src/gui/mainwindow.ui	2007-04-13 17:49:49 UTC (rev 1710)
+++ trunk/src/gui/mainwindow.ui	2007-04-13 23:17:48 UTC (rev 1711)
@@ -347,6 +347,14 @@
           <property name="orientation" >
            <enum>Qt::Horizontal</enum>
           </property>
+          <property name="sizePolicy" >
+           <sizepolicy>
+            <hsizetype>4</hsizetype>
+            <vsizetype>4</vsizetype>
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="sizeHint" >
            <size>
             <width>20</width>
@@ -364,11 +372,25 @@
         </item>
         <item>
          <widget class="QLabel" name="lblTorStatus" >
+          <property name="sizePolicy" >
+           <sizepolicy>
+            <hsizetype>3</hsizetype>
+            <vsizetype>3</vsizetype>
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="maximumSize" >
+           <size>
+            <width>300</width>
+            <height>40</height>
+           </size>
+          </property>
           <property name="text" >
            <string>Tor is not running</string>
           </property>
           <property name="wordWrap" >
-           <bool>true</bool>
+           <bool>false</bool>
           </property>
          </widget>
         </item>
@@ -377,6 +399,14 @@
           <property name="orientation" >
            <enum>Qt::Horizontal</enum>
           </property>
+          <property name="sizePolicy" >
+           <sizepolicy>
+            <hsizetype>4</hsizetype>
+            <vsizetype>4</vsizetype>
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="sizeHint" >
            <size>
             <width>20</width>