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

Merge pull request #2093 from defnax/Subscribe-Button

Browse Source 
Added back counting on Subscribe button
This commit is contained in:
csoler 2020-11-01 22:23:14 +01:00 committed by GitHub
commit b667ccd645
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
View File

@ -1048,7 +1048,7 @@ void GxsChannelPostsWidgetWithModel::insertChannelDetails(const RsGxsChannelGrou
setAutoDownload(autoDownload); setAutoDownload(autoDownload);
#endif #endif
setSubscribeButtonText(group.mMeta.mGroupId,group.mMeta.mSubscribeFlags); setSubscribeButtonText(group.mMeta.mGroupId,group.mMeta.mSubscribeFlags, group.mMeta.mPop);
if (IS_GROUP_SUBSCRIBED(group.mMeta.mSubscribeFlags)) if (IS_GROUP_SUBSCRIBED(group.mMeta.mSubscribeFlags))
{ {
@ -1160,16 +1160,16 @@ void GxsChannelPostsWidgetWithModel::insertChannelDetails(const RsGxsChannelGrou
//ui->fileToolButton->setEnabled(false); //ui->fileToolButton->setEnabled(false);
#endif #endif
setSubscribeButtonText(group.mMeta.mGroupId,group.mMeta.mSubscribeFlags); setSubscribeButtonText(group.mMeta.mGroupId,group.mMeta.mSubscribeFlags, group.mMeta.mPop);
showPostDetails(); showPostDetails();
} }
void GxsChannelPostsWidgetWithModel::setSubscribeButtonText(const RsGxsGroupId& group_id,uint32_t flags) void GxsChannelPostsWidgetWithModel::setSubscribeButtonText(const RsGxsGroupId& group_id,uint32_t flags, uint32_t mPop)
{ {
if(IS_GROUP_SUBSCRIBED(flags)) if(IS_GROUP_SUBSCRIBED(flags))
{ {
ui->subscribeToolButton->setText(tr("Unsubscribe")); ui->subscribeToolButton->setText(tr("Subscribed")+ " " + QString::number(mPop));
ui->subscribeToolButton->setSubscribed(true); ui->subscribeToolButton->setSubscribed(true);
ui->subscribeToolButton->setEnabled(true); ui->subscribeToolButton->setEnabled(true);
} }

2
retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h
View File

@ -175,7 +175,7 @@ private:
void handleEvent_main_thread(std::shared_ptr<const RsEvent> event); void handleEvent_main_thread(std::shared_ptr<const RsEvent> event);
private: private:
void setSubscribeButtonText(const RsGxsGroupId& group_id,uint32_t flags); void setSubscribeButtonText(const RsGxsGroupId& group_id,uint32_t flags, uint32_t mPop);
// QAction *mAutoDownloadAction; // QAction *mAutoDownloadAction;