Improved the Channel Composer & small fixes

* Fixed the issue with stretching of the RichTextEdit
* Improved the Layout
* Moved the Channel Name to the Top Right to be visible always
* Added option to hide the Thumbnail frame when needs more space for Post Edit/Blog Posting

retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp

@@ -75,6 +75,7 @@ CreateGxsChannelMsg::CreateGxsChannelMsg(const RsGxsGroupId &cId, RsGxsMessageId
     connect(removeAllFilesButton, SIGNAL(clicked() ), this , SLOT(clearAllAttachments()));
     //connect(addfilepushButton, SIGNAL(clicked() ), this , SLOT(addExtraFile()));
 	connect(subjectEdit,SIGNAL(textChanged(const QString&)),this,SLOT(updatePreviewText(const QString&)));
+	connect(expandButton, SIGNAL(clicked()), this, SLOT( toggle()));
 
 	connect(addThumbnailButton, SIGNAL(clicked() ), this , SLOT(addThumbnail()));
 	connect(thumbNailCb, SIGNAL(toggled(bool)), this, SLOT(allowAutoMediaThumbNail(bool)));
@@ -86,6 +87,7 @@ CreateGxsChannelMsg::CreateGxsChannelMsg(const RsGxsGroupId &cId, RsGxsMessageId
 	channelpostButton->setIcon(FilesDefs::getIconFromQtResourcePath(":/icons/png/comment.png"));
 	attachmentsButton->setIcon(FilesDefs::getIconFromQtResourcePath(":/icons/png/attachements.png"));
 	addThumbnailButton->setIcon(FilesDefs::getIconFromQtResourcePath(":/icons/png/add-image.png"));
+	expandButton->setIcon(FilesDefs::getIconFromQtResourcePath(QString(":/icons/png/up-arrow.png")));
 
     aspectRatio_CB->setItemIcon(0,FilesDefs::getIconFromQtResourcePath(":/icons/svg/ratio-auto.svg"));
     aspectRatio_CB->setItemIcon(1,FilesDefs::getIconFromQtResourcePath(":/icons/svg/ratio-1-1.svg"));
@@ -926,3 +928,22 @@ void CreateGxsChannelMsg::on_attachmentsButton_clicked()
 {
 	stackedWidget->setCurrentIndex(1);
 }
+
+void CreateGxsChannelMsg::toggle()
+{
+	if (expandButton->isChecked())
+	{
+		thumbnailFrame->hide();
+		gridLayoutTextEdit->setContentsMargins(0,9,0,0);
+		expandButton->setIcon(FilesDefs::getIconFromQtResourcePath(QString(":/icons/png/down-arrow.png")));
+		expandButton->setToolTip(tr("Show"));
+	}
+	else
+	{
+		thumbnailFrame->show();
+		gridLayoutTextEdit->setContentsMargins(0,0,0,0);
+		expandButton->setIcon(FilesDefs::getIconFromQtResourcePath(QString(":/icons/png/up-arrow.png")));
+		expandButton->setToolTip(tr("Hide"));
+	}
+}
+

retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.h

@@ -57,6 +57,7 @@ protected:
 	virtual void dropEvent(QDropEvent *event);
 
 private slots:
+	void toggle() ;
 	void addExtraFile();
 	void checkAttachmentReady();
 	void deleteAttachment();

retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui

@@ -57,10 +57,10 @@
       <property name="verticalSpacing">
        <number>0</number>
       </property>
-      <item row="0" column="1">
+      <item row="0" column="0">
-       <widget class="QPushButton" name="attachmentsButton">
+       <widget class="QPushButton" name="channelpostButton">
         <property name="text">
-         <string>Attachments</string>
+         <string>Channel Post</string>
         </property>
         <property name="iconSize">
          <size>
@@ -70,7 +70,58 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="0" colspan="3">
+      <item row="2" column="0" colspan="4">
+       <layout class="QHBoxLayout" name="buttonHLayout">
+        <property name="spacing">
+         <number>9</number>
+        </property>
+        <item>
+         <widget class="QCheckBox" name="generateCheckBox">
+          <property name="text">
+           <string>Generate mass data</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSpinBox" name="generateSpinBox">
+          <property name="minimum">
+           <number>1</number>
+          </property>
+          <property name="maximum">
+           <number>999</number>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer_3">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QPushButton" name="postButton">
+          <property name="text">
+           <string>Post</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="cancelButton">
+          <property name="text">
+           <string>Cancel</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="1" column="0" colspan="4">
        <widget class="QStackedWidget" name="stackedWidget">
         <property name="mouseTracking">
          <bool>true</bool>
@@ -85,15 +136,45 @@
          <number>0</number>
         </property>
         <widget class="QWidget" name="stackedWidgetPage1">
-         <layout class="QGridLayout" name="gridLayout_2">
+         <layout class="QGridLayout" name="gridLayout_5">
           <property name="leftMargin">
            <number>0</number>
           </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
           <property name="rightMargin">
            <number>0</number>
           </property>
-          <item row="0" column="0" rowspan="4">
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
+          <item row="0" column="0">
+           <widget class="QFrame" name="thumbnailFrame">
+            <property name="frameShape">
+             <enum>QFrame::NoFrame</enum>
+            </property>
+            <property name="frameShadow">
+             <enum>QFrame::Plain</enum>
+            </property>
+            <layout class="QGridLayout" name="gridLayout_3">
+             <property name="leftMargin">
+              <number>6</number>
+             </property>
+             <property name="topMargin">
+              <number>9</number>
+             </property>
+             <property name="rightMargin">
+              <number>6</number>
+             </property>
+             <property name="bottomMargin">
+              <number>0</number>
+             </property>
+             <item row="0" column="0" rowspan="3">
               <layout class="QVBoxLayout" name="verticalLayout_2">
+               <property name="spacing">
+                <number>6</number>
+               </property>
                <item>
                 <widget class="ChannelPostThumbnailView" name="preview_W" native="true">
                  <property name="sizePolicy">
@@ -119,42 +200,6 @@
                </item>
               </layout>
              </item>
-          <item row="0" column="1">
-           <layout class="QHBoxLayout" name="channelNameHLayout">
-            <property name="topMargin">
-             <number>6</number>
-            </property>
-            <item>
-             <widget class="QLabel" name="channelNameLabel">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="font">
-               <font>
-                <weight>75</weight>
-                <bold>true</bold>
-               </font>
-              </property>
-              <property name="text">
-               <string>Channel Post to:</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLineEdit" name="channelName">
-              <property name="enabled">
-               <bool>true</bool>
-              </property>
-              <property name="readOnly">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
              <item row="1" column="1">
               <widget class="QLabel" name="channelAttachLabel">
                <property name="text">
@@ -166,9 +211,12 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt; Use Drag and Drop / Add Files button, to Hash new files.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt; Copy/Paste RetroShare links from your shares&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                </property>
+               <property name="alignment">
+                <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+               </property>
               </widget>
              </item>
-          <item row="2" column="1">
+             <item row="0" column="1">
               <layout class="QHBoxLayout" name="horizontalLayout">
                <item>
                 <widget class="QPushButton" name="addThumbnailButton">
@@ -234,34 +282,35 @@ p, li { white-space: pre-wrap; }
                </item>
               </layout>
              </item>
-          <item row="3" column="1">
+            </layout>
-           <layout class="QVBoxLayout" name="verticalLayout_3">
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <layout class="QGridLayout" name="gridLayoutTextEdit">
             <property name="topMargin">
-             <number>9</number>
+             <number>6</number>
             </property>
-            <item>
+            <item row="0" column="0">
              <widget class="QLineEdit" name="subjectEdit">
               <property name="placeholderText">
                <string>Title</string>
               </property>
              </widget>
             </item>
-            <item>
+            <item row="0" column="1">
-             <spacer name="verticalSpacer">
+             <widget class="QToolButton" name="expandButton">
-              <property name="orientation">
+              <property name="toolTip">
-               <enum>Qt::Vertical</enum>
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Hide&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
               </property>
-              <property name="sizeHint" stdset="0">
+              <property name="text">
-               <size>
+               <string/>
-                <width>20</width>
-                <height>40</height>
-               </size>
               </property>
-             </spacer>
+              <property name="checkable">
+               <bool>true</bool>
+              </property>
+             </widget>
             </item>
-           </layout>
+            <item row="1" column="0" colspan="2">
-          </item>
-          <item row="4" column="0" colspan="2">
              <widget class="RichTextEdit" name="RichTextEditWidget" native="true">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -272,6 +321,8 @@ p, li { white-space: pre-wrap; }
              </widget>
             </item>
            </layout>
+          </item>
+         </layout>
         </widget>
         <widget class="QWidget" name="stackedWidgetPage2">
          <layout class="QVBoxLayout" name="verticalLayout">
@@ -344,7 +395,7 @@ p, li { white-space: pre-wrap; }
                </size>
               </property>
               <property name="toolTip">
-               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Add File&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Remove File&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
               </property>
               <property name="text">
                <string/>
@@ -393,7 +444,7 @@ p, li { white-space: pre-wrap; }
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>827</width>
+               <width>824</width>
                <height>24</height>
               </rect>
              </property>
@@ -444,23 +495,10 @@ p, li { white-space: pre-wrap; }
         </widget>
        </widget>
       </item>
-      <item row="0" column="2">
+      <item row="0" column="1">
-       <spacer name="horizontalSpacer">
+       <widget class="QPushButton" name="attachmentsButton">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>486</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="0" column="0">
-       <widget class="QPushButton" name="channelpostButton">
         <property name="text">
-         <string>Channel Post</string>
+         <string>Attachments</string>
         </property>
         <property name="iconSize">
          <size>
@@ -470,52 +508,46 @@ p, li { white-space: pre-wrap; }
         </property>
        </widget>
       </item>
-      <item row="2" column="0" colspan="3">
+      <item row="0" column="2">
-       <layout class="QHBoxLayout" name="buttonHLayout">
+       <layout class="QHBoxLayout" name="channelNameHLayout">
         <property name="spacing">
          <number>9</number>
         </property>
+        <property name="leftMargin">
+         <number>6</number>
+        </property>
+        <property name="topMargin">
+         <number>6</number>
+        </property>
+        <property name="rightMargin">
+         <number>6</number>
+        </property>
         <item>
-         <widget class="QCheckBox" name="generateCheckBox">
+         <widget class="QLabel" name="channelNameLabel">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="font">
+           <font>
+            <weight>75</weight>
+            <bold>true</bold>
+           </font>
+          </property>
           <property name="text">
-           <string>Generate mass data</string>
+           <string>Channel Post to:</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QSpinBox" name="generateSpinBox">
+         <widget class="QLineEdit" name="channelName">
-          <property name="minimum">
+          <property name="enabled">
-           <number>1</number>
+           <bool>true</bool>
           </property>
-          <property name="maximum">
+          <property name="readOnly">
-           <number>999</number>
+           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer_3">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QPushButton" name="postButton">
-          <property name="text">
-           <string>Post</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="cancelButton">
-          <property name="text">
-           <string>Cancel</string>
           </property>
          </widget>
         </item>