Introduce QtUiStyleSettings and make highlight color configurable again

[quassel.git] / src / qtui / settingspages / colorsettingspage.cpp

diff --git a/src/qtui/settingspages/colorsettingspage.cpp b/src/qtui/settingspages/colorsettingspage.cpp
index 1d80afd..9ea8758 100644 (file)
--- a/src/qtui/settingspages/colorsettingspage.cpp
+++ b/src/qtui/settingspages/colorsettingspage.cpp
@@ -335,6 +335,8 @@ void ColorSettingsPage::defaultMessage() {
   ui.senderBG->setColor(QColor("white"));
   ui.senderBG->setEnabled(false);
   ui.senderUseBG->setChecked(false);
+
+  /*
   ui.nickFG->setColor(QColor("black"));
   ui.nickBG->setColor(QColor("white"));
   ui.nickBG->setEnabled(false);
@@ -355,6 +357,7 @@ void ColorSettingsPage::defaultMessage() {
   ui.urlBG->setColor(QColor("white"));
   ui.urlBG->setEnabled(false);
   ui.urlUseBG->setChecked(false);
+  */
 }
 
 void ColorSettingsPage::defaultMircColorCodes() {
@@ -532,8 +535,7 @@ void ColorSettingsPage::load() {
   ui.urlFG->setColor(QtUi::style()->format(UiStyle::Url).foreground().color());
   ui.urlBG->setColor(QtUi::style()->format(UiStyle::Url).background().color());
 
-  settings["HighlightColor"] = s.value("highlightColor", QVariant(QColor("lightcoral")));
-  ui.highlightColor->setColor(settings["HighlightColor"].value<QColor>());
+  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());
@@ -614,12 +616,14 @@ void ColorSettingsPage::save() {
   saveColor(UiStyle::RenameMsg, ui.renameMessageFG->color(), ui.renameMessageBG->color(), ui.renameMessageUseBG->isChecked());
   s.setValue("renameMessageUseBG", ui.renameMessageUseBG->isChecked());
 
-  s.setValue("highlightColor", 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());
   saveColor(UiStyle::Sender, ui.senderFG->color(), ui.senderBG->color(), ui.senderUseBG->isChecked());
   s.setValue("senderUseBG", ui.senderUseBG->isChecked());
+
+  /*
   saveColor(UiStyle::Nick, ui.nickFG->color(), ui.nickBG->color(), ui.nickUseBG->isChecked());
   s.setValue("nickUseBG", ui.nickUseBG->isChecked());
   saveColor(UiStyle::Hostmask, ui.hostmaskFG->color(), ui.hostmaskBG->color(), ui.hostmaskUseBG->isChecked());
@@ -630,6 +634,7 @@ void ColorSettingsPage::save() {
   s.setValue("modeFlagsUseBG", ui.modeFlagsUseBG->isChecked());
   saveColor(UiStyle::Url, ui.urlFG->color(), ui.urlBG->color(), ui.urlUseBG->isChecked());
   s.setValue("urlUseBG", ui.urlUseBG->isChecked());
+  */
 
   saveMircColor(0, ui.color0->color());
   saveMircColor(1, ui.color1->color());
@@ -738,7 +743,7 @@ bool ColorSettingsPage::testHasChanged() {
   if(QtUi::style()->format(UiStyle::RenameMsg).background().color() != ui.renameMessageBG->color()) return true;
   if(settings["RenameMessageUseBG"].toBool() != ui.renameMessageUseBG->isChecked()) return true;
 
-  if(settings["HighlightColor"].value<QColor>() != ui.highlightColor->color()) 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;
@@ -747,6 +752,7 @@ bool ColorSettingsPage::testHasChanged() {
   if(QtUi::style()->format(UiStyle::Sender).background().color() != ui.senderBG->color()) return true;
   if(settings["SenderUseBG"].toBool() != ui.senderUseBG->isChecked()) return true;
 
+  /*
   if(QtUi::style()->format(UiStyle::Nick).foreground().color() != ui.nickFG->color()) return true;
   if(QtUi::style()->format(UiStyle::Nick).background().color() != ui.nickBG->color()) return true;
   if(settings["nickUseBG"].toBool() != ui.nickUseBG->isChecked()) return true;
@@ -762,6 +768,7 @@ bool ColorSettingsPage::testHasChanged() {
   if(QtUi::style()->format(UiStyle::Url).foreground().color() != ui.urlFG->color()) return true;
   if(QtUi::style()->format(UiStyle::Url).background().color() != ui.urlBG->color()) return true;
   if(settings["urlUseBG"].toBool() != ui.urlUseBG->isChecked()) return true;
+  */
 
   if(QtUi::style()->format(UiStyle::FgCol00).foreground().color() != ui.color0->color()) return true;
   if(QtUi::style()->format(UiStyle::FgCol01).foreground().color() != ui.color1->color()) return true;