From 03cee1b99854656553047278059a7c31eced42ff Mon Sep 17 00:00:00 2001
From: defnax <retroshare.project@gmail.com>
Date: Tue, 25 Nov 2014 01:01:43 +0000
Subject: [PATCH] * Hide by default the Attachments Recommend Files list. *
 Changed the tooltips for the Hide/Show Button , "Download all" Button now
 with default text. * Moved files count label before "Recommend Files" label

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7708 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 retroshare-gui/src/gui/msgs/MessageWidget.cpp |  8 +--
 retroshare-gui/src/gui/msgs/MessageWidget.ui  | 53 ++++++++++---------
 2 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/retroshare-gui/src/gui/msgs/MessageWidget.cpp b/retroshare-gui/src/gui/msgs/MessageWidget.cpp
index fd1510819..2b71f8e2b 100644
--- a/retroshare-gui/src/gui/msgs/MessageWidget.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageWidget.cpp
@@ -247,7 +247,7 @@ void MessageWidget::processSettings(const QString &settingsGroup, bool load)
 		// load settings
 
 		// expandFiles
-		bool value = Settings->value("expandFiles", true).toBool();
+		bool value = Settings->value("expandFiles", false).toBool();
 		ui.expandFilesButton->setChecked(value);
 		ui.msgList->setVisible(value);
 		togglefileview();
@@ -289,10 +289,10 @@ void MessageWidget::togglefileview()
 
 	if (ui.expandFilesButton->isChecked()) {
 		ui.expandFilesButton->setIcon(QIcon(QString(":/images/edit_remove24.png")));
-		ui.expandFilesButton->setToolTip(tr("Hide"));
+		ui.expandFilesButton->setToolTip(tr("Hide the attachment pane"));
 	} else {
 		ui.expandFilesButton->setIcon(QIcon(QString(":/images/edit_add24.png")));
-		ui.expandFilesButton->setToolTip(tr("Expand"));
+		ui.expandFilesButton->setToolTip(tr("Show the attachment pane"));
 	}
 }
 
@@ -583,7 +583,7 @@ void MessageWidget::fill(const std::string &msgId)
 	ui.msgText->resetImagesStatus(Settings->getMsgLoadEmbeddedImages() || (msgInfo.msgflags & RS_MSG_LOAD_EMBEDDED_IMAGES));
 	ui.msgText->setHtml(text);
 
-	ui.filesText->setText(QString("(%1 %2)").arg(msgInfo.count).arg(msgInfo.count == 1 ? tr("File") : tr("Files")));
+	ui.filesText->setText(QString("%1").arg(msgInfo.count)/*.arg(msgInfo.count == 1 ? tr("File") : tr("Files"))*/);
 
 	if (msgInfo.msgflags & RS_MSG_ENCRYPTED) {
 		ui.decryptFrame->show();
diff --git a/retroshare-gui/src/gui/msgs/MessageWidget.ui b/retroshare-gui/src/gui/msgs/MessageWidget.ui
index 79c25b606..4e3db31e2 100644
--- a/retroshare-gui/src/gui/msgs/MessageWidget.ui
+++ b/retroshare-gui/src/gui/msgs/MessageWidget.ui
@@ -355,6 +355,26 @@
             <property name="spacing">
              <number>6</number>
             </property>
+            <item row="0" column="0">
+             <widget class="QPushButton" name="expandFilesButton">
+              <property name="focusPolicy">
+               <enum>Qt::NoFocus</enum>
+              </property>
+              <property name="text">
+               <string/>
+              </property>
+              <property name="icon">
+               <iconset resource="../images.qrc">
+                <normaloff>:/images/edit_remove24.png</normaloff>:/images/edit_remove24.png</iconset>
+              </property>
+              <property name="checkable">
+               <bool>true</bool>
+              </property>
+              <property name="checked">
+               <bool>false</bool>
+              </property>
+             </widget>
+            </item>
             <item row="0" column="2">
              <widget class="QLabel" name="label_6">
               <property name="text">
@@ -365,13 +385,13 @@
               </property>
              </widget>
             </item>
-            <item row="0" column="3">
+            <item row="0" column="4">
              <widget class="QLabel" name="label_2">
               <property name="font">
                <font>
                 <pointsize>10</pointsize>
-                <weight>75</weight>
-                <bold>true</bold>
+                <weight>50</weight>
+                <bold>false</bold>
                </font>
               </property>
               <property name="text">
@@ -379,12 +399,12 @@
               </property>
              </widget>
             </item>
-            <item row="0" column="4">
+            <item row="0" column="3">
              <widget class="QLabel" name="filesText">
               <property name="font">
                <font>
                 <pointsize>10</pointsize>
-                <italic>true</italic>
+                <italic>false</italic>
                </font>
               </property>
               <property name="text">
@@ -415,32 +435,15 @@
             <property name="toolTip">
              <string>Download all Recommended Files</string>
             </property>
+            <property name="text">
+             <string>Download all</string>
+            </property>
             <property name="icon">
              <iconset resource="../images.qrc">
               <normaloff>:/images/down.png</normaloff>:/images/down.png</iconset>
             </property>
            </widget>
           </item>
-          <item>
-           <widget class="QPushButton" name="expandFilesButton">
-            <property name="focusPolicy">
-             <enum>Qt::NoFocus</enum>
-            </property>
-            <property name="text">
-             <string/>
-            </property>
-            <property name="icon">
-             <iconset resource="../images.qrc">
-              <normaloff>:/images/edit_remove24.png</normaloff>:/images/edit_remove24.png</iconset>
-            </property>
-            <property name="checkable">
-             <bool>true</bool>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
          </layout>
         </item>
        </layout>