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

fixed display of channels with publish key

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7585 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-10-06 19:18:09 +00:00
parent 0f025efb13
commit b3bedd592d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
View File

@ -284,12 +284,12 @@ void GxsGroupFrameDialog::groupTreeCustomPopupMenu(QPoint point)
if (shareKeyType()) { if (shareKeyType()) {
action = contextMnu.addAction(QIcon(IMAGE_SHARE), tr("Share"), this, SLOT(shareKey())); action = contextMnu.addAction(QIcon(IMAGE_SHARE), tr("Share"), this, SLOT(shareKey()));
action->setEnabled(!mGroupId.isNull() && isAdmin); action->setEnabled(!mGroupId.isNull() && isPublisher);
} }
if (!mGroupId.isNull() && isPublisher && !isAdmin) { //if (!mGroupId.isNull() && isPublisher && !isAdmin) {
contextMnu.addAction(QIcon(":/images/settings16.png"), tr("Restore Publish Rights" ), this, SLOT(restoreGroupKeys())); // contextMnu.addAction(QIcon(":/images/settings16.png"), tr("Restore Publish Rights" ), this, SLOT(restoreGroupKeys()));
} //}
if (getLinkType() != RetroShareLink::TYPE_UNKNOWN) { if (getLinkType() != RetroShareLink::TYPE_UNKNOWN) {
action = contextMnu.addAction(QIcon(IMAGE_COPYLINK), tr("Copy RetroShare Link"), this, SLOT(copyGroupLink())); action = contextMnu.addAction(QIcon(IMAGE_COPYLINK), tr("Copy RetroShare Link"), this, SLOT(copyGroupLink()));
@ -657,6 +657,7 @@ void GxsGroupFrameDialog::groupInfoToGroupItemInfo(const RsGroupMetaData &groupI
groupItemInfo.popularity = groupInfo.mPop; groupItemInfo.popularity = groupInfo.mPop;
groupItemInfo.lastpost = QDateTime::fromTime_t(groupInfo.mLastPost); groupItemInfo.lastpost = QDateTime::fromTime_t(groupInfo.mLastPost);
groupItemInfo.subscribeFlags = groupInfo.mSubscribeFlags; groupItemInfo.subscribeFlags = groupInfo.mSubscribeFlags;
groupItemInfo.privatekey = IS_GROUP_PUBLISHER(groupInfo.mSubscribeFlags) ;
#if TOGXS #if TOGXS
if (groupInfo.mGroupFlags & RS_DISTRIB_AUTHEN_REQ) { if (groupInfo.mGroupFlags & RS_DISTRIB_AUTHEN_REQ) {