From 749a34d8154eff45ca41a0cb9073a6d6e8edeb87 Mon Sep 17 00:00:00 2001
From: RetroPooh <RetroPooh@users.noreply.github.com>
Date: Sun, 22 Oct 2017 15:55:08 +0300
Subject: [PATCH] add text labels to post buttons in forums and channels; fix
 version selector placement

---
 .../gui/gxschannels/GxsChannelPostsWidget.cpp |  2 ++
 .../gui/gxschannels/GxsChannelPostsWidget.ui  |  6 ++++++
 .../gui/gxsforums/GxsForumThreadWidget.cpp    |  3 +++
 .../src/gui/gxsforums/GxsForumThreadWidget.ui | 20 +++++++++++++++----
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.cpp
index 56cf042a5..b3f5662b4 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.cpp
@@ -75,6 +75,8 @@ GxsChannelPostsWidget::GxsChannelPostsWidget(const RsGxsGroupId &channelId, QWid
 	connect(ui->subscribeToolButton, SIGNAL(subscribe(bool)), this, SLOT(subscribeGroup(bool)));
 	connect(NotifyQt::getInstance(), SIGNAL(settingsChanged()), this, SLOT(settingsChanged()));
 
+	ui->postButton->setText(tr("Add new post"));
+	
 	/* add filter actions */
 	ui->filterLineEdit->addFilter(QIcon(), tr("Title"), FILTER_TITLE, tr("Search Title"));
 	ui->filterLineEdit->addFilter(QIcon(), tr("Message"), FILTER_MSG, tr("Search Message"));
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.ui b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.ui
index 47f98bcdf..7e9b478ac 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.ui
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.ui
@@ -169,6 +169,9 @@
         <property name="toolTip">
          <string>Post to Channel</string>
         </property>
+        <property name="text">
+         <string>Add new post</string>
+        </property>
         <property name="icon">
          <iconset resource="../images.qrc">
           <normaloff>:/images/mail_send.png</normaloff>:/images/mail_send.png</iconset>
@@ -179,6 +182,9 @@
           <height>16</height>
          </size>
         </property>
+        <property name="toolButtonStyle">
+         <enum>Qt::ToolButtonTextBesideIcon</enum>
+        </property>
         <property name="autoRaise">
          <bool>true</bool>
         </property>
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
index f08b1f61f..2a0f59ceb 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
@@ -210,6 +210,9 @@ GxsForumThreadWidget::GxsForumThreadWidget(const RsGxsGroupId &forumId, QWidget
 	connect(ui->newmessageButton, SIGNAL(clicked()), this, SLOT(replytoforummessage()));
 	connect(ui->newthreadButton, SIGNAL(clicked()), this, SLOT(createthread()));
 
+	ui->newmessageButton->setText(tr("Reply"));
+	ui->newthreadButton->setText(tr("New thread"));
+	
 	connect(ui->threadTreeWidget, SIGNAL(itemSelectionChanged()), this, SLOT(changedThread()));
 	connect(ui->threadTreeWidget, SIGNAL(itemClicked(QTreeWidgetItem*,int)), this, SLOT(clickedThread(QTreeWidgetItem*,int)));
 	connect(ui->viewBox, SIGNAL(currentIndexChanged(int)), this, SLOT(changedViewBox()));
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui
index 789616228..571e99c01 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui
@@ -84,6 +84,9 @@
             <property name="toolTip">
              <string>Start new Thread for Selected Forum</string>
             </property>
+            <property name="text">
+             <string>New Thread</string>
+            </property>
             <property name="icon">
              <iconset resource="../images.qrc">
               <normaloff>:/images/mail_new.png</normaloff>:/images/mail_new.png</iconset>
@@ -94,6 +97,9 @@
               <height>16</height>
              </size>
             </property>
+            <property name="toolButtonStyle">
+             <enum>Qt::ToolButtonTextBesideIcon</enum>
+            </property>
             <property name="autoRaise">
              <bool>true</bool>
             </property>
@@ -306,8 +312,8 @@
           <widget class="QToolButton" name="newmessageButton">
            <property name="maximumSize">
             <size>
-             <width>24</width>
-             <height>24</height>
+             <width>16777215</width>
+             <height>16777215</height>
             </size>
            </property>
            <property name="focusPolicy">
@@ -316,10 +322,16 @@
            <property name="toolTip">
             <string>Reply Message</string>
            </property>
+           <property name="text">
+            <string>Reply</string>
+           </property>
            <property name="icon">
             <iconset resource="../images.qrc">
              <normaloff>:/images/mail_reply.png</normaloff>:/images/mail_reply.png</iconset>
            </property>
+            <property name="toolButtonStyle">
+             <enum>Qt::ToolButtonTextBesideIcon</enum>
+            </property>
            <property name="autoRaise">
             <bool>true</bool>
            </property>
@@ -358,7 +370,7 @@
            </property>
           </widget>
          </item>
-         <item row="0" column="8">
+         <item row="0" column="9">
           <widget class="Line" name="lineRight">
            <property name="orientation">
             <enum>Qt::Vertical</enum>
@@ -471,7 +483,7 @@
            </property>
           </widget>
          </item>
-         <item row="0" column="9">
+         <item row="0" column="8">
           <widget class="QComboBox" name="versions_CB"/>
          </item>
          <item row="0" column="7">