diff --git a/configuration/akregator_config_appearance.cpp b/configuration/akregator_config_appearance.cpp index 2f394817..e39ce3e4 100644 --- a/configuration/akregator_config_appearance.cpp +++ b/configuration/akregator_config_appearance.cpp @@ -1,82 +1,77 @@ /* This file is part of Akregator. Copyright (c) 2008 Frank Osterfeld This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program with any edition of Qt, and distribute the resulting executable, without including the source code for Qt in the source distribution. */ #include "akregator_config_appearance.h" #include "akregatorconfig.h" #include #include #include #include #include using namespace Akregator; K_PLUGIN_CLASS_WITH_JSON(KCMAkregatorAppearanceConfig, "akregator_config_appearance.json") KCMAkregatorAppearanceConfig::KCMAkregatorAppearanceConfig(QWidget *parent, const QVariantList &args) : KCModule(parent, args) , m_widget(new QWidget) { m_ui.setupUi(m_widget); QVBoxLayout *layout = new QVBoxLayout(this); layout->addWidget(m_widget); connect(m_ui.kcfg_UseCustomColors, &QAbstractButton::toggled, m_ui.kcfg_ColorUnreadArticles, &QWidget::setEnabled); connect(m_ui.kcfg_UseCustomColors, &QAbstractButton::toggled, m_ui.kcfg_ColorNewArticles, &QWidget::setEnabled); connect(m_ui.kcfg_UseCustomColors, &QAbstractButton::toggled, m_ui.lbl_newArticles, &QWidget::setEnabled); connect(m_ui.kcfg_UseCustomColors, &QAbstractButton::toggled, m_ui.lbl_unreadArticles, &QWidget::setEnabled); connect(m_ui.slider_minimumFontSize, &QAbstractSlider::valueChanged, m_ui.kcfg_MinimumFontSize, &QSpinBox::setValue); connect(m_ui.slider_mediumFontSize, &QAbstractSlider::valueChanged, m_ui.kcfg_MediumFontSize, &QSpinBox::setValue); - connect(m_ui.slider_zoom, &QAbstractSlider::valueChanged, m_ui.kcfg_Zoom, &QSpinBox::setValue); connect(m_ui.slider_minimumFontSize, &QAbstractSlider::sliderMoved, m_ui.kcfg_MinimumFontSize, &QSpinBox::setValue); connect(m_ui.slider_mediumFontSize, &QAbstractSlider::sliderMoved, m_ui.kcfg_MediumFontSize, &QSpinBox::setValue); - connect(m_ui.slider_zoom, &QAbstractSlider::sliderMoved, m_ui.kcfg_Zoom, &QSpinBox::setValue); connect(m_ui.kcfg_MinimumFontSize, QOverload::of(&KPluralHandlingSpinBox::valueChanged), m_ui.slider_minimumFontSize, &QSlider::setValue); connect(m_ui.kcfg_MediumFontSize, QOverload::of(&KPluralHandlingSpinBox::valueChanged), m_ui.slider_mediumFontSize, &QSlider::setValue); - connect(m_ui.kcfg_Zoom, QOverload::of(&QSpinBox::valueChanged), m_ui.slider_zoom, &QSlider::setValue); KAboutData *about = new KAboutData(QStringLiteral("kcmakrappearanceconfig"), i18n("Configure Feed Reader Appearance"), QString(), QString(), KAboutLicense::GPL, i18n("(c), 2004 - 2008 Frank Osterfeld")); about->addAuthor(i18n("Frank Osterfeld"), QString(), QStringLiteral("osterfeld@kde.org")); setAboutData(about); m_ui.slider_minimumFontSize->setDisabled(Settings::self()->isImmutable(QStringLiteral("MinimumFontSize"))); m_ui.slider_mediumFontSize->setDisabled(Settings::self()->isImmutable(QStringLiteral("MediumFontSize"))); - m_ui.slider_zoom->setDisabled(Settings::self()->isImmutable(QStringLiteral("Zoom"))); m_ui.lbl_MinimumFontSize->setDisabled(Settings::self()->isImmutable(QStringLiteral("MinimumFontSize"))); m_ui.lbl_MediumFontSize->setDisabled(Settings::self()->isImmutable(QStringLiteral("MediumFontSize"))); - m_ui.lbl_Zoom->setDisabled(Settings::self()->isImmutable(QStringLiteral("Zoom"))); addConfig(Settings::self(), m_widget); } #include "akregator_config_appearance.moc" diff --git a/configuration/ui/settings_appearance.ui b/configuration/ui/settings_appearance.ui index ba96fb14..4f91bd50 100644 --- a/configuration/ui/settings_appearance.ui +++ b/configuration/ui/settings_appearance.ui @@ -1,385 +1,316 @@ Frank Osterfeld Akregator::SettingsAppearance 0 0 438 538 0 0 0 0 Article List Colors 0 0 0 0 false Unread articles: false 24 24 false New articles: false 24 24 Use custom colors Qt::Horizontal 40 20 Font Size Minimum font size: 0 0 0 0 2 30 8 Qt::Horizontal 3 8 Medium font size: 0 0 0 0 2 30 12 Qt::Horizontal 3 12 - - - - Zoom: - - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - 25 - - - 500 - - - 5 - - - 100 - - - Qt::Horizontal - - - QSlider::NoTicks - - - 5 - - - - - - - % - - - 25 - - - 500 - - - 5 - - - 100 - - - - - Fonts Standard font: Fixed font: Serif font: Sans serif font: Qt::Vertical 20 1 - - KPluralHandlingSpinBox - QSpinBox -
kpluralhandlingspinbox.h
-
KColorButton QPushButton
kcolorbutton.h
+ + KPluralHandlingSpinBox + QSpinBox +
kpluralhandlingspinbox.h
+
kcfg_UseCustomColors kcfg_ColorUnreadArticles kcfg_ColorNewArticles slider_minimumFontSize kcfg_MinimumFontSize slider_mediumFontSize kcfg_MediumFontSize - slider_zoom - kcfg_Zoom kcfg_StandardFont kcfg_FixedFont kcfg_SerifFont kcfg_SansSerifFont