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 #1391 from RetroShare/v0.6.5

Browse Source 
V0.6.5
This commit is contained in:
csoler 2018-11-03 20:48:11 +01:00 committed by GitHub
commit 56b31a0e23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 73 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-gui/src/gui/GetStartedDialog.cpp
View File

@ -236,7 +236,7 @@ void GetStartedDialog::inviteFriends()
{ {
RsAutoUpdatePage::lockAllEvents(); RsAutoUpdatePage::lockAllEvents();
cert = rsPeers->GetRetroshareInvite(); cert = rsPeers->GetRetroshareInvite(RsPeerId(),false,false);
RsAutoUpdatePage::unlockAllEvents() ; RsAutoUpdatePage::unlockAllEvents() ;
} }

2
retroshare-gui/src/gui/RetroShareLink.cpp
View File

@ -565,7 +565,7 @@ RetroShareLink RetroShareLink::createCertificate(const RsPeerId& ssl_id)
} else { } else {
link._type = TYPE_CERTIFICATE; link._type = TYPE_CERTIFICATE;
link._radix = QString::fromUtf8(rsPeers->GetRetroshareInvite(ssl_id,false).c_str()); link._radix = QString::fromUtf8(rsPeers->GetRetroshareInvite(ssl_id,false,false).c_str());
link._name = QString::fromUtf8(detail.name.c_str()); link._name = QString::fromUtf8(detail.name.c_str());
link._location = QString::fromUtf8(detail.location.c_str()); link._location = QString::fromUtf8(detail.location.c_str());
link._radix.replace("\n",""); link._radix.replace("\n","");

2
retroshare-gui/src/gui/common/FriendList.cpp
View File

@ -1903,7 +1903,7 @@ bool FriendList::exportFriendlist(QString &fileName)
if (!rsPeers->getPeerDetails(*list_iter, detailSSL)) if (!rsPeers->getPeerDetails(*list_iter, detailSSL))
continue; continue;
std::string certificate = rsPeers->GetRetroshareInvite(detailSSL.id, true); std::string certificate = rsPeers->GetRetroshareInvite(detailSSL.id, true,true);
// remove \n from certificate // remove \n from certificate
certificate.erase(std::remove(certificate.begin(), certificate.end(), '\n'), certificate.end()); certificate.erase(std::remove(certificate.begin(), certificate.end(), '\n'), certificate.end());

10
retroshare-gui/src/gui/connect/ConfCertDialog.cpp
View File

@ -94,6 +94,7 @@ ConfCertDialog::ConfCertDialog(const RsPeerId& id, const RsPgpId &pgp_id, QWidge
connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(applyDialog())); connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(applyDialog()));
connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(close())); connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(close()));
connect(ui._shouldAddSignatures_CB, SIGNAL(toggled(bool)), this, SLOT(loadInvitePage())); connect(ui._shouldAddSignatures_CB, SIGNAL(toggled(bool)), this, SLOT(loadInvitePage()));
connect(ui._includeIPHistory_CB, SIGNAL(toggled(bool)), this, SLOT(loadInvitePage()));
ui.avatar->setFrameType(AvatarWidget::NORMAL_FRAME); ui.avatar->setFrameType(AvatarWidget::NORMAL_FRAME);
@ -270,9 +271,14 @@ void ConfCertDialog::loadInvitePage()
// ui.userCertificateText_2->setFont(font); // ui.userCertificateText_2->setFont(font);
// ui.userCertificateText_2->setText(QString::fromUtf8(pgp_key.c_str())); // ui.userCertificateText_2->setText(QString::fromUtf8(pgp_key.c_str()));
std::string invite = rsPeers->GetRetroshareInvite(detail.id,ui._shouldAddSignatures_CB->isChecked()) ; // this needs to be a SSL id std::string invite = rsPeers->GetRetroshareInvite(detail.id,
ui._shouldAddSignatures_CB->isChecked(),
ui._includeIPHistory_CB->isChecked()
) ;
QString infotext = getCertificateDescription(detail,ui._shouldAddSignatures_CB->isChecked(),true); // true, because default parameter in GetRetroshareInvite is true QString infotext = getCertificateDescription(detail,ui._shouldAddSignatures_CB->isChecked(),
ui._includeIPHistory_CB->isChecked()
);
ui.userCertificateText->setToolTip(infotext) ; ui.userCertificateText->setToolTip(infotext) ;

