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

Merge branch 'master' into v0.6-FT4

Browse source
This commit is contained in:
csoler 2020-02-22 21:11:00 +01:00 • committed by GitHub
commit 737b846e23
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
324 changed files with 1296 additions and 2057 deletions
Download patch file Download diff file Expand all files Collapse all files

12
retroshare-gui/src/gui/Posted/PostedItem.cpp
View file

@ -26,6 +26,7 @@
#include "rshare.h"
#include "PostedItem.h"
#include "gui/feeds/FeedHolder.h"
#include "gui/RetroShareLink.h"
#include "gui/gxs/GxsIdDetails.h"
#include "util/misc.h"
#include "util/qtthreadsutils.h"
@ -133,6 +134,7 @@ void PostedItem::setup()
ui->clearButton->hide();
ui->readAndClearButton->hide();
ui->nameLabel->hide();
}
bool PostedItem::setGroup(const RsPostedGroup &group, bool doFill)
@ -300,11 +302,9 @@ void PostedItem::loadComment()
}
void PostedItem::fill()
{
// if (isLoading()) {
// /* Wait for all requests */
// return;
// }
{
RetroShareLink link = RetroShareLink::createGxsGroupLink(RetroShareLink::TYPE_POSTED, mGroup.mMeta.mGroupId, groupName());
ui->nameLabel->setText(link.toHtml());
QPixmap sqpixmap2 = QPixmap(":/images/thumb-default.png");
@ -447,11 +447,13 @@ void PostedItem::fill()
{
ui->clearButton->hide();
ui->readAndClearButton->hide();
ui->nameLabel->hide();
}
else
{
ui->clearButton->show();
ui->readAndClearButton->show();
ui->nameLabel->show();
}
// disable voting buttons - if they have already voted.