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

Removed dialog FriendRequest and use ConnectFriendWizard instead.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5482 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-08-28 23:39:11 +00:00
parent 51e0f5e679
commit e49854ee25
11 changed files with 220 additions and 710 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -64,6 +64,8 @@ ConnectFriendWizard::ConnectFriendWizard(QWidget *parent) :
{
ui->setupUi(this);
setAttribute(Qt::WA_DeleteOnClose, true);
/* add stylesheet to title */
QList<int> ids = pageIds();
for (QList<int>::iterator it = ids.begin(); it != ids.end(); ++it) {
@ -119,6 +121,17 @@ void ConnectFriendWizard::setCertificate(const QString &certificate, bool friend
}
}
void ConnectFriendWizard::setGpgId(const std::string &gpgId, bool friendRequest)
{
if (!rsPeers->getPeerDetails(gpgId, peerDetails)) {
setField("errorMessage", tr("Cannot get peer details of gpg key %1").arg(QString::fromStdString(gpgId)));
setStartId(Page_ErrorMessage);
return;
}
setStartId(friendRequest ? Page_FriendRequest : Page_Conclusion);
}
ConnectFriendWizard::~ConnectFriendWizard()
{
delete ui;