From c76b74c18766c1a6631a06bab95f2290dd860395 Mon Sep 17 00:00:00 2001 From: Shane Synan Date: Fri, 19 Jun 2020 20:14:17 -0400 Subject: [PATCH] Revert "settings: Local Highlights, default Current nick" This reverts commit 8fb51dcb129db8399209e9d07b518063d1a910f1. Quassel 0.13 with core-side highlight support ("Remote Highlights") has been out for roughly 1.5 years (2018-11-17). Users have gotten confused by why highlight ignore rules don't work, only to find out client-side ("Local Highlights") were enabled instead. Disable local highlights by default to avoid this issue. Those using old cores can re-enable this. --- src/client/clientsettings.cpp | 2 +- src/qtui/settingspages/highlightsettingspage.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/clientsettings.cpp b/src/client/clientsettings.cpp index 17c65f2c..e4a76c3f 100644 --- a/src/client/clientsettings.cpp +++ b/src/client/clientsettings.cpp @@ -296,7 +296,7 @@ void NotificationSettings::setHighlightNick(NotificationSettings::HighlightNickT NotificationSettings::HighlightNickType NotificationSettings::highlightNick() const { - return (NotificationSettings::HighlightNickType)localValue("Highlights/HighlightNick", CurrentNick).toInt(); + return (NotificationSettings::HighlightNickType)localValue("Highlights/HighlightNick", NoNick).toInt(); } void NotificationSettings::setNicksCaseSensitive(bool cs) diff --git a/src/qtui/settingspages/highlightsettingspage.cpp b/src/qtui/settingspages/highlightsettingspage.cpp index 3741fe27..bc0debe6 100644 --- a/src/qtui/settingspages/highlightsettingspage.cpp +++ b/src/qtui/settingspages/highlightsettingspage.cpp @@ -117,7 +117,7 @@ bool HighlightSettingsPage::hasDefaults() const void HighlightSettingsPage::defaults() { - ui.highlightCurrentNick->setChecked(true); + ui.highlightNoNick->setChecked(true); ui.nicksCaseSensitive->setChecked(false); emptyTable(); -- 2.20.1