From 2f6ad6f50e5aeaa5c8fe83b3bdc8c6538ce5946c Mon Sep 17 00:00:00 2001
From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Sun, 21 Jun 2009 21:58:18 +0200
Subject: [PATCH 1/1] Remove highlight-color related settings from
 QtUiStyle[Settings]

Since we now use message labels for styling highlighted messages, it's no longer
necessary to have explicit options for this in QtUiStyle.
---
 src/qtui/qtuisettings.cpp                    |  8 --------
 src/qtui/qtuisettings.h                      |  3 ---
 src/qtui/qtuistyle.cpp                       |  6 ------
 src/qtui/qtuistyle.h                         |  4 ----
 src/qtui/settingspages/colorsettingspage.cpp | 10 +++++-----
 5 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/src/qtui/qtuisettings.cpp b/src/qtui/qtuisettings.cpp
index 81411545..3cdd26a8 100644
--- a/src/qtui/qtuisettings.cpp
+++ b/src/qtui/qtuisettings.cpp
@@ -40,11 +40,3 @@ QtUiStyleSettings::QtUiStyleSettings()
   : UiStyleSettings("QtUiStyle")
 {
 }
-
-void QtUiStyleSettings::setHighlightColor(const QColor &col) {
-  setLocalValue("Colors/HighlightColor", col);
-}
-
-QColor QtUiStyleSettings::highlightColor() {
-  return localValue("Colors/HighlightColor", QColor()).value<QColor>();
-}
diff --git a/src/qtui/qtuisettings.h b/src/qtui/qtuisettings.h
index 4d199fdd..8559c6ec 100644
--- a/src/qtui/qtuisettings.h
+++ b/src/qtui/qtuisettings.h
@@ -35,9 +35,6 @@ class QtUiStyleSettings : public UiStyleSettings {
 public:
   QtUiStyleSettings(const QString &subGroup);
   QtUiStyleSettings();
-
-  void setHighlightColor(const QColor &);
-  QColor highlightColor();
 };
 
 #endif
diff --git a/src/qtui/qtuistyle.cpp b/src/qtui/qtuistyle.cpp
index 5ea72c19..5aa65349 100644
--- a/src/qtui/qtuistyle.cpp
+++ b/src/qtui/qtuistyle.cpp
@@ -26,9 +26,3 @@ QtUiStyle::QtUiStyle() : UiStyle() {
 }
 
 QtUiStyle::~QtUiStyle() {}
-
-void QtUiStyle::setHighlightColor(const QColor &col) {
-  _highlightColor = col;
-  QtUiStyleSettings s;
-  s.setHighlightColor(col);
-}
diff --git a/src/qtui/qtuistyle.h b/src/qtui/qtuistyle.h
index 270e2480..e3417362 100644
--- a/src/qtui/qtuistyle.h
+++ b/src/qtui/qtuistyle.h
@@ -31,11 +31,7 @@ public:
 
   virtual inline qreal firstColumnSeparator() const { return 6; }
   virtual inline qreal secondColumnSeparator() const { return 6; }
-  virtual inline QColor highlightColor() const { return _highlightColor; }
-  virtual void setHighlightColor(const QColor &);
 
-private:
-  QColor _highlightColor;
 };
 
 #endif
diff --git a/src/qtui/settingspages/colorsettingspage.cpp b/src/qtui/settingspages/colorsettingspage.cpp
index f77d5785..58f699a2 100644
--- a/src/qtui/settingspages/colorsettingspage.cpp
+++ b/src/qtui/settingspages/colorsettingspage.cpp
@@ -362,9 +362,9 @@ void ColorSettingsPage::load() {
   ui.modeFlagsBG->setColor(QtUi::style()->format(UiStyle::ModeFlags).background().color());
   ui.urlFG->setColor(QtUi::style()->format(UiStyle::Url).foreground().color());
   ui.urlBG->setColor(QtUi::style()->format(UiStyle::Url).background().color());
-*/
+
   ui.highlightColor->setColor(QtUi::style()->highlightColor());
-/*
+
   ui.color0->setColor(QtUi::style()->format(UiStyle::FgCol00).foreground().color());
   ui.color1->setColor(QtUi::style()->format(UiStyle::FgCol01).foreground().color());
   ui.color2->setColor(QtUi::style()->format(UiStyle::FgCol02).foreground().color());
@@ -444,7 +444,7 @@ void ColorSettingsPage::save() {
   saveColor(UiStyle::NickMsg, ui.renameMessageFG->color(), ui.renameMessageBG->color(), ui.renameMessageUseBG->isChecked());
   s.setValue("renameMessageUseBG", ui.renameMessageUseBG->isChecked());
 
-  QtUi::style()->setHighlightColor(ui.highlightColor->color());
+  //QtUi::style()->setHighlightColor(ui.highlightColor->color());
 
   saveColor(UiStyle::Timestamp, ui.timestampFG->color(), ui.timestampBG->color(), ui.timestampUseBG->isChecked());
   s.setValue("timestampUseBG", ui.timestampUseBG->isChecked());
@@ -573,9 +573,9 @@ bool ColorSettingsPage::testHasChanged() {
   if(QtUi::style()->format(UiStyle::RenameMsg).foreground().color() != ui.renameMessageFG->color()) return true;
   if(QtUi::style()->format(UiStyle::RenameMsg).background().color() != ui.renameMessageBG->color()) return true;
   if(settings["RenameMessageUseBG"].toBool() != ui.renameMessageUseBG->isChecked()) return true;
-*/
+
   if(QtUi::style()->highlightColor() != ui.highlightColor->color()) return true;
-/*
+
   if(QtUi::style()->format(UiStyle::Timestamp).foreground().color() != ui.timestampFG->color()) return true;
   if(QtUi::style()->format(UiStyle::Timestamp).background().color() != ui.timestampBG->color()) return true;
   if(settings["TimestampUseBG"].toBool() != ui.timestampUseBG->isChecked()) return true;
-- 
2.20.1