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

Fixed to display Avatars and nickname on news feeds Messages Item for Distant Messages.

Browse source 
Added for Invite Message RS_MSG_USER_REQUEST flag & auto send invites to outbox.
Optimized Messages Item for Invite Messages, display a Send Invite Button, to send back own rs cert link via Distant Message.
This commit is contained in:
defnax 2017-01-29 19:01:38 +01:00
parent 7327f1a98b
commit 7861b092c3
9 changed files with 307 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

29
retroshare-gui/src/gui/Identity/IdDialog.cpp
View file

@ -230,6 +230,8 @@ IdDialog::IdDialog(QWidget *parent) :
ui->mainSplitter->setStretchFactor(0, 0);
ui->mainSplitter->setStretchFactor(1, 1);
ui->inviteFrame->hide();
/*remove
QList<int> sizes;
sizes << width() << 500; // Qt calculates the right sizes
@ -2458,28 +2460,13 @@ void IdDialog::sendInvite()
{
return;
}
/* create a message */
MessageComposer *composer = MessageComposer::newMsg();
composer->setTitleText(tr("You have a friend invite"));
RsGxsId id(ui->lineEdit_KeyId->text().toStdString());
RsPeerId ownId = rsPeers->getOwnId();
RetroShareLink link;
link.createCertificate(ownId);
MessageComposer::sendInvite(id);
std::string keyId = item->text(RSID_COL_KEYID).toStdString();
QString sMsgText = inviteMessage();
sMsgText += "<br><br>";
sMsgText += tr("Respond now:") + "<br>";
sMsgText += link.toHtml() + "<br>";
sMsgText += "<br>";
sMsgText += tr("Thanks, <br>") + QString::fromUtf8(rsPeers->getGPGName(rsPeers->getGPGOwnId()).c_str());
composer->setMsgText(sMsgText);
composer->addRecipient(MessageComposer::TO, RsGxsId(keyId));
composer->show();
ui->inviteFrame->show();
ui->inviteButton->setEnabled(false);
}
void IdDialog::negativePerson()
@ -2557,3 +2544,7 @@ QList<QTreeWidgetItem *> selected_items = ui->idTreeWidget->selectedItems();
requestIdList();
}
void IdDialog::on_closeInfoFrameButton_clicked()
{
ui->inviteFrame->setVisible(false);
}