From 05a97c13a78d4c87dd39af7932f2203cbb393fe1 Mon Sep 17 00:00:00 2001 From: defnax Date: Wed, 7 Oct 2020 22:22:59 +0200 Subject: [PATCH] Added Thumbnail for blocked messages * Added Thumbnail for blocked messages * Fixed to disable the Picture Label when Author is banned. --- .../src/gui/Posted/BoardPostDisplayWidget.cpp | 9 +++++---- retroshare-gui/src/gui/Posted/Posted_images.qrc | 1 + .../src/gui/Posted/images/thumb-blocked.png | Bin 0 -> 10325 bytes 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 retroshare-gui/src/gui/Posted/images/thumb-blocked.png diff --git a/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp b/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp index 74326d8f4..21685d83d 100644 --- a/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp +++ b/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp @@ -217,6 +217,7 @@ void BoardPostDisplayWidgetBase::setup() qtime.setTime_t(mPost.mMeta.mPublishTs); QString timestamp = qtime.toString("hh:mm dd-MMM-yyyy"); dateLabel()->setText(timestamp); + pictureLabel()->setDisabled(true); } else { @@ -353,15 +354,15 @@ void BoardPostDisplayWidget_compact::setup() RsReputationLevel overall_reputation = rsReputations->overallReputationLevel(mPost.mMeta.mAuthorId); bool redacted = (overall_reputation == RsReputationLevel::LOCALLY_NEGATIVE); + int desired_height = QFontMetricsF(font()).height() * 5; + ui->pictureLabel->setFixedSize(16/9.0*desired_height,desired_height); + if(redacted) { - ui->pictureLabel->setPicture( FilesDefs::getPixmapFromQtResourcePath(":/images/thumb-default.png") ); + ui->pictureLabel->setPicture( FilesDefs::getPixmapFromQtResourcePath(":/images/thumb-blocked.png") ); } else { - int desired_height = QFontMetricsF(font()).height() * 5; - ui->pictureLabel->setFixedSize(16/9.0*desired_height,desired_height); - if(mPost.mImage.mData != NULL) { QPixmap pixmap; diff --git a/retroshare-gui/src/gui/Posted/Posted_images.qrc b/retroshare-gui/src/gui/Posted/Posted_images.qrc index fab0bae65..72cb3c40c 100644 --- a/retroshare-gui/src/gui/Posted/Posted_images.qrc +++ b/retroshare-gui/src/gui/Posted/Posted_images.qrc @@ -6,6 +6,7 @@ images/up-arrow.png images/comments.png images/comments_blue.png + images/thumb-blocked.png images/thumb-default.png images/thumb-link.png images/share.png diff --git a/retroshare-gui/src/gui/Posted/images/thumb-blocked.png b/retroshare-gui/src/gui/Posted/images/thumb-blocked.png new file mode 100644 index 0000000000000000000000000000000000000000..3ff44d7fa772f93ea1cb2fcf1c1e7d61aef582c7 GIT binary patch literal 10325 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