Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-06 05:14:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #108 from sehraf/i2p

Browse source 
Adding I2P support to RS
This commit is contained in:
Cyril Soler 2015-09-16 20:01:39 -04:00
commit 66691d4f37
19 changed files with 824 additions and 243 deletions
Download patch file Download diff file Expand all files Collapse all files

1
retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
View file

@ -488,6 +488,7 @@ void ConnectFriendWizard::initializePage(int id)
}
ui->nodeEdit->setText(loc);
ui->ipEdit->setText(QString::fromStdString(peerDetails.isHiddenNode ? peerDetails.hiddenNodeAddress : peerDetails.extAddr));
ui->signersEdit->setPlainText(ts);
fillGroups(this, ui->groupComboBox, groupId);

24
retroshare-gui/src/gui/connect/ConnectFriendWizard.ui
View file

@ -31,7 +31,7 @@
<item>
<widget class="QRadioButton" name="textRadioButton">
<property name="text">
<string>&amp;Enter the certificate manually</string>
<string>Enter the certificate manually</string>
</property>
</widget>
</item>
@ -52,7 +52,7 @@
<item>
<widget class="QRadioButton" name="rsidRadioButton">
<property name="text">
<string>&amp;Enter RetroShare ID manually</string>
<string>Enter RetroShare ID manually</string>
</property>
</widget>
</item>
@ -1039,21 +1039,21 @@ resources.</string>
</property>
</widget>
</item>
<item row="5" column="0">
<item row="6" column="0">
<widget class="QLabel" name="signersLabel">
<property name="text">
<string>Signers</string>
</property>
</widget>
</item>
<item row="5" column="1">
<item row="6" column="1">
<widget class="QPlainTextEdit" name="signersEdit">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="6" column="0" colspan="2">
<item row="7" column="0" colspan="2">
<widget class="QLabel" name="alreadyRegisteredLabel">
<property name="text">
<string>This peer is already on your friend list. Adding it might just set it's ip address.</string>
@ -1063,6 +1063,20 @@ resources.</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="ipLabel">
<property name="text">
<string>IP-Addr:</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QLabel" name="ipEdit">
<property name="text">
<string>IP-Address</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>