From edf83f0eb3c158bedc269e5eca0a218506d93ff3 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Thu, 19 Nov 2020 22:24:03 +0100
Subject: [PATCH 1/3] Hide the Subscribe Button on the Channel Post & Forum MSG
 Feeds

* Hide the Subscribe Button on the Channel Post & Forum MSG Feeds
* Fixed to enabled the RS Links for Channel Names back.
---
 .../src/gui/feeds/GxsChannelPostItem.cpp      |  9 ++++--
 .../src/gui/feeds/GxsChannelPostItem.ui       | 27 +++++++----------
 .../src/gui/feeds/GxsForumMsgItem.cpp         |  3 ++
 .../src/gui/qss/stylesheet/Standard.qss       | 30 +++++++++++++++++--
 4 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp
index f8346183f..fa37f17a1 100644
--- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp
+++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp
@@ -209,6 +209,9 @@ void GxsChannelPostItem::setup()
 
 	ui->scoreLabel->hide();
 
+	// hide unsubscribe button not necessary
+	ui->unsubscribeButton->hide();
+
 	ui->downloadButton->hide();
 	ui->playButton->hide();
     //ui->warn_image_label->hide();
@@ -426,7 +429,7 @@ void GxsChannelPostItem::fill()
 	mInFill = true;
 
 	QString title;
-	
+	QString msgText;
 	//float f = QFontMetricsF(font()).height()/14.0 ;
 
 	if(mPost.mThumbnail.mData != NULL)
@@ -465,8 +468,10 @@ void GxsChannelPostItem::fill()
 		title += link.toHtml();
 		ui->titleLabel->setText(title);
 
+		msgText = tr("Post") + ": ";
 		RetroShareLink msgLink = RetroShareLink::createGxsMessageLink(RetroShareLink::TYPE_CHANNEL, mPost.mMeta.mGroupId, mPost.mMeta.mMsgId, messageName());
-        ui->subjectLabel->setText(msgLink.toHtml());
+		msgText += msgLink.toHtml();
+		ui->subjectLabel->setText(msgText);
 
 		if (IS_GROUP_SUBSCRIBED(mGroupMeta.mSubscribeFlags) || IS_GROUP_ADMIN(mGroupMeta.mSubscribeFlags))
 		{
diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui
index 2188df912..e45e9d867 100644
--- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui
+++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui
@@ -77,7 +77,7 @@
           <item>
            <layout class="QHBoxLayout" name="tilteHLayout">
             <item>
-             <widget class="StyledElidedLabel" name="titleLabel">
+             <widget class="QLabel" name="titleLabel">
               <property name="sizePolicy">
                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
                 <horstretch>0</horstretch>
@@ -124,16 +124,6 @@
             </item>
            </layout>
           </item>
-          <item>
-           <widget class="QLabel" name="subjectLabel">
-            <property name="text">
-             <string notr="true">TextLabel</string>
-            </property>
-            <property name="openExternalLinks">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
           <item>
            <spacer name="verticalSpacer_2">
             <property name="orientation">
@@ -147,6 +137,16 @@
             </property>
            </spacer>
           </item>
+          <item>
+           <widget class="QLabel" name="subjectLabel">
+            <property name="text">
+             <string notr="true">TextLabel</string>
+            </property>
+            <property name="openExternalLinks">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
           <item>
            <layout class="QHBoxLayout" name="newCommHLayout">
             <property name="topMargin">
@@ -469,11 +469,6 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>StyledElidedLabel</class>
-   <extends>QLabel</extends>
-   <header>gui/common/StyledElidedLabel.h</header>
-  </customwidget>
   <customwidget>
    <class>ElidedLabel</class>
    <extends>QLabel</extends>
diff --git a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
index 45869585d..17437129b 100644
--- a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
+++ b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
@@ -118,6 +118,9 @@ void GxsForumMsgItem::setup()
 
 	ui->subjectLabel->setMinimumWidth(20);
 
+	// hide unsubscribe button not necessary
+	ui->unsubscribeButton->hide();
+
 	ui->expandFrame->hide();
 	ui->parentFrame->hide();
 }
diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
index d2304a83d..b8dda64e2 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
@@ -169,7 +169,7 @@ ShareManager QPushButton#closeButton {
     padding-right: 6px;
 }
 
-ShareManager QPushButton#addButton {
+ShareManager QPushButton#addButton{
 	font: bold;
 	font-size: 15px;
 	color: white;
@@ -180,7 +180,25 @@ ShareManager QPushButton#addButton {
 	padding: 4px;
 }
 
