Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-12-10 06:15:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

added circle invite notifications

Browse source
This commit is contained in:
csoler 2020-04-28 21:39:38 +02:00
parent f5af7dfeb3
commit 767440afc5
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
6 changed files with 64 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -438,7 +438,7 @@ void IdDialog::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
case RsGxsCircleEventCode::CIRCLE_MEMBERSHIP_INVITE:
case RsGxsCircleEventCode::CIRCLE_MEMBERSHIP_LEAVE:
case RsGxsCircleEventCode::CIRCLE_MEMBERSHIP_JOIN:
case RsGxsCircleEventCode::CIRCLE_MEMBERSHIP_REVOQUED:
case RsGxsCircleEventCode::CIRCLE_MEMBERSHIP_REVOKED:
case RsGxsCircleEventCode::CACHE_DATA_UPDATED:
updateCircles();

4
retroshare-gui/src/gui/NewsFeed.cpp
View file

@ -329,8 +329,8 @@ void NewsFeed::handleCircleEvent(std::shared_ptr<const RsEvent> event)
case RsGxsCircleEventCode::CIRCLE_MEMBERSHIP_INVITE:
addFeedItemIfUnique(new GxsCircleItem(this, NEWSFEED_CIRCLELIST, pe->mCircleId, pe->mGxsId, RS_FEED_ITEM_CIRCLE_INVIT_REC),true);
break;
case RsGxsCircleEventCode::CIRCLE_MEMBERSHIP_REVOQUED:
addFeedItemIfUnique(new GxsCircleItem(this, NEWSFEED_CIRCLELIST, pe->mCircleId, pe->mGxsId, RS_FEED_ITEM_CIRCLE_MEMB_REVOQUED),true);
case RsGxsCircleEventCode::CIRCLE_MEMBERSHIP_REVOKED:
addFeedItemIfUnique(new GxsCircleItem(this, NEWSFEED_CIRCLELIST, pe->mCircleId, pe->mGxsId, RS_FEED_ITEM_CIRCLE_MEMB_REVOKED),true);
break;
default: break;
}

2
retroshare-gui/src/gui/feeds/GxsCircleItem.cpp
View file

@ -136,7 +136,7 @@ void GxsCircleItem::setup()
ui->acceptButton->setHidden(true);
ui->revokeButton->setHidden(true);
}
else if (mType == RS_FEED_ITEM_CIRCLE_MEMB_REVOQUED)
else if (mType == RS_FEED_ITEM_CIRCLE_MEMB_REVOKED)
{
if(rsIdentity->isOwnId(mGxsId))
ui->titleLabel->setText(tr("Your identity %1 has been revoqued from this circle.").arg(idName));