From 983ac7dda91670db47ff766c4ddd4b2c2c830906 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 9 Dec 2018 21:22:18 +0100
Subject: [PATCH] improved icons in forums and removed - button because it is
 not useful

---
 .../gui/gxsforums/GxsForumThreadWidget.cpp    | 16 ++++---
 .../src/gui/gxsforums/GxsForumThreadWidget.ui | 43 +++++++++----------
 2 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
index 9bc8fd487..f0c851b44 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
@@ -365,7 +365,9 @@ GxsForumThreadWidget::GxsForumThreadWidget(const RsGxsGroupId &forumId, QWidget
 	connect(ui->threadTreeWidget->selectionModel(), SIGNAL(currentChanged(const QModelIndex&,const QModelIndex&)), this, SLOT(changedSelection(const QModelIndex&,const QModelIndex&)));
 	connect(ui->viewBox, SIGNAL(currentIndexChanged(int)), this, SLOT(changedViewBox()));
 
-	connect(ui->expandButton, SIGNAL(clicked()), this, SLOT(togglethreadview()));
+	//connect(ui->expandButton, SIGNAL(clicked()), this, SLOT(togglethreadview()));
+    ui->expandButton->hide();
+
 	connect(ui->previousButton, SIGNAL(clicked()), this, SLOT(previousMessage()));
 	connect(ui->nextButton, SIGNAL(clicked()), this, SLOT(nextMessage()));
 	connect(ui->nextUnreadButton, SIGNAL(clicked()), this, SLOT(nextUnreadMessage()));
@@ -940,15 +942,15 @@ void GxsForumThreadWidget::togglethreadview()
 
 void GxsForumThreadWidget::togglethreadview_internal()
 {
-	if (ui->expandButton->isChecked()) {
+//	if (ui->expandButton->isChecked()) {
 		ui->postText->setVisible(true);
 		ui->expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png")));
 		ui->expandButton->setToolTip(tr("Hide"));
-	} else  {
-		ui->postText->setVisible(false);
-		ui->expandButton->setIcon(QIcon(QString(":/images/edit_add24.png")));
-		ui->expandButton->setToolTip(tr("Expand"));
-	}
+//	} else  {
+//		ui->postText->setVisible(false);
+//		ui->expandButton->setIcon(QIcon(QString(":/images/edit_add24.png")));
+//		ui->expandButton->setToolTip(tr("Expand"));
+//	}
 }
 
 void GxsForumThreadWidget::changedVersion()
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui
index 122372207..f9d226c94 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui
@@ -239,7 +239,7 @@
        </item>
        <item>
         <layout class="QGridLayout" name="postLayout">
-         <item row="0" column="5">
+         <item row="0" column="6">
           <widget class="QToolButton" name="downloadButton">
            <property name="maximumSize">
             <size>
@@ -294,7 +294,7 @@
            </property>
           </widget>
          </item>
-         <item row="0" column="15">
+         <item row="0" column="16">
           <widget class="QPushButton" name="expandButton">
            <property name="maximumSize">
             <size>
@@ -320,21 +320,14 @@
            </property>
           </widget>
          </item>
-         <item row="0" column="6">
-          <widget class="Line" name="lineLeft">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="9">
+         <item row="0" column="10">
           <widget class="Line" name="lineRight">
            <property name="orientation">
             <enum>Qt::Vertical</enum>
            </property>
           </widget>
          </item>
-         <item row="0" column="12">
+         <item row="0" column="13">
           <spacer name="postHSpacer">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
@@ -426,31 +419,38 @@
            </property>
           </widget>
          </item>
-         <item row="0" column="11">
+         <item row="0" column="12">
           <widget class="GxsIdLabel" name="by_label">
            <property name="text">
             <string notr="true"/>
            </property>
           </widget>
          </item>
-         <item row="0" column="10">
-          <widget class="QLabel" name="by_text_label">
-           <property name="text">
-            <string>By </string>
+         <item row="0" column="7">
+          <widget class="Line" name="lineLeft">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
            </property>
           </widget>
          </item>
-         <item row="0" column="8">
+         <item row="0" column="9">
           <widget class="QComboBox" name="versions_CB"/>
          </item>
-         <item row="0" column="7">
+         <item row="0" column="8">
           <widget class="QLabel" name="time_label">
            <property name="text">
             <string notr="true"/>
            </property>
           </widget>
          </item>
-         <item row="0" column="13">
+         <item row="0" column="11">
+          <widget class="QLabel" name="by_text_label">
+           <property name="text">
+            <string>By </string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="5">
           <widget class="QToolButton" name="nextUnreadButton">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
@@ -465,8 +465,8 @@
             <string notr="true"/>
            </property>
            <property name="icon">
-            <iconset resource="../WikiPoos/Wiki_images.qrc">
-             <normaloff>:/images/arrow-right.png</normaloff>:/images/arrow-right.png</iconset>
+            <iconset resource="../images.qrc">
+             <normaloff>:/images/start.png</normaloff>:/images/start.png</iconset>
            </property>
           </widget>
          </item>
@@ -550,7 +550,6 @@
  </customwidgets>
  <resources>
   <include location="../icons.qrc"/>
-  <include location="../WikiPoos/Wiki_images.qrc"/>
   <include location="../images.qrc"/>
  </resources>
  <connections/>