-ShareManager QPushButton#addButton:hover {
+ShareManager QPushButton#addButton:hover{
+	background: #5AD75A;
+	border-radius: 4px;
+	min-width: 4em;
+	padding: 4px;
+}
+
+SearchDialog QPushButton#pushButtonSearch {
+	font: bold;
+	font-size: 15px;
+	color: white;
+	background: #32CD32;
+	border-radius: 4px;
+	max-height: 25px;
+	min-width: 4em;
+	padding: 4px;
+}
+
+SearchDialog QPushButton#pushButtonSearch:hover{
 	background: #5AD75A;
 	border-radius: 4px;
 	min-width: 4em;
@@ -444,10 +462,16 @@ GxsChannelPostItem > QFrame#mainFrame[new=true] {
 	border-radius: 10px;
 }
 
-GxsChannelPostItem QLabel#newLabel {
+GxsChannelPostItem QLabel#newLabel{
 	border: 1px solid #167BE7;
 	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2291E0, stop: 1 #3EB3FF);
 	border-radius: 3px;
+	color: white;
+}
+
+GxsChannelPostItem QLabel#subjectLabel, GxsChannelPostItem QLabel#titleLabel {
+	font: 11pt;
+	font: bold italic;
 }
 
 GxsChannelPostItem QLabel#logoLabel {

From d136db2ffb7624c4a0f030f134a2162702845a42 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Fri, 20 Nov 2020 20:14:49 +0100
Subject: [PATCH 2/3] Fixing the stylesheets for Channel Post Feeds

---
 retroshare-gui/src/gui/qss/stylesheet/Standard.qss | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
index b8dda64e2..7615dcabb 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
@@ -451,15 +451,11 @@ ChanNewItem QLabel#logoLabel {
 }
 
 GxsChannelPostItem > QFrame#mainFrame[new=false] {
-	border: 3px solid #D3D3D3;
-	background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFFF, stop:1 #F2F2F2);
-	border-radius: 10px;
+	background-color: white;
 }
 
 GxsChannelPostItem > QFrame#mainFrame[new=true] {
-	border: 3px solid #82B9F4;
 	background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #F0F8FD, stop:0.8 #E6F2FD, stop: 0.81 #E6F2FD, stop: 1 #D2E7FD);
-	border-radius: 10px;
 }
 
 GxsChannelPostItem QLabel#newLabel{
@@ -474,6 +470,11 @@ GxsChannelPostItem QLabel#subjectLabel, GxsChannelPostItem QLabel#titleLabel {
 	font: bold italic;
 }
 
+GxsChannelPostItem QFrame#msgFrame {
+	border: 2px solid #82B9F4;
+	border-radius: 3px;
+}
+
 GxsChannelPostItem QLabel#logoLabel {
 	border: 2px solid #D3D3D3;
 }

From 92322d1a4b4a52c42df0eeb027aa36335389f8f7 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Thu, 26 Nov 2020 20:03:49 +0100
Subject: [PATCH 3/3] Fixed to use the right icons for the Grant & Cancel
 membership & improved Circle Notiy layout

* Fixed to use the right icons for the Grant & Cancel membership & improved Circle Notify layout
* Fixed stylesheets for the Circle notify feeds
---
 .../src/gui/feeds/GxsCircleItem.cpp           |   9 +-
 retroshare-gui/src/gui/feeds/GxsCircleItem.ui | 145 +++++++++---------
 .../src/gui/qss/stylesheet/Standard.qss       |   9 ++
 3 files changed, 92 insertions(+), 71 deletions(-)

diff --git a/retroshare-gui/src/gui/feeds/GxsCircleItem.cpp b/retroshare-gui/src/gui/feeds/GxsCircleItem.cpp
index 18997a084..aa7dfa705 100644
--- a/retroshare-gui/src/gui/feeds/GxsCircleItem.cpp
+++ b/retroshare-gui/src/gui/feeds/GxsCircleItem.cpp
@@ -25,6 +25,7 @@
 #include "gui/notifyqt.h"
 #include "gui/Circles/CreateCircleDialog.h"
 #include "gui/gxs/GxsIdDetails.h"
+#include "gui/common/FilesDefs.h"
 
 #include <QLabel>
 #include <QPushButton>
@@ -98,8 +99,9 @@ void GxsCircleItem::setup()
 			ui->gxsIdLabel->setId(mGxsId);
 
 			ui->inviteeButton->setHidden(false);
-            ui->inviteeButton->setText(tr("Grant membership"));
-            ui->inviteeButton->setToolTip(tr("Grant membership to this circle, for this identity"));
+			ui->inviteeButton->setText(tr("Grant membership"));
+			ui->inviteeButton->setToolTip(tr("Grant membership to this circle, for this identity"));
+			ui->inviteeButton->setIcon(FilesDefs::getIconFromQtResourcePath(":/images/accepted16.png"));
 
 			ui->membershipButton->setHidden(true);
 		}
