Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-30 09:56:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

added proper menus for adding/removing IDs from circles

Browse Source
This commit is contained in:
csoler 2016-05-12 22:30:12 -04:00
parent d01c61fde8
commit a3a0b1d312
3 changed files with 88 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libretroshare/src/retroshare/rsgxscircles.h
View File

@ -115,8 +115,10 @@ class RsGxsCircleDetails
bool mAmIAllowed ; bool mAmIAllowed ;
std::set<RsGxsId> mAllowedGxsIds; std::set<RsGxsId> mAllowedGxsIds; // This crosses admin list and subscribed list
std::set<RsPgpId> mAllowedNodes; std::set<RsPgpId> mAllowedNodes;
std::map<RsGxsId,uint32_t> mSubscriptionFlags ; // subscription flags for all ids
}; };
class RsGxsCircles: public RsGxsIfaceHelper class RsGxsCircles: public RsGxsIfaceHelper

2
libretroshare/src/services/p3gxscircles.cc
View File

@ -1851,6 +1851,8 @@ void p3GxsCircles::handle_event(uint32_t event_type, const std::string &elabel)
bool p3GxsCircles::pushCircleMembershipRequest(const RsGxsId& own_gxsid,const RsGxsCircleId& circle_id,uint32_t request_type) bool p3GxsCircles::pushCircleMembershipRequest(const RsGxsId& own_gxsid,const RsGxsCircleId& circle_id,uint32_t request_type)
{ {
std::cerr << "Circle membership request: own_gxsid = " << own_gxsid << ", circle=" << circle_id << ", req type=" << request_type << std::endl;
// check for some consistency // check for some consistency
if(request_type != RsGxsCircleSubscriptionRequestItem::SUBSCRIPTION_REQUEST_SUBSCRIBE && request_type != RsGxsCircleSubscriptionRequestItem::SUBSCRIPTION_REQUEST_UNSUBSCRIBE) if(request_type != RsGxsCircleSubscriptionRequestItem::SUBSCRIPTION_REQUEST_SUBSCRIBE && request_type != RsGxsCircleSubscriptionRequestItem::SUBSCRIPTION_REQUEST_UNSUBSCRIBE)

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

@ -621,9 +621,7 @@ void IdDialog::acceptCircleSubscription()
if (!item) if (!item)
return ; return ;
#warning we have to find a way to get the correct own id here. RsGxsId own_id(qobject_cast<QAction*>(sender())->data().toString().toStdString());
RsGxsId own_id ;
QString coltext = item->text(CIRCLEGROUP_CIRCLE_COL_GROUPID); QString coltext = item->text(CIRCLEGROUP_CIRCLE_COL_GROUPID);
RsGxsCircleId circle_id ( coltext.toStdString()) ; RsGxsCircleId circle_id ( coltext.toStdString()) ;
@ -638,9 +636,7 @@ void IdDialog::refuseCircleSubscription()
if (!item) if (!item)
return ; return ;
#warning we have to find a way to get the correct own id here. RsGxsId own_id(qobject_cast<QAction*>(sender())->data().toString().toStdString());
RsGxsId own_id ;
QString coltext = item->text(CIRCLEGROUP_CIRCLE_COL_GROUPID); QString coltext = item->text(CIRCLEGROUP_CIRCLE_COL_GROUPID);
RsGxsCircleId circle_id ( coltext.toStdString()) ; RsGxsCircleId circle_id ( coltext.toStdString()) ;
@ -659,30 +655,87 @@ void IdDialog::CircleListCustomPopupMenu( QPoint )
uint32_t group_flags = item->data(CIRCLEGROUP_CIRCLE_COL_GROUPFLAGS, Qt::UserRole).toUInt(); uint32_t group_flags = item->data(CIRCLEGROUP_CIRCLE_COL_GROUPFLAGS, Qt::UserRole).toUInt();
if(item->parent() != NULL) if(item->parent() != NULL)
{
if(group_flags & GXS_SERV::GROUP_SUBSCRIBE_ADMIN) if(group_flags & GXS_SERV::GROUP_SUBSCRIBE_ADMIN)
contextMnu.addAction(QIcon(IMAGE_EDIT), tr("Edit Circle"), this, SLOT(showEditExistingCircle())); contextMnu.addAction(QIcon(IMAGE_EDIT), tr("Edit Circle"), this, SLOT(showEditExistingCircle()));
else else
contextMnu.addAction(QIcon(IMAGE_EDIT), tr("See details"), this, SLOT(showEditExistingCircle())); contextMnu.addAction(QIcon(IMAGE_EDIT), tr("See details"), this, SLOT(showEditExistingCircle()));
} }
}
contextMnu.addSeparator() ; contextMnu.addSeparator() ;
uint32_t subscribe_flags = item->data(CIRCLEGROUP_CIRCLE_COL_SUBSCRIBEFLAGS, Qt::UserRole).toUInt(); RsGxsCircleId circle_id(item->data(CIRCLEGROUP_CIRCLE_COL_GROUPID, Qt::UserRole).toString().toStdString());
RsGxsCircleDetails details ;
rsGxsCircles->getCircleDetails(circle_id,details) ;
static const int REQUES = 0 ; // Admin list: no Subscribed: no
static const int ACCEPT = 1 ; // Admin list: yes Subscribed: no
static const int REMOVE = 2 ; // Admin list: yes Subscribed: yes
static const int CANCEL = 3 ; // Admin list: no Subscribed: yes
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" } ;
std::vector< std::vector<RsGxsId> > ids ;
std::list<RsGxsId> own_identities ;
rsIdentity->getOwnIds(own_identities) ;
for(std::list<RsGxsId>::const_iterator it(own_identities.begin());it!=own_identities.end();++it)
{
std::map<RsGxsId,uint32_t>::const_iterator vit = details.mSubscriptionFlags.find(*it) ;
uint32_t subscribe_flags = (vit == details.mSubscriptionFlags.end())?0:(vit->second) ;
if(subscribe_flags & GXS_EXTERNAL_CIRCLE_FLAGS_SUBSCRIBED) if(subscribe_flags & GXS_EXTERNAL_CIRCLE_FLAGS_SUBSCRIBED)
if(subscribe_flags & GXS_EXTERNAL_CIRCLE_FLAGS_IN_ADMIN_LIST) if(subscribe_flags & GXS_EXTERNAL_CIRCLE_FLAGS_IN_ADMIN_LIST)
contextMnu.addAction(QIcon(IMAGE_EDIT), tr("Remove me from this circle"), this, SLOT(refuseCircleMembership())); ids[REMOVE].push_back(*it) ;
else else
contextMnu.addAction(QIcon(IMAGE_EDIT), tr("Cancel subscription request"), this, SLOT(refuseCircleMembership())); ids[CANCEL].push_back(*it) ;
else else
if(subscribe_flags & GXS_EXTERNAL_CIRCLE_FLAGS_IN_ADMIN_LIST) if(subscribe_flags & GXS_EXTERNAL_CIRCLE_FLAGS_IN_ADMIN_LIST)
contextMnu.addAction(QIcon(IMAGE_EDIT), tr("Accept circle invite and join the circle"), this, SLOT(acceptCircleMembership())); ids[ACCEPT].push_back(*it) ;
else else
contextMnu.addAction(QIcon(IMAGE_EDIT), tr("Request to join this circle"), this, SLOT(acceptCircleMembership())); ids[REQUES].push_back(*it) ;
}
contextMnu.addSeparator() ; contextMnu.addSeparator() ;
contextMnu.addAction(QIcon(IMAGE_CREATE), tr("Create external circle"), this, SLOT(createExternalCircle())); for(int i=0;i<4;++i)
{
if(ids[i].size() == 1)
{
QAction *action = new QAction(QIcon(image_names[i]), menu_titles[i],this) ;
if(i <2)
QObject::connect(action,SLOT(), this, SLOT(acceptCircleSubscription()));
else
QObject::connect(action,SLOT(), this, SLOT(cancelCircleSubscription()));
action->setData(QString::fromStdString(ids[i][0].toStdString()));
contextMnu.addAction(action) ;
}
else if(ids[i].size() > 1)
{
QMenu *menu = new QMenu(menu_titles[i],this) ;
for(uint32_t j=0;j<ids[i].size();++j)
{
QAction *action = new QAction(QIcon(image_names[i]), menu_titles[i],this) ;
if(i <2)
QObject::connect(action,SLOT(), this, SLOT(acceptCircleSubscription()));
else
QObject::connect(action,SLOT(), this, SLOT(cancelCircleSubscription()));
action->setData(QString::fromStdString(ids[i][0].toStdString()));
menu->addAction(action) ;
}
contextMnu.addMenu(menu) ;
}
}
contextMnu.exec(QCursor::pos()); contextMnu.exec(QCursor::pos());
} }