X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtui%2Fsettingspages%2Fchatviewsettingspage.cpp;h=d55f201dbaa51db4010ed23314a24390b244f6b2;hb=cc6e7c08709c4e761e2fd9c2e322751015497003;hp=c3fd8ae5286970f53e3cfff387e9fd513deb0af8;hpb=4171bdf884b6bbc7dad85f100a29746bf955191f;p=quassel.git

diff --git a/src/qtui/settingspages/chatviewsettingspage.cpp b/src/qtui/settingspages/chatviewsettingspage.cpp
index c3fd8ae5..d55f201d 100644
--- a/src/qtui/settingspages/chatviewsettingspage.cpp
+++ b/src/qtui/settingspages/chatviewsettingspage.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2018 by the Quassel Project                        *
+ *   Copyright (C) 2005-2019 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -19,13 +19,14 @@
  ***************************************************************************/
 
 #include "chatviewsettingspage.h"
+
 #include "chatviewsettings.h"
 #include "client.h"
 #include "qtui.h"
 #include "qtuistyle.h"
 #include "uistyle.h"
 
-ChatViewSettingsPage::ChatViewSettingsPage(QWidget *parent)
+ChatViewSettingsPage::ChatViewSettingsPage(QWidget* parent)
     : SettingsPage(tr("Interface"), tr("Chat View"), parent)
 {
     ui.setupUi(this);
@@ -49,36 +50,35 @@ ChatViewSettingsPage::ChatViewSettingsPage(QWidget *parent)
         // [Original tool-tip]
         // [Bold 'does not support feature' message]
         // [Specific version needed and feature details]
-        ui.senderPrefixComboBox->setToolTip(
-                    QString("<b>%2</b><br/>%3").arg(
-                        tr("Your Quassel core does not support this feature"),
-                        tr("You need a Quassel core v0.13.0 or newer in order to show sender "
-                           "modes before nicknames.")));
+        ui.senderPrefixComboBox->setToolTip(QString("<b>%2</b><br/>%3")
+                                                .arg(tr("Your Quassel core does not support this feature"),
+                                                     tr("You need a Quassel core v0.13.0 or newer in order to show sender "
+                                                        "modes before nicknames.")));
     }
     initAutoWidgets();
     initSenderPrefixComboBox();
 }
 
-
 void ChatViewSettingsPage::initSenderPrefixComboBox()
 {
     // Fill combobox with sender prefix modes
     // Do not change ComboBox ordering without also adjusting chatviewsettingspage.ui "defaultValue"
     // and UiStyle::SenderPrefixMode
-    ui.senderPrefixComboBox->addItem(tr("No modes"),
-                                     static_cast<int>(UiStyle::SenderPrefixMode::NoModes));
-    ui.senderPrefixComboBox->addItem(tr("Highest mode"),
-                                     static_cast<int>(UiStyle::SenderPrefixMode::HighestMode));
-    ui.senderPrefixComboBox->addItem(tr("All modes"),
-                                     static_cast<int>(UiStyle::SenderPrefixMode::AllModes));
+    ui.senderPrefixComboBox->addItem(tr("No modes"), static_cast<int>(UiStyle::SenderPrefixMode::NoModes));
+    ui.senderPrefixComboBox->addItem(tr("Highest mode"), static_cast<int>(UiStyle::SenderPrefixMode::HighestMode));
+    ui.senderPrefixComboBox->addItem(tr("All modes"), static_cast<int>(UiStyle::SenderPrefixMode::AllModes));
 }
 
-
 void ChatViewSettingsPage::save()
 {
+    bool needsStyleReload = SettingsPage::hasChanged(ui.customChatViewFont) || SettingsPage::hasChanged(ui.chatViewFont);
+
     // Save the general settings
     SettingsPage::save();
-    // Update the stylesheet in case fonts are changed
-    QtUi::style()->generateSettingsQss();
-    QtUi::style()->reload();
+
+    // Update the stylesheet if fonts are changed
+    if (needsStyleReload) {
+        QtUi::style()->generateSettingsQss();
+        QtUi::style()->reload();
+    }
 }