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

merge of branch v0.6-idclean 7180

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7187 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2014-03-17 20:56:06 +00:00
parent 7815efb16f
commit 0f29d28b1b
397 changed files with 6503 additions and 5702 deletions
Download patch file Download diff file Expand all files Collapse all files

34
retroshare-gui/src/gui/settings/ChatPage.cpp
View file

@ -140,15 +140,15 @@ void ChatPage::collectedInvite_openDistantChat()
{
QList<QListWidgetItem*> selected = ui._collected_contacts_LW->selectedItems() ;
std::string hash = (*selected.begin())->data(Qt::UserRole).toString().toStdString() ;
RsPeerId virtual_peer_id( (*selected.begin())->data(Qt::UserRole).toString().toStdString() );
std::cerr << "Openning secured chat tunnel for hash " << hash << ". Please wait..." << std::endl;
std::cerr << "Openning secured chat tunnel for virtual peer id " << virtual_peer_id << ". Please wait..." << std::endl;
uint32_t error_code ;
if(!rsMsgs->initiateDistantChatConnexion(hash,error_code))
if(!rsMsgs->initiateDistantChatConnexion(virtual_peer_id,error_code))
QMessageBox::critical(NULL,tr("Can't open distant chat"),tr("Cannot open distant chat. Error code=")+QString::number(error_code)) ;
else
ChatDialog::chatFriend(hash);
ChatDialog::chatFriend(virtual_peer_id);
}
void ChatPage::collectedInvite_delete()
@ -157,11 +157,11 @@ void ChatPage::collectedInvite_delete()
for(QList<QListWidgetItem*>::const_iterator it(selected.begin());it!=selected.end();++it)
{
std::string hash = (*it)->data(Qt::UserRole).toString().toStdString() ;
RsPeerId virtual_peer_id ( (*it)->data(Qt::UserRole).toString().toStdString() );
std::cerr << "Removing chat invite for hash " << hash << std::endl;
std::cerr << "Removing chat invite for virtual_peer_id " << virtual_peer_id << std::endl;
if(!rsMsgs->removeDistantChatInvite(hash))
if(!rsMsgs->removeDistantChatInvite(virtual_peer_id))
QMessageBox::critical(NULL,tr("Can't open distant chat"),tr("Cannot remove distant chat invite.")) ;
}
@ -198,15 +198,15 @@ void ChatPage::personalInvites_copyLink()
for(QList<QListWidgetItem*>::const_iterator it(selected.begin());it!=selected.end();++it)
{
std::string hash = (*it)->data(Qt::UserRole).toString().toStdString() ;
RsPeerId virtual_peer_id ( (*it)->data(Qt::UserRole).toString().toStdString() );
bool found = false ;
for(uint32_t i=0;i<invites.size();++i)
if(invites[i].hash == hash)
if(invites[i].pid == virtual_peer_id)
{
RetroShareLink link ;
if(!link.createPrivateChatInvite(invites[i].time_of_validity,QString::fromStdString(invites[i].destination_pgp_id),QString::fromStdString(invites[i].encrypted_radix64_string)))
if(!link.createPrivateChatInvite(invites[i].time_of_validity,QString::fromStdString(invites[i].destination_pgp_id.toStdString()),QString::fromStdString(invites[i].encrypted_radix64_string)))
{
std::cerr << "Cannot create link." << std::endl;
continue;
@ -228,9 +228,9 @@ void ChatPage::personalInvites_delete()
for(QList<QListWidgetItem*>::const_iterator it(selected.begin());it!=selected.end();++it)
{
std::string hash = (*it)->data(Qt::UserRole).toString().toStdString() ;
RsPeerId virtual_peer_id ( (*it)->data(Qt::UserRole).toString().toStdString() );
rsMsgs->removeDistantChatInvite(hash) ;
rsMsgs->removeDistantChatInvite(virtual_peer_id) ;
}
load() ;
}
@ -397,7 +397,7 @@ ChatPage::load()
for(uint32_t i=0;i<invites.size();++i)
{
RsPeerDetails detail ;
rsPeers->getPeerDetails(invites[i].destination_pgp_id,detail) ;
rsPeers->getGPGDetails(invites[i].destination_pgp_id,detail) ;
if(invites[i].encrypted_radix64_string.empty())
{
@ -406,7 +406,7 @@ ChatPage::load()
QString tt ;
tt += tr("Name : ") + QString::fromStdString(detail.name) ;
tt += "\n" + QString("PGP id : ") + QString::fromStdString(invites[i].destination_pgp_id) ;
tt += "\n" + QString("PGP id : ") + QString::fromStdString(invites[i].destination_pgp_id.toStdString()) ;
tt += "\n" + QString("Valid until : ") + QDateTime::fromTime_t(invites[i].time_of_validity).toString() ;
if(invites[i].invite_flags & RS_DISTANT_CHAT_FLAG_SIGNED)
@ -426,7 +426,7 @@ ChatPage::load()
item->setIcon(QIcon(":images/stock_signature_missing.png")) ;
}
item->setData(Qt::UserRole,QString::fromStdString(invites[i].hash)) ;
item->setData(Qt::UserRole,QString::fromStdString(invites[i].pid.toStdString())) ;
item->setToolTip(tt) ;
ui._collected_contacts_LW->insertItem(0,item) ;
@ -434,8 +434,8 @@ ChatPage::load()
else
{
QListWidgetItem *item = new QListWidgetItem;
item->setData(Qt::DisplayRole,tr("Private chat invite to ")+QString::fromStdString(detail.name)+" ("+QString::fromStdString(invites[i].destination_pgp_id)+", " + QString::fromStdString(detail.name) + ", valid until " + QDateTime::fromTime_t(invites[i].time_of_validity).toString() + ")") ;
item->setData(Qt::UserRole,QString::fromStdString(invites[i].hash)) ;
item->setData(Qt::DisplayRole,tr("Private chat invite to ")+QString::fromStdString(detail.name)+" ("+QString::fromStdString(invites[i].destination_pgp_id.toStdString())+", " + QString::fromStdString(detail.name) + ", valid until " + QDateTime::fromTime_t(invites[i].time_of_validity).toString() + ")") ;
item->setData(Qt::UserRole,QString::fromStdString(invites[i].pid.toStdString())) ;
ui._personal_invites_LW->insertItem(0,item) ;
}