Merge pull request #1913 from defnax/fixing-comments-button-icon

Added new icon for the Chat menu

retroshare-gui/src/gui/chat/ChatWidget.cpp

@@ -200,12 +200,14 @@ ChatWidget::ChatWidget(QWidget *parent)
 	#endif
 
 	QMenu *menu = new QMenu();
+	menu->addAction(ui->actionMessageHistory);
+	menu->addMenu(fontmenu);
+	menu->addSeparator();
+	menu->addAction(ui->actionSaveChatHistory);
 	menu->addAction(ui->actionClearChatHistory);
 	menu->addAction(ui->actionDeleteChatHistory);
-	menu->addAction(ui->actionSaveChatHistory);
-	menu->addAction(ui->actionMessageHistory);
+
 	ui->pushtoolsButton->setMenu(menu);
-	menu->addMenu(fontmenu);
 
 	ui->actionSendAsPlainText->setChecked(Settings->getChatSendAsPlainTextByDef());
 	ui->chatTextEdit->setOnlyPlainText(ui->actionSendAsPlainText->isChecked());

retroshare-gui/src/gui/chat/ChatWidget.ui

@@ -774,9 +774,12 @@ border-image: url(:/images/closepressed.png)
           <property name="focusPolicy">
            <enum>Qt::NoFocus</enum>
           </property>
+          <property name="toolTip">
+           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          </property>
           <property name="icon">
            <iconset resource="../icons.qrc">
-            <normaloff>:/icons/png/options2.png</normaloff>:/icons/png/options2.png</iconset>
+            <normaloff>:/icons/png/menu.png</normaloff>:/icons/png/menu.png</iconset>
           </property>
           <property name="iconSize">
            <size>

retroshare-gui/src/gui/icons.qrc

@@ -91,6 +91,7 @@
         <file>icons/png/leave2.png</file>
         <file>icons/png/messages-notify.png</file>
         <file>icons/png/messages.png</file>
+        <file>icons/png/menu.png</file>
         <file>icons/png/microphone_mute.png</file>
         <file>icons/png/microphone.png</file>
         <file>icons/png/netgraph.png</file>