X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fcolorsettingspage.cpp;h=3038c18020822416d9475f5254965c0b26ad4e9a;hb=d37bdc91c5474603e1417c2cd9c40c02e1ad5ee6;hp=8e76c7097aa46618b35b9d3be02bc55b6c67b1e8;hpb=630dbdaf56fcee546387275898bde59426da71cb;p=quassel.git diff --git a/src/qtui/settingspages/colorsettingspage.cpp b/src/qtui/settingspages/colorsettingspage.cpp index 8e76c709..3038c180 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 * @@ -22,13 +22,12 @@ #include "qtui.h" #include "qtuisettings.h" +#include "qtuistyle.h" #include "colorbutton.h" #include #include -// #define PHONDEV - ColorSettingsPage::ColorSettingsPage(QWidget *parent) : SettingsPage(tr("Appearance"), tr("Color settings"), parent), mapper(new QSignalMapper(this)) @@ -46,27 +45,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 { @@ -590,7 +574,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(settings["NewMsgMarkerFG"].value() != ui.newMsgMarkerFG->color()) 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;