@@ -133,6 +135,7 @@ void GxsCircleItem::setup()
 				ui->inviteeButton->setHidden(false);
 				ui->inviteeButton->setText(tr("Revoke membership"));
 				ui->inviteeButton->setToolTip(tr("Revoke membership for that identity"));
+				ui->inviteeButton->setIcon(FilesDefs::getIconFromQtResourcePath(":/images/cancel.png"));
 			}
             else
             {
@@ -155,6 +158,7 @@ void GxsCircleItem::setup()
 			ui->membershipButton->setHidden(false);
 			ui->membershipButton->setText(tr("Cancel membership request"));
 			ui->membershipButton->setToolTip(tr("Cancel your membership request from that circle"));
+			ui->membershipButton->setIcon(FilesDefs::getIconFromQtResourcePath(":/images/cancel.png"));
 
 			ui->inviteeButton->setHidden(true);
 		}
@@ -168,6 +172,7 @@ void GxsCircleItem::setup()
 			ui->membershipButton->setHidden(false);
 			ui->membershipButton->setText(tr("Cancel membership"));
 			ui->membershipButton->setToolTip(tr("Cancel your membership from that circle"));
+			ui->membershipButton->setIcon(FilesDefs::getIconFromQtResourcePath(":/images/cancel.png"));
 
 			ui->inviteeButton->setHidden(true);
 		}
diff --git a/retroshare-gui/src/gui/feeds/GxsCircleItem.ui b/retroshare-gui/src/gui/feeds/GxsCircleItem.ui
index fa8d30014..ced9279b3 100644
--- a/retroshare-gui/src/gui/feeds/GxsCircleItem.ui
+++ b/retroshare-gui/src/gui/feeds/GxsCircleItem.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>618</width>
-    <height>217</height>
+    <height>108</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="GxsCircleItemGLayout">
@@ -133,29 +133,86 @@
       <item>
        <layout class="QVBoxLayout" name="verticalLayout">
         <item>
-         <widget class="QLabel" name="titleLabel">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="font">
-           <font>
-            <weight>75</weight>
-            <italic>true</italic>
-            <bold>true</bold>
-           </font>
-          </property>
-          <property name="text">
-           <string notr="true">Circle msg</string>
-          </property>
-         </widget>
+         <layout class="QHBoxLayout" name="horizontalLayout">
+          <item>
+           <widget class="QLabel" name="iconLabel">
+            <property name="maximumSize">
+             <size>
+              <width>20</width>
+              <height>20</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>TextLabel</string>
+            </property>
+            <property name="scaledContents">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="GxsIdLabel" name="gxsIdLabel">
+            <property name="font">
+             <font>
+              <pointsize>10</pointsize>
+              <weight>75</weight>
+              <bold>true</bold>
+             </font>
+            </property>
+            <property name="text">
+             <string notr="true">name</string>
+            </property>
+            <property name="openExternalLinks">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="titleLabel">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="font">
+             <font>
+              <weight>75</weight>
+              <italic>true</italic>
+              <bold>true</bold>
+             </font>
+            </property>
+            <property name="text">
+             <string notr="true">Circle msg</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer name="horizontalSpacer">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>358</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
         </item>
         <item>
          <layout class="QHBoxLayout" name="nameHLayout">
           <item>
            <widget class="QLabel" name="label">
+            <property name="font">
+             <font>
+              <pointsize>10</pointsize>
+              <weight>75</weight>
+              <bold>true</bold>
+             </font>
+            </property>
             <property name="text">
              <string>Circle name:</string>
             </property>
@@ -186,56 +243,6 @@
           </item>
          </layout>
         </item>
-        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout">
-          <item>
-           <widget class="QLabel" name="forLabel">
-            <property name="text">
-             <string>Identity:</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="iconLabel">
-            <property name="maximumSize">
-             <size>
-              <width>20</width>
-              <height>20</height>
-             </size>
-            </property>
-            <property name="text">
-             <string>TextLabel</string>
-            </property>
-            <property name="scaledContents">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="GxsIdLabel" name="gxsIdLabel">
-            <property name="text">
-             <string notr="true">name</string>
-            </property>
-            <property name="openExternalLinks">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <spacer name="horizontalSpacer">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>358</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-         </layout>
-        </item>
         <item>
          <layout class="QHBoxLayout" name="horizontalLayout_2">
           <item>
diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
index 7615dcabb..be77a72fb 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
@@ -483,6 +483,15 @@ GxsChannelPostItem QLabel#logoLabel {
   background-color: black;
 }
 
+GxsCircleItem QFrame#frame {
+	background-color: white;
+}
+
+GxsCircleItem QLabel#nameLabel, QLabel#titleLabel {
+	font: 11pt;
+	font: bold italic;
+}
+
 ForumNewItem > QFrame#frame, ForumMsgItem > QFrame#frame {
 	border: 2px solid #CCCCCC;
 	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #EEEEEE, stop: 1 #CCCCCC);