Chat toolbar (#916)

* chatdlg.cpp and groupchatdlg.cpp: cleanup imports

* chatdlg.cpp: use ≡ instead of icon, same as it was made in groupchat

* chatdlg.cpp: always show Actions button, same as it was made in groupchat

Author: stokito

src/chatdlg.cpp

@@ -19,18 +19,14 @@
 
 #include "chatdlg.h"
 
-#include "accountlabel.h"
 #include "avatars.h"
 #include "chatview.h"
 #include "eventdb.h"
-#include "fancylabel.h"
 #include "filesharedlg.h"
 #include "filesharingmanager.h"
 #include "iconaction.h"
-#include "iconlabel.h"
 #include "iconselect.h"
 #include "jidutil.h"
-#include "msgmle.h"
 #include "pgputil.h"
 #ifdef PSI_PLUGINS
 #include "pluginmanager.h"
@@ -41,7 +37,6 @@
 #include "iris/xmpp_message.h"
 #include "psiaccount.h"
 #include "psichatdlg.h"
-#include "psicon.h"
 #include "psicontactlist.h"
 #include "psiiconset.h"
 #include "psioptions.h"
@@ -51,32 +46,9 @@
 #include "textutil.h"
 #include "userlist.h"
 
-#include <QCloseEvent>
-#include <QColor>
-#include <QContextMenuEvent>
-#include <QCursor>
 #include <QDateTime>
-#include <QDragEnterEvent>
-#include <QDropEvent>
-#include <QHBoxLayout>
-#include <QKeyEvent>
-#include <QLabel>
-#include <QLayout>
-#include <QLineEdit>
-#include <QList>
-#include <QMenu>
 #include <QMessageBox>
-#include <QMimeData>
-#include <QPixmap>
-#include <QResizeEvent>
-#include <QScrollBar>
-#include <QShowEvent>
-#include <QSplitter>
-#include <QTextDocument> // for TextUtil::escape()
 #include <QTimer>
-#include <QToolBar>
-#include <QToolButton>
-#include <QVBoxLayout>
 #include <Qt>
 #ifdef Q_OS_WIN
 #include <windows.h>

src/chatdlg.ui

@@ -203,21 +203,29 @@
          </item>
          <item>
           <widget class="QToolButton" name="tb_actions">
+           <property name="font">
+            <font>
+             <pointsize>13</pointsize>
+            </font>
+           </property>
            <property name="toolTip">
             <string>Actions</string>
            </property>
-           <property name="text">
-            <string/>
+           <property name="styleSheet">
+            <string notr="true">QToolButton { padding: 0px; } QToolButton::menu-indicator { image:none; } </string>
            </property>
-           <property name="iconSize">
-            <size>
-             <width>16</width>
-             <height>16</height>
-            </size>
+           <property name="text">
+            <string notr="true">≡</string>
            </property>
            <property name="popupMode">
             <enum>QToolButton::ToolButtonPopupMode::InstantPopup</enum>
            </property>
+           <property name="toolButtonStyle">
+            <enum>Qt::ToolButtonStyle::ToolButtonTextOnly</enum>
+           </property>
+           <property name="autoRaise">
+            <bool>true</bool>
+           </property>
            <property name="arrowType">
             <enum>Qt::ArrowType::NoArrow</enum>
            </property>

src/groupchatdlg.cpp

@@ -17,12 +17,10 @@
  *
  */
 
-// TODO: Move all the 'logic' of groupchats into MUCManager. See MUCManager
-// for more details.
+// TODO: Move all the 'logic' of groupchats into MUCManager
 
 #include "groupchatdlg.h"
 
-#include "accountlabel.h"
 #include "avatars.h"
 #include "avcall/avcall.h"
 #include "bookmarkmanager.h"
@@ -72,38 +70,23 @@
 #include "userlist.h"
 #include "vcardfactory.h"
 
-#include <QAction>
 #include <QCheckBox>
 #include <QClipboard>
-#include <QCloseEvent>
-#include <QContextMenuEvent>
 #include <QCursor>
-#include <QDialogButtonBox>
 #include <QEvent>
 #include <QFormLayout>
-#include <QFrame>
-#include <QHBoxLayout>
 #include <QInputDialog>
 #include <QKeyEvent>
-#include <QLabel>
-#include <QLayout>
 #include <QList>
 #include <QMessageBox>
 #include <QMimeData>
 #include <QPointer>
 #include <QPushButton>
-#include <QResizeEvent>
-#include <QScrollBar>
-#include <QSplitter>
 #include <QTextCursor>
-#include <QTextDocument> // for TextUtil::escape()
 #include <QTimer>
-#include <QToolBar>
 #include <QToolButton>
-#include <QToolTip>
 #include <QVBoxLayout>
 #include <QWidgetAction>
-#include <QWindow>
 
 #ifdef Q_OS_WIN
 #include <windows.h>
@@ -1063,7 +1046,6 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, const Jid &j, TabManager *tabManager) : Tab
     d->pm_settings = new QMenu(this);
     connect(d->pm_settings, SIGNAL(aboutToShow()), SLOT(buildMenu()));
     ui_.tb_actions->setMenu(d->pm_settings);
-    ui_.tb_actions->setIcon(IconsetFactory::icon("psi/select").icon());
 
     connect(ui_.hsplitter, SIGNAL(splitterMoved(int, int)), this, SLOT(horizSplitterMoved()));
     connect(ui_.vsplitter, SIGNAL(splitterMoved(int, int)), this, SLOT(verticalSplitterMoved(int, int)));
@@ -2419,12 +2401,10 @@ void GCMainDlg::setLooks()
 
     if (PsiOptions::instance()->getOption("options.ui.contactlist.toolbars.m1.visible").toBool()) {
         ui_.toolbar->show();
-        // ui_.tb_actions->hide();
         ui_.tb_emoticons->hide();
     } else {
         ui_.toolbar->hide();
         ui_.tb_emoticons->setVisible(PsiOptions::instance()->getOption("options.ui.emoticons.use-emoticons").toBool());
-        ui_.tb_actions->show();
     }
 
     if (PsiOptions::instance()->getOption("options.ui.disable-send-button").toBool()) {

src/psichatdlg.cpp

@@ -295,8 +295,6 @@ void PsiChatDlg::initUi()
     pm_settings_ = new QMenu(this);
     connect(pm_settings_, SIGNAL(aboutToShow()), SLOT(buildMenu()));
     ui_.tb_actions->setMenu(pm_settings_);
-    ui_.tb_actions->setIcon(IconsetFactory::icon("psi/select").icon());
-    ui_.tb_actions->setStyleSheet(" QToolButton::menu-indicator { image:none } ");
 
     connect(account()->client()->capsManager(), &CapsManager::capsChanged, this, &PsiChatDlg::capsChanged);
 
@@ -379,7 +377,6 @@ void PsiChatDlg::setLooks()
     if (smallChat_) {
         ui_.lb_status->hide();
         ui_.le_jid->hide();
-        ui_.tb_actions->hide();
         ui_.tb_emoticons->hide();
         ui_.toolbar->hide();
         ui_.tb_voice->hide();
@@ -388,14 +385,12 @@ void PsiChatDlg::setLooks()
         ui_.le_jid->show();
         if (PsiOptions::instance()->getOption("options.ui.contactlist.toolbars.m0.visible").toBool()) {
             ui_.toolbar->show();
-            ui_.tb_actions->hide();
             ui_.tb_emoticons->hide();
             ui_.tb_voice->hide();
         } else {
             ui_.toolbar->hide();
             ui_.tb_emoticons->setVisible(
                 PsiOptions::instance()->getOption("options.ui.emoticons.use-emoticons").toBool());
-            ui_.tb_actions->show();
             ui_.tb_voice->setVisible(AvCallManager::isSupported());
         }
     }