diff --git a/src/declarativeimports/plasmaextracomponents/qml/animations/ActivateAnimation.qml b/src/declarativeimports/plasmaextracomponents/qml/animations/ActivateAnimation.qml index 508b946c3..d1d22d1f0 100644 --- a/src/declarativeimports/plasmaextracomponents/qml/animations/ActivateAnimation.qml +++ b/src/declarativeimports/plasmaextracomponents/qml/animations/ActivateAnimation.qml @@ -19,14 +19,14 @@ */ import QtQuick 2.0 -import "Animations.js" as Animations +import org.kde.plasma.core 2.0 as PlasmaCore SequentialAnimation { id: activateAnimation objectName: "activateAnimation" property Item targetItem - property int duration: Animations.normalDuration/5 + property int duration: units.shortDuration // Fast scaling while we're animation == more FPS ScriptAction { script: targetItem.smooth = false } diff --git a/src/declarativeimports/plasmaextracomponents/qml/animations/Animations.js b/src/declarativeimports/plasmaextracomponents/qml/animations/Animations.js deleted file mode 100644 index b8492f870..000000000 --- a/src/declarativeimports/plasmaextracomponents/qml/animations/Animations.js +++ /dev/null @@ -1,8 +0,0 @@ - -.pragma library - -// a normal animation -var normalDuration = units.longDuration; - -// for direct feedback, such as tapping -var feedbackDuration = units.shortDuration; \ No newline at end of file diff --git a/src/declarativeimports/plasmaextracomponents/qml/animations/AppearAnimation.qml b/src/declarativeimports/plasmaextracomponents/qml/animations/AppearAnimation.qml index cd15a060f..24ae693eb 100644 --- a/src/declarativeimports/plasmaextracomponents/qml/animations/AppearAnimation.qml +++ b/src/declarativeimports/plasmaextracomponents/qml/animations/AppearAnimation.qml @@ -19,14 +19,13 @@ */ import QtQuick 2.0 -import "Animations.js" as Animations SequentialAnimation { id: appearAnimation objectName: "appearAnimation" property Item targetItem - property int duration: Animations.normalDuration + property int duration: units.longDuration // Fast scaling while we're animation == more FPS ScriptAction { script: { targetItem.smooth = false; targetItem.visible = true; } } diff --git a/src/declarativeimports/plasmaextracomponents/qml/animations/DisappearAnimation.qml b/src/declarativeimports/plasmaextracomponents/qml/animations/DisappearAnimation.qml index 2469a78fa..faa4f71c5 100644 --- a/src/declarativeimports/plasmaextracomponents/qml/animations/DisappearAnimation.qml +++ b/src/declarativeimports/plasmaextracomponents/qml/animations/DisappearAnimation.qml @@ -19,14 +19,14 @@ */ import QtQuick 2.0 -import "Animations.js" as Animations +import org.kde.plasma.core 2.0 as PlasmaCore SequentialAnimation { id: disappearAnimation objectName: "disappearAnimation" property Item targetItem - property int duration: Animations.normalDuration + property int duration: units.longDuration ScriptAction { script: targetItem.smooth = false; } diff --git a/src/declarativeimports/plasmaextracomponents/qml/animations/PressedAnimation.qml b/src/declarativeimports/plasmaextracomponents/qml/animations/PressedAnimation.qml index 819e0642d..c50b8fd30 100644 --- a/src/declarativeimports/plasmaextracomponents/qml/animations/PressedAnimation.qml +++ b/src/declarativeimports/plasmaextracomponents/qml/animations/PressedAnimation.qml @@ -19,14 +19,14 @@ */ import QtQuick 2.0 -import "Animations.js" as Animations +import org.kde.plasma.core 2.0 as PlasmaCore SequentialAnimation { id: pressedAnimation objectName: "pressedAnimation" property Item targetItem - property int duration: Animations.feedbackDuration + property int duration: units.shortDuration // Fast scaling while we're animation == more FPS ScriptAction { script: targetItem.smooth = false } diff --git a/src/declarativeimports/plasmaextracomponents/qml/animations/ReleasedAnimation.qml b/src/declarativeimports/plasmaextracomponents/qml/animations/ReleasedAnimation.qml index eff0fe645..029119d7d 100644 --- a/src/declarativeimports/plasmaextracomponents/qml/animations/ReleasedAnimation.qml +++ b/src/declarativeimports/plasmaextracomponents/qml/animations/ReleasedAnimation.qml @@ -19,14 +19,14 @@ */ import QtQuick 2.0 -import "Animations.js" as Animations +import org.kde.plasma.core 2.0 as PlasmaCore SequentialAnimation { id: releasedAnimation objectName: "releasedAnimation" property Item targetItem - property int duration: Animations.feedbackDuration + property int duration: units.shortDuration // Fast scaling while we're animation == more FPS ScriptAction { script: targetItem.smooth = false }