23
retroshare-gui/src/gui/connect/ConfCertDialog.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1104</width> <width>1104</width>
<height>1086</height> <height>1120</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -69,7 +69,7 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QTabWidget" name="stabWidget"> <widget class="QTabWidget" name="stabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="tab"> <widget class="QWidget" name="tab">
<attribute name="icon"> <attribute name="icon">
@ -389,6 +389,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QCheckBox" name="_includeIPHistory_CB">
<property name="text">
<string>Include IP history</string>
</property>
</widget>
</item>
<item> <item>
<spacer name="horizontalSpacer_2"> <spacer name="horizontalSpacer_2">
<property name="orientation"> <property name="orientation">
@ -414,12 +421,6 @@
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>HeaderFrame</class>
<extends>QFrame</extends>
<header>gui/common/HeaderFrame.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>RSTextBrowser</class> <class>RSTextBrowser</class>
<extends>QTextBrowser</extends> <extends>QTextBrowser</extends>
@ -431,6 +432,12 @@
<header>gui/common/AvatarWidget.h</header> <header>gui/common/AvatarWidget.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>HeaderFrame</class>
<extends>QFrame</extends>
<header>gui/common/HeaderFrame.h</header>
<container>1</container>
</customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../images.qrc"/> <include location="../images.qrc"/>

19
retroshare-gui/src/gui/gxs/GxsIdChooser.cpp
View File

