From 2d8a86f2fa2d8e08299fc4f33c41e05a6ec402d8 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Sat, 23 Jan 2021 17:25:53 +0100
Subject: [PATCH] Hide title label for comments feeds

* Hide Title label for comments feeds
* Hide Vote frame for boards feed
---
 retroshare-gui/src/gui/Posted/PostedItem.cpp       |  1 +
 retroshare-gui/src/gui/Posted/PostedItem.ui        |  3 +++
 .../src/gui/feeds/BoardsCommentsItem.cpp           |  7 ++++---
 .../src/gui/feeds/ChannelsCommentsItem.cpp         | 14 ++++++++------
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/retroshare-gui/src/gui/Posted/PostedItem.cpp b/retroshare-gui/src/gui/Posted/PostedItem.cpp
index 4b9a0c91c..b97e08e32 100644
--- a/retroshare-gui/src/gui/Posted/PostedItem.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedItem.cpp
@@ -652,6 +652,7 @@ void PostedItem::fill()
 		ui->clearButton->show();
 		ui->readAndClearButton->show();
 		ui->nameLabel->show();
+		ui->voteFrame->hide();
 	}
 
 	// disable voting buttons - if they have already voted.
diff --git a/retroshare-gui/src/gui/Posted/PostedItem.ui b/retroshare-gui/src/gui/Posted/PostedItem.ui
index 4c011c121..f16c7b100 100644
--- a/retroshare-gui/src/gui/Posted/PostedItem.ui
+++ b/retroshare-gui/src/gui/Posted/PostedItem.ui
@@ -184,6 +184,9 @@
       </item>
       <item row="0" column="1" rowspan="2">
        <layout class="QVBoxLayout" name="verticalLayout_3">
+        <property name="leftMargin">
+         <number>9</number>
+        </property>
         <property name="topMargin">
          <number>6</number>
         </property>
diff --git a/retroshare-gui/src/gui/feeds/BoardsCommentsItem.cpp b/retroshare-gui/src/gui/feeds/BoardsCommentsItem.cpp
index be9be47fb..1e42cd06f 100644
--- a/retroshare-gui/src/gui/feeds/BoardsCommentsItem.cpp
+++ b/retroshare-gui/src/gui/feeds/BoardsCommentsItem.cpp
@@ -365,7 +365,7 @@ void BoardsCommentsItem::setup()
 	mInFill = false;
 
 	/* clear ui */
-	ui->titleLabel->setText(tr("Loading"));
+	//ui->titleLabel->setText(tr("Loading"));
 	ui->datetimeLabel->clear();
 	ui->replyFrame->hide();
 
@@ -456,8 +456,8 @@ void BoardsCommentsItem::fill()
 
 	ui->logoLabel->setPixmap( FilesDefs::getPixmapFromQtResourcePath(":/icons/png/comment.png"));
 
-	RetroShareLink link = RetroShareLink::createGxsGroupLink(RetroShareLink::TYPE_POSTED, mGroupMeta.mGroupId, groupName());
-	ui->titleLabel->setText(link.toHtml());
+	//RetroShareLink link = RetroShareLink::createGxsGroupLink(RetroShareLink::TYPE_POSTED, mGroupMeta.mGroupId, groupName());
+	//ui->titleLabel->setText(link.toHtml());
 
 	RetroShareLink msgLink = RetroShareLink::createGxsMessageLink(RetroShareLink::TYPE_POSTED, mPost.mMeta.mGroupId, mPost.mMeta.mMsgId, messageName());
 	ui->subjectLabel->setText(msgLink.toHtml());
@@ -506,6 +506,7 @@ void BoardsCommentsItem::fill()
 	{
 		ui->clearButton->show();
 		ui->readAndClearButton->show();
+		ui->titleLabel->hide();
 	}
 	
 	// hide read button not yet functional
diff --git a/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.cpp b/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.cpp
index 6b80de690..362bff7b8 100644
--- a/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.cpp
+++ b/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.cpp
@@ -150,7 +150,7 @@ void ChannelsCommentsItem::setup()
 	mLoaded = false;
 
 	/* clear ui */
-	ui->titleLabel->setText(tr("Loading..."));
+	//ui->titleLabel->setText(tr("Loading..."));
 	ui->datetimelabel->clear();
 
 	/* general ones */
@@ -180,7 +180,7 @@ void ChannelsCommentsItem::setup()
 	ui->expandButton->hide();
 	ui->unsubscribeButton->hide();
 
-	ui->titleLabel->setMinimumWidth(100);
+	//ui->titleLabel->setMinimumWidth(100);
 
 	ui->mainFrame->setProperty("new", false);
 	ui->mainFrame->style()->unpolish(ui->mainFrame);
@@ -412,9 +412,9 @@ void ChannelsCommentsItem::fill()
 			removeItem();
 		}
 
-		RetroShareLink link = RetroShareLink::createGxsGroupLink(RetroShareLink::TYPE_CHANNEL, mPost.mMeta.mGroupId, groupName());
-		title += link.toHtml();
-		ui->titleLabel->setText(title);
+		//RetroShareLink link = RetroShareLink::createGxsGroupLink(RetroShareLink::TYPE_CHANNEL, mPost.mMeta.mGroupId, groupName());
+		//title += link.toHtml();
+		//ui->titleLabel->setText(title);
 
 		RetroShareLink msgLink = RetroShareLink::createGxsMessageLink(RetroShareLink::TYPE_CHANNEL, mPost.mMeta.mGroupId, mPost.mMeta.mMsgId, messageName());
 		ui->subjectLabel->setText(msgLink.toHtml());
@@ -428,6 +428,7 @@ void ChannelsCommentsItem::fill()
 			ui->unsubscribeButton->setEnabled(false);
 		}
 		ui->readButton->hide();
+		ui->titleLabel->hide();
 
 		if (IS_MSG_NEW(mPost.mMeta.mMsgStatus)) {
 			mCloseOnRead = true;
@@ -436,7 +437,7 @@ void ChannelsCommentsItem::fill()
 	else
 	{
 		/* subject */
-		ui->titleLabel->setText(QString::fromUtf8(mPost.mMeta.mMsgName.c_str()));
+		//ui->titleLabel->setText(QString::fromUtf8(mPost.mMeta.mMsgName.c_str()));
 
 		uint32_t autorized_lines = (int)floor((ui->logoLabel->height() - ui->titleLabel->height() - ui->buttonHLayout->sizeHint().height())/QFontMetricsF(ui->subjectLabel->font()).height());
 
@@ -455,6 +456,7 @@ void ChannelsCommentsItem::fill()
 		ui->readAndClearButton->hide();
 		ui->unsubscribeButton->hide();
 		ui->copyLinkButton->show();
+		ui->titleLabel->hide();
 
 		if (IS_GROUP_SUBSCRIBED(mGroupMeta.mSubscribeFlags) || IS_GROUP_ADMIN(mGroupMeta.mSubscribeFlags))
 		{