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

fixed GUI for invitation handling menus

Browse Source
This commit is contained in:
csoler 2016-05-14 11:13:54 -04:00
parent a3a0b1d312
commit aa80ffd5e6
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -678,7 +678,7 @@ void IdDialog::CircleListCustomPopupMenu( QPoint )
const QString menu_titles[4] = { tr("Accept circle invitation"), tr("Remove from this circle"),tr("Cancel subscribe request"), tr("Request subscription") } ; const QString menu_titles[4] = { tr("Accept circle invitation"), tr("Remove from this circle"),tr("Cancel subscribe request"), tr("Request subscription") } ;
const QString image_names[4] = { ":/images/edit_16.png",":/images/edit_16.png",":/images/edit_16.png",":/images/edit_16.png" } ; const QString image_names[4] = { ":/images/edit_16.png",":/images/edit_16.png",":/images/edit_16.png",":/images/edit_16.png" } ;
std::vector< std::vector<RsGxsId> > ids ; std::vector< std::vector<RsGxsId> > ids(4) ;
std::list<RsGxsId> own_identities ; std::list<RsGxsId> own_identities ;
rsIdentity->getOwnIds(own_identities) ; rsIdentity->getOwnIds(own_identities) ;
@ -705,7 +705,14 @@ void IdDialog::CircleListCustomPopupMenu( QPoint )
{ {
if(ids[i].size() == 1) if(ids[i].size() == 1)
{ {
QAction *action = new QAction(QIcon(image_names[i]), menu_titles[i],this) ; RsIdentityDetails det ;
QString id_name ;
if(rsIdentity->getIdDetails(ids[i][0],det))
id_name = tr("for identity ")+QString::fromUtf8(det.mNickname.c_str()) + "(ID=" + QString::fromStdString(ids[i][0].toStdString()) + ")" ;
else
id_name = tr("for identity ")+QString::fromStdString(ids[i][0].toStdString()) ;
QAction *action = new QAction(QIcon(image_names[i]), menu_titles[i] + " " + id_name,this) ;
if(i <2) if(i <2)
QObject::connect(action,SLOT(), this, SLOT(acceptCircleSubscription())); QObject::connect(action,SLOT(), this, SLOT(acceptCircleSubscription()));
@ -721,14 +728,21 @@ void IdDialog::CircleListCustomPopupMenu( QPoint )
for(uint32_t j=0;j<ids[i].size();++j) for(uint32_t j=0;j<ids[i].size();++j)
{ {
QAction *action = new QAction(QIcon(image_names[i]), menu_titles[i],this) ; RsIdentityDetails det ;
QString id_name ;
if(rsIdentity->getIdDetails(ids[i][j],det))
id_name = tr("for identity ")+QString::fromUtf8(det.mNickname.c_str()) + "(ID=" + QString::fromStdString(ids[i][j].toStdString()) + ")" ;
else
id_name = tr("for identity ")+QString::fromStdString(ids[i][j].toStdString()) ;
QAction *action = new QAction(QIcon(image_names[i]), id_name,this) ;
if(i <2) if(i <2)
QObject::connect(action,SLOT(), this, SLOT(acceptCircleSubscription())); QObject::connect(action,SLOT(), this, SLOT(acceptCircleSubscription()));
else else
QObject::connect(action,SLOT(), this, SLOT(cancelCircleSubscription())); QObject::connect(action,SLOT(), this, SLOT(cancelCircleSubscription()));
action->setData(QString::fromStdString(ids[i][0].toStdString())); action->setData(QString::fromStdString(ids[i][j].toStdString()));
menu->addAction(action) ; menu->addAction(action) ;
} }