[vidalia-svn] r2083: Tweak the label over the bridge relay address thingy per arm (in trunk: . src/gui/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-10-24 03:51:26 -0400 (Wed, 24 Oct 2007)
New Revision: 2083

Modified:
   trunk/
   trunk/src/gui/config/serverpage.cpp
   trunk/src/gui/config/serverpage.ui
Log:
 r2224@lysithea:  edmanm | 2007-10-24 03:51:20 -0400
 Tweak the label over the bridge relay address thingy per arma's suggestion and
 also tweak the words we display when their bridge is not running.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r2224] on dc66be73-d13e-47ba-a267-8dc7cda68c65

Modified: trunk/src/gui/config/serverpage.cpp
===================================================================
--- trunk/src/gui/config/serverpage.cpp	2007-10-24 06:45:13 UTC (rev 2082)
+++ trunk/src/gui/config/serverpage.cpp	2007-10-24 07:51:26 UTC (rev 2083)
@@ -190,7 +190,9 @@
     bridge = bridge.trimmed();
   }
 
-  ui.lblBridgeIdentity->setText(bridge.isEmpty() ? tr("Not Running") : bridge);
+  ui.lblBridgeIdentity->setText(bridge.isEmpty()
+                                  ? tr("Your bridge relay is not running.")
+                                  : bridge);
   ui.btnCopyBridgeIdentity->setEnabled(!bridge.isEmpty());
 }
 

Modified: trunk/src/gui/config/serverpage.ui
===================================================================
--- trunk/src/gui/config/serverpage.ui	2007-10-24 06:45:13 UTC (rev 2082)
+++ trunk/src/gui/config/serverpage.ui	2007-10-24 07:51:26 UTC (rev 2083)
@@ -971,8 +971,11 @@
       <enum>QFrame::NoFrame</enum>
      </property>
      <property name="text" >
-      <string>Your bridge relay is:</string>
+      <string>Let others access your bridge by giving them this line:</string>
      </property>
+     <property name="wordWrap" >
+      <bool>true</bool>
+     </property>
      <property name="textInteractionFlags" >
       <enum>Qt::TextSelectableByMouse</enum>
      </property>
@@ -1001,7 +1004,7 @@
         <enum>QFrame::Sunken</enum>
        </property>
        <property name="text" >
-        <string>Not Running</string>
+        <string/>
        </property>
        <property name="textInteractionFlags" >
         <enum>Qt::TextSelectableByMouse</enum>