Load KFileItemAction plugins with json metadata

[dolphin.git] / src / kitemviews / private / kitemlistviewanimation.cpp

diff --git a/src/kitemviews/private/kitemlistviewanimation.cpp b/src/kitemviews/private/kitemlistviewanimation.cpp
index 336ba38adb702f4caaa8c46a24633e285c2df76c..67ad192c6ecdadd689749d7a13d7694968f1bf7a 100644 (file)
--- a/src/kitemviews/private/kitemlistviewanimation.cpp
+++ b/src/kitemviews/private/kitemlistviewanimation.cpp
@@ -21,22 +21,16 @@
 
 #include <kitemviews/kitemlistview.h>
 
 
 #include <kitemviews/kitemlistview.h>
 

-#include <KDebug>
-#include <KGlobalSettings>

 
 #include <QGraphicsWidget>
 #include <QPropertyAnimation>
 
 KItemListViewAnimation::KItemListViewAnimation(QObject* parent) :
     QObject(parent),
 
 #include <QGraphicsWidget>
 #include <QPropertyAnimation>
 
 KItemListViewAnimation::KItemListViewAnimation(QObject* parent) :
     QObject(parent),

-    m_animationDuration(200),

     m_scrollOrientation(Qt::Vertical),
     m_scrollOffset(0),
     m_animation()
 {
     m_scrollOrientation(Qt::Vertical),
     m_scrollOffset(0),
     m_animation()
 {

-    if (KGlobalSettings::graphicEffectsLevel() == KGlobalSettings::NoEffects) {
-        m_animationDuration = 1;
-    }

 }
 
 KItemListViewAnimation::~KItemListViewAnimation()
 }
 
 KItemListViewAnimation::~KItemListViewAnimation()


@@ -123,6 +117,7 @@ void KItemListViewAnimation::start(QGraphicsWidget* widget, AnimationType type,
     stop(widget, type);
 
     QPropertyAnimation* propertyAnim = 0;
     stop(widget, type);
 
     QPropertyAnimation* propertyAnim = 0;

+    const int animationDuration = widget->style()->styleHint(QStyle::SH_Widget_Animate) ? 200 : 1;

 
     switch (type) {
     case MovingAnimation: {
 
     switch (type) {
     case MovingAnimation: {


@@ -132,7 +127,7 @@ void KItemListViewAnimation::start(QGraphicsWidget* widget, AnimationType type,
         }
 
         propertyAnim = new QPropertyAnimation(widget, "pos");
         }
 
         propertyAnim = new QPropertyAnimation(widget, "pos");

-        propertyAnim->setDuration(m_animationDuration);
+        propertyAnim->setDuration(animationDuration);

         propertyAnim->setEndValue(newPos);
         break;
     }
         propertyAnim->setEndValue(newPos);
         break;
     }


@@ -140,7 +135,7 @@ void KItemListViewAnimation::start(QGraphicsWidget* widget, AnimationType type,
     case CreateAnimation: {
         propertyAnim = new QPropertyAnimation(widget, "opacity");
         propertyAnim->setEasingCurve(QEasingCurve::InQuart);
     case CreateAnimation: {
         propertyAnim = new QPropertyAnimation(widget, "opacity");
         propertyAnim->setEasingCurve(QEasingCurve::InQuart);

-        propertyAnim->setDuration(m_animationDuration);
+        propertyAnim->setDuration(animationDuration);

         propertyAnim->setStartValue(0.0);
         propertyAnim->setEndValue(1.0);
         break;
         propertyAnim->setStartValue(0.0);
         propertyAnim->setEndValue(1.0);
         break;


@@ -149,7 +144,7 @@ void KItemListViewAnimation::start(QGraphicsWidget* widget, AnimationType type,
     case DeleteAnimation: {
         propertyAnim = new QPropertyAnimation(widget, "opacity");
         propertyAnim->setEasingCurve(QEasingCurve::OutQuart);
     case DeleteAnimation: {
         propertyAnim = new QPropertyAnimation(widget, "opacity");
         propertyAnim->setEasingCurve(QEasingCurve::OutQuart);

-        propertyAnim->setDuration(m_animationDuration);
+        propertyAnim->setDuration(animationDuration);

         propertyAnim->setStartValue(1.0);
         propertyAnim->setEndValue(0.0);
         break;
         propertyAnim->setStartValue(1.0);
         propertyAnim->setEndValue(0.0);
         break;


@@ -162,7 +157,7 @@ void KItemListViewAnimation::start(QGraphicsWidget* widget, AnimationType type,
         }
 
         propertyAnim = new QPropertyAnimation(widget, "size");
         }
 
         propertyAnim = new QPropertyAnimation(widget, "size");

-        propertyAnim->setDuration(m_animationDuration);
+        propertyAnim->setDuration(animationDuration);

         propertyAnim->setEndValue(newSize);
         break;
     }
         propertyAnim->setEndValue(newSize);
         break;
     }