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

removed more debug info, improved tooltips

Browse source
This commit is contained in:
csoler 2016-05-28 21:09:44 -04:00
parent ccd72cb827
commit 2bde81f210
2 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1018,12 +1018,16 @@ bool p3GxsCircles::cache_load_for_token(uint32_t token)
if(locked_processLoadingCacheEntry(it->second)) if(locked_processLoadingCacheEntry(it->second))
{ {
#ifdef DEBUG_CIRCLES
std::cerr << " All peers available. Moving to cache..." << std::endl; std::cerr << " All peers available. Moving to cache..." << std::endl;
#endif
mLoadingCache.erase(it); mLoadingCache.erase(it);
} }
else else
{ {
#ifdef DEBUG_CIRCLES
std::cerr << " Unprocessed peers. Requesting reload..." << std::endl; std::cerr << " Unprocessed peers. Requesting reload..." << std::endl;
#endif
/* schedule event to try reload gxsIds */ /* schedule event to try reload gxsIds */
RsTickEvent::schedule_in(CIRCLE_EVENT_RELOADIDS, GXSID_LOAD_CYCLE, id.toStdString()); RsTickEvent::schedule_in(CIRCLE_EVENT_RELOADIDS, GXSID_LOAD_CYCLE, id.toStdString());
@ -1179,7 +1183,9 @@ bool p3GxsCircles::cache_reloadids(const RsGxsCircleId &circleId)
} }
else else
{ {
#ifdef DEBUG_CIRCLES
std::cerr << " Unprocessed peers. Requesting reload for circle " << circleId << std::endl; std::cerr << " Unprocessed peers. Requesting reload for circle " << circleId << std::endl;
#endif
/* schedule event to try reload gxsIds */ /* schedule event to try reload gxsIds */
RsTickEvent::schedule_in(CIRCLE_EVENT_RELOADIDS, GXSID_LOAD_CYCLE, circleId.toStdString()); RsTickEvent::schedule_in(CIRCLE_EVENT_RELOADIDS, GXSID_LOAD_CYCLE, circleId.toStdString());
@ -1201,7 +1207,9 @@ bool p3GxsCircles::locked_checkCircleCacheForMembershipUpdate(RsGxsCircleCache&
if(cache.mLastUpdatedMembershipTS + GXS_CIRCLE_DELAY_TO_FORCE_MEMBERSHIP_UPDATE < now) if(cache.mLastUpdatedMembershipTS + GXS_CIRCLE_DELAY_TO_FORCE_MEMBERSHIP_UPDATE < now)
{ {
#ifdef DEBUG_CIRCLES
std::cerr << "Cache entry for circle " << cache.mCircleId << " needs a swab over membership requests. Re-scheduling it." << std::endl; std::cerr << "Cache entry for circle " << cache.mCircleId << " needs a swab over membership requests. Re-scheduling it." << std::endl;
#endif
// this should be called regularly // this should be called regularly

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

@ -499,6 +499,13 @@ 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: ") ;
if(am_I_in_circle)
tooltip += tr("Full member (have access to data limited to this circle)") ;
else
tooltip += tr("Not a member (do not have access to data limited to this circle)") ;
item->setToolTip(CIRCLEGROUP_CIRCLE_COL_GROUPNAME,tooltip); item->setToolTip(CIRCLEGROUP_CIRCLE_COL_GROUPNAME,tooltip);
#ifdef CIRCLE_MEMBERSHIP_CATEGORIES #ifdef CIRCLE_MEMBERSHIP_CATEGORIES
if(am_I_in_circle) if(am_I_in_circle)