From 5ee9c75fb9301473d40ca1f219201950529096f7 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Sun, 9 Mar 2008 21:08:09 +0000 Subject: [PATCH] Stopping ColorSettingsPage from messing up mIRC colors, and restoring defaults. Saving custom mIRC colors is disabled until somebody implements this properly. --- src/qtui/settingspages/colorsettingspage.cpp | 4 +++- src/uisupport/uistyle.cpp | 3 +++ version.inc | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/qtui/settingspages/colorsettingspage.cpp b/src/qtui/settingspages/colorsettingspage.cpp index b1e88f72..11ac57c5 100644 --- a/src/qtui/settingspages/colorsettingspage.cpp +++ b/src/qtui/settingspages/colorsettingspage.cpp @@ -602,6 +602,7 @@ void ColorSettingsPage::save() { s.setValue("urlBG", ui.urlBG->color()); s.setValue("urlUseBG", ui.urlUseBG->isChecked()); + /* This ain't working! saveColor(UiStyle::FgCol00, ui.color0->color()); saveColor(UiStyle::FgCol01, ui.color1->color()); saveColor(UiStyle::FgCol02, ui.color2->color()); @@ -635,7 +636,8 @@ void ColorSettingsPage::save() { saveColor(UiStyle::BgCol13, ui.color13->color()); saveColor(UiStyle::BgCol14, ui.color14->color()); saveColor(UiStyle::BgCol15, ui.color15->color()); - +*/ + s.setValue("onlineStatusFG", ui.onlineStatusFG->color()); s.setValue("onlineStatusBG", ui.onlineStatusBG->color()); s.setValue("onlineStatusUseBG", ui.onlineStatusUseBG->isChecked()); diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp index 8c62b373..017fee24 100644 --- a/src/uisupport/uistyle.cpp +++ b/src/uisupport/uistyle.cpp @@ -78,6 +78,9 @@ UiStyle::UiStyle(const QString &settingsKey) : _settingsKey(settingsKey) { QTextCharFormat fgf, bgf; fgf.setForeground(QBrush(QColor(colors[i]))); setFormat((FormatType)(FgCol00 + i), fgf, Settings::Default); bgf.setBackground(QBrush(QColor(colors[i]))); setFormat((FormatType)(BgCol00 + i), bgf, Settings::Default); + //FIXME fix the havoc caused by ColorSettingsPage + setFormat((FormatType)(FgCol00 + i), fgf, Settings::Custom); + setFormat((FormatType)(BgCol00 + i), bgf, Settings::Custom); } // Set a few more standard formats diff --git a/version.inc b/version.inc index a3e6cee8..58df021e 100644 --- a/version.inc +++ b/version.inc @@ -5,7 +5,7 @@ quasselVersion = "0.2.0-alpha3-pre"; quasselDate = "2008-03-09"; - quasselBuild = 620; + quasselBuild = 622; //! Minimum client build number the core needs clientBuildNeeded = 620; -- 2.20.1