@ -127,10 +127,13 @@ void GxsIdChooser::setDefaultId(const RsGxsId &defId)
static void loadPrivateIdsCallback(GxsIdDetailsType type, const RsIdentityDetails &details, QObject *object, const QVariant &/*data*/) static void loadPrivateIdsCallback(GxsIdDetailsType type, const RsIdentityDetails &details, QObject *object, const QVariant &/*data*/)
{ {
GxsIdChooser *chooser = dynamic_cast<GxsIdChooser*>(object); GxsIdChooser *chooser = dynamic_cast<GxsIdChooser*>(object);
if (!chooser) {
return;
}
if (!chooser)
return;
int current_index = chooser->currentIndex();
QString current_id = (current_index >= 0)? chooser->itemData(current_index).toString() : "" ;
// this prevents the objects that depend on what's in the combo-box to activate and // this prevents the objects that depend on what's in the combo-box to activate and
// perform any change.Only user-changes should cause this. // perform any change.Only user-changes should cause this.
@ -186,6 +189,16 @@ static void loadPrivateIdsCallback(GxsIdDetailsType type, const RsIdentityDetail
chooser->model()->sort(0); chooser->model()->sort(0);
// now restore the current item. Problem is, we cannot use the ID position because it may have changed.
if(!current_id.isNull())
for(int indx=0;indx<chooser->count();++indx)
if(chooser->itemData(indx).toString() == current_id)
{
chooser->setCurrentIndex(indx);
break;
}
chooser->blockSignals(false) ; chooser->blockSignals(false) ;
} }

2
retroshare-gui/src/gui/profile/ProfileWidget.cpp
View File

@ -92,7 +92,7 @@ void ProfileWidget::statusmessagedlg()
void ProfileWidget::copyCert() void ProfileWidget::copyCert()
{ {
std::string cert = rsPeers->GetRetroshareInvite(); std::string cert = rsPeers->GetRetroshareInvite(RsPeerId(),false,false);
if (cert.empty()) { if (cert.empty()) {
QMessageBox::information(this, tr("RetroShare"), QMessageBox::information(this, tr("RetroShare"),
tr("Sorry, create certificate failed"), tr("Sorry, create certificate failed"),

10
retroshare-gui/src/gui/settings/ChatPage.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1216</width> <width>1216</width>
<height>1107</height> <height>1127</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout"> <layout class="QGridLayout">
@ -231,7 +231,7 @@
<item> <item>
<widget class="QGroupBox" name="chatLobbyGBox"> <widget class="QGroupBox" name="chatLobbyGBox">
<property name="title"> <property name="title">
<string>Chat Lobby</string> <string>Chat Rooms</string>
</property> </property>
<layout class="QVBoxLayout" name="chatLobbyGBoxVLayout"> <layout class="QVBoxLayout" name="chatLobbyGBoxVLayout">
<item> <item>
@ -244,7 +244,7 @@
<item> <item>
<widget class="QLabel" name="defIDLabel"> <widget class="QLabel" name="defIDLabel">
<property name="text"> <property name="text">
<string>Default identity for chat lobbies:</string> <string>Default identity for chat rooms:</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -866,11 +866,11 @@
<enum>QTabWidget::North</enum> <enum>QTabWidget::North</enum>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>2</number>
</property> </property>
<widget class="QWidget" name="publicTab"> <widget class="QWidget" name="publicTab">
<attribute name="title"> <attribute name="title">
<string>Group chat</string> <string>Chat rooms</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>

12
retroshare-gui/src/gui/settings/CryptoPage.cpp
View File

@ -31,6 +31,7 @@
#include "util/misc.h" #include "util/misc.h"
#include "util/DateTime.h" #include "util/DateTime.h"
#include <gui/RetroShareLink.h> #include <gui/RetroShareLink.h>
#include <gui/connect/ConfCertDialog.h>
#include <gui/profile/ProfileManager.h> #include <gui/profile/ProfileManager.h>
#include <gui/statistics/StatisticsWindow.h> #include <gui/statistics/StatisticsWindow.h>
@ -47,6 +48,7 @@ CryptoPage::CryptoPage(QWidget * parent, Qt::WindowFlags flags)
// connect(ui.copykeyButton, SIGNAL(clicked()), this, SLOT(copyPublicKey())); // connect(ui.copykeyButton, SIGNAL(clicked()), this, SLOT(copyPublicKey()));
connect(ui.saveButton, SIGNAL(clicked()), this, SLOT(fileSaveAs())); connect(ui.saveButton, SIGNAL(clicked()), this, SLOT(fileSaveAs()));
connect(ui._includeSignatures_CB, SIGNAL(toggled(bool)), this, SLOT(load())); connect(ui._includeSignatures_CB, SIGNAL(toggled(bool)), this, SLOT(load()));
connect(ui._includeAllIPs_CB, SIGNAL(toggled(bool)), this, SLOT(load()));
connect(ui._copyLink_PB, SIGNAL(clicked()), this, SLOT(copyRSLink())); connect(ui._copyLink_PB, SIGNAL(clicked()), this, SLOT(copyRSLink()));
connect(ui.showStats_PB, SIGNAL(clicked()), this, SLOT(showStats())); connect(ui.showStats_PB, SIGNAL(clicked()), this, SLOT(showStats()));
@ -98,9 +100,13 @@ CryptoPage::load()
{ {
ui.certplainTextEdit->setPlainText( ui.certplainTextEdit->setPlainText(
QString::fromUtf8( QString::fromUtf8(
rsPeers->GetRetroshareInvite( rsPeers->GetRetroshareInvite( rsPeers->getOwnId(), ui._includeSignatures_CB->isChecked(), ui._includeAllIPs_CB->isChecked() ).c_str()
rsPeers->getOwnId(), ) );
ui._includeSignatures_CB->isChecked() ).c_str() ) );
RsPeerDetails detail;
rsPeers->getPeerDetails(rsPeers->getOwnId(),detail);
ui.certplainTextEdit->setToolTip(ConfCertDialog::getCertificateDescription(detail, ui._includeSignatures_CB->isChecked(), ui._includeAllIPs_CB->isChecked() ));
} }
void void
CryptoPage::copyRSLink() CryptoPage::copyRSLink()

33
retroshare-gui/src/gui/settings/CryptoPage.ui
View File

@ -6,15 +6,15 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>650</width> <width>989</width>
<height>566</height> <height>678</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="tab"> <widget class="QWidget" name="tab">
<attribute name="title"> <attribute name="title">
@ -426,6 +426,12 @@
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QPlainTextEdit" name="certplainTextEdit"> <widget class="QPlainTextEdit" name="certplainTextEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font"> <property name="font">
<font> <font>
<family>Courier New</family> <family>Courier New</family>
@ -455,22 +461,15 @@
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="horizontalSpacer_2"> <widget class="QCheckBox" name="_includeAllIPs_CB">
<property name="orientation"> <property name="toolTip">
<enum>Qt::Horizontal</enum> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;IP history is the list of IP you used accross time. Including this might help your friends reach you. This is optional for privacy reasons.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="text">
<size> <string>Include IP history</string>
<width>40</width>
<height>20</height>
</size>
</property> </property>
</spacer> </widget>
</item> </item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QPushButton" name="_copyLink_PB"> <widget class="QPushButton" name="_copyLink_PB">
<property name="text"> <property name="text">
@ -496,7 +495,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="horizontalSpacer_3"> <spacer name="horizontalSpacer_2">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>