Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-29 01:16:20 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

retroshare-gui open distant chat when double clicking on people

Browse Source
This commit is contained in:
Gioacchino Mazzurco 2018-11-20 00:11:00 +01:00
parent 53f8307bee
commit 9eef7735f3
No known key found for this signature in database
GPG Key ID: A1FBCA3872E87051
2 changed files with 57 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
retroshare-gui/src/gui/Identity/IdDialog.cpp
View File

@ -229,6 +229,9 @@ IdDialog::IdDialog(QWidget *parent) :
connect(ui->inviteButton, SIGNAL(clicked()), this, SLOT(sendInvite())); connect(ui->inviteButton, SIGNAL(clicked()), this, SLOT(sendInvite()));
connect( ui->idTreeWidget, &RSTreeWidget::itemDoubleClicked,
this, &IdDialog::chatIdentityItem );
ui->avlabel_Circles->setPixmap(QPixmap(":/icons/png/circles.png")); ui->avlabel_Circles->setPixmap(QPixmap(":/icons/png/circles.png"));
@ -2339,8 +2342,8 @@ void IdDialog::IdListCustomPopupMenu( QPoint )
QMenu *contextMenu = new QMenu(this); QMenu *contextMenu = new QMenu(this);
std::list<RsGxsId> own_identities ; std::list<RsGxsId> own_identities;
rsIdentity->getOwnIds(own_identities) ; rsIdentity->getOwnIds(own_identities);
// make some stats about what's selected. If the same value is used for all selected items, it can be switched. // make some stats about what's selected. If the same value is used for all selected items, it can be switched.
@ -2545,26 +2548,65 @@ void IdDialog::copyRetroshareLink()
void IdDialog::chatIdentity() void IdDialog::chatIdentity()
{ {
QTreeWidgetItem *item = ui->idTreeWidget->currentItem(); QTreeWidgetItem* item = ui->idTreeWidget->currentItem();
if (!item) if (!item)
{ {
std::cerr << "IdDialog::editIdentity() Invalid item"; std::cerr << __PRETTY_FUNCTION__ << " Error. Invalid item!" << std::endl;
std::cerr << std::endl;
return; return;
} }
std::string keyId = item->text(RSID_COL_KEYID).toStdString(); chatIdentityItem(item);
}
QAction *action = qobject_cast<QAction *>(QObject::sender()); void IdDialog::chatIdentityItem(QTreeWidgetItem* item)
if (!action) {
return ; if(!item)
{
std::cerr << __PRETTY_FUNCTION__ << " Error. Invalid item." << std::endl;
return;
}
RsGxsId from_gxs_id(action->data().toString().toStdString()); std::string&& toIdString(item->text(RSID_COL_KEYID).toStdString());
uint32_t error_code ; RsGxsId toGxsId(toIdString);
DistantChatPeerId did ; if(toGxsId.isNull())
{
std::cerr << __PRETTY_FUNCTION__ << " Error. Invalid destination id: "
<< toIdString << std::endl;
return;
}
if(!rsMsgs->initiateDistantChatConnexion(RsGxsId(keyId), from_gxs_id, did, error_code)) RsGxsId fromGxsId;
QMessageBox::information(NULL, tr("Distant chat cannot work"), QString("%1 %2: %3").arg(tr("Distant chat refused with this person.")).arg(tr("Error code")).arg(error_code)) ; QAction* action = qobject_cast<QAction*>(QObject::sender());
if(!action)
{
std::list<RsGxsId> ownIdentities;
rsIdentity->getOwnIds(ownIdentities);
if(ownIdentities.empty())
{
std::cerr << __PRETTY_FUNCTION__ << " Error. Own identities list "
<< " is empty!" << std::endl;
return;
}
else fromGxsId = ownIdentities.front();
}
else fromGxsId = RsGxsId(action->data().toString().toStdString());
if(fromGxsId.isNull())
{
std::cerr << __PRETTY_FUNCTION__ << " Error. Could not determine sender"
<< " identity to open chat toward: " << toIdString << std::endl;
return;
}
uint32_t error_code;
DistantChatPeerId did;
if(!rsMsgs->initiateDistantChatConnexion(toGxsId, fromGxsId, did, error_code))
QMessageBox::information(
nullptr, tr("Distant chat cannot work"),
QString("%1 %2: %3")
.arg(tr("Distant chat refused with this person."))
.arg(tr("Error code")).arg(error_code) ) ;
} }
void IdDialog::sendMsg() void IdDialog::sendMsg()

1
retroshare-gui/src/gui/Identity/IdDialog.h
View File

@ -89,6 +89,7 @@ private slots:
void removeIdentity(); void removeIdentity();
void editIdentity(); void editIdentity();
void chatIdentity(); void chatIdentity();
void chatIdentityItem(QTreeWidgetItem* item);
void sendMsg(); void sendMsg();
void copyRetroshareLink(); void copyRetroshareLink();
void on_closeInfoFrameButton_clicked(); void on_closeInfoFrameButton_clicked();