enabled custom colors and

disabled all non working parts of colorsettingspage

diff --git a/src/qtui/settingspages/colorsettingspage.cpp b/src/qtui/settingspages/colorsettingspage.cpp
index 475d57c..c17346c 100644 (file)
--- a/src/qtui/settingspages/colorsettingspage.cpp
+++ b/src/qtui/settingspages/colorsettingspage.cpp
@@ -159,6 +159,32 @@ ColorSettingsPage::ColorSettingsPage(QWidget *parent)
   mapper->setMapping(ui.color15, ui.color15);
 
   connect(mapper, SIGNAL(mapped(QWidget *)), this, SLOT(chooseColor(QWidget *)));
+
+  //disable unused buttons:
+  ui.errorMessageBG->setEnabled(false);
+  ui.noticeMessageBG->setEnabled(false);
+  ui.plainMessageBG->setEnabled(false);
+  ui.serverMessageBG->setEnabled(false);
+  ui.actionMessageBG->setEnabled(false);
+  ui.joinMessageBG->setEnabled(false);
+  ui.kickMessageBG->setEnabled(false);
+  ui.modeMessageBG->setEnabled(false);
+  ui.partMessageBG->setEnabled(false);
+  ui.quitMessageBG->setEnabled(false);
+  ui.renameMessageBG->setEnabled(false);
+
+  ui.timestampBG->setEnabled(false);
+  ui.senderBG->setEnabled(false);
+  ui.nickFG->setEnabled(false);
+  ui.nickBG->setEnabled(false);
+  ui.hostmaskFG->setEnabled(false);
+  ui.hostmaskBG->setEnabled(false);
+  ui.channelnameFG->setEnabled(false);
+  ui.channelnameBG->setEnabled(false);
+  ui.modeFlagsFG->setEnabled(false);
+  ui.modeFlagsBG->setEnabled(false);
+  ui.urlFG->setEnabled(false);
+  ui.urlBG->setEnabled(false);
 }
 
 bool ColorSettingsPage::hasDefaults() const {
@@ -166,38 +192,63 @@ bool ColorSettingsPage::hasDefaults() const {
 }
 
 void ColorSettingsPage::defaults() {
+  defaultBufferview();
+  defaultServerActivity();
+  defaultUserActivity();
+  defaultMessage();
+  defaultMircColorCodes();
+}
+
+void ColorSettingsPage::defaultBufferview() {
   ui.inactiveActivity->setColor(QColor(Qt::gray));
   ui.noActivity->setColor(QColor(Qt::black));
   ui.highlightActivity->setColor(QColor(Qt::magenta));
   ui.newMessageActivity->setColor(QColor(Qt::green));
   ui.otherActivity->setColor(QColor(Qt::darkGreen));
 
-  ui.errorMessageFG->setColor(QColor("red"));
+  widgetHasChanged();
+  bufferviewPreview();
+}
+
+void ColorSettingsPage::defaultServerActivity() {
+  ui.errorMessageFG->setColor(QtUi::style()->format(UiStyle::ErrorMsg, Settings::Default).foreground().color());
   ui.errorMessageBG->setColor(QColor("white"));
-  ui.noticeMessageFG->setColor(QColor("navy"));
+  ui.noticeMessageFG->setColor(QtUi::style()->format(UiStyle::NoticeMsg, Settings::Default).foreground().color());
   ui.noticeMessageBG->setColor(QColor("white"));
-  ui.plainMessageFG->setColor(QColor("black"));
+  ui.plainMessageFG->setColor(QtUi::style()->format(UiStyle::PlainMsg, Settings::Default).foreground().color());
   ui.plainMessageBG->setColor(QColor("white"));
-  ui.serverMessageFG->setColor(QColor("navy"));
+  ui.serverMessageFG->setColor(QtUi::style()->format(UiStyle::ServerMsg, Settings::Default).foreground().color());
   ui.serverMessageBG->setColor(QColor("white"));
-  ui.actionMessageFG->setColor(QColor("darkmagenta"));
+
+  widgetHasChanged();
+  chatviewPreview();
+}
+
+void ColorSettingsPage::defaultUserActivity() {
+  ui.actionMessageFG->setColor(QtUi::style()->format(UiStyle::ActionMsg, Settings::Default).foreground().color());
   ui.actionMessageBG->setColor(QColor("white"));
-  ui.joinMessageFG->setColor(QColor("green"));
+  ui.joinMessageFG->setColor(QtUi::style()->format(UiStyle::JoinMsg, Settings::Default).foreground().color());
   ui.joinMessageBG->setColor(QColor("white"));
-  ui.kickMessageFG->setColor(QColor("black"));
+  ui.kickMessageFG->setColor(QtUi::style()->format(UiStyle::KickMsg, Settings::Default).foreground().color());
   ui.kickMessageBG->setColor(QColor("white"));
-  ui.modeMessageFG->setColor(QColor("steelblue"));
+  ui.modeMessageFG->setColor(QtUi::style()->format(UiStyle::ModeMsg, Settings::Default).foreground().color());
   ui.modeMessageBG->setColor(QColor("white"));
-  ui.partMessageFG->setColor(QColor("indianred"));
+  ui.partMessageFG->setColor(QtUi::style()->format(UiStyle::PartMsg, Settings::Default).foreground().color());
   ui.partMessageBG->setColor(QColor("white"));
-  ui.quitMessageFG->setColor(QColor("indianred"));
+  ui.quitMessageFG->setColor(QtUi::style()->format(UiStyle::QuitMsg, Settings::Default).foreground().color());
   ui.quitMessageBG->setColor(QColor("white"));
-  ui.renameMessageFG->setColor(QColor("magenta"));
+  ui.renameMessageFG->setColor(QtUi::style()->format(UiStyle::RenameMsg, Settings::Default).foreground().color());
   ui.renameMessageBG->setColor(QColor("white"));
 
-  ui.timestampFG->setColor(QColor("grey"));
+  widgetHasChanged();
+  chatviewPreview();
+}
+
+void ColorSettingsPage::defaultMessage() {
+  ui.timestampFG->setColor(QtUi::style()->format(UiStyle::Timestamp, Settings::Default).foreground().color());
+  ui.senderFG->setColor(QtUi::style()->format(UiStyle::Sender, Settings::Default).foreground().color());
+
   ui.timestampBG->setColor(QColor("white"));
-  ui.senderFG->setColor(QColor("navy"));
   ui.senderBG->setColor(QColor("white"));
   ui.nickFG->setColor(QColor("black"));
   ui.nickBG->setColor(QColor("white"));
@@ -210,27 +261,29 @@ void ColorSettingsPage::defaults() {
   ui.urlFG->setColor(QColor("black"));
   ui.urlBG->setColor(QColor("white"));
 
+  widgetHasChanged();
+  chatviewPreview();
+}
 
-  ui.color0->setColor(QColor("#ffffff"));
-  ui.color1->setColor(QColor("#000000"));
-  ui.color2->setColor(QColor("#000080"));
-  ui.color3->setColor(QColor("#008000"));
-  ui.color4->setColor(QColor("#ff0000"));
-  ui.color5->setColor(QColor("#800000"));
-  ui.color6->setColor(QColor("#800080"));
-  ui.color7->setColor(QColor("#ffa500"));
-  ui.color8->setColor(QColor("#ffff00"));
-  ui.color9->setColor(QColor("#00ff00"));
-  ui.color10->setColor(QColor("#008080"));
-  ui.color11->setColor(QColor("#00ffff"));
-  ui.color12->setColor(QColor("#4169E1"));
-  ui.color13->setColor(QColor("#ff00ff"));
-  ui.color14->setColor(QColor("#808080"));
-  ui.color15->setColor(QColor("#c0c0c0"));
+void ColorSettingsPage::defaultMircColorCodes() {
+  ui.color0->setColor(QtUi::style()->format(UiStyle::FgCol00, Settings::Default).foreground().color());
+  ui.color1->setColor(QtUi::style()->format(UiStyle::FgCol01, Settings::Default).foreground().color());
+  ui.color2->setColor(QtUi::style()->format(UiStyle::FgCol02, Settings::Default).foreground().color());
+  ui.color3->setColor(QtUi::style()->format(UiStyle::FgCol03, Settings::Default).foreground().color());
+  ui.color4->setColor(QtUi::style()->format(UiStyle::FgCol04, Settings::Default).foreground().color());
+  ui.color5->setColor(QtUi::style()->format(UiStyle::FgCol05, Settings::Default).foreground().color());
+  ui.color6->setColor(QtUi::style()->format(UiStyle::FgCol06, Settings::Default).foreground().color());
+  ui.color7->setColor(QtUi::style()->format(UiStyle::FgCol07, Settings::Default).foreground().color());
+  ui.color8->setColor(QtUi::style()->format(UiStyle::FgCol08, Settings::Default).foreground().color());
+  ui.color9->setColor(QtUi::style()->format(UiStyle::FgCol09, Settings::Default).foreground().color());
+  ui.color10->setColor(QtUi::style()->format(UiStyle::FgCol10, Settings::Default).foreground().color());
+  ui.color11->setColor(QtUi::style()->format(UiStyle::FgCol11, Settings::Default).foreground().color());
+  ui.color12->setColor(QtUi::style()->format(UiStyle::FgCol12, Settings::Default).foreground().color());
+  ui.color13->setColor(QtUi::style()->format(UiStyle::FgCol13, Settings::Default).foreground().color());
+  ui.color14->setColor(QtUi::style()->format(UiStyle::FgCol14, Settings::Default).foreground().color());
+  ui.color15->setColor(QtUi::style()->format(UiStyle::FgCol15, Settings::Default).foreground().color());
 
   widgetHasChanged();
-  bufferviewPreview();
-  chatviewPreview();
 }
 
 void ColorSettingsPage::load() {
@@ -246,57 +299,46 @@ void ColorSettingsPage::load() {
   settings["OtherActivity"] = s.value("otherActivity", QVariant(QColor(Qt::darkGreen)));
   ui.otherActivity->setColor(settings["OtherActivity"].value<QColor>());
 
-  settings["ErrorMessageFG"] = s.value("errorMessageFG", QVariant(QColor("red")));
-  ui.errorMessageFG->setColor(settings["ErrorMessageFG"].value<QColor>());
-  settings["ErrorMessageBG"] = s.value("errorMessageBG", QVariant(QColor("white")));
-  ui.errorMessageBG->setColor(settings["ErrorMessageBG"].value<QColor>());
-  settings["NoticeMessageFG"] = s.value("noticeMessageFG", QVariant(QColor("navy")));
-  ui.noticeMessageFG->setColor(settings["NoticeMessageFG"].value<QColor>());
-  settings["NoticeMessageBG"] = s.value("noticeMessageBG", QVariant(QColor("white")));
-  ui.noticeMessageBG->setColor(settings["NoticeMessageBG"].value<QColor>());
-  settings["PlainMessageFG"] = s.value("plainMessageFG", QVariant(QColor("black")));
-  ui.plainMessageFG->setColor(settings["PlainMessageFG"].value<QColor>());
-  settings["PlainMessageBG"] = s.value("plainMessageBG", QVariant(QColor("white")));
-  ui.plainMessageBG->setColor(settings["PlainMessageBG"].value<QColor>());
-  settings["ServerMessageFG"] = s.value("serverMessageFG", QVariant(QColor("navy")));
-  ui.serverMessageFG->setColor(settings["ServerMessageFG"].value<QColor>());
-  settings["ServerMessageBG"] = s.value("serverMessageBG", QVariant(QColor("white")));
-  ui.serverMessageBG->setColor(settings["ServerMessageBG"].value<QColor>());
-  settings["ActionMessageFG"] = s.value("actionMessageFG", QVariant(QColor("darkmagenta")));
-  ui.actionMessageFG->setColor(settings["ActionMessageFG"].value<QColor>());
+  ui.actionMessageFG->setColor(QtUi::style()->format(UiStyle::ActionMsg).foreground().color());
+  ui.errorMessageFG->setColor(QtUi::style()->format(UiStyle::ErrorMsg).foreground().color());
+  ui.joinMessageFG->setColor(QtUi::style()->format(UiStyle::JoinMsg).foreground().color());
+  ui.kickMessageFG->setColor(QtUi::style()->format(UiStyle::KickMsg).foreground().color());
+  ui.modeMessageFG->setColor(QtUi::style()->format(UiStyle::ModeMsg).foreground().color());
+  ui.noticeMessageFG->setColor(QtUi::style()->format(UiStyle::NoticeMsg).foreground().color());
+  ui.partMessageFG->setColor(QtUi::style()->format(UiStyle::PartMsg).foreground().color());
+  ui.plainMessageFG->setColor(QtUi::style()->format(UiStyle::PlainMsg).foreground().color());
+  ui.quitMessageFG->setColor(QtUi::style()->format(UiStyle::QuitMsg).foreground().color());
+  ui.renameMessageFG->setColor(QtUi::style()->format(UiStyle::RenameMsg).foreground().color());
+  ui.serverMessageFG->setColor(QtUi::style()->format(UiStyle::ServerMsg).foreground().color());
+
   settings["ActionMessageBG"] = s.value("actionMessageBG", QVariant(QColor("white")));
   ui.actionMessageBG->setColor(settings["ActionMessageBG"].value<QColor>());
-  settings["JoinMessageFG"] = s.value("joinMessageFG", QVariant(QColor("green")));
-  ui.joinMessageFG->setColor(settings["JoinMessageFG"].value<QColor>());
+  settings["ErrorMessageBG"] = s.value("errorMessageBG", QVariant(QColor("white")));
+  ui.errorMessageBG->setColor(settings["ErrorMessageBG"].value<QColor>());
   settings["JoinMessageBG"] = s.value("joinMessageBG", QVariant(QColor("white")));
   ui.joinMessageBG->setColor(settings["JoinMessageBG"].value<QColor>());
-  settings["KickMessageFG"] = s.value("kickMessageFG", QVariant(QColor("black")));
-  ui.kickMessageFG->setColor(settings["KickMessageFG"].value<QColor>());
   settings["KickMessageBG"] = s.value("kickMessageBG", QVariant(QColor("white")));
   ui.kickMessageBG->setColor(settings["KickMessageBG"].value<QColor>());
-  settings["ModeMessageFG"] = s.value("modeMessageFG", QVariant(QColor("steelblue")));
-  ui.modeMessageFG->setColor(settings["ModeMessageFG"].value<QColor>());
   settings["ModeMessageBG"] = s.value("modeMessageBG", QVariant(QColor("white")));
   ui.modeMessageBG->setColor(settings["ModeMessageBG"].value<QColor>());
-  settings["PartMessageFG"] = s.value("partMessageFG", QVariant(QColor("indianred")));
-  ui.partMessageFG->setColor(settings["PartMessageFG"].value<QColor>());
+  settings["NoticeMessageBG"] = s.value("noticeMessageBG", QVariant(QColor("white")));
+  ui.noticeMessageBG->setColor(settings["NoticeMessageBG"].value<QColor>());
   settings["PartMessageBG"] = s.value("partMessageBG", QVariant(QColor("white")));
   ui.partMessageBG->setColor(settings["PartMessageBG"].value<QColor>());
-  settings["QuitMessageFG"] = s.value("quitMessageFG", QVariant(QColor("indianred")));
-  ui.quitMessageFG->setColor(settings["QuitMessageFG"].value<QColor>());
+  settings["PlainMessageBG"] = s.value("plainMessageBG", QVariant(QColor("white")));
+  ui.plainMessageBG->setColor(settings["PlainMessageBG"].value<QColor>());
   settings["QuitMessageBG"] = s.value("quitMessageBG", QVariant(QColor("white")));
   ui.quitMessageBG->setColor(settings["QuitMessageBG"].value<QColor>());
-  settings["RenameMessageFG"] = s.value("renameMessageFG", QVariant(QColor("magenta")));
-  ui.renameMessageFG->setColor(settings["RenameMessageFG"].value<QColor>());
   settings["RenameMessageBG"] = s.value("renameMessageBG", QVariant(QColor("white")));
   ui.renameMessageBG->setColor(settings["RenameMessageBG"].value<QColor>());
+  settings["ServerMessageBG"] = s.value("serverMessageBG", QVariant(QColor("white")));
+  ui.serverMessageBG->setColor(settings["ServerMessageBG"].value<QColor>());
+
+  ui.timestampFG->setColor(QtUi::style()->format(UiStyle::Timestamp).foreground().color());
+  ui.senderFG->setColor(QtUi::style()->format(UiStyle::Sender).foreground().color());
 
-  settings["TimestampFG"] = s.value("timestampFG", QVariant(QColor("grey")));
-  ui.timestampFG->setColor(settings["TimestampFG"].value<QColor>());
   settings["TimestampBG"] = s.value("timestampBG", QVariant(QColor("white")));
   ui.timestampBG->setColor(settings["TimestampBG"].value<QColor>());
-  settings["SenderFG"] = s.value("senderFG", QVariant(QColor("navy")));
-  ui.senderFG->setColor(settings["SenderFG"].value<QColor>());
   settings["SenderBG"] = s.value("senderBG", QVariant(QColor("white")));
   ui.senderBG->setColor(settings["SenderBG"].value<QColor>());
   settings["NickFG"] = s.value("nickFG", QVariant(QColor("black")));
@@ -320,38 +362,22 @@ void ColorSettingsPage::load() {
   settings["UrlBG"] = s.value("urlBG", QVariant(QColor("white")));
   ui.urlBG->setColor(settings["UrlBG"].value<QColor>());
 
-  settings["Color0"] = s.value("color0", QVariant(QColor("#ffffff")));
-  ui.color0->setColor(settings["Color0"].value<QColor>());
-  settings["Color1"] = s.value("color1", QVariant(QColor("#000000")));
-  ui.color1->setColor(settings["Color1"].value<QColor>());
-  settings["Color2"] = s.value("color2", QVariant(QColor("#000080")));
-  ui.color2->setColor(settings["Color2"].value<QColor>());
-  settings["Color3"] = s.value("color3", QVariant(QColor("#008000")));
-  ui.color3->setColor(settings["Color3"].value<QColor>());
-  settings["Color4"] = s.value("color4", QVariant(QColor("#ff0000")));
-  ui.color4->setColor(settings["Color4"].value<QColor>());
-  settings["Color5"] = s.value("color5", QVariant(QColor("#800000")));
-  ui.color5->setColor(settings["Color5"].value<QColor>());
-  settings["Color6"] = s.value("color6", QVariant(QColor("#800080")));
-  ui.color6->setColor(settings["Color6"].value<QColor>());
-  settings["Color7"] = s.value("color7", QVariant(QColor("#ffa500")));
-  ui.color7->setColor(settings["Color7"].value<QColor>());
-  settings["Color8"] = s.value("color8", QVariant(QColor("#ffff00")));
-  ui.color8->setColor(settings["Color8"].value<QColor>());
-  settings["Color9"] = s.value("color9", QVariant(QColor("#00ff00")));
-  ui.color9->setColor(settings["Color9"].value<QColor>());
-  settings["Color10"] = s.value("color10", QVariant(QColor("#008080")));
-  ui.color10->setColor(settings["Color10"].value<QColor>());
-  settings["Color11"] = s.value("color11", QVariant(QColor("#00ffff")));
-  ui.color11->setColor(settings["Color11"].value<QColor>());
-  settings["Color12"] = s.value("color12", QVariant(QColor("#4169E1")));
-  ui.color12->setColor(settings["Color12"].value<QColor>());
-  settings["Color13"] = s.value("color13", QVariant(QColor("#ff00ff")));
-  ui.color13->setColor(settings["Color13"].value<QColor>());
-  settings["Color14"] = s.value("color14", QVariant(QColor("#808080")));
-  ui.color14->setColor(settings["Color14"].value<QColor>());
-  settings["Color15"] = s.value("color15", QVariant(QColor("#c0c0c0")));
-  ui.color15->setColor(settings["Color15"].value<QColor>());
+  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());
+  ui.color3->setColor(QtUi::style()->format(UiStyle::FgCol03).foreground().color());
+  ui.color4->setColor(QtUi::style()->format(UiStyle::FgCol04).foreground().color());
+  ui.color5->setColor(QtUi::style()->format(UiStyle::FgCol05).foreground().color());
+  ui.color6->setColor(QtUi::style()->format(UiStyle::FgCol06).foreground().color());
+  ui.color7->setColor(QtUi::style()->format(UiStyle::FgCol07).foreground().color());
+  ui.color8->setColor(QtUi::style()->format(UiStyle::FgCol08).foreground().color());
+  ui.color9->setColor(QtUi::style()->format(UiStyle::FgCol09).foreground().color());
+  ui.color10->setColor(QtUi::style()->format(UiStyle::FgCol10).foreground().color());
+  ui.color11->setColor(QtUi::style()->format(UiStyle::FgCol11).foreground().color());
+  ui.color12->setColor(QtUi::style()->format(UiStyle::FgCol12).foreground().color());
+  ui.color13->setColor(QtUi::style()->format(UiStyle::FgCol13).foreground().color());
+  ui.color14->setColor(QtUi::style()->format(UiStyle::FgCol14).foreground().color());
+  ui.color15->setColor(QtUi::style()->format(UiStyle::FgCol15).foreground().color());
 
   setChangedState(false);
 
@@ -367,32 +393,33 @@ void ColorSettingsPage::save() {
   s.setValue("newMessageActivity", ui.newMessageActivity->color());
   s.setValue("otherActivity", ui.otherActivity->color());
 
-  s.setValue("errorMessageFG", ui.errorMessageFG->color());
+  saveColor(UiStyle::ErrorMsg, ui.errorMessageFG->color());
   s.setValue("errorMessageBG", ui.errorMessageBG->color());
-  s.setValue("noticeMessageFG", ui.noticeMessageFG->color());
+  saveColor(UiStyle::NoticeMsg, ui.noticeMessageFG->color());
   s.setValue("noticeMessageBG", ui.noticeMessageBG->color());
-  s.setValue("plainMessageFG", ui.plainMessageFG->color());
+  saveColor(UiStyle::PlainMsg, ui.plainMessageFG->color());
   s.setValue("plainMessageBG", ui.plainMessageBG->color());
-  s.setValue("serverMessageFG", ui.serverMessageFG->color());
+  saveColor(UiStyle::ServerMsg, ui.serverMessageFG->color());
   s.setValue("serverMessageBG", ui.serverMessageBG->color());
-  s.setValue("actionMessageFG", ui.actionMessageFG->color());
+  saveColor(UiStyle::ActionMsg, ui.actionMessageFG->color());
   s.setValue("actionMessageBG", ui.actionMessageBG->color());
-  s.setValue("joinMessageFG", ui.joinMessageFG->color());
+  saveColor(UiStyle::JoinMsg, ui.joinMessageFG->color());
   s.setValue("joinMessageBG", ui.joinMessageBG->color());
-  s.setValue("kickMessageFG", ui.kickMessageFG->color());
+  saveColor(UiStyle::KickMsg, ui.kickMessageFG->color());
   s.setValue("kickMessageBG", ui.kickMessageBG->color());
-  s.setValue("modeMessageFG", ui.modeMessageFG->color());
+  saveColor(UiStyle::ModeMsg, ui.modeMessageFG->color());
   s.setValue("modeMessageBG", ui.modeMessageBG->color());
-  s.setValue("partMessageFG", ui.partMessageFG->color());
+  saveColor(UiStyle::PartMsg, ui.partMessageFG->color());
   s.setValue("partMessageBG", ui.partMessageBG->color());
-  s.setValue("quitMessageFG", ui.quitMessageFG->color());
+  saveColor(UiStyle::QuitMsg, ui.quitMessageFG->color());
   s.setValue("quitMessageBG", ui.quitMessageBG->color());
-  s.setValue("renameMessageFG", ui.renameMessageFG->color());
+  saveColor(UiStyle::RenameMsg, ui.renameMessageFG->color());
   s.setValue("renameMessageBG", ui.renameMessageBG->color());
 
-  s.setValue("timestampFG", ui.timestampFG->color());
+  saveColor(UiStyle::Timestamp, ui.timestampFG->color());
+  saveColor(UiStyle::Sender, ui.senderFG->color());
+
   s.setValue("timestampBG", ui.timestampBG->color());
-  s.setValue("senderFG", ui.senderFG->color());
   s.setValue("senderBG", ui.senderBG->color());
   s.setValue("nickFG", ui.nickFG->color());
   s.setValue("nickBG", ui.nickBG->color());
@@ -405,28 +432,50 @@ void ColorSettingsPage::save() {
   s.setValue("urlFG", ui.urlFG->color());
   s.setValue("urlBG", ui.urlBG->color());
 
-
-  s.setValue("color0", ui.color0->color());
-  s.setValue("color1", ui.color1->color());
-  s.setValue("color2", ui.color2->color());
-  s.setValue("color3", ui.color3->color());
-  s.setValue("color4", ui.color4->color());
-  s.setValue("color5", ui.color5->color());
-  s.setValue("color6", ui.color6->color());
-  s.setValue("color7", ui.color7->color());
-  s.setValue("color8", ui.color8->color());
-  s.setValue("color9", ui.color9->color());
-  s.setValue("color10", ui.color10->color());
-  s.setValue("color11", ui.color11->color());
-  s.setValue("color12", ui.color12->color());
-  s.setValue("color13", ui.color13->color());
-  s.setValue("color14", ui.color14->color());
-  s.setValue("color15", ui.color15->color());
-
-  load();
+  saveColor(UiStyle::FgCol00, ui.color0->color());
+  saveColor(UiStyle::FgCol01, ui.color1->color());
+  saveColor(UiStyle::FgCol02, ui.color2->color());
+  saveColor(UiStyle::FgCol03, ui.color3->color());
+  saveColor(UiStyle::FgCol04, ui.color4->color());
+  saveColor(UiStyle::FgCol05, ui.color5->color());
+  saveColor(UiStyle::FgCol06, ui.color6->color());
+  saveColor(UiStyle::FgCol07, ui.color7->color());
+  saveColor(UiStyle::FgCol08, ui.color8->color());
+  saveColor(UiStyle::FgCol09, ui.color9->color());
+  saveColor(UiStyle::FgCol10, ui.color10->color());
+  saveColor(UiStyle::FgCol11, ui.color11->color());
+  saveColor(UiStyle::FgCol12, ui.color12->color());
+  saveColor(UiStyle::FgCol13, ui.color13->color());
+  saveColor(UiStyle::FgCol14, ui.color14->color());
+  saveColor(UiStyle::FgCol15, ui.color15->color());
+
+  saveColor(UiStyle::BgCol00, ui.color0->color());
+  saveColor(UiStyle::BgCol01, ui.color1->color());
+  saveColor(UiStyle::BgCol02, ui.color2->color());
+  saveColor(UiStyle::BgCol03, ui.color3->color());
+  saveColor(UiStyle::BgCol04, ui.color4->color());
+  saveColor(UiStyle::BgCol05, ui.color5->color());
+  saveColor(UiStyle::BgCol06, ui.color6->color());
+  saveColor(UiStyle::BgCol07, ui.color7->color());
+  saveColor(UiStyle::BgCol08, ui.color8->color());
+  saveColor(UiStyle::BgCol09, ui.color9->color());
+  saveColor(UiStyle::BgCol10, ui.color10->color());
+  saveColor(UiStyle::BgCol11, ui.color11->color());
+  saveColor(UiStyle::BgCol12, ui.color12->color());
+  saveColor(UiStyle::BgCol13, ui.color13->color());
+  saveColor(UiStyle::BgCol14, ui.color14->color());
+  saveColor(UiStyle::BgCol15, ui.color15->color());
+
+  load(); //TODO: remove when settings hash map is unnescessary
   setChangedState(false);
 }
 
+void ColorSettingsPage::saveColor(UiStyle::FormatType formatType, const QColor &color) {
+  QTextCharFormat format = QtUi::style()->format(formatType);
+  format.setForeground(QBrush(color));
+  QtUi::style()->setFormat(formatType, format, Settings::Custom);
+}
+
 void ColorSettingsPage::widgetHasChanged() {
   bool changed = testHasChanged();
   if(changed != hasChanged()) setChangedState(changed);
@@ -439,32 +488,33 @@ bool ColorSettingsPage::testHasChanged() {
   if(settings["NewMessageActivity"].value<QColor>() != ui.newMessageActivity->color()) return true;
   if(settings["OtherActivity"].value<QColor>() != ui.otherActivity->color()) return true;
 
-  if(settings["ErrorMessageFG"].value<QColor>() != ui.errorMessageFG->color()) return true;
+  if(QtUi::style()->format(UiStyle::ErrorMsg).foreground().color() != ui.errorMessageFG->color()) return true;
   if(settings["ErrorMessageBG"].value<QColor>() != ui.errorMessageBG->color()) return true;
-  if(settings["NoticeMessageFG"].value<QColor>() != ui.noticeMessageFG->color()) return true;
+  if(QtUi::style()->format(UiStyle::NoticeMsg).foreground().color() != ui.noticeMessageFG->color()) return true;
   if(settings["NoticeMessageBG"].value<QColor>() != ui.noticeMessageBG->color()) return true;
-  if(settings["PlainMessageFG"].value<QColor>() != ui.plainMessageFG->color()) return true;
+  if(QtUi::style()->format(UiStyle::PlainMsg).foreground().color() != ui.plainMessageFG->color()) return true;
   if(settings["PlainMessageBG"].value<QColor>() != ui.plainMessageBG->color()) return true;
-  if(settings["ServerMessageFG"].value<QColor>() != ui.serverMessageFG->color()) return true;
+  if(QtUi::style()->format(UiStyle::ServerMsg).foreground().color() != ui.serverMessageFG->color()) return true;
   if(settings["ServerMessageBG"].value<QColor>() != ui.serverMessageBG->color()) return true;
-  if(settings["ActionMessageFG"].value<QColor>() != ui.actionMessageFG->color()) return true;
+  if(QtUi::style()->format(UiStyle::ActionMsg).foreground().color() != ui.actionMessageFG->color()) return true;
   if(settings["ActionMessageBG"].value<QColor>() != ui.actionMessageBG->color()) return true;
-  if(settings["JoinMessageFG"].value<QColor>() != ui.joinMessageFG->color()) return true;
+  if(QtUi::style()->format(UiStyle::JoinMsg).foreground().color() != ui.joinMessageFG->color()) return true;
   if(settings["JoinMessageBG"].value<QColor>() != ui.joinMessageBG->color()) return true;
-  if(settings["KickMessageFG"].value<QColor>() != ui.kickMessageFG->color()) return true;
+  if(QtUi::style()->format(UiStyle::KickMsg).foreground().color() != ui.kickMessageFG->color()) return true;
   if(settings["KickMessageBG"].value<QColor>() != ui.kickMessageBG->color()) return true;
-  if(settings["ModeMessageFG"].value<QColor>() != ui.modeMessageFG->color()) return true;
+  if(QtUi::style()->format(UiStyle::ModeMsg).foreground().color() != ui.modeMessageFG->color()) return true;
   if(settings["ModeMessageBG"].value<QColor>() != ui.modeMessageBG->color()) return true;
-  if(settings["PartMessageFG"].value<QColor>() != ui.partMessageFG->color()) return true;
+  if(QtUi::style()->format(UiStyle::PartMsg).foreground().color() != ui.partMessageFG->color()) return true;
   if(settings["PartMessageBG"].value<QColor>() != ui.partMessageBG->color()) return true;
-  if(settings["QuitMessageFG"].value<QColor>() != ui.quitMessageFG->color()) return true;
+  if(QtUi::style()->format(UiStyle::QuitMsg).foreground().color() != ui.quitMessageFG->color()) return true;
   if(settings["QuitMessageBG"].value<QColor>() != ui.quitMessageBG->color()) return true;
-  if(settings["RenameMessageFG"].value<QColor>() != ui.renameMessageFG->color()) return true;
+  if(QtUi::style()->format(UiStyle::RenameMsg).foreground().color() != ui.renameMessageFG->color()) return true;
   if(settings["RenameMessageBG"].value<QColor>() != ui.renameMessageBG->color()) return true;
 
-  if(settings["TimestampFG"].value<QColor>() != ui.timestampFG->color()) return true;
+  if(QtUi::style()->format(UiStyle::Timestamp).foreground().color() != ui.timestampFG->color()) return true;
+  if(QtUi::style()->format(UiStyle::Sender).foreground().color() != ui.senderFG->color()) return true;
+
   if(settings["TimestampBG"].value<QColor>() != ui.timestampBG->color()) return true;
-  if(settings["SenderFG"].value<QColor>() != ui.senderFG->color()) return true;
   if(settings["SenderBG"].value<QColor>() != ui.senderBG->color()) return true;
   if(settings["NickFG"].value<QColor>() != ui.nickFG->color()) return true;
   if(settings["NickBG"].value<QColor>() != ui.nickBG->color()) return true;
@@ -477,22 +527,22 @@ bool ColorSettingsPage::testHasChanged() {
   if(settings["UrlFG"].value<QColor>() != ui.urlFG->color()) return true;
   if(settings["UrlBG"].value<QColor>() != ui.urlBG->color()) return true;
 
-  if(settings["Color0"].value<QColor>() != ui.color0->color()) return true;
-  if(settings["Color1"].value<QColor>() != ui.color1->color()) return true;
-  if(settings["Color2"].value<QColor>() != ui.color2->color()) return true;
-  if(settings["Color3"].value<QColor>() != ui.color3->color()) return true;
-  if(settings["Color4"].value<QColor>() != ui.color4->color()) return true;
-  if(settings["Color5"].value<QColor>() != ui.color5->color()) return true;
-  if(settings["Color6"].value<QColor>() != ui.color6->color()) return true;
-  if(settings["Color7"].value<QColor>() != ui.color7->color()) return true;
-  if(settings["Color8"].value<QColor>() != ui.color8->color()) return true;
-  if(settings["Color9"].value<QColor>() != ui.color9->color()) return true;
-  if(settings["Color10"].value<QColor>() != ui.color10->color()) return true;
-  if(settings["Color11"].value<QColor>() != ui.color11->color()) return true;
-  if(settings["Color12"].value<QColor>() != ui.color12->color()) return true;
-  if(settings["Color13"].value<QColor>() != ui.color13->color()) return true;
-  if(settings["Color14"].value<QColor>() != ui.color14->color()) return true;
-  if(settings["Color15"].value<QColor>() != ui.color15->color()) 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;
+  if(QtUi::style()->format(UiStyle::FgCol02).foreground().color() != ui.color2->color()) return true;
+  if(QtUi::style()->format(UiStyle::FgCol03).foreground().color() != ui.color3->color()) return true;
+  if(QtUi::style()->format(UiStyle::FgCol04).foreground().color() != ui.color4->color()) return true;
+  if(QtUi::style()->format(UiStyle::FgCol05).foreground().color() != ui.color5->color()) return true;
+  if(QtUi::style()->format(UiStyle::FgCol06).foreground().color() != ui.color6->color()) return true;
+  if(QtUi::style()->format(UiStyle::FgCol07).foreground().color() != ui.color7->color()) return true;
+  if(QtUi::style()->format(UiStyle::FgCol08).foreground().color() != ui.color8->color()) return true;
+  if(QtUi::style()->format(UiStyle::FgCol09).foreground().color() != ui.color9->color()) return true;
+  if(QtUi::style()->format(UiStyle::FgCol10).foreground().color() != ui.color10->color()) return true;
+  if(QtUi::style()->format(UiStyle::FgCol11).foreground().color() != ui.color11->color()) return true;
+  if(QtUi::style()->format(UiStyle::FgCol12).foreground().color() != ui.color12->color()) return true;
+  if(QtUi::style()->format(UiStyle::FgCol13).foreground().color() != ui.color13->color()) return true;
+  if(QtUi::style()->format(UiStyle::FgCol14).foreground().color() != ui.color14->color()) return true;
+  if(QtUi::style()->format(UiStyle::FgCol15).foreground().color() != ui.color15->color()) return true;
 
   return false;
 }

diff --git a/src/qtui/settingspages/colorsettingspage.h b/src/qtui/settingspages/colorsettingspage.h
index 7e7aa42..4049a98 100644 (file)
--- a/src/qtui/settingspages/colorsettingspage.h
+++ b/src/qtui/settingspages/colorsettingspage.h
@@ -25,6 +25,7 @@
 
 #include "settingspage.h"
 #include "ui_colorsettingspage.h"
+#include "uistyle.h"
 
 class QSignalMapper;
 class ColorButton;
@@ -41,6 +42,11 @@ class ColorSettingsPage : public SettingsPage {
     void save();
     void load();
     void defaults();
+    void defaultBufferview();
+    void defaultServerActivity();
+    void defaultUserActivity();
+    void defaultMessage();
+    void defaultMircColorCodes();
 
   private slots:
     void widgetHasChanged();
@@ -54,6 +60,7 @@ class ColorSettingsPage : public SettingsPage {
     bool testHasChanged();
     void chatviewPreview();
     void bufferviewPreview();
+    void saveColor(UiStyle::FormatType formatType, const QColor &color);
 };
 
 #endif

diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp
index a9f34fd..22b5141 100644 (file)
--- a/src/uisupport/bufferviewfilter.cpp
+++ b/src/uisupport/bufferviewfilter.cpp
@@ -24,6 +24,8 @@
 
 #include "networkmodel.h"
 
+#include "uisettings.h"
+
 /*****************************************
 * The Filter for the Tree View
 *****************************************/
@@ -161,19 +163,26 @@ QVariant BufferViewFilter::data(const QModelIndex &index, int role) const {
 }
 
 QVariant BufferViewFilter::foreground(const QModelIndex &index) const {
+  UiSettings s("QtUi/Colors");
+  QVariant inactiveActivity = s.value("inactiveActivity", QVariant(QColor(Qt::gray)));
+  QVariant noActivity = s.value("noActivity", QVariant(QColor(Qt::black)));
+  QVariant highlightActivity = s.value("highlightActivity", QVariant(QColor(Qt::magenta)));
+  QVariant newMessageActivity = s.value("newMessageActivity", QVariant(QColor(Qt::green)));
+  QVariant otherActivity = s.value("otherActivity", QVariant(QColor(Qt::darkGreen)));
+
   if(!index.data(NetworkModel::ItemActiveRole).toBool())
-    return QColor(Qt::gray);
+    return inactiveActivity.value<QColor>();
 
   BufferItem::ActivityLevel activity = (BufferItem::ActivityLevel)index.data(NetworkModel::BufferActivityRole).toInt();
 
   if(activity & BufferItem::Highlight)
-    return QColor(Qt::magenta);
+    return highlightActivity.value<QColor>();
   if(activity & BufferItem::NewMessage)
-    return QColor(Qt::green);
+    return newMessageActivity.value<QColor>();
   if(activity & BufferItem::OtherActivity)
-    return QColor(Qt::darkGreen);
+    return otherActivity.value<QColor>();
   
-  return QColor(Qt::black);
+  return noActivity.value<QColor>();
   
   // FIXME:: make colors configurable;
 

diff --git a/version.inc b/version.inc
index a7cabe9..7d1679a 100644 (file)
--- a/version.inc
+++ b/version.inc
@@ -5,7 +5,7 @@
 
   quasselVersion = "0.2.0-pre";
   quasselDate = "2008-02-14";
-  quasselBuild = 522;
+  quasselBuild = 523;
 
   //! Minimum client build number the core needs
   clientBuildNeeded = 519;