Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-22 13:24:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

renamed subscribed circle item into belongingCircle item which is more appropriate

Browse source
This commit is contained in:
csoler 2016-04-19 22:00:32 -04:00
parent d44efc7b68
commit a35a60849a
2 changed files with 15 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

36
retroshare-gui/src/gui/Identity/IdDialog.cpp
View file

@ -141,7 +141,7 @@ IdDialog::IdDialog(QWidget *parent) :
ui->treeWidget_membership->clear(); ui->treeWidget_membership->clear();
mExternalOtherCircleItem = NULL ; mExternalOtherCircleItem = NULL ;
mExternalSubCircleItem = NULL ; mExternalBelongingCircleItem = NULL ;
/* Setup UI helper */ /* Setup UI helper */
mStateHelper = new UIStateHelper(this); mStateHelper = new UIStateHelper(this);
@ -391,18 +391,11 @@ void IdDialog::loadCircleGroupMeta(const uint32_t &token)
ui->treeWidget_membership->addTopLevelItem(mExternalOtherCircleItem); ui->treeWidget_membership->addTopLevelItem(mExternalOtherCircleItem);
} }
if(!mExternalSubCircleItem ) if(!mExternalBelongingCircleItem )
{ {
mExternalSubCircleItem = new QTreeWidgetItem(); mExternalBelongingCircleItem = new QTreeWidgetItem();
mExternalSubCircleItem->setText(0, tr("External circles my identities belong to")); mExternalBelongingCircleItem->setText(0, tr("External circles my identities belong to"));
ui->treeWidget_membership->addTopLevelItem(mExternalSubCircleItem); ui->treeWidget_membership->addTopLevelItem(mExternalBelongingCircleItem);
}
if(!mExternalLocalCircleItem)
{
mExternalLocalCircleItem = new QTreeWidgetItem();
mExternalLocalCircleItem->setText(0, tr("Local circles"));
ui->treeWidget_membership->addTopLevelItem(mExternalLocalCircleItem);
} }
for(vit = groupInfo.begin(); vit != groupInfo.end();++vit) for(vit = groupInfo.begin(); vit != groupInfo.end();++vit)
@ -440,7 +433,7 @@ void IdDialog::loadCircleGroupMeta(const uint32_t &token)
item = clist.front() ; item = clist.front() ;
if(am_I_in_circle && item->parent() != mExternalSubCircleItem) if(am_I_in_circle && item->parent() != mExternalBelongingCircleItem)
{ {
#ifdef ID_DEBUG #ifdef ID_DEBUG
std::cerr << " Existing group is not in subscribed items although it is subscribed. Removing." << std::endl; std::cerr << " Existing group is not in subscribed items although it is subscribed. Removing." << std::endl;
@ -460,11 +453,6 @@ void IdDialog::loadCircleGroupMeta(const uint32_t &token)
should_re_add = false ; // item already exists should_re_add = false ; // item already exists
} }
// if (vit->mCircleType == GXS_CIRCLE_TYPE_LOCAL)
// {
// std::cerr << "(WW) Local circle not added to tree widget. Needs to be implmeented." << std::endl;
// continue ;
// }
/* Add Widget, and request Pages */ /* Add Widget, and request Pages */
if(should_re_add) if(should_re_add)
@ -480,7 +468,7 @@ void IdDialog::loadCircleGroupMeta(const uint32_t &token)
#ifdef ID_DEBUG #ifdef ID_DEBUG
std::cerr << " adding item for group " << vit->mGroupId << " to own circles"<< std::endl; std::cerr << " adding item for group " << vit->mGroupId << " to own circles"<< std::endl;
#endif #endif
mExternalSubCircleItem->addChild(item); mExternalBelongingCircleItem->addChild(item);
} }
else else
{ {
@ -508,9 +496,15 @@ void IdDialog::loadCircleGroupMeta(const uint32_t &token)
} }
if (subscribed) if (subscribed)
{
item->setIcon(CIRCLEGROUP_CIRCLE_COL_GROUPNAME,QIcon(":icons/bullet_green_128.png")) ; item->setIcon(CIRCLEGROUP_CIRCLE_COL_GROUPNAME,QIcon(":icons/bullet_green_128.png")) ;
item->setToolTip(CIRCLEGROUP_CIRCLE_COL_GROUPNAME,tr("This circle is \"subscribed\" i.e. advertised to neighbor nodes")) ;
}
else else
{
item->setIcon(CIRCLEGROUP_CIRCLE_COL_GROUPNAME,QIcon(":icons/bullet_yellow_128.png")) ; item->setIcon(CIRCLEGROUP_CIRCLE_COL_GROUPNAME,QIcon(":icons/bullet_yellow_128.png")) ;
item->setToolTip(CIRCLEGROUP_CIRCLE_COL_GROUPNAME,"") ;
}
} }
} }
@ -609,8 +603,6 @@ void IdDialog::CircleListCustomPopupMenu( QPoint )
QTreeWidgetItem *item = ui->treeWidget_membership->currentItem(); QTreeWidgetItem *item = ui->treeWidget_membership->currentItem();
contextMnu.addAction(QIcon(IMAGE_CREATE), tr("Create Circle"), this, SLOT(createExternalCircle()));
if (item) if (item)
{ {
uint32_t subscribe_flags = item->data(CIRCLEGROUP_CIRCLE_COL_GROUPFLAGS, Qt::UserRole).toUInt(); uint32_t subscribe_flags = item->data(CIRCLEGROUP_CIRCLE_COL_GROUPFLAGS, Qt::UserRole).toUInt();
@ -621,7 +613,7 @@ void IdDialog::CircleListCustomPopupMenu( QPoint )
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.addAction(QIcon(IMAGE_CREATE), tr("Create external circle"), this, SLOT(createExternalCircle()));
contextMnu.exec(QCursor::pos()); contextMnu.exec(QCursor::pos());
} }

3
retroshare-gui/src/gui/Identity/IdDialog.h
View file

@ -124,9 +124,8 @@ private:
QTreeWidgetItem *contactsItem; QTreeWidgetItem *contactsItem;
QTreeWidgetItem *allItem; QTreeWidgetItem *allItem;
QTreeWidgetItem *ownItem; QTreeWidgetItem *ownItem;
QTreeWidgetItem *mExternalSubCircleItem; QTreeWidgetItem *mExternalBelongingCircleItem;
QTreeWidgetItem *mExternalOtherCircleItem; QTreeWidgetItem *mExternalOtherCircleItem;
QTreeWidgetItem *mExternalLocalCircleItem;
RsGxsUpdateBroadcastBase *mCirclesBroadcastBase ; RsGxsUpdateBroadcastBase *mCirclesBroadcastBase ;
RsGxsGroupId mId; RsGxsGroupId mId;