From 8fb51dcb129db8399209e9d07b518063d1a910f1 Mon Sep 17 00:00:00 2001 From: Shane Synan Date: Mon, 6 Aug 2018 16:31:48 -0500 Subject: [PATCH] settings: Local Highlights, default Current nick Re-enable nickname highlighting in Local Highlights by default. This fixes the issue of upgrading the client before the core resulting in loss of nickname highlighting. Many other options were discussed, such as unifying these settings (new UI work), automatically toggling/disabling local based on core features, auto-importing, etc, and though all better approaches, they will take a good bit more time to implement correctly. The focus is on fixing client-side settings properly in 0.14+, with profiles allowing for different settings per groups of clients, allowing deprecation of local highlights entirely. Partial revert of f2e4560b71a1888599ca2153eee36a9b4136c902 and 5fcc2f000757bb7c2578e09c8fc8c86a288c3cb5 --- src/client/clientsettings.cpp | 3 ++- src/qtui/settingspages/highlightsettingspage.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/client/clientsettings.cpp b/src/client/clientsettings.cpp index ddeb9c1c..5e114312 100644 --- a/src/client/clientsettings.cpp +++ b/src/client/clientsettings.cpp @@ -320,7 +320,8 @@ void NotificationSettings::setHighlightNick(NotificationSettings::HighlightNickT NotificationSettings::HighlightNickType NotificationSettings::highlightNick() { - return (NotificationSettings::HighlightNickType)localValue("Highlights/HighlightNick", NoNick).toInt(); + return (NotificationSettings::HighlightNickType)localValue("Highlights/HighlightNick", + CurrentNick).toInt(); } diff --git a/src/qtui/settingspages/highlightsettingspage.cpp b/src/qtui/settingspages/highlightsettingspage.cpp index edb0bcdb..db5982e9 100644 --- a/src/qtui/settingspages/highlightsettingspage.cpp +++ b/src/qtui/settingspages/highlightsettingspage.cpp @@ -130,7 +130,7 @@ bool HighlightSettingsPage::hasDefaults() const void HighlightSettingsPage::defaults() { - ui.highlightNoNick->setChecked(true); + ui.highlightCurrentNick->setChecked(true); ui.nicksCaseSensitive->setChecked(false); emptyTable(); -- 2.20.1