From 5b3a26daaf70b6da134e086edd9709e8b0cb1b4e Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
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 +++++++++++++++++-----
 kcontrol/icons/icons.h               |  3 ++-
 kcontrol/kicker/positiontab_impl.cpp |  2 +-
 kdesktop/kdiconview.cc               |  2 +-
 libkonq/konq_iconviewwidget.cc       |  4 +++-
 5 files changed, 24 insertions(+), 9 deletions(-)

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,
diff --git a/kcontrol/icons/icons.h b/kcontrol/icons/icons.h
index 5f98db8c7..cc94b6e8b 100644
--- a/kcontrol/icons/icons.h
+++ b/kcontrol/icons/icons.h
@@ -77,6 +77,7 @@ private slots:
     void slotDPCheck(bool check);
     void slotAnimatedCheck(bool check);
     void slotRoundedCheck(bool check);
+    void slotActiveEffect(bool check);
     void QLSizeLockedChanged(bool checked);
 
 private:
@@ -114,7 +115,7 @@ private:
 
     TQListBox *mpUsageList;
     TQComboBox *mpSizeBox;
-    TQCheckBox *mpDPCheck, *wordWrapCB, *underlineCB, *mpAnimatedCheck, *mpRoundedCheck;
+    TQCheckBox *mpDPCheck, *wordWrapCB, *underlineCB, *mpAnimatedCheck, *mpRoundedCheck, *mpActiveEffectCheck;
     TQTabWidget *m_pTabWidget;
     TQWidget *m_pTab1;
     TQPushButton *mPreviewButton1, *mPreviewButton2, *mPreviewButton3;
diff --git a/kcontrol/kicker/positiontab_impl.cpp b/kcontrol/kicker/positiontab_impl.cpp
index 5bc9e2eb1..d65498430 100644
--- a/kcontrol/kicker/positiontab_impl.cpp
+++ b/kcontrol/kicker/positiontab_impl.cpp
@@ -204,7 +204,7 @@ void PositionTab::defaults()
         m_panelAlign = AlignLeft;
     }
 
-    m_panelSize->setCurrentItem(KPanelExtension::SizeNormal);
+    m_panelSize->setCurrentItem(KPanelExtension::SizeSmall);
 
     // update the magic drawing
     lengthenPanel(-1);
diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc
index e3b005b73..66796ca39 100644
--- a/kdesktop/kdiconview.cc
+++ b/kdesktop/kdiconview.cc
@@ -1496,7 +1496,7 @@ void KDIconView::updateWorkArea( const TQRect &wr )
 
     if (( iconArea() == wr ) && (m_needDesktopAlign == false)) return;  // nothing changed; avoid repaint/saveIconPosition ...
 
-    m_needDesktopAlign = false;
+//    m_needDesktopAlign = false;
     lineupIcons();
 
     TQRect oldArea = iconArea();
diff --git a/libkonq/konq_iconviewwidget.cc b/libkonq/konq_iconviewwidget.cc
index d8c4bb93e..0ce2ca346 100644
--- a/libkonq/konq_iconviewwidget.cc
+++ b/libkonq/konq_iconviewwidget.cc
@@ -1848,7 +1848,9 @@ void KonqIconViewWidget::visualActivate(TQIconViewItem * item)
     // Adjust for scrolling (David)
     rect.moveBy( -contentsX(), -contentsY() );
 
-    KIconEffect::visualActivate(viewport(), rect, item->pixmap());
+    if (KGlobalSettings::showKonqIconActivationEffect() == true) {
+        KIconEffect::visualActivate(viewport(), rect, item->pixmap());
+    }
 }
 
 void KonqIconViewWidget::backgroundPixmapChange( const TQPixmap & )
-- 
cgit v1.2.3