From 4b3d1dfbdc5a541dbbdd6574e603f4351d8b3274 Mon Sep 17 00:00:00 2001
From: Shane Synan <digitalcircuit36939@gmail.com>
Date: Wed, 29 Jun 2016 02:10:40 -0400
Subject: [PATCH] Move Chat View colors to new settings page

Add new settings page Chat View Colors for "allowMircColors",
"useCustomColors", "useSenderColors", and related color buttons.

Remove the above settings from the general Chat View settings page.
Add missing tab stops for "autoMarkerLineOnLostFocus" and
"webSearchUrlFormat".

This reduces visual clutter, improves organization, and saves
vertical space, helpful for smaller screens.
(~54 pixels saved vs 0.12.4, ~112 pixels saved vs all options in one)
---
 src/qtui/mainwin.cpp                          |   2 +
 .../chatviewcolorsettingspage.cpp             |  44 ++
 .../settingspages/chatviewcolorsettingspage.h |  62 ++
 .../chatviewcolorsettingspage.ui              | 727 ++++++++++++++++++
 .../settingspages/chatviewsettingspage.cpp    |   3 +-
 .../settingspages/chatviewsettingspage.ui     | 690 +----------------
 src/qtui/settingspages/settingspages.cmake    |   1 +
 7 files changed, 841 insertions(+), 688 deletions(-)
 create mode 100644 src/qtui/settingspages/chatviewcolorsettingspage.cpp
 create mode 100644 src/qtui/settingspages/chatviewcolorsettingspage.h
 create mode 100644 src/qtui/settingspages/chatviewcolorsettingspage.ui

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 37921675..6e681e44 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -140,6 +140,7 @@
 #include "settingspages/bufferviewsettingspage.h"
 #include "settingspages/chatmonitorsettingspage.h"
 #include "settingspages/chatviewsettingspage.h"
+#include "settingspages/chatviewcolorsettingspage.h"
 #include "settingspages/connectionsettingspage.h"
 #include "settingspages/coreaccountsettingspage.h"
 #include "settingspages/coreconnectionsettingspage.h"
@@ -1384,6 +1385,7 @@ void MainWin::showSettingsDlg()
     //Category: Interface
     dlg->registerSettingsPage(new AppearanceSettingsPage(dlg));
     dlg->registerSettingsPage(new ChatViewSettingsPage(dlg));
+    dlg->registerSettingsPage(new ChatViewColorSettingsPage(dlg));
     dlg->registerSettingsPage(new ChatMonitorSettingsPage(dlg));
     dlg->registerSettingsPage(new ItemViewSettingsPage(dlg));
     dlg->registerSettingsPage(new BufferViewSettingsPage(dlg));
diff --git a/src/qtui/settingspages/chatviewcolorsettingspage.cpp b/src/qtui/settingspages/chatviewcolorsettingspage.cpp
new file mode 100644
index 00000000..69a4979b
--- /dev/null
+++ b/src/qtui/settingspages/chatviewcolorsettingspage.cpp
@@ -0,0 +1,44 @@
+/***************************************************************************
+ *   Copyright (C) 2005-2016 by the Quassel Project                        *
+ *   devel@quassel-irc.org                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) version 3.                                           *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   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.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
+ ***************************************************************************/
+
+#include "chatviewcolorsettingspage.h"
+
+#include "client.h"
+#include "colorbutton.h"
+#include "qtui.h"
+#include "qtuistyle.h"
+
+ChatViewColorSettingsPage::ChatViewColorSettingsPage(QWidget *parent) :
+    SettingsPage(tr("Interface"), tr("Chat View Colors"), parent)
+{
+    ui.setupUi(this);
+
+    initAutoWidgets();
+}
+
+
+void ChatViewColorSettingsPage::save()
+{
+    // Save the general settings
+    SettingsPage::save();
+    // Update the stylesheet in case colors are changed
+    QtUi::style()->generateSettingsQss();
+    QtUi::style()->reload();
+}
diff --git a/src/qtui/settingspages/chatviewcolorsettingspage.h b/src/qtui/settingspages/chatviewcolorsettingspage.h
new file mode 100644
index 00000000..6f21f3ca
--- /dev/null
+++ b/src/qtui/settingspages/chatviewcolorsettingspage.h
@@ -0,0 +1,62 @@
+/***************************************************************************
+ *   Copyright (C) 2005-2016 by the Quassel Project                        *
+ *   devel@quassel-irc.org                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) version 3.                                           *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   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.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
+ ***************************************************************************/
+
+#pragma once
+
+#include "settingspage.h"
+#include "ui_chatviewcolorsettingspage.h"
+
+class ColorButton;
+
+class ChatViewColorSettingsPage : public SettingsPage
+{
+    Q_OBJECT
+
+public:
+    /**
+     * Construct and initialize the ChatViewColorSettingsPage
+     *
+     * @param parent Parent QWidget object, such as the settings dialog
+     */
+    explicit ChatViewColorSettingsPage(QWidget *parent = 0);
+
+    /**
+     * Gets whether or not this settings page has defaults
+     *
+     * @return True if defaults available, otherwise false
+     */
+    inline bool hasDefaults() const { return true; }
+
+public slots:
+    /**
+     * Save and apply current settings
+     */
+    void save();
+
+private:
+    Ui::ChatViewColorSettingsPage ui;  /// Reference to the Qt settings page UI
+
+    /**
+     * Gets the settings path for configuration values
+     *
+     * @return QString pointing to settings group and key for configuration values
+     */
+    inline QString settingsKey() const { return QString("QtUi/ChatView/__default__"); }
+};
diff --git a/src/qtui/settingspages/chatviewcolorsettingspage.ui b/src/qtui/settingspages/chatviewcolorsettingspage.ui
new file mode 100644
index 00000000..3070a3a6
--- /dev/null
+++ b/src/qtui/settingspages/chatviewcolorsettingspage.ui
@@ -0,0 +1,727 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ChatViewColorSettingsPage</class>
+ <widget class="QWidget" name="ChatViewColorSettingsPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>486</width>
+    <height>398</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <widget class="QCheckBox" name="allowMircColors">
+     <property name="toolTip">
+      <string>Show colored text in the chat window</string>
+     </property>
+     <property name="text">
+      <string>Allow colored text (mIRC color codes)</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+     <property name="defaultValue" stdset="0">
+      <bool>true</bool>
+     </property>
+     <property name="settingsKey" stdset="0">
+      <string notr="true">/UiStyle/AllowMircColors</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="useCustomColors">
+     <property name="title">
+      <string>Custom Colors</string>
+     </property>
+     <property name="checkable">
+      <bool>true</bool>
+     </property>
+     <property name="checked">
+      <bool>false</bool>
+     </property>
+     <property name="settingsKey" stdset="0">
+      <string notr="true">/QtUiStyle/Colors/UseChatViewColors</string>
+     </property>
+     <property name="defaultValue" stdset="0">
+      <bool>false</bool>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_10">
+        <property name="text">
+         <string>Action:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="ColorButton" name="actionMsgColor">
+        <property name="text">
+         <string>...</string>
+        </property>
+        <property name="settingsKey" stdset="0">
+         <string notr="true">/QtUiStyle/Colors/ActionMsg</string>
+        </property>
+        <property name="defaultValue" stdset="0">
+         <color>
+          <red>0</red>
+          <green>0</green>
+          <blue>255</blue>
+         </color>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3">
+       <widget class="QLabel" name="label_5">
+        <property name="text">
+         <string>Timestamp:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="4">
+       <widget class="ColorButton" name="timestampColor">
+        <property name="text">
+         <string>...</string>
+        </property>
+        <property name="settingsKey" stdset="0">
+         <string notr="true">/QtUiStyle/Colors/Timestamp</string>
+        </property>
+        <property name="defaultValue" stdset="0">
+         <color>
+          <red>112</red>
+          <green>124</green>
+          <blue>112</blue>
+         </color>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_3">
+        <property name="text">
+         <string>Channel message:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="ColorButton" name="channelMsgColor">
+        <property name="text">
+         <string>...</string>
+        </property>
+        <property name="settingsKey" stdset="0">
+         <string notr="true">/QtUiStyle/Colors/ChannelMsg</string>
+        </property>
+        <property name="defaultValue" stdset="0">
+         <color>
+          <red>0</red>
+          <green>0</green>
+          <blue>0</blue>
+         </color>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <spacer name="horizontalSpacer_2">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>134</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="1" column="3">
+       <widget class="QLabel" name="label_7">
+        <property name="text">
+         <string>Highlight foreground:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="4">
+       <widget class="ColorButton" name="highlightColor">
+        <property name="text">
+         <string>...</string>
+        </property>
+        <property name="settingsKey" stdset="0">
+         <string notr="true">/QtUiStyle/Colors/Highlight</string>
+        </property>
+        <property name="defaultValue" stdset="0">
+         <color>
+          <red>0</red>
+          <green>0</green>
+          <blue>0</blue>
+         </color>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_6">
+        <property name="text">
+         <string>Command message:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="ColorButton" name="commandMsgColor">
+        <property name="text">
+         <string>...</string>
+        </property>
+        <property name="settingsKey" stdset="0">
+         <string notr="true">/QtUiStyle/Colors/CommandMsg</string>
+        </property>
+        <property name="defaultValue" stdset="0">
+         <color>
+          <red>150</red>
+          <green>0</green>
+          <blue>150</blue>
+         </color>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="3">
+       <widget class="QLabel" name="label_12">
+        <property name="text">
+         <string>Highlight background:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="label_4">
+        <property name="text">
+         <string>Server message:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="ColorButton" name="serverMsgColor">
+        <property name="text">
+         <string>...</string>
+        </property>
+        <property name="settingsKey" stdset="0">
+         <string notr="true">/QtUiStyle/Colors/ServerMsg</string>
+        </property>
+        <property name="defaultValue" stdset="0">
+         <color>
+          <red>145</red>
+          <green>100</green>
+          <blue>9</blue>
+         </color>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="3">
+       <widget class="QLabel" name="label_11">
+        <property name="text">
+         <string>Marker line:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="4">
+       <widget class="ColorButton" name="markerLineColor">
+        <property name="text">
+         <string>...</string>
+        </property>
+        <property name="settingsKey" stdset="0">
+         <string notr="true">/QtUiStyle/Colors/MarkerLine</string>
+        </property>
+        <property name="defaultValue" stdset="0">
+         <color>
+          <red>255</red>
+          <green>0</green>
+          <blue>0</blue>
+         </color>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>Error message:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1">
+       <widget class="ColorButton" name="errorMsgColor">
+        <property name="text">
+         <string>...</string>
+        </property>
+        <property name="settingsKey" stdset="0">
+         <string notr="true">/QtUiStyle/Colors/ErrorMsg</string>
+        </property>
+        <property name="defaultValue" stdset="0">
+         <color>
+          <red>145</red>
+          <green>100</green>
+          <blue>9</blue>
+         </color>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="3">
+       <widget class="QLabel" name="label_8">
+        <property name="text">
+         <string>Background:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="4">
+       <widget class="ColorButton" name="backgroundColor">
+        <property name="text">
+         <string>...</string>
+        </property>
+        <property name="settingsKey" stdset="0">
+         <string notr="true">/QtUiStyle/Colors/ChatViewBackground</string>
+        </property>
+        <property name="defaultValue" stdset="0">
+         <color>
+          <red>255</red>
+          <green>255</green>
+          <blue>255</blue>
+         </color>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="4">
+       <widget class="ColorButton" name="highlightBackgroundColor">
+        <property name="text">
+         <string>...</string>
+        </property>
+        <property name="settingsKey" stdset="0">
+         <string notr="true">/QtUiStyle/Colors/HighlightBackground</string>
+        </property>
+        <property name="defaultValue" stdset="0">
+         <color>
+          <red>255</red>
+          <green>128</green>
+          <blue>0</blue>
+         </color>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="useSenderColors">
+     <property name="toolTip">
+      <string>Color senders in chat based on nicknames</string>
+     </property>
+     <property name="title">
+      <string>Use Sender Coloring</string>
+     </property>
+     <property name="checkable">
+      <bool>true</bool>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+     <property name="settingsKey" stdset="0">
+      <string notr="true">/QtUiStyle/Colors/UseSenderColors</string>
+     </property>
+     <property name="defaultValue" stdset="0">
+      <bool>true</bool>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <layout class="QGridLayout" name="gridLayout_3">
+        <item row="0" column="0">
+         <widget class="ColorButton" name="senderColor00">
+          <property name="text">
+           <string>...</string>
+          </property>
+          <property name="settingsKey" stdset="0">
+           <string notr="true">/QtUiStyle/Colors/Sender00</string>
+          </property>
+          <property name="defaultValue" stdset="0">
+           <color>
+            <red>233</red>
+            <green>13</green>
+            <blue>127</blue>
+           </color>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="2">
+         <widget class="ColorButton" name="senderColor02">
+          <property name="text">
+           <string>...</string>
+          </property>
+          <property name="settingsKey" stdset="0">
+           <string notr="true">/QtUiStyle/Colors/Sender02</string>
+          </property>
+          <property name="defaultValue" stdset="0">
+           <color>
+            <red>179</red>
+            <green>14</green>
+            <blue>14</blue>
+           </color>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="4">
+         <widget class="ColorButton" name="senderColor04">
+          <property name="text">
+           <string>...</string>
+          </property>
+          <property name="settingsKey" stdset="0">
+           <string notr="true">/QtUiStyle/Colors/Sender04</string>
+          </property>
+          <property name="defaultValue" stdset="0">
+           <color>
+            <red>88</red>
+            <green>175</green>
+            <blue>179</blue>
+           </color>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="5">
+         <widget class="ColorButton" name="senderColor05">
+          <property name="text">
+           <string>...</string>
+          </property>
+          <property name="settingsKey" stdset="0">
+           <string notr="true">/QtUiStyle/Colors/Sender05</string>
+          </property>
+          <property name="defaultValue" stdset="0">
+           <color>
+            <red>157</red>
+            <green>84</green>
+            <blue>179</blue>
+           </color>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="6">
+         <widget class="ColorButton" name="senderColor06">
+          <property name="text">
+           <string>...</string>
+          </property>
+          <property name="settingsKey" stdset="0">
+           <string notr="true">/QtUiStyle/Colors/Sender06</string>
+          </property>
+          <property name="defaultValue" stdset="0">
+           <color>
+            <red>179</red>
+            <green>151</green>
+            <blue>117</blue>
+           </color>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="7">
+         <widget class="ColorButton" name="senderColor07">
+          <property name="text">
+           <string>...</string>
+          </property>
+          <property name="settingsKey" stdset="0">
+           <string notr="true">/QtUiStyle/Colors/Sender07</string>
+          </property>
+          <property name="defaultValue" stdset="0">
+           <color>
+            <red>49</red>
+            <green>118</green>
+            <blue>179</blue>
+           </color>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="ColorButton" name="senderColor08">
+          <property name="text">
+           <string>...</string>
+          </property>
+          <property name="settingsKey" stdset="0">
+           <string notr="true">/QtUiStyle/Colors/Sender08</string>
+          </property>
+          <property name="defaultValue" stdset="0">
+           <color>
+            <red>233</red>
+            <green>13</green>
+            <blue>127</blue>
+           </color>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="ColorButton" name="senderColor09">
+          <property name="text">
+           <string>...</string>
+          </property>
+          <property name="settingsKey" stdset="0">
+           <string notr="true">/QtUiStyle/Colors/Sender09</string>
+          </property>
+          <property name="defaultValue" stdset="0">
+           <color>
+            <red>142</red>
+            <green>85</green>
+            <blue>233</blue>
+           </color>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="2">
+         <widget class="ColorButton" name="senderColor10">
+          <property name="text">
+           <string>...</string>
+          </property>
+          <property name="settingsKey" stdset="0">
+           <string notr="true">/QtUiStyle/Colors/Sender10</string>
+          </property>
+          <property name="defaultValue" stdset="0">
+           <color>
+            <red>179</red>
+            <green>14</green>
+            <blue>14</blue>
+           </color>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="3">
+         <widget class="ColorButton" name="senderColor11">
+          <property name="text">
+           <string>...</string>
+          </property>
+          <property name="settingsKey" stdset="0">
+           <string notr="true">/QtUiStyle/Colors/Sender11</string>
+          </property>
+          <property name="defaultValue" stdset="0">
+           <color>
+            <red>23</red>
+            <green>179</green>
+            <blue>57</blue>
+           </color>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="4">
+         <widget class="ColorButton" name="senderColor12">
+          <property name="text">
+           <string>...</string>
+          </property>
+          <property name="settingsKey" stdset="0">
+           <string notr="true">/QtUiStyle/Colors/Sender12</string>
+          </property>
+          <property name="defaultValue" stdset="0">
+           <color>
+            <red>88</red>
+            <green>175</green>
+            <blue>179</blue>
+           </color>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="5">
+         <widget class="ColorButton" name="senderColor13">
+          <property name="text">
+           <string>...</string>
+          </property>
+          <property name="settingsKey" stdset="0">
+           <string notr="true">/QtUiStyle/Colors/Sender13</string>
+          </property>
+          <property name="defaultValue" stdset="0">
+           <color>
+            <red>157</red>
+            <green>84</green>
+            <blue>179</blue>
+           </color>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="6">
+         <widget class="ColorButton" name="senderColor14">
+          <property name="text">
+           <string>...</string>
+          </property>
+          <property name="settingsKey" stdset="0">
+           <string notr="true">/QtUiStyle/Colors/Sender14</string>
+          </property>
+          <property name="defaultValue" stdset="0">
+           <color>
+            <red>179</red>
+            <green>151</green>
+            <blue>117</blue>
+           </color>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="7">
+         <widget class="ColorButton" name="senderColor15">
+          <property name="text">
+           <string>...</string>
+          </property>
+          <property name="settingsKey" stdset="0">
+           <string notr="true">/QtUiStyle/Colors/Sender15</string>
+          </property>
+          <property name="defaultValue" stdset="0">
+           <color>
+            <red>49</red>
+            <green>118</green>
+            <blue>179</blue>
+           </color>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="ColorButton" name="senderColor01">
+          <property name="text">
+           <string>...</string>
+          </property>
+          <property name="settingsKey" stdset="0">
+           <string notr="true">/QtUiStyle/Colors/Sender01</string>
+          </property>
+          <property name="defaultValue" stdset="0">
+           <color>
+            <red>142</red>
+            <green>85</green>
+            <blue>233</blue>
+           </color>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="3">
+         <widget class="ColorButton" name="senderColor03">
+          <property name="text">
+           <string>...</string>
+          </property>
+          <property name="settingsKey" stdset="0">
+           <string notr="true">/QtUiStyle/Colors/Sender03</string>
+          </property>
+          <property name="defaultValue" stdset="0">
+           <color>
+            <red>23</red>
+            <green>179</green>
+            <blue>57</blue>
+           </color>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QLabel" name="label_9">
+          <property name="text">
+           <string>Own messages:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="ColorButton" name="senderColorSelf">
+          <property name="text">
+           <string>...</string>
+          </property>
+          <property name="settingsKey" stdset="0">
+           <string notr="true">/QtUiStyle/Colors/SenderSelf</string>
+          </property>
+          <property name="defaultValue" stdset="0">
+           <color>
+            <red>0</red>
+            <green>0</green>
+            <blue>0</blue>
+           </color>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer_3">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="useSenderActionColors">
+        <property name="toolTip">
+         <string>Color sender nicknames in action messages, e.g.&lt;br/&gt;-*- &lt;span style=&quot; font-style:italic;&quot;&gt;Nick&lt;/span&gt; does an action</string>
+        </property>
+        <property name="text">
+         <string>Color senders in action messages</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+        <property name="settingsKey" stdset="0">
+         <string notr="true">/QtUiStyle/Colors/UseSenderActionColors</string>
+        </property>
+        <property name="defaultValue" stdset="0">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ColorButton</class>
+   <extends>QToolButton</extends>
+   <header>colorbutton.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>allowMircColors</tabstop>
+  <tabstop>useCustomColors</tabstop>
+  <tabstop>actionMsgColor</tabstop>
+  <tabstop>channelMsgColor</tabstop>
+  <tabstop>commandMsgColor</tabstop>
+  <tabstop>serverMsgColor</tabstop>
+  <tabstop>errorMsgColor</tabstop>
+  <tabstop>timestampColor</tabstop>
+  <tabstop>highlightColor</tabstop>
+  <tabstop>highlightBackgroundColor</tabstop>
+  <tabstop>markerLineColor</tabstop>
+  <tabstop>backgroundColor</tabstop>
+  <tabstop>useSenderColors</tabstop>
+  <tabstop>senderColor00</tabstop>
+  <tabstop>senderColor01</tabstop>
+  <tabstop>senderColor02</tabstop>
+  <tabstop>senderColor03</tabstop>
+  <tabstop>senderColor04</tabstop>
+  <tabstop>senderColor05</tabstop>
+  <tabstop>senderColor06</tabstop>
+  <tabstop>senderColor07</tabstop>
+  <tabstop>senderColor08</tabstop>
+  <tabstop>senderColor09</tabstop>
+  <tabstop>senderColor10</tabstop>
+  <tabstop>senderColor11</tabstop>
+  <tabstop>senderColor12</tabstop>
+  <tabstop>senderColor13</tabstop>
+  <tabstop>senderColor14</tabstop>
+  <tabstop>senderColor15</tabstop>
+  <tabstop>senderColorSelf</tabstop>
+  <tabstop>useSenderActionColors</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/qtui/settingspages/chatviewsettingspage.cpp b/src/qtui/settingspages/chatviewsettingspage.cpp
index 47463881..924474c1 100644
--- a/src/qtui/settingspages/chatviewsettingspage.cpp
+++ b/src/qtui/settingspages/chatviewsettingspage.cpp
@@ -20,7 +20,6 @@
 
 #include "chatviewsettingspage.h"
 #include "client.h"
-#include "colorbutton.h"
 #include "qtui.h"
 #include "qtuistyle.h"
 
@@ -47,7 +46,9 @@ ChatViewSettingsPage::ChatViewSettingsPage(QWidget *parent)
 
 void ChatViewSettingsPage::save()
 {
+    // Save the general settings
     SettingsPage::save();
+    // Update the stylesheet in case fonts are changed
     QtUi::style()->generateSettingsQss();
     QtUi::style()->reload();
 }
diff --git a/src/qtui/settingspages/chatviewsettingspage.ui b/src/qtui/settingspages/chatviewsettingspage.ui
index 5e4eb245..b68c8726 100644
--- a/src/qtui/settingspages/chatviewsettingspage.ui
+++ b/src/qtui/settingspages/chatviewsettingspage.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>486</width>
-    <height>610</height>
+    <height>230</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -115,25 +115,6 @@
      </item>
     </layout>
    </item>
-   <item>
-    <widget class="QCheckBox" name="allowMircColors">
-     <property name="toolTip">
-      <string>Show colored text in the chat window</string>
-     </property>
-     <property name="text">
-      <string>Allow colored text (mIRC color codes)</string>
-     </property>
-     <property name="checked">
-      <bool>true</bool>
-     </property>
-     <property name="defaultValue" stdset="0">
-      <bool>true</bool>
-     </property>
-     <property name="settingsKey" stdset="0">
-      <string notr="true">/UiStyle/AllowMircColors</string>
-     </property>
-    </widget>
-   </item>
    <item>
     <widget class="QCheckBox" name="showWebPreview">
      <property name="toolTip">
@@ -215,637 +196,6 @@
      </item>
     </layout>
    </item>
-   <item>
-    <widget class="QGroupBox" name="useCustomColors">
-     <property name="title">
-      <string>Custom Colors</string>
-     </property>
-     <property name="checkable">
-      <bool>true</bool>
-     </property>
-     <property name="checked">
-      <bool>false</bool>
-     </property>
-     <property name="settingsKey" stdset="0">
-      <string notr="true">/QtUiStyle/Colors/UseChatViewColors</string>
-     </property>
-     <property name="defaultValue" stdset="0">
-      <bool>false</bool>
-     </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_10">
-        <property name="text">
-         <string>Action:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="ColorButton" name="actionMsgColor">
-        <property name="text">
-         <string>...</string>
-        </property>
-        <property name="settingsKey" stdset="0">
-         <string notr="true">/QtUiStyle/Colors/ActionMsg</string>
-        </property>
-        <property name="defaultValue" stdset="0">
-         <color>
-          <red>0</red>
-          <green>0</green>
-          <blue>255</blue>
-         </color>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="3">
-       <widget class="QLabel" name="label_5">
-        <property name="text">
-         <string>Timestamp:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="4">
-       <widget class="ColorButton" name="timestampColor">
-        <property name="text">
-         <string>...</string>
-        </property>
-        <property name="settingsKey" stdset="0">
-         <string notr="true">/QtUiStyle/Colors/Timestamp</string>
-        </property>
-        <property name="defaultValue" stdset="0">
-         <color>
-          <red>112</red>
-          <green>124</green>
-          <blue>112</blue>
-         </color>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_3">
-        <property name="text">
-         <string>Channel message:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="ColorButton" name="channelMsgColor">
-        <property name="text">
-         <string>...</string>
-        </property>
-        <property name="settingsKey" stdset="0">
-         <string notr="true">/QtUiStyle/Colors/ChannelMsg</string>
-        </property>
-        <property name="defaultValue" stdset="0">
-         <color>
-          <red>0</red>
-          <green>0</green>
-          <blue>0</blue>
-         </color>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <spacer name="horizontalSpacer_2">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>134</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="1" column="3">
-       <widget class="QLabel" name="label_7">
-        <property name="text">
-         <string>Highlight foreground:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="4">
-       <widget class="ColorButton" name="highlightColor">
-        <property name="text">
-         <string>...</string>
-        </property>
-        <property name="settingsKey" stdset="0">
-         <string notr="true">/QtUiStyle/Colors/Highlight</string>
-        </property>
-        <property name="defaultValue" stdset="0">
-         <color>
-          <red>0</red>
-          <green>0</green>
-          <blue>0</blue>
-         </color>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="label_6">
-        <property name="text">
-         <string>Command message:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="ColorButton" name="commandMsgColor">
-        <property name="text">
-         <string>...</string>
-        </property>
-        <property name="settingsKey" stdset="0">
-         <string notr="true">/QtUiStyle/Colors/CommandMsg</string>
-        </property>
-        <property name="defaultValue" stdset="0">
-         <color>
-          <red>150</red>
-          <green>0</green>
-          <blue>150</blue>
-         </color>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="3">
-       <widget class="QLabel" name="label_12">
-        <property name="text">
-         <string>Highlight background:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="label_4">
-        <property name="text">
-         <string>Server message:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1">
-       <widget class="ColorButton" name="serverMsgColor">
-        <property name="text">
-         <string>...</string>
-        </property>
-        <property name="settingsKey" stdset="0">
-         <string notr="true">/QtUiStyle/Colors/ServerMsg</string>
-        </property>
-        <property name="defaultValue" stdset="0">
-         <color>
-          <red>145</red>
-          <green>100</green>
-          <blue>9</blue>
-         </color>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="3">
-       <widget class="QLabel" name="label_11">
-        <property name="text">
-         <string>Marker line:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="4">
-       <widget class="ColorButton" name="markerLineColor">
-        <property name="text">
-         <string>...</string>
-        </property>
-        <property name="settingsKey" stdset="0">
-         <string notr="true">/QtUiStyle/Colors/MarkerLine</string>
-        </property>
-        <property name="defaultValue" stdset="0">
-         <color>
-          <red>255</red>
-          <green>0</green>
-          <blue>0</blue>
-         </color>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="label">
-        <property name="text">
-         <string>Error message:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1">
-       <widget class="ColorButton" name="errorMsgColor">
-        <property name="text">
-         <string>...</string>
-        </property>
-        <property name="settingsKey" stdset="0">
-         <string notr="true">/QtUiStyle/Colors/ErrorMsg</string>
-        </property>
-        <property name="defaultValue" stdset="0">
-         <color>
-          <red>145</red>
-          <green>100</green>
-          <blue>9</blue>
-         </color>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="3">
-       <widget class="QLabel" name="label_8">
-        <property name="text">
-         <string>Background:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="4">
-       <widget class="ColorButton" name="backgroundColor">
-        <property name="text">
-         <string>...</string>
-        </property>
-        <property name="settingsKey" stdset="0">
-         <string notr="true">/QtUiStyle/Colors/ChatViewBackground</string>
-        </property>
-        <property name="defaultValue" stdset="0">
-         <color>
-          <red>255</red>
-          <green>255</green>
-          <blue>255</blue>
-         </color>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="4">
-       <widget class="ColorButton" name="highlightBackgroundColor">
-        <property name="text">
-         <string>...</string>
-        </property>
-        <property name="settingsKey" stdset="0">
-         <string notr="true">/QtUiStyle/Colors/HighlightBackground</string>
-        </property>
-        <property name="defaultValue" stdset="0">
-         <color>
-          <red>255</red>
-          <green>128</green>
-          <blue>0</blue>
-         </color>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="useSenderColors">
-     <property name="title">
-      <string>Use Sender Coloring</string>
-     </property>
-     <property name="checkable">
-      <bool>true</bool>
-     </property>
-     <property name="checked">
-      <bool>true</bool>
-     </property>
-     <property name="settingsKey" stdset="0">
-      <string notr="true">/QtUiStyle/Colors/UseSenderColors</string>
-     </property>
-     <property name="defaultValue" stdset="0">
-      <bool>true</bool>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <item>
-       <layout class="QGridLayout" name="gridLayout_3">
-        <item row="0" column="0">
-         <widget class="ColorButton" name="senderColor00">
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="settingsKey" stdset="0">
-           <string notr="true">/QtUiStyle/Colors/Sender00</string>
-          </property>
-          <property name="defaultValue" stdset="0">
-           <color>
-            <red>233</red>
-            <green>13</green>
-            <blue>127</blue>
-           </color>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="2">
-         <widget class="ColorButton" name="senderColor02">
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="settingsKey" stdset="0">
-           <string notr="true">/QtUiStyle/Colors/Sender02</string>
-          </property>
-          <property name="defaultValue" stdset="0">
-           <color>
-            <red>179</red>
-            <green>14</green>
-            <blue>14</blue>
-           </color>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="4">
-         <widget class="ColorButton" name="senderColor04">
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="settingsKey" stdset="0">
-           <string notr="true">/QtUiStyle/Colors/Sender04</string>
-          </property>
-          <property name="defaultValue" stdset="0">
-           <color>
-            <red>88</red>
-            <green>175</green>
-            <blue>179</blue>
-           </color>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="5">
-         <widget class="ColorButton" name="senderColor05">
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="settingsKey" stdset="0">
-           <string notr="true">/QtUiStyle/Colors/Sender05</string>
-          </property>
-          <property name="defaultValue" stdset="0">
-           <color>
-            <red>157</red>
-            <green>84</green>
-            <blue>179</blue>
-           </color>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="6">
-         <widget class="ColorButton" name="senderColor06">
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="settingsKey" stdset="0">
-           <string notr="true">/QtUiStyle/Colors/Sender06</string>
-          </property>
-          <property name="defaultValue" stdset="0">
-           <color>
-            <red>179</red>
-            <green>151</green>
-            <blue>117</blue>
-           </color>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="7">
-         <widget class="ColorButton" name="senderColor07">
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="settingsKey" stdset="0">
-           <string notr="true">/QtUiStyle/Colors/Sender07</string>
-          </property>
-          <property name="defaultValue" stdset="0">
-           <color>
-            <red>49</red>
-            <green>118</green>
-            <blue>179</blue>
-           </color>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0">
-         <widget class="ColorButton" name="senderColor08">
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="settingsKey" stdset="0">
-           <string notr="true">/QtUiStyle/Colors/Sender08</string>
-          </property>
-          <property name="defaultValue" stdset="0">
-           <color>
-            <red>233</red>
-            <green>13</green>
-            <blue>127</blue>
-           </color>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="1">
-         <widget class="ColorButton" name="senderColor09">
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="settingsKey" stdset="0">
-           <string notr="true">/QtUiStyle/Colors/Sender09</string>
-          </property>
-          <property name="defaultValue" stdset="0">
-           <color>
-            <red>142</red>
-            <green>85</green>
-            <blue>233</blue>
-           </color>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="2">
-         <widget class="ColorButton" name="senderColor10">
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="settingsKey" stdset="0">
-           <string notr="true">/QtUiStyle/Colors/Sender10</string>
-          </property>
-          <property name="defaultValue" stdset="0">
-           <color>
-            <red>179</red>
-            <green>14</green>
-            <blue>14</blue>
-           </color>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="3">
-         <widget class="ColorButton" name="senderColor11">
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="settingsKey" stdset="0">
-           <string notr="true">/QtUiStyle/Colors/Sender11</string>
-          </property>
-          <property name="defaultValue" stdset="0">
-           <color>
-            <red>23</red>
-            <green>179</green>
-            <blue>57</blue>
-           </color>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="4">
-         <widget class="ColorButton" name="senderColor12">
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="settingsKey" stdset="0">
-           <string notr="true">/QtUiStyle/Colors/Sender12</string>
-          </property>
-          <property name="defaultValue" stdset="0">
-           <color>
-            <red>88</red>
-            <green>175</green>
-            <blue>179</blue>
-           </color>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="5">
-         <widget class="ColorButton" name="senderColor13">
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="settingsKey" stdset="0">
-           <string notr="true">/QtUiStyle/Colors/Sender13</string>
-          </property>
-          <property name="defaultValue" stdset="0">
-           <color>
-            <red>157</red>
-            <green>84</green>
-            <blue>179</blue>
-           </color>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="6">
-         <widget class="ColorButton" name="senderColor14">
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="settingsKey" stdset="0">
-           <string notr="true">/QtUiStyle/Colors/Sender14</string>
-          </property>
-          <property name="defaultValue" stdset="0">
-           <color>
-            <red>179</red>
-            <green>151</green>
-            <blue>117</blue>
-           </color>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="7">
-         <widget class="ColorButton" name="senderColor15">
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="settingsKey" stdset="0">
-           <string notr="true">/QtUiStyle/Colors/Sender15</string>
-          </property>
-          <property name="defaultValue" stdset="0">
-           <color>
-            <red>49</red>
-            <green>118</green>
-            <blue>179</blue>
-           </color>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1">
-         <widget class="ColorButton" name="senderColor01">
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="settingsKey" stdset="0">
-           <string notr="true">/QtUiStyle/Colors/Sender01</string>
-          </property>
-          <property name="defaultValue" stdset="0">
-           <color>
-            <red>142</red>
-            <green>85</green>
-            <blue>233</blue>
-           </color>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="3">
-         <widget class="ColorButton" name="senderColor03">
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="settingsKey" stdset="0">
-           <string notr="true">/QtUiStyle/Colors/Sender03</string>
-          </property>
-          <property name="defaultValue" stdset="0">
-           <color>
-            <red>23</red>
-            <green>179</green>
-            <blue>57</blue>
-           </color>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_2">
-        <item>
-         <widget class="QLabel" name="label_9">
-          <property name="text">
-           <string>Own messages:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="ColorButton" name="senderColorSelf">
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="settingsKey" stdset="0">
-           <string notr="true">/QtUiStyle/Colors/SenderSelf</string>
-          </property>
-          <property name="defaultValue" stdset="0">
-           <color>
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
-           </color>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer_3">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="useSenderActionColors">
-        <property name="toolTip">
-         <string>Color sender nicknames in action messages, e.g.&lt;br/&gt;-*- &lt;span style=&quot; font-style:italic;&quot;&gt;Nick&lt;/span&gt; does an action</string>
-        </property>
-        <property name="text">
-         <string>Color senders in action messages</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-        <property name="settingsKey" stdset="0">
-         <string notr="true">/QtUiStyle/Colors/UseSenderActionColors</string>
-        </property>
-        <property name="defaultValue" stdset="0">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
@@ -862,11 +212,6 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>ColorButton</class>
-   <extends>QToolButton</extends>
-   <header>colorbutton.h</header>
-  </customwidget>
   <customwidget>
    <class>FontSelector</class>
    <extends>QWidget</extends>
@@ -878,39 +223,10 @@
   <tabstop>timestampFormat</tabstop>
   <tabstop>showSenderBrackets</tabstop>
   <tabstop>customChatViewFont</tabstop>
-  <tabstop>allowMircColors</tabstop>
   <tabstop>showWebPreview</tabstop>
   <tabstop>autoMarkerLine</tabstop>
-  <tabstop>useCustomColors</tabstop>
-  <tabstop>actionMsgColor</tabstop>
-  <tabstop>channelMsgColor</tabstop>
-  <tabstop>commandMsgColor</tabstop>
-  <tabstop>serverMsgColor</tabstop>
-  <tabstop>errorMsgColor</tabstop>
-  <tabstop>timestampColor</tabstop>
-  <tabstop>highlightColor</tabstop>
-  <tabstop>highlightBackgroundColor</tabstop>
-  <tabstop>markerLineColor</tabstop>
-  <tabstop>backgroundColor</tabstop>
-  <tabstop>useSenderColors</tabstop>
-  <tabstop>senderColor00</tabstop>
-  <tabstop>senderColor01</tabstop>
-  <tabstop>senderColor02</tabstop>
-  <tabstop>senderColor03</tabstop>
-  <tabstop>senderColor04</tabstop>
-  <tabstop>senderColor05</tabstop>
-  <tabstop>senderColor06</tabstop>
-  <tabstop>senderColor07</tabstop>
-  <tabstop>senderColor08</tabstop>
-  <tabstop>senderColor09</tabstop>
-  <tabstop>senderColor10</tabstop>
-  <tabstop>senderColor11</tabstop>
-  <tabstop>senderColor12</tabstop>
-  <tabstop>senderColor13</tabstop>
-  <tabstop>senderColor14</tabstop>
-  <tabstop>senderColor15</tabstop>
-  <tabstop>senderColorSelf</tabstop>
-  <tabstop>useSenderActionColors</tabstop>
+  <tabstop>autoMarkerLineOnLostFocus</tabstop>
+  <tabstop>webSearchUrlFormat</tabstop>
  </tabstops>
  <resources/>
  <connections>
diff --git a/src/qtui/settingspages/settingspages.cmake b/src/qtui/settingspages/settingspages.cmake
index ded24d7e..c2705cbc 100644
--- a/src/qtui/settingspages/settingspages.cmake
+++ b/src/qtui/settingspages/settingspages.cmake
@@ -8,6 +8,7 @@ set(SETTINGSPAGES
     bufferview
     chatmonitor
     chatview
+    chatviewcolor
     connection
     coreconnection
     coreaccount
-- 
2.20.1