X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fitemviewsettingspage.cpp;h=e4136e0c56d7b2440c107adc2c6fc3316b6cc56c;hp=1b37c534e58ec3d25d1ac36f60564de947cf211c;hb=HEAD;hpb=983164018267de71e92c025ff81e4f10b8ddc5b0

diff --git a/src/qtui/settingspages/itemviewsettingspage.cpp b/src/qtui/settingspages/itemviewsettingspage.cpp
index 1b37c534..5b86360e 100644
--- a/src/qtui/settingspages/itemviewsettingspage.cpp
+++ b/src/qtui/settingspages/itemviewsettingspage.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2022 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,62 +15,66 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
-#include <QSignalMapper>
 
 #include "itemviewsettingspage.h"
+
+#include <QSignalMapper>
+
 #include "colorbutton.h"
 #include "qtui.h"
 #include "qtuistyle.h"
 
-ItemViewSettingsPage::ItemViewSettingsPage(QWidget *parent)
-  : SettingsPage(tr("Appearance"), tr("Chat & Nick Lists"), parent),
-  _mapper(new QSignalMapper(this))
+ItemViewSettingsPage::ItemViewSettingsPage(QWidget* parent)
+    : SettingsPage(tr("Interface"), tr("Chat & Nick Lists"), parent)
 {
-  ui.setupUi(this);
+    ui.setupUi(this);
 
-  _networkItem = new QTreeWidgetItem(ui.bufferViewPreview, QStringList(tr("Network")));
-  _networkItem->setFlags(Qt::NoItemFlags);
+    _networkItem = new QTreeWidgetItem(ui.bufferViewPreview, QStringList(tr("Network")));
+    _networkItem->setFlags(Qt::NoItemFlags);
 
-  _inactiveBufferItem = new QTreeWidgetItem(_networkItem, QStringList(tr("Inactive")));
-  _defaultBufferItem = new QTreeWidgetItem(_networkItem, QStringList(tr("Normal")));
-  _unreadBufferItem = new QTreeWidgetItem(_networkItem, QStringList(tr("Unread messages")));
-  _highlightedBufferItem = new QTreeWidgetItem(_networkItem, QStringList(tr("Highlight")));
-  _activeBufferItem = new QTreeWidgetItem(_networkItem, QStringList(tr("Other activity")));
+    _inactiveBufferItem = new QTreeWidgetItem(_networkItem, QStringList(tr("Inactive")));
+    _defaultBufferItem = new QTreeWidgetItem(_networkItem, QStringList(tr("Normal")));
+    _unreadBufferItem = new QTreeWidgetItem(_networkItem, QStringList(tr("Unread messages")));
+    _highlightedBufferItem = new QTreeWidgetItem(_networkItem, QStringList(tr("Highlight")));
+    _activeBufferItem = new QTreeWidgetItem(_networkItem, QStringList(tr("Other activity")));
 
-  ui.bufferViewPreview->expandAll();
+    ui.bufferViewPreview->expandAll();
 
-  foreach(ColorButton *button, findChildren<ColorButton *>()) {
-    connect(button, SIGNAL(colorChanged(QColor)), _mapper, SLOT(map()));
-    _mapper->setMapping(button, button);
-  }
-  connect(_mapper, SIGNAL(mapped(QWidget *)), SLOT(updateBufferViewPreview(QWidget *)));
+    for (ColorButton* button : findChildren<ColorButton*>()) {
+        connect(button, &ColorButton::colorChanged, button, [this, button]() {
+            updateBufferViewPreview(button);
+        });
+    }
 
-  initAutoWidgets();
+    initAutoWidgets();
 }
 
-void ItemViewSettingsPage::save() {
-  SettingsPage::save();
-  QtUi::style()->generateSettingsQss();
-  QtUi::style()->reload();
+void ItemViewSettingsPage::save()
+{
+    SettingsPage::save();
+    QtUi::style()->generateSettingsQss();
+    QtUi::style()->reload();
 }
 
-void ItemViewSettingsPage::updateBufferViewPreview(QWidget *widget) {
-  ColorButton *button = qobject_cast<ColorButton *>(widget);
-  if(!button)
-    return;
+void ItemViewSettingsPage::updateBufferViewPreview(QWidget* widget)
+{
+    auto* button = qobject_cast<ColorButton*>(widget);
+    if (!button)
+        return;
 
-  QString objName = button->objectName();
-  if(objName == "defaultBufferColor") {
-    _networkItem->setForeground(0, button->color());
-    _defaultBufferItem->setForeground(0, button->color());
-  } else if(objName == "inactiveBufferColor")
-    _inactiveBufferItem->setForeground(0, button->color());
-  else if(objName == "activeBufferColor")
-    _activeBufferItem->setForeground(0, button->color());
-  else if(objName == "unreadBufferColor")
-    _unreadBufferItem->setForeground(0, button->color());
-  else if(objName == "highlightedBufferColor")
-    _highlightedBufferItem->setForeground(0, button->color());
+    QString objName = button->objectName();
+    if (objName == "defaultBufferColor") {
+        _networkItem->setForeground(0, button->color());
+        _defaultBufferItem->setForeground(0, button->color());
+    }
+    else if (objName == "inactiveBufferColor")
+        _inactiveBufferItem->setForeground(0, button->color());
+    else if (objName == "activeBufferColor")
+        _activeBufferItem->setForeground(0, button->color());
+    else if (objName == "unreadBufferColor")
+        _unreadBufferItem->setForeground(0, button->color());
+    else if (objName == "highlightedBufferColor")
+        _highlightedBufferItem->setForeground(0, button->color());
 }