X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fcolorsettingspage.cpp;fp=src%2Fqtui%2Fsettingspages%2Fcolorsettingspage.cpp;h=a301bd8ba798ed9b3205999f62a621aa3a47b198;hp=2d5c3ba374a3bc23c5b9c5b5e7a51ffa7db02448;hb=b3ec58929bead822048a25f87f6a0d699c490b7a;hpb=a5aa42bfbd30790c2063cc88b5949519b5b0c4a4

diff --git a/src/qtui/settingspages/colorsettingspage.cpp b/src/qtui/settingspages/colorsettingspage.cpp
index 2d5c3ba3..a301bd8b 100644
--- a/src/qtui/settingspages/colorsettingspage.cpp
+++ b/src/qtui/settingspages/colorsettingspage.cpp
@@ -46,7 +46,8 @@ ColorSettingsPage::ColorSettingsPage(QWidget *parent)
 
   connect(mapper, SIGNAL(mapped(QWidget *)), this, SLOT(chooseColor(QWidget *)));
 
-  //disable unused buttons:
+
+  
 #ifndef PHONDEV
   ui.inactiveActivityUseBG->setEnabled(false);
   ui.noActivityUseBG->setEnabled(false);
@@ -64,9 +65,6 @@ ColorSettingsPage::ColorSettingsPage(QWidget *parent)
   ui.modeFlagsUseBG->setEnabled(false);
   ui.urlFG->setEnabled(false);
   ui.urlUseBG->setEnabled(false);
-
-  ui.onlineStatusUseBG->setEnabled(false);
-  ui.awayStatusUseBG->setEnabled(false);
 #endif
 }
 
@@ -80,7 +78,6 @@ void ColorSettingsPage::defaults() {
   defaultUserActivity();
   defaultMessage();
   defaultMircColorCodes();
-  defaultNickview();
 
   widgetHasChanged();
   bufferviewPreview();
@@ -215,17 +212,6 @@ void ColorSettingsPage::defaultMircColorCodes() {
   ui.color15->setColor(QtUi::style()->format(UiStyle::FgCol15, Settings::Default).foreground().color());
 }
 
-void ColorSettingsPage::defaultNickview() {
-  ui.onlineStatusFG->setColor(QColor(Qt::black));
-  ui.onlineStatusBG->setColor(QColor("white"));
-  ui.onlineStatusBG->setEnabled(false);
-  ui.onlineStatusUseBG->setChecked(false);
-  ui.awayStatusFG->setColor(QColor(Qt::gray));
-  ui.awayStatusBG->setColor(QColor("white"));
-  ui.awayStatusBG->setEnabled(false);
-  ui.awayStatusUseBG->setChecked(false);
-}
-
 void ColorSettingsPage::load() {
   QtUiStyleSettings s("Colors");
   settings["InactiveActivityFG"] = s.value("inactiveActivityFG", QVariant(QColor(Qt::gray)));
@@ -392,20 +378,6 @@ void ColorSettingsPage::load() {
   ui.color14->setColor(QtUi::style()->format(UiStyle::FgCol14).foreground().color());
   ui.color15->setColor(QtUi::style()->format(UiStyle::FgCol15).foreground().color());
 
-  settings["OnlineStatusFG"] = s.value("onlineStatusFG", QVariant(QColor(Qt::black)));
-  ui.onlineStatusFG->setColor(settings["OnlineStatusFG"].value<QColor>());
-  settings["OnlineStatusBG"] = s.value("onlineStatusBG", QVariant(QColor(Qt::white)));
-  ui.onlineStatusBG->setColor(settings["OnlineStatusBG"].value<QColor>());
-  settings["OnlineStatusUseBG"] = s.value("onlineStatusUseBG");
-  ui.onlineStatusUseBG->setChecked(settings["OnlineStatusUseBG"].toBool());
-
-  settings["AwayStatusFG"] = s.value("awayStatusFG", QVariant(QColor(Qt::gray)));
-  ui.awayStatusFG->setColor(settings["AwayStatusFG"].value<QColor>());
-  settings["AwayStatusBG"] = s.value("awayStatusBG", QVariant(QColor(Qt::white)));
-  ui.awayStatusBG->setColor(settings["AwayStatusBG"].value<QColor>());
-  settings["AwayStatusUseBG"] = s.value("awayStatusUseBG");
-  ui.awayStatusUseBG->setChecked(settings["AwayStatusUseBG"].toBool());
-
   setChangedState(false);
   bufferviewPreview();
   chatviewPreview();
@@ -492,13 +464,6 @@ void ColorSettingsPage::save() {
   saveMircColor(14, ui.color14->color());
   saveMircColor(15, ui.color15->color());
 
-  s.setValue("onlineStatusFG", ui.onlineStatusFG->color());
-  s.setValue("onlineStatusBG", ui.onlineStatusBG->color());
-  s.setValue("onlineStatusUseBG", ui.onlineStatusUseBG->isChecked());
-  s.setValue("awayStatusFG", ui.awayStatusFG->color());
-  s.setValue("awayStatusBG", ui.awayStatusBG->color());
-  s.setValue("awayStatusUseBG", ui.awayStatusUseBG->isChecked());
-
   load(); //TODO: remove when settings hash map is unnescessary
   setChangedState(false);
 }
@@ -627,13 +592,6 @@ bool ColorSettingsPage::testHasChanged() {
   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;
 
-  if(settings["OnlineStatusFG"].value<QColor>() != ui.onlineStatusFG->color()) return true;
-  if(settings["OnlineStatusBG"].value<QColor>() != ui.onlineStatusBG->color()) return true;
-  if(settings["OnlineStatusUseBG"].toBool() != ui.onlineStatusUseBG->isChecked()) return true;
-  if(settings["AwayStatusFG"].value<QColor>() != ui.awayStatusFG->color()) return true;
-  if(settings["AwayStatusBG"].value<QColor>() != ui.awayStatusBG->color()) return true;
-  if(settings["AwayStatusUseBG"].toBool() != ui.awayStatusUseBG->isChecked()) return true;
-
   return false;
 }