From 0f3e054778a468db43817eac1d5976d806f0304d Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Fri, 23 Oct 2020 22:06:13 +0200
Subject: [PATCH] moved attach button to second tab of create channel msg
 (information redundancy). Added some tooltips

---
 .../gui/gxschannels/CreateGxsChannelMsg.ui    | 21 ++++++-------------
 .../gxschannels/GxsChannelPostThumbnail.cpp   |  2 +-
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui
index 185639054..db3da194f 100644
--- a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui
+++ b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui
@@ -185,6 +185,9 @@ p, li { white-space: pre-wrap; }
             </item>
             <item>
              <widget class="QComboBox" name="aspectRatio_CB">
+              <property name="toolTip">
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Choose aspect ratio policy.&lt;/p&gt;&lt;p&gt;In 'Auto' mode, the most suitable &lt;/p&gt;&lt;p&gt;aspect ratio is chosen for you.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              </property>
               <property name="iconSize">
                <size>
                 <width>24</width>
@@ -213,19 +216,6 @@ p, li { white-space: pre-wrap; }
               </item>
              </widget>
             </item>
-            <item>
-             <widget class="QPushButton" name="addfilepushButton">
-              <property name="text">
-               <string>Add File to Attach</string>
-              </property>
-              <property name="iconSize">
-               <size>
-                <width>24</width>
-                <height>24</height>
-               </size>
-              </property>
-             </widget>
-            </item>
             <item>
              <spacer name="horizontalSpacer_2">
               <property name="orientation">
@@ -305,7 +295,7 @@ p, li { white-space: pre-wrap; }
              <string/>
             </property>
             <property name="icon">
-             <iconset>
+             <iconset resource="../icons.qrc">
               <normaloff>:/icons/png/add-file.png</normaloff>:/icons/png/add-file.png</iconset>
             </property>
             <property name="iconSize">
@@ -329,7 +319,7 @@ p, li { white-space: pre-wrap; }
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>81</width>
+               <width>84</width>
                <height>24</height>
               </rect>
              </property>
@@ -514,6 +504,7 @@ p, li { white-space: pre-wrap; }
  </customwidgets>
  <resources>
   <include location="../images.qrc"/>
+  <include location="../icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.cpp
index ea887212c..eb890b075 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.cpp
@@ -118,7 +118,7 @@ void ChannelPostThumbnailView::init(const RsGxsChannelPost& post)
     mPostImage->setPicture(thumbnail);
 
     if(mFlags & FLAG_ALLOW_PAN)
-        mPostImage->setToolTip(tr("Use mouse to center and zoom into the image"));
+        mPostImage->setToolTip(tr("Use mouse to center and zoom\ninto the image, so as to\n crop it for your post."));
 
     QVBoxLayout *layout = new QVBoxLayout(this);