[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r2227: Add arma's bridge link label thingy and help text. (in trunk: . src/vidalia/config src/vidalia/help/content src/vidalia/help/content/en)
Author: edmanm
Date: 2007-12-17 19:20:52 -0500 (Mon, 17 Dec 2007)
New Revision: 2227
Added:
trunk/src/vidalia/help/content/en/bridges.html
Modified:
trunk/
trunk/src/vidalia/config/networkpage.cpp
trunk/src/vidalia/config/networkpage.h
trunk/src/vidalia/config/networkpage.ui
trunk/src/vidalia/help/content/content.qrc
trunk/src/vidalia/help/content/en/config.html
trunk/src/vidalia/help/content/en/contents.xml
Log:
r2323@lysithea: edmanm | 2007-12-17 19:20:44 -0500
Add arma's bridge link label thingy and help text.
Property changes on: trunk
___________________________________________________________________
svk:merge ticket from /local/vidalia/trunk [r2323] on 0108964c-5b0b-4c9e-969f-e2288315d100
Modified: trunk/src/vidalia/config/networkpage.cpp
===================================================================
--- trunk/src/vidalia/config/networkpage.cpp 2007-12-17 04:26:35 UTC (rev 2226)
+++ trunk/src/vidalia/config/networkpage.cpp 2007-12-18 00:20:52 UTC (rev 2227)
@@ -60,7 +60,9 @@
this, SLOT(onAuthenticated()));
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));
ui.lineHttpProxyPort->setValidator(new QIntValidator(1, 65535, this));
@@ -127,6 +129,14 @@
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);
+}
+
/** Verifies that <b>bridge</b> is a valid bridge identifier and places a
* normalized identifier in <b>out</b>. The normalized identifier will have
* all spaces removed from the fingerprint portion (if any) and all
Modified: trunk/src/vidalia/config/networkpage.h
===================================================================
--- trunk/src/vidalia/config/networkpage.h 2007-12-17 04:26:35 UTC (rev 2226)
+++ trunk/src/vidalia/config/networkpage.h 2007-12-18 00:20:52 UTC (rev 2227)
@@ -79,6 +79,9 @@
* settings (if they were previously disabled) and hide the warning message
* 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:
/** Verifies that <b>bridge</b> is a valid bridge identifier and places a
Modified: trunk/src/vidalia/config/networkpage.ui
===================================================================
--- trunk/src/vidalia/config/networkpage.ui 2007-12-17 04:26:35 UTC (rev 2226)
+++ trunk/src/vidalia/config/networkpage.ui 2007-12-18 00:20:52 UTC (rev 2227)
@@ -282,19 +282,44 @@
</widget>
</item>
<item>
- <widget class="QLabel" name="lblAddBridge" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>5</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
</property>
- <property name="text" >
- <string>Add a Bridge:</string>
+ <property name="spacing" >
+ <number>6</number>
</property>
- </widget>
+ <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><a href="bridges.finding">How do I find a bridge?</a></string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
<item>
<layout class="QHBoxLayout" >
Modified: trunk/src/vidalia/help/content/content.qrc
===================================================================
--- trunk/src/vidalia/help/content/content.qrc 2007-12-17 04:26:35 UTC (rev 2226)
+++ trunk/src/vidalia/help/content/content.qrc 2007-12-18 00:20:52 UTC (rev 2227)
@@ -10,6 +10,7 @@
<file>en/troubleshooting.html</file>
<file>en/netview.html</file>
<file>en/links.html</file>
+ <file>en/bridges.html</file>
<!-- German -->
<file>de/contents.xml</file>
<file>de/index.html</file>
Added: trunk/src/vidalia/help/content/en/bridges.html
===================================================================
--- trunk/src/vidalia/help/content/en/bridges.html (rev 0)
+++ trunk/src/vidalia/help/content/en/bridges.html 2007-12-18 00:20:52 UTC (rev 2227)
@@ -0,0 +1,72 @@
+<!--
+ $Id$
+
+ Vidalia is distributed under the following license:
+
+ Copyright (C) 2007, Matt Edman, Justin Hipple
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+-->
+
+<html>
+<body>
+
+<h1>Bridge Relays</h1>
+<hr />
+
+<a name="about"/>
+<h3>What are bridge relays?</h3>
+<p>
+Bridge relays (or <i>bridges</i> for short) are Tor relays that aren't listed
+in the main directory. Since there is no complete public list of them,
+even if your ISP is filtering connections to all the known Tor relays,
+they probably won't be able to block all the bridges.
+</p>
+
+<a name="finding"/>
+<h3>How do I find a bridge relay?</h3>
+<p>
+There are two main ways to learn about a bridge address:
+<ol>
+ <li>Get some friends to run private bridges for you</li>
+ <li>Use some of the public bridges</li>
+</ol>
+</p>
+
+<p>
+To use private bridges, ask your friends to run Vidalia and Tor in an
+uncensored area of the Internet, and then click on <i>Help censored users</i>
+in Vidalia's <a href="server.html">Relay settings page</a>. Then they should
+privately send you the <i>Bridge address</i> line at the bottom of their
+Relay page.
+</p>
+
+<p>
+You can find public bridge addresses by visiting
+<b>https://bridges.torproject.org</b>.
+The answers you get from that page will change every few days, so check back
+periodically if you need more bridge addresses. Another way to find public
+bridge addresses is to send mail to <b>bridges@xxxxxxxxxxxxxx</b> with the line
+<b>get bridges</b> by itself in the body of the mail. However, so we can make
+it harder for an attacker to learn lots of bridge addresses, you must send
+this request from a Gmail or Yahoo! account.
+</p>
+
+<p>
+Configuring more than one bridge address will make your Tor connection
+more stable, in case some of the bridges become unreachable.
+</p>
+
Property changes on: trunk/src/vidalia/help/content/en/bridges.html
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Modified: trunk/src/vidalia/help/content/en/config.html
===================================================================
--- trunk/src/vidalia/help/content/en/config.html 2007-12-17 04:26:35 UTC (rev 2226)
+++ trunk/src/vidalia/help/content/en/config.html 2007-12-18 00:20:52 UTC (rev 2227)
@@ -101,7 +101,9 @@
defeat blocking mechanisms that try to filter Tor's requests for
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>
Modified: trunk/src/vidalia/help/content/en/contents.xml
===================================================================
--- trunk/src/vidalia/help/content/en/contents.xml 2007-12-17 04:26:35 UTC (rev 2226)
+++ trunk/src/vidalia/help/content/en/contents.xml 2007-12-18 00:20:52 UTC (rev 2227)
@@ -49,6 +49,10 @@
<Topic id="bandwidth" name="Bandwidth Limits" html="server.html" section="bandwidth"/>
<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"/>
<Topic id="connect" name="Vidalia Can't Connect to Tor" html="troubleshooting.html" section="connect"/>