X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fcolorsettingspage.cpp;h=01bc5177dbc96e658d4c6a3add7adf4eeda059cc;hp=2a8ee4c3f6b5501fc80228ca4b0f95619ea99324;hb=23ba965cc6d1d9918d6d1ff08a1051e22ef9052d;hpb=ba934ceb1bfe30d01d5fb5c072c3197f8080be04 diff --git a/src/qtui/settingspages/colorsettingspage.cpp b/src/qtui/settingspages/colorsettingspage.cpp index 2a8ee4c3..01bc5177 100644 --- a/src/qtui/settingspages/colorsettingspage.cpp +++ b/src/qtui/settingspages/colorsettingspage.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel IRC Team * + * Copyright (C) 2005-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -28,8 +28,6 @@ #include #include -// #define PHONDEV - ColorSettingsPage::ColorSettingsPage(QWidget *parent) : SettingsPage(tr("Appearance"), tr("Color settings"), parent), mapper(new QSignalMapper(this)) @@ -46,28 +44,12 @@ 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); - ui.highlightActivityUseBG->setEnabled(false); - ui.newMessageActivityUseBG->setEnabled(false); - ui.otherActivityUseBG->setEnabled(false); - - ui.nickFG->setEnabled(false); - ui.nickUseBG->setEnabled(false); - ui.hostmaskFG->setEnabled(false); - ui.hostmaskUseBG->setEnabled(false); - ui.channelnameFG->setEnabled(false); - ui.channelnameUseBG->setEnabled(false); - ui.modeFlagsFG->setEnabled(false); - ui.modeFlagsUseBG->setEnabled(false); - ui.urlFG->setEnabled(false); - ui.urlUseBG->setEnabled(false); - - ui.onlineStatusUseBG->setEnabled(false); - ui.awayStatusUseBG->setEnabled(false); -#endif + foreach(QWidget *widget, findChildren()) { + if(widget->property("NotInUse").toBool()) { + widget->setEnabled(false); + widget->hide(); + } + } } bool ColorSettingsPage::hasDefaults() const { @@ -80,7 +62,6 @@ void ColorSettingsPage::defaults() { defaultUserActivity(); defaultMessage(); defaultMircColorCodes(); - defaultNickview(); widgetHasChanged(); bufferviewPreview(); @@ -88,14 +69,6 @@ void ColorSettingsPage::defaults() { } void ColorSettingsPage::defaultBufferview() { - ui.inactiveActivityFG->setColor(QColor(Qt::gray)); - ui.inactiveActivityBG->setColor(QColor(Qt::white)); - ui.inactiveActivityBG->setEnabled(false); - ui.inactiveActivityUseBG->setChecked(false); - ui.noActivityFG->setColor(QColor(Qt::black)); - ui.noActivityBG->setColor(QColor(Qt::white)); - ui.noActivityBG->setEnabled(false); - ui.noActivityUseBG->setChecked(false); ui.highlightActivityFG->setColor(QColor(Qt::magenta)); ui.highlightActivityBG->setColor(QColor(Qt::white)); ui.highlightActivityBG->setEnabled(false); @@ -215,33 +188,8 @@ 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))); - ui.inactiveActivityFG->setColor(settings["InactiveActivityFG"].value()); - settings["InactiveActivityBG"] = s.value("inactiveActivityBG", QVariant(QColor(Qt::white))); - ui.inactiveActivityBG->setColor(settings["InactiveActivityBG"].value()); - settings["InactiveActivityUseBG"] = s.value("inactiveActivityUseBG"); - ui.inactiveActivityUseBG->setChecked(settings["InactiveActivityUseBG"].toBool()); - - settings["NoActivityFG"] = s.value("noActivityFG", QVariant(QColor(Qt::black))); - ui.noActivityFG->setColor(settings["NoActivityFG"].value()); - settings["NoActivityBG"] = s.value("noActivityBG", QVariant(QColor(Qt::white))); - ui.noActivityBG->setColor(settings["NoActivityBG"].value()); - settings["NoActivityUseBG"] = s.value("noActivityUseBG"); - ui.noActivityUseBG->setChecked(settings["NoActivityUseBG"].toBool()); - settings["HighlightActivityFG"] = s.value("highlightActivityFG", QVariant(QColor(Qt::magenta))); ui.highlightActivityFG->setColor(settings["HighlightActivityFG"].value()); settings["HighlightActivityBG"] = s.value("highlightActivityBG", QVariant(QColor(Qt::white))); @@ -392,20 +340,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()); - settings["OnlineStatusBG"] = s.value("onlineStatusBG", QVariant(QColor(Qt::white))); - ui.onlineStatusBG->setColor(settings["OnlineStatusBG"].value()); - 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()); - settings["AwayStatusBG"] = s.value("awayStatusBG", QVariant(QColor(Qt::white))); - ui.awayStatusBG->setColor(settings["AwayStatusBG"].value()); - settings["AwayStatusUseBG"] = s.value("awayStatusUseBG"); - ui.awayStatusUseBG->setChecked(settings["AwayStatusUseBG"].toBool()); - setChangedState(false); bufferviewPreview(); chatviewPreview(); @@ -413,12 +347,6 @@ void ColorSettingsPage::load() { void ColorSettingsPage::save() { QtUiStyleSettings s("Colors"); - s.setValue("noActivityFG", ui.noActivityFG->color()); - s.setValue("noActivityBG", ui.noActivityBG->color()); - s.setValue("noActivityUseBG", ui.noActivityUseBG->isChecked()); - s.setValue("inactiveActivityFG", ui.inactiveActivityFG->color()); - s.setValue("inactiveActivityBG", ui.inactiveActivityBG->color()); - s.setValue("inactiveActivityUseBG", ui.inactiveActivityUseBG->isChecked()); s.setValue("highlightActivityFG", ui.highlightActivityFG->color()); s.setValue("highlightActivityBG", ui.highlightActivityBG->color()); s.setValue("highlightActivityUseBG", ui.highlightActivityUseBG->isChecked()); @@ -492,13 +420,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); } @@ -529,12 +450,6 @@ void ColorSettingsPage::widgetHasChanged() { } bool ColorSettingsPage::testHasChanged() { - if(settings["InactiveActivityFG"].value() != ui.inactiveActivityFG->color()) return true; - if(settings["InactiveActivityBG"].value() != ui.inactiveActivityBG->color()) return true; - if(settings["InactiveActivityUseBG"].toBool() != ui.inactiveActivityUseBG->isChecked()) return true; - if(settings["NoActivityFG"].value() != ui.noActivityFG->color()) return true; - if(settings["NoActivityBG"].value() != ui.noActivityBG->color()) return true; - if(settings["NoActivityUseBG"].toBool() != ui.noActivityUseBG->isChecked()) return true; if(settings["HighlightActivityFG"].value() != ui.highlightActivityFG->color()) return true; if(settings["HighlightActivityBG"].value() != ui.highlightActivityBG->color()) return true; if(settings["HighlightActivityUseBG"].toBool() != ui.highlightActivityUseBG->isChecked()) return true; @@ -627,13 +542,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() != ui.onlineStatusFG->color()) return true; - if(settings["OnlineStatusBG"].value() != ui.onlineStatusBG->color()) return true; - if(settings["OnlineStatusUseBG"].toBool() != ui.onlineStatusUseBG->isChecked()) return true; - if(settings["AwayStatusFG"].value() != ui.awayStatusFG->color()) return true; - if(settings["AwayStatusBG"].value() != ui.awayStatusBG->color()) return true; - if(settings["AwayStatusUseBG"].toBool() != ui.awayStatusUseBG->isChecked()) return true; - return false; } @@ -654,47 +562,32 @@ void ColorSettingsPage::chatviewPreview() { void ColorSettingsPage::bufferviewPreview() { ui.bufferviewPreview->clear(); ui.bufferviewPreview->setColumnCount(1); - ui.bufferviewPreview->setHeaderLabels(QStringList("Buffers")); + ui.bufferviewPreview->setHeaderLabels(QStringList(tr("Buffers"))); - QTreeWidgetItem *topLevelItem = new QTreeWidgetItem((QTreeWidget*)0, QStringList(QString("network"))); + QTreeWidgetItem *topLevelItem = new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("Network"))); ui.bufferviewPreview->insertTopLevelItem(0, topLevelItem); - topLevelItem->setForeground(0, QBrush(ui.noActivityFG->color())); - if(ui.noActivityUseBG->isChecked()) - topLevelItem->setBackground(0, QBrush(ui.noActivityBG->color())); - QList items; - QTreeWidgetItem *statusBuffer = new QTreeWidgetItem((QTreeWidget*)0, QStringList(QString("Status Buffer"))); - items.append(statusBuffer); - statusBuffer->setForeground(0, QBrush(ui.noActivityFG->color())); - if(ui.noActivityUseBG->isChecked()) - statusBuffer->setBackground(0, QBrush(ui.noActivityBG->color())); - - QTreeWidgetItem *inactiveActivity = new QTreeWidgetItem((QTreeWidget*)0, QStringList(QString("#inactive channel"))); + QTreeWidgetItem *inactiveActivity = new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("#incative"))); items.append(inactiveActivity); - inactiveActivity->setForeground(0, QBrush(ui.inactiveActivityFG->color())); - if(ui.inactiveActivityUseBG->isChecked()) - inactiveActivity->setBackground(0, QBrush(ui.inactiveActivityBG->color())); + inactiveActivity->setForeground(0, QPalette().color(QPalette::Dark)); - QTreeWidgetItem *noActivity = new QTreeWidgetItem((QTreeWidget*)0, QStringList(QString("#channel with no activity"))); + QTreeWidgetItem *noActivity = new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("#regular"))); items.append(noActivity); - noActivity->setForeground(0, QBrush(ui.noActivityFG->color())); - if(ui.noActivityUseBG->isChecked()) - noActivity->setBackground(0, QBrush(ui.noActivityBG->color())); - QTreeWidgetItem *highlightActivity = new QTreeWidgetItem((QTreeWidget*)0, QStringList(QString("#channel with highlight"))); + QTreeWidgetItem *highlightActivity = new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("#highlight"))); items.append(highlightActivity); highlightActivity->setForeground(0, QBrush(ui.highlightActivityFG->color())); if(ui.highlightActivityUseBG->isChecked()) highlightActivity->setBackground(0, QBrush(ui.highlightActivityBG->color())); - QTreeWidgetItem *newMessageActivity = new QTreeWidgetItem((QTreeWidget*)0, QStringList(QString("#channel with new message"))); + QTreeWidgetItem *newMessageActivity = new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("#new message"))); items.append(newMessageActivity); newMessageActivity->setForeground(0, QBrush(ui.newMessageActivityFG->color())); if(ui.newMessageActivityUseBG->isChecked()) newMessageActivity->setBackground(0, QBrush(ui.newMessageActivityBG->color())); - QTreeWidgetItem *otherActivity = new QTreeWidgetItem((QTreeWidget*)0, QStringList(QString("#channel with other activity"))); + QTreeWidgetItem *otherActivity = new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("#other activity"))); items.append(otherActivity); otherActivity->setForeground(0, QBrush(ui.otherActivityFG->color())); if(ui.otherActivityUseBG->isChecked())