added some flat mail icons for Messages Main Window

retroshare-gui/src/gui/icons.qrc

@@ -299,5 +299,11 @@
         <file>icons/png/add-file.png</file>
         <file>icons/png/add-image.png</file>
         <file>icons/png/attachements.png</file>
+        <file>icons/mail/compose.png</file>
+        <file>icons/mail/delete.png</file>
+        <file>icons/mail/forward-mail .png</file>
+        <file>icons/mail/replayall-mail.png</file>
+        <file>icons/mail/reply-mail.png</file>
+        <file>icons/mail/tags.png</file>
     </qresource>
 </RCC>

retroshare-gui/src/gui/msgs/MessageComposer.ui

@@ -475,8 +475,8 @@
                  <string/>
                 </property>
                 <property name="icon">
-                 <iconset>
+                 <iconset resource="../icons.qrc">
-                  <normaloff>:/images/add_image24.png</normaloff>:/images/add_image24.png</iconset>
+                  <normaloff>:/icons/png/add-image.png</normaloff>:/icons/png/add-image.png</iconset>
                 </property>
                 <property name="iconSize">
                  <size>

retroshare-gui/src/gui/msgs/MessageWidget.cpp

@@ -297,10 +297,10 @@ void MessageWidget::togglefileview()
 	*/
 
 	if (ui.expandFilesButton->isChecked()) {
-		ui.expandFilesButton->setIcon(QIcon(QString(":/images/edit_remove24.png")));
+		ui.expandFilesButton->setIcon(QIcon(QString(":/icons/png/down-arrow.png")));
 		ui.expandFilesButton->setToolTip(tr("Hide the attachment pane"));
 	} else {
-		ui.expandFilesButton->setIcon(QIcon(QString(":/images/edit_add24.png")));
+		ui.expandFilesButton->setIcon(QIcon(QString(":/icons/png/up-arrow.png")));
 		ui.expandFilesButton->setToolTip(tr("Show the attachment pane"));
 	}
 }

retroshare-gui/src/gui/msgs/MessageWidget.ui

@@ -176,8 +176,14 @@
                <string>Reply</string>
               </property>
               <property name="icon">
-               <iconset resource="../images.qrc">
+               <iconset resource="../icons.qrc">
-                <normaloff>:/images/replymail-pressed.png</normaloff>:/images/replymail-pressed.png</iconset>
+                <normaloff>:/icons/mail/reply-mail.png</normaloff>:/icons/mail/reply-mail.png</iconset>
+              </property>
+              <property name="iconSize">
+               <size>
+                <width>22</width>
+                <height>22</height>
+               </size>
               </property>
               <property name="toolButtonStyle">
                <enum>Qt::ToolButtonTextBesideIcon</enum>
@@ -193,8 +199,14 @@
                <string>Reply all</string>
               </property>
               <property name="icon">
-               <iconset resource="../images.qrc">
+               <iconset resource="../icons.qrc">
-                <normaloff>:/images/replymailall24-hover.png</normaloff>:/images/replymailall24-hover.png</iconset>
+                <normaloff>:/icons/mail/replayall-mail.png</normaloff>:/icons/mail/replayall-mail.png</iconset>
+              </property>
+              <property name="iconSize">
+               <size>
+                <width>22</width>
+                <height>22</height>
+               </size>
               </property>
               <property name="toolButtonStyle">
                <enum>Qt::ToolButtonTextBesideIcon</enum>
@@ -210,8 +222,14 @@
                <string>Forward</string>
               </property>
               <property name="icon">
-               <iconset resource="../images.qrc">
+               <iconset resource="../icons.qrc">
-                <normaloff>:/images/mailforward24-hover.png</normaloff>:/images/mailforward24-hover.png</iconset>
+                <normaloff>:/icons/mail/forward-mail .png</normaloff>:/icons/mail/forward-mail .png</iconset>
+              </property>
+              <property name="iconSize">
+               <size>
+                <width>22</width>
+                <height>22</height>
+               </size>
               </property>
               <property name="toolButtonStyle">
                <enum>Qt::ToolButtonTextBesideIcon</enum>
@@ -224,8 +242,14 @@
                <string>Delete</string>
               </property>
               <property name="icon">
-               <iconset resource="../images.qrc">
+               <iconset resource="../icons.qrc">
-                <normaloff>:/images/deletemail-pressed.png</normaloff>:/images/deletemail-pressed.png</iconset>
+                <normaloff>:/icons/mail/delete.png</normaloff>:/icons/mail/delete.png</iconset>
+              </property>
+              <property name="iconSize">
+               <size>
+                <width>22</width>
+                <height>22</height>
+               </size>
               </property>
               <property name="toolButtonStyle">
                <enum>Qt::ToolButtonTextBesideIcon</enum>
@@ -599,8 +623,8 @@
                <string/>
               </property>
               <property name="icon">
-               <iconset resource="../images.qrc">
+               <iconset resource="../icons.qrc">
-                <normaloff>:/images/edit_remove24.png</normaloff>:/images/edit_remove24.png</iconset>
+                <normaloff>:/icons/png/down-arrow.png</normaloff>:/icons/png/down-arrow.png</iconset>
               </property>
               <property name="checkable">
                <bool>true</bool>
@@ -651,8 +675,8 @@
              <string>Download all</string>
             </property>
             <property name="icon">
-             <iconset resource="../images.qrc">
+             <iconset resource="../icons.qrc">
-              <normaloff>:/images/down.png</normaloff>:/images/down.png</iconset>
+              <normaloff>:/icons/png/download.png</normaloff>:/icons/png/download.png</iconset>
             </property>
            </widget>
           </item>
@@ -721,6 +745,7 @@
  </customwidgets>
  <resources>
   <include location="../images.qrc"/>
+  <include location="../icons.qrc"/>
  </resources>
  <connections>
   <connection>

retroshare-gui/src/gui/msgs/MessagesDialog.ui

@@ -113,8 +113,14 @@
                  <string>Compose</string>
                 </property>
                 <property name="icon">
-                 <iconset resource="../images.qrc">
+                 <iconset resource="../icons.qrc">
-                  <normaloff>:/images/folder-draft24.png</normaloff>:/images/folder-draft24.png</iconset>
+                  <normaloff>:/icons/mail/compose.png</normaloff>:/icons/mail/compose.png</iconset>
+                </property>
+                <property name="iconSize">
+                 <size>
+                  <width>24</width>
+                  <height>24</height>
+                 </size>
                 </property>
                 <property name="toolButtonStyle">
                  <enum>Qt::ToolButtonTextBesideIcon</enum>
@@ -297,8 +303,14 @@
                 <string>Tags</string>
                </property>
                <property name="icon">
-                <iconset resource="../images.qrc">
+                <iconset resource="../icons.qrc">
-                 <normaloff>:/images/tag24.png</normaloff>:/images/tag24.png</iconset>
+                 <normaloff>:/icons/mail/tags.png</normaloff>:/icons/mail/tags.png</iconset>
+               </property>
+               <property name="iconSize">
+                <size>
+                 <width>24</width>
+                 <height>24</height>
+                </size>
                </property>
                <property name="popupMode">
                 <enum>QToolButton::InstantPopup</enum>