From 5b3a26daaf70b6da134e086edd9709e8b0cb1b4e Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 21 Sep 2010 04:05:14 +0000 Subject: Added option to disable Konqueror/KDesktop icon activation effects git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1177743 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kcontrol/icons/icons.cpp | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'kcontrol/icons/icons.cpp') diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp index 0e800169e..8466c9d32 100644 --- a/kcontrol/icons/icons.cpp +++ b/kcontrol/icons/icons.cpp @@ -99,6 +99,10 @@ KIconConfig::KIconConfig(TQWidget *parent, const char *name) connect(mpRoundedCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRoundedCheck(bool))); grid->addMultiCellWidget(mpRoundedCheck, 3, 3, 0, 1, Qt::AlignLeft); + mpActiveEffectCheck = new TQCheckBox(i18n("Show icon activation effect"), m_pTab1); + connect(mpActiveEffectCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotActiveEffectCheck(bool))); + grid->addMultiCellWidget(mpActiveEffectCheck, 4, 4, 0, 1, Qt::AlignLeft); + top->activate(); mpSystrayConfig = new KSimpleConfig( TQString::fromLatin1( "systemtray_panelappletrc" )); @@ -285,8 +289,9 @@ void KIconConfig::read() mpKickerConfig->setGroup("General"); mQuickLaunchSize = mpKickerConfig->readNumEntry("panelIconWidth", KIcon::SizeLarge); - mpConfig->setGroup("KDE"); - mpRoundedCheck->setChecked(mpConfig->readBoolEntry("IconsUseRoundedRect", KDE_DEFAULT_ICONTEXTROUNDED)); + KConfigGroup g( KGlobal::config(), "KDE" ); + mpRoundedCheck->setChecked(g.readBoolEntry("IconsUseRoundedRect", KDE_DEFAULT_ICONTEXTROUNDED)); + mpActiveEffectCheck->setChecked(g.readBoolEntry("ShowKonqIconActivationEffect", KDE_DEFAULT_KONQ_ACTIVATION_EFFECT)); } void KIconConfig::apply() @@ -467,8 +472,10 @@ void KIconConfig::save() mpSystrayConfig->writeEntry("systrayIconWidth", mSysTraySize); mpKickerConfig->setGroup("General"); mpKickerConfig->writeEntry("panelIconWidth", mQuickLaunchSize); - mpConfig->setGroup("KDE"); - mpConfig->writeEntry("IconsUseRoundedRect", mpRoundedCheck->isChecked()); + + KConfigGroup g( KGlobal::config(), "KDE" ); + g.writeEntry("IconsUseRoundedRect", mpRoundedCheck->isChecked()); + g.writeEntry("ShowKonqIconActivationEffect", mpActiveEffectCheck->isChecked()); mpConfig->sync(); mpSystrayConfig->sync(); @@ -644,7 +651,12 @@ void KIconConfig::slotAnimatedCheck(bool check) void KIconConfig::slotRoundedCheck(bool check) { - // Do nothing + emit changed(true); +} + +void KIconConfig::slotActiveEffect(bool check) +{ + emit changed(true); } KIconEffectSetupDialog::KIconEffectSetupDialog(const Effect &effect, -- cgit v1.2.1