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

added line in circle tooltip for visibility. Re-worked tooltip text a little bit

Browse source
This commit is contained in:
csoler 2016-06-05 15:49:33 -04:00
parent ee2559620b
commit 54a0ca4678
4 changed files with 79 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libretroshare/src/retroshare/rsgxscircles.h
View file

@ -112,6 +112,7 @@ class RsGxsCircleDetails
std::string mCircleName; std::string mCircleName;
uint32_t mCircleType; uint32_t mCircleType;
RsGxsCircleId mRestrictedCircleId;
bool mAmIAllowed ; // true when one of load GXS ids belong to the circle allowed list (admin list & subscribed list). bool mAmIAllowed ; // true when one of load GXS ids belong to the circle allowed list (admin list & subscribed list).

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

@ -283,6 +283,7 @@ bool p3GxsCircles:: getCircleDetails(const RsGxsCircleId &id, RsGxsCircleDetails
details.mCircleName = data.mCircleName; details.mCircleName = data.mCircleName;
details.mCircleType = data.mCircleType; details.mCircleType = data.mCircleType;
details.mRestrictedCircleId = data.mRestrictedCircleId;
details.mAllowedNodes = data.mAllowedNodes; details.mAllowedNodes = data.mAllowedNodes;
details.mSubscriptionFlags.clear(); details.mSubscriptionFlags.clear();
@ -588,6 +589,7 @@ bool RsGxsCircleCache::loadBaseCircle(const RsGxsCircleGroup &circle)
mOriginator = circle.mMeta.mOriginator ; mOriginator = circle.mMeta.mOriginator ;
mAllowedNodes = circle.mLocalFriends ; mAllowedNodes = circle.mLocalFriends ;
mRestrictedCircleId = circle.mMeta.mCircleId ;
mMembershipStatus.clear() ; mMembershipStatus.clear() ;

1
libretroshare/src/services/p3gxscircles.h
View file

@ -152,6 +152,7 @@ class RsGxsCircleCache
uint32_t mCircleType; uint32_t mCircleType;
bool mIsExternal; bool mIsExternal;
RsGxsCircleId mRestrictedCircleId ; // circle ID that circle is restricted to.
uint32_t mGroupStatus; uint32_t mGroupStatus;
uint32_t mGroupSubscribeFlags; uint32_t mGroupSubscribeFlags;

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

@ -517,7 +517,16 @@ void IdDialog::loadCircleGroupMeta(const uint32_t &token)
QString tooltip ; QString tooltip ;
tooltip += tr("Circle ID: ")+QString::fromStdString(vit->mGroupId.toStdString()) ; tooltip += tr("Circle ID: ")+QString::fromStdString(vit->mGroupId.toStdString()) ;
tooltip += "\n"+tr("Role: "); tooltip += "\n"+tr("Visibility: ");
if(details.mRestrictedCircleId == details.mCircleId)
tooltip += tr("Private (only visible to invited members)") ;
else if(!details.mRestrictedCircleId.isNull())
tooltip += tr("Only visible to full members of circle ")+QString::fromStdString(details.mRestrictedCircleId.toStdString()) ;
else
tooltip += tr("Public") ;
tooltip += "\n"+tr("Your role: ");
if(am_I_admin) if(am_I_admin)
tooltip += tr("Administrator (Can edit invite list, and request membership).") ; tooltip += tr("Administrator (Can edit invite list, and request membership).") ;
@ -530,10 +539,10 @@ void IdDialog::loadCircleGroupMeta(const uint32_t &token)
else else
tooltip += tr("unsubscribed (Only receive invite list).") ; tooltip += tr("unsubscribed (Only receive invite list).") ;
tooltip += "\n"+tr("Permissions: ") ; tooltip += "\n"+tr("Your status: ") ;
if(am_I_in_circle) if(am_I_in_circle)
tooltip += tr("Full member (have access to data limited to this circle)") ; tooltip += tr("Full member (you have access to data limited to this circle)") ;
else else
tooltip += tr("Not a member (do not have access to data limited to this circle)") ; tooltip += tr("Not a member (do not have access to data limited to this circle)") ;