Changeset 2227

Timestamp:

12/17/07 19:20:52 (8 months ago)

Author:

edmanm

Message:

r2323@lysithea: edmanm | 2007-12-17 19:20:44 -0500
Add arma's bridge link label thingy and help text.

Location:

trunk/src/vidalia

Files:

• config/networkpage.cpp (modified) (2 diffs)
• config/networkpage.h (modified) (1 diff)
• config/networkpage.ui (modified) (1 diff)
• help/content/content.qrc (modified) (1 diff)
• help/content/en/bridges.html (added)
• help/content/en/config.html (modified) (1 diff)
• help/content/en/contents.xml (modified) (1 diff)

trunk/src/vidalia/config/networkpage.cpp

@@ -61 +61 @@
   connect(Vidalia::torControl(), SIGNAL(disconnected()),
           this, SLOT(onDisconnected()));
-  
+  connect(ui.lblHelpFindBridges, SIGNAL(linkActivated(QString)),
+          this, SLOT(onLinkActivated(QString)));
+          
   ui.lblNoBridgeSupport->setVisible(false);
   ui.lineHttpProxyAddress->setValidator(new DomainValidator(this));
@@ -126 +128 @@
   ui.grpBridgeSettings->setEnabled(true);
   ui.lblNoBridgeSupport->setVisible(false);
+}
+
+/** Called when a link in a label is clicked. <b>url</b> is the target of
+ * the clicked link. */
+void
+NetworkPage::onLinkActivated(const QString &url)
+{
+  emit helpRequested(url);
 }
 

trunk/src/vidalia/config/networkpage.h

@@ -80 +80 @@
    * indicating the user's Tor does not support bridges. */
   void onDisconnected();
+  /** Called when a link in a label is clicked. <b>url</b> is the target of
+   * the clicked link.*/
+  void onLinkActivated(const QString &url);
 
 private:

trunk/src/vidalia/config/networkpage.ui

@@ -283 +283 @@
       </item>
       <item>
-       <widget class="QLabel" name="lblAddBridge" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>7</hsizetype>
-          <vsizetype>5</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>Add a Bridge:</string>
-        </property>
-       </widget>
+       <layout class="QHBoxLayout" >
+        <property name="margin" >
+         <number>0</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
+        <item>
+         <widget class="QLabel" name="lblAddBridge" >
+          <property name="text" >
+           <string>Add a Bridge:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" >
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QLabel" name="lblHelpFindBridges" >
+          <property name="cursor" >
+           <cursor>13</cursor>
+          </property>
+          <property name="text" >
+           <string>&lt;a href="bridges.finding">How do I find a bridge?&lt;/a></string>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </item>
       <item>

trunk/src/vidalia/help/content/content.qrc

@@ -11 +11 @@
     <file>en/netview.html</file>
     <file>en/links.html</file>
+    <file>en/bridges.html</file>
     <!-- German -->
     <file>de/contents.xml</file>

trunk/src/vidalia/help/content/en/config.html

@@ -102 +102 @@
     information about other relays. If connections to normal Tor relays are
     also blocked, then you will need to learn a bridge relay address somehow
-    and add it here.
+    and add it here. See the help topic on <a href="bridges.html#finding">finding
+    bridge relays</a> for more information on how to learn new bridge relay
+    addresses and fingerprints.
   </li>
 </ul>

trunk/src/vidalia/help/content/en/contents.xml

@@ -50 +50 @@
     <Topic id="exitpolicy" name="Exit Policies" html="server.html" section="exitpolicy"/>
   </Topic>
+  <Topic id="bridges" name="Bridge Relays" html="bridges.html">
+    <Topic id="about" name="What are bridge relays?" html="bridges.html" section="about"/>
+    <Topic id="finding" name="How do I find a bridge relay?" html="bridges.html" section="finding"/>
+  </Topic>
   <Topic id="troubleshooting" name="Troubleshooting" html="troubleshooting.html">
     <Topic id="start" name="I Can't Start Tor" html="troubleshooting.html" section="start"/>