From c2ebd10aa6beb4fba212bfb1dab077461776b969 Mon Sep 17 00:00:00 2001 From: defnax Date: Wed, 27 Mar 2019 19:33:10 +0100 Subject: [PATCH] Count subscribers on the channels subscribe button like Youtube --- .../gui/gxschannels/GxsChannelPostsWidget.cpp | 10 +++++---- .../gui/gxschannels/GxsChannelPostsWidget.ui | 22 ------------------- 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.cpp index 3cf412606..215036c1e 100644 --- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.cpp +++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.cpp @@ -244,8 +244,6 @@ void GxsChannelPostsWidget::insertChannelDetails(const RsGxsChannelGroup &group) } ui->logoLabel->setPixmap(chanImage); - ui->subscribersLabel->setText(QString::number(group.mMeta.mPop)) ; - if (group.mMeta.mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_PUBLISH) { mStateHelper->setWidgetEnabled(ui->postButton, true); @@ -271,6 +269,9 @@ void GxsChannelPostsWidget::insertChannelDetails(const RsGxsChannelGroup &group) ui->fileToolButton->setEnabled(true); ui->infoWidget->hide(); setViewMode(viewMode()); + + ui->subscribeToolButton->setText(tr("Subscribed") + " " + QString::number(group.mMeta.mPop) ); + ui->infoPosts->clear(); ui->infoDescription->clear(); @@ -332,6 +333,9 @@ void GxsChannelPostsWidget::insertChannelDetails(const RsGxsChannelGroup &group) ui->feedToolButton->setEnabled(false); ui->fileToolButton->setEnabled(false); + + ui->subscribeToolButton->setText(tr("Subscribe ") + " " + QString::number(group.mMeta.mPop) ); + } } @@ -622,8 +626,6 @@ void GxsChannelPostsWidget::blank() mStateHelper->setWidgetEnabled(ui->postButton, false); mStateHelper->setWidgetEnabled(ui->subscribeToolButton, false); - ui->subscribersLabel->setText("") ; - clearPosts(); groupNameChanged(QString()); diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.ui b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.ui index b86d3265c..c175d95d8 100644 --- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.ui +++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.ui @@ -138,28 +138,6 @@ - - - - - 30 - 0 - - - - Subscribers - - - - - - - - - Qt::AlignCenter - - -