From 23ba965cc6d1d9918d6d1ff08a1051e22ef9052d Mon Sep 17 00:00:00 2001 From: Marcus Eggenberger Date: Sun, 1 Feb 2009 18:20:05 +0100 Subject: [PATCH 1/1] hiding unused settings from the colors settings page --- src/qtui/settingspages/colorsettingspage.cpp | 93 +---- src/qtui/settingspages/colorsettingspage.ui | 336 ++++++++++--------- src/uisupport/bufferview.cpp | 2 +- 3 files changed, 187 insertions(+), 244 deletions(-) diff --git a/src/qtui/settingspages/colorsettingspage.cpp b/src/qtui/settingspages/colorsettingspage.cpp index a301bd8b..01bc5177 100644 --- a/src/qtui/settingspages/colorsettingspage.cpp +++ b/src/qtui/settingspages/colorsettingspage.cpp @@ -28,8 +28,6 @@ #include #include -// #define PHONDEV - ColorSettingsPage::ColorSettingsPage(QWidget *parent) : SettingsPage(tr("Appearance"), tr("Color settings"), parent), mapper(new QSignalMapper(this)) @@ -46,26 +44,12 @@ ColorSettingsPage::ColorSettingsPage(QWidget *parent) connect(mapper, SIGNAL(mapped(QWidget *)), this, SLOT(chooseColor(QWidget *))); - - -#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); -#endif + foreach(QWidget *widget, findChildren()) { + if(widget->property("NotInUse").toBool()) { + widget->setEnabled(false); + widget->hide(); + } + } } bool ColorSettingsPage::hasDefaults() const { @@ -85,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); @@ -214,20 +190,6 @@ void ColorSettingsPage::defaultMircColorCodes() { 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))); @@ -385,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()); @@ -494,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; @@ -612,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()) diff --git a/src/qtui/settingspages/colorsettingspage.ui b/src/qtui/settingspages/colorsettingspage.ui index f8772542..932225cd 100644 --- a/src/qtui/settingspages/colorsettingspage.ui +++ b/src/qtui/settingspages/colorsettingspage.ui @@ -6,7 +6,7 @@ 0 0 517 - 532 + 436 @@ -30,7 +30,7 @@ 0 0 487 - 485 + 389 @@ -61,122 +61,39 @@ Qt::AlignCenter + + true + - + Use BG Qt::AlignCenter - - - - - - Default: - - - - - - - - 0 - 0 - - - - - - - - - - - false - - - - 0 - 0 - - - - + + true - - - - - 0 - 0 - - - - - - - - - - - Inactive: - - - - - - - - - - - - - - false - - - - - - - - - - - 0 - 0 - - - - Qt::LeftToRight - - - - - - - + Highlight: - + - + false @@ -184,9 +101,12 @@ + + true + - + @@ -197,23 +117,26 @@ + + true + - + New Message: - + - + false @@ -221,9 +144,12 @@ + + true + - + @@ -234,23 +160,26 @@ + + true + - + Other Activity: - + - + false @@ -258,9 +187,12 @@ + + true + - + @@ -271,9 +203,12 @@ + + true + - + Qt::Vertical @@ -328,7 +263,7 @@ 0 0 487 - 485 + 389 @@ -387,6 +322,9 @@ Qt::AlignCenter + + true + @@ -411,6 +349,9 @@ + + true + @@ -427,6 +368,9 @@ + + true + @@ -451,6 +395,9 @@ + + true + @@ -467,6 +414,9 @@ + + true + @@ -491,6 +441,9 @@ + + true + @@ -507,6 +460,9 @@ + + true + @@ -531,6 +487,9 @@ + + true + @@ -547,6 +506,9 @@ + + true + @@ -584,10 +546,10 @@ - 360 - 270 - 720 - 360 + 0 + 0 + 441 + 294 @@ -612,6 +574,9 @@ Qt::AlignCenter + + true + @@ -622,6 +587,9 @@ Qt::AlignCenter + + true + @@ -646,6 +614,9 @@ + + true + @@ -662,6 +633,9 @@ + + true + @@ -686,6 +660,9 @@ + + true + @@ -702,6 +679,9 @@ + + true + @@ -726,6 +706,9 @@ + + true + @@ -742,6 +725,9 @@ + + true + @@ -766,6 +752,9 @@ + + true + @@ -782,6 +771,9 @@ + + true + @@ -806,6 +798,9 @@ + + true + @@ -822,6 +817,9 @@ + + true + @@ -846,6 +844,9 @@ + + true + @@ -862,6 +863,9 @@ + + true + @@ -886,6 +890,9 @@ + + true + @@ -902,6 +909,9 @@ + + true + @@ -909,10 +919,10 @@ - 360 - 270 - 720 - 360 + 0 + 0 + 441 + 294 @@ -937,6 +947,9 @@ Qt::AlignCenter + + true + @@ -947,6 +960,9 @@ Qt::AlignCenter + + true + @@ -971,6 +987,9 @@ + + true + @@ -987,6 +1006,9 @@ + + true + @@ -1011,6 +1033,9 @@ + + true + @@ -1027,6 +1052,9 @@ + + true + @@ -1051,6 +1079,9 @@ + + true + @@ -1067,6 +1098,9 @@ + + true + @@ -1091,6 +1125,9 @@ + + true + @@ -1107,6 +1144,9 @@ + + true + @@ -1131,6 +1171,9 @@ + + true + @@ -1147,6 +1190,9 @@ + + true + @@ -1171,6 +1217,9 @@ + + true + @@ -1187,6 +1236,9 @@ + + true + @@ -1211,6 +1263,9 @@ + + true + @@ -1227,6 +1282,9 @@ + + true + @@ -1247,24 +1305,6 @@ - - - - - 0 - 0 - - - - Preview: - - - - - - - - @@ -1273,7 +1313,7 @@ 0 0 487 - 485 + 389 @@ -1547,38 +1587,6 @@ - - inactiveActivityUseBG - clicked(bool) - inactiveActivityBG - setEnabled(bool) - - - 249 - 111 - - - 197 - 111 - - - - - noActivityUseBG - clicked(bool) - noActivityBG - setEnabled(bool) - - - 249 - 147 - - - 197 - 147 - - - highlightActivityUseBG clicked(bool) diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp index 0b338697..38dc02d2 100644 --- a/src/uisupport/bufferview.cpp +++ b/src/uisupport/bufferview.cpp @@ -523,7 +523,7 @@ void BufferViewDelegate::initStyleOption(QStyleOptionViewItem *option, const QMo } if(!index.data(NetworkModel::ItemActiveRole).toBool() || index.data(NetworkModel::UserAwayRole).toBool()) { - option->palette.setColor(QPalette::Text, QPalette().color(QPalette::Dark)); + option->palette.setColor(QPalette::Text, option->palette.color(QPalette::Dark)); } } -- 2.20.1