Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #895 from PhenomRetroShare/Add_HelpInRelayTab

Browse Source 
Add help in Relay setting tab.
This commit is contained in:
csoler 2017-06-28 22:37:50 +02:00 committed by GitHub
commit b96effb2d2
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
retroshare-gui/src/gui/settings/ServerPage.cpp
View File

@ -35,6 +35,7 @@
#include <retroshare/rspeers.h>
#include <retroshare/rsturtle.h>
#include <QCheckBox>
#include <QMovie>
#include <QMenu>
#include <QTcpSocket>
@ -1921,11 +1922,11 @@ void ServerPage::checkKey()
std::cerr << std::endl;
if (server.length() == 40)
{
ui.keyOkBox->setChecked(Qt::Checked);
ui.keyOkBox->setChecked(true);
}
else
{
ui.keyOkBox->setChecked(Qt::Unchecked);
ui.keyOkBox->setChecked(false);
}
}

25
retroshare-gui/src/gui/settings/ServerPage.ui
View File

@ -2059,6 +2059,31 @@ If you have issues connecting over Tor check the Tor logs too.</string>
</layout>
</widget>
</item>
<item>
<widget class="QLabel" name="relayHelpLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="styleSheet">
<string notr="true"> border: 1px solid #DCDC41;
border-radius: 6px;
background: #FFFFD7;
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFD7, stop:1 #FFFFB2);
</string>
</property>
<property name="text">
<string>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare users who cannot connect directly, e.g. because they're firewalled.&lt;/p&gt;
&lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former, you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
&lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer name="relayVSpacer">
<property name="orientation">