Merge pull request #1964 from defnax/Chat-widget

Moved Fonts to bottom & Chat notify to top

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

@@ -115,6 +115,7 @@ ChatWidget::ChatWidget(QWidget *parent)
 	//ui->sendButton->setFixedHeight(iconHeight);
 	ui->sendButton->setIconSize(iconSize);
 	ui->typingLabel->setMaximumHeight(QFontMetricsF(font()).height()*1.2);
+	ui->fontcolorButton->setIconSize(iconSize);
 
 	//Initialize search
 	iCharToStartSearch=Settings->getChatSearchCharToStartSearch();
@@ -189,7 +190,7 @@ ChatWidget::ChatWidget(QWidget *parent)
 	ui->hashBox->setDropWidget(this);
 	ui->hashBox->setAutoHide(true);
 
-	QMenu *fontmenu = new QMenu(tr("Set text font & color"));
+	QMenu *fontmenu = new QMenu();
 	fontmenu->addAction(ui->actionChooseFont);
 	fontmenu->addAction(ui->actionChooseColor);
 	fontmenu->addAction(ui->actionResetFont);
@@ -198,10 +199,10 @@ ChatWidget::ChatWidget(QWidget *parent)
 	#ifdef USE_CMARK
 	fontmenu->addAction(ui->actionSend_as_CommonMark);
 	#endif
+	ui->fontcolorButton->setMenu(fontmenu);
 
 	QMenu *menu = new QMenu();
 	menu->addAction(ui->actionMessageHistory);
-	menu->addMenu(fontmenu);
 	menu->addSeparator();
 	menu->addAction(ui->actionSaveChatHistory);
 	menu->addAction(ui->actionClearChatHistory);

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

@@ -455,13 +455,13 @@ border-image: url(:/images/closepressed.png)
             </widget>
            </item>
            <item>
-            <widget class="QToolButton" name="notifyButton">
-             <property name="focusPolicy">
-              <enum>Qt::NoFocus</enum>
+            <widget class="QToolButton" name="fontcolorButton">
+             <property name="toolTip">
+              <string>Set font &amp; color</string>
              </property>
              <property name="icon">
               <iconset resource="../icons.qrc">
-               <normaloff>:/icons/png/chat-bubble-notify.png</normaloff>:/icons/png/chat-bubble-notify.png</iconset>
+               <normaloff>:/icons/png/font.png</normaloff>:/icons/png/font.png</iconset>
              </property>
              <property name="iconSize">
               <size>
@@ -469,6 +469,9 @@ border-image: url(:/images/closepressed.png)
                <height>28</height>
               </size>
              </property>
+             <property name="popupMode">
+              <enum>QToolButton::InstantPopup</enum>
+             </property>
              <property name="autoRaise">
               <bool>true</bool>
              </property>
@@ -769,6 +772,26 @@ border-image: url(:/images/closepressed.png)
           </property>
          </widget>
         </item>
+        <item>
+         <widget class="QToolButton" name="notifyButton">
+          <property name="focusPolicy">
+           <enum>Qt::NoFocus</enum>
+          </property>
+          <property name="icon">
+           <iconset resource="../icons.qrc">
+            <normaloff>:/icons/png/chat-bubble-notify.png</normaloff>:/icons/png/chat-bubble-notify.png</iconset>
+          </property>
+          <property name="iconSize">
+           <size>
+            <width>28</width>
+            <height>28</height>
+           </size>
+          </property>
+          <property name="autoRaise">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
         <item>
          <widget class="QToolButton" name="pushtoolsButton">
           <property name="focusPolicy">