From c89d406cd5a538195042cc21fa2c7862a59fcbf6 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Sun, 15 Feb 2009 19:09:39 +0100 Subject: [PATCH] Fix issues with the color settings page, default to off for sender colors --- src/qtui/settingspages/colorsettingspage.cpp | 7 +++++-- src/uisupport/uistyle.cpp | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/qtui/settingspages/colorsettingspage.cpp b/src/qtui/settingspages/colorsettingspage.cpp index 6fff1389..bf44ce70 100644 --- a/src/qtui/settingspages/colorsettingspage.cpp +++ b/src/qtui/settingspages/colorsettingspage.cpp @@ -332,7 +332,10 @@ void ColorSettingsPage::load() { ui.timestampBG->setColor(QtUi::style()->format(UiStyle::Timestamp).background().color()); ui.senderFG->setColor(QtUi::style()->format(UiStyle::Sender).foreground().color()); ui.senderBG->setColor(QtUi::style()->format(UiStyle::Sender).background().color()); - settings["SenderAutoColor"] = s.value("senderAutoColor", QVariant(false)); + + settings["SenderAutoColor"] = s.value("SenderAutoColor", QVariant(false)); + ui.senderFG->setEnabled(!settings["SenderAutoColor"].toBool()); + ui.senderAutoColor->setChecked(settings["SenderAutoColor"].toBool()); settings["NewMsgMarkerFG"] = s.value("newMsgMarkerFG", QColor(Qt::red)); ui.newMsgMarkerFG->setColor(settings["NewMsgMarkerFG"].value()); @@ -446,7 +449,7 @@ void ColorSettingsPage::save() { s.setValue("timestampUseBG", ui.timestampUseBG->isChecked()); saveColor(UiStyle::Sender, ui.senderFG->color(), ui.senderBG->color(), ui.senderUseBG->isChecked()); s.setValue("senderUseBG", ui.senderUseBG->isChecked()); - s.setValue("senderAutoColor", ui.senderAutoColor->isChecked()); + s.setValue("SenderAutoColor", ui.senderAutoColor->isChecked()); QtUi::style()->setSenderAutoColor(ui.senderAutoColor->isChecked()); s.setValue("newMsgMarkerFG", ui.newMsgMarkerFG->color()); diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp index dbefa52d..f6ce8a66 100644 --- a/src/uisupport/uistyle.cpp +++ b/src/uisupport/uistyle.cpp @@ -49,7 +49,7 @@ UiStyle::UiStyle(const QString &settingsKey) : _settingsKey(settingsKey) { } // Check for the sender auto coloring option - _senderAutoColor = s.value("Flags/senderAutoColor", QVariant(true)).toBool(); + _senderAutoColor = s.value("Colors/SenderAutoColor", false).toBool(); // Now initialize the mapping between FormatCodes and FormatTypes... _formatCodes["%O"] = None; @@ -133,7 +133,7 @@ void UiStyle::setFormat(FormatType ftype, QTextCharFormat fmt, Settings::Mode mo void UiStyle::setSenderAutoColor( bool state ) { _senderAutoColor = state; UiStyleSettings s(_settingsKey); - s.setValue("Flags/senderAutoColor", QVariant(state)); + s.setValue("Colors/SenderAutoColor", QVariant(state)); } QTextCharFormat UiStyle::format(FormatType ftype, Settings::Mode mode) const { -- 2.20.1