diff --git a/examples/containments/testcontainment/contents/ui/main.qml b/examples/containments/testcontainment/contents/ui/main.qml index c60e88040..ada11b016 100644 --- a/examples/containments/testcontainment/contents/ui/main.qml +++ b/examples/containments/testcontainment/contents/ui/main.qml @@ -157,7 +157,7 @@ Item { target: frame properties: "scale" to: 0 - duration: 250 + duration: units.longDuration } ScriptAction { script: frame.destroy()} } diff --git a/src/declarativeimports/plasmacomponents/platformcomponents/touch/SectionScroller.qml b/src/declarativeimports/plasmacomponents/platformcomponents/touch/SectionScroller.qml index f1a621564..900c55e54 100644 --- a/src/declarativeimports/plasmacomponents/platformcomponents/touch/SectionScroller.qml +++ b/src/declarativeimports/plasmacomponents/platformcomponents/touch/SectionScroller.qml @@ -85,7 +85,7 @@ Item { opacity: 0 Behavior on opacity { NumberAnimation { - duration: 250 + duration: units.longDuration } } @@ -172,7 +172,7 @@ Item { opacity: dragArea.pressed?1:0 Behavior on opacity { NumberAnimation { - duration: 250 + duration: units.longDuration } } } diff --git a/src/declarativeimports/plasmacomponents/platformcomponents/touch/TextField.qml b/src/declarativeimports/plasmacomponents/platformcomponents/touch/TextField.qml index c0baa4b4f..bdad67b2c 100644 --- a/src/declarativeimports/plasmacomponents/platformcomponents/touch/TextField.qml +++ b/src/declarativeimports/plasmacomponents/platformcomponents/touch/TextField.qml @@ -178,7 +178,7 @@ Item { opacity: (textInput.text != "" && clearButtonShown) ? 1 : 0 Behavior on opacity { NumberAnimation { - duration: 250 + duration: units.longDuration easing.type: Easing.InOutQuad } } diff --git a/src/declarativeimports/plasmacomponents/platformcomponents/touch/TextFieldFocus.qml b/src/declarativeimports/plasmacomponents/platformcomponents/touch/TextFieldFocus.qml index 237893319..f550e6609 100644 --- a/src/declarativeimports/plasmacomponents/platformcomponents/touch/TextFieldFocus.qml +++ b/src/declarativeimports/plasmacomponents/platformcomponents/touch/TextFieldFocus.qml @@ -63,7 +63,7 @@ Item { Transition { PropertyAnimation { properties: "opacity" - duration: 250 + duration: units.longDuration easing.type: Easing.OutQuad } } diff --git a/src/declarativeimports/plasmacomponents/platformcomponents/touch/private/ButtonShadow.qml b/src/declarativeimports/plasmacomponents/platformcomponents/touch/private/ButtonShadow.qml index 440add43c..e49655632 100644 --- a/src/declarativeimports/plasmacomponents/platformcomponents/touch/private/ButtonShadow.qml +++ b/src/declarativeimports/plasmacomponents/platformcomponents/touch/private/ButtonShadow.qml @@ -61,7 +61,7 @@ Item { Transition { PropertyAnimation { properties: "opacity" - duration: 250 + duration: units.longDuration easing.type: Easing.OutQuad } } diff --git a/src/declarativeimports/plasmacomponents/platformcomponents/touch/private/RoundShadow.qml b/src/declarativeimports/plasmacomponents/platformcomponents/touch/private/RoundShadow.qml index e8ca2e684..fb928583d 100644 --- a/src/declarativeimports/plasmacomponents/platformcomponents/touch/private/RoundShadow.qml +++ b/src/declarativeimports/plasmacomponents/platformcomponents/touch/private/RoundShadow.qml @@ -96,7 +96,7 @@ Item { Transition { PropertyAnimation { properties: "opacity" - duration: 250 + duration: units.longDuration easing.type: Easing.OutQuad } } diff --git a/src/declarativeimports/plasmacomponents/qml/CheckBox.qml b/src/declarativeimports/plasmacomponents/qml/CheckBox.qml index af3455d0c..7d9413e5c 100644 --- a/src/declarativeimports/plasmacomponents/qml/CheckBox.qml +++ b/src/declarativeimports/plasmacomponents/qml/CheckBox.qml @@ -55,7 +55,7 @@ Private.DualStateButton { } Behavior on opacity { NumberAnimation { - duration: 250 + duration: units.longDuration easing.type: Easing.InOutQuad } } diff --git a/src/declarativeimports/plasmacomponents/qml/Highlight.qml b/src/declarativeimports/plasmacomponents/qml/Highlight.qml index 86626c932..e34296628 100644 --- a/src/declarativeimports/plasmacomponents/qml/Highlight.qml +++ b/src/declarativeimports/plasmacomponents/qml/Highlight.qml @@ -55,7 +55,7 @@ Item { Behavior on opacity { NumberAnimation { - duration: 250 + duration: units.longDuration easing.type: Easing.OutQuad } } @@ -75,7 +75,7 @@ Item { Behavior on opacity { NumberAnimation { - duration: 250 + duration: units.longDuration easing.type: Easing.OutQuad } } diff --git a/src/declarativeimports/plasmacomponents/qml/RadioButton.qml b/src/declarativeimports/plasmacomponents/qml/RadioButton.qml index c93ec8dc1..9e340b959 100644 --- a/src/declarativeimports/plasmacomponents/qml/RadioButton.qml +++ b/src/declarativeimports/plasmacomponents/qml/RadioButton.qml @@ -54,7 +54,7 @@ Private.DualStateButton { } Behavior on opacity { NumberAnimation { - duration: 250 + duration: units.longDuration easing.type: Easing.InOutQuad } } diff --git a/src/declarativeimports/plasmacomponents/qml/SectionScroller.qml b/src/declarativeimports/plasmacomponents/qml/SectionScroller.qml index 2e73835a1..e7c80d53c 100644 --- a/src/declarativeimports/plasmacomponents/qml/SectionScroller.qml +++ b/src/declarativeimports/plasmacomponents/qml/SectionScroller.qml @@ -80,7 +80,7 @@ Item { implicitWidth: scrollBar.implicitWidth Behavior on opacity { NumberAnimation { - duration: 250 + duration: units.longDuration } } @@ -129,7 +129,7 @@ Item { opacity: sectionLabel.text && scrollBar.pressed ? 1 : 0 Behavior on opacity { NumberAnimation { - duration: 250 + duration: units.longDuration } } } diff --git a/src/declarativeimports/plasmacomponents/qml/Switch.qml b/src/declarativeimports/plasmacomponents/qml/Switch.qml index af3455d0c..7d9413e5c 100644 --- a/src/declarativeimports/plasmacomponents/qml/Switch.qml +++ b/src/declarativeimports/plasmacomponents/qml/Switch.qml @@ -55,7 +55,7 @@ Private.DualStateButton { } Behavior on opacity { NumberAnimation { - duration: 250 + duration: units.longDuration easing.type: Easing.InOutQuad } } diff --git a/src/declarativeimports/plasmacomponents/qml/TabBar.qml b/src/declarativeimports/plasmacomponents/qml/TabBar.qml index 44469bbd1..4578cce37 100644 --- a/src/declarativeimports/plasmacomponents/qml/TabBar.qml +++ b/src/declarativeimports/plasmacomponents/qml/TabBar.qml @@ -100,7 +100,7 @@ FocusScope { Behavior on x { PropertyAnimation { easing.type: Easing.InQuad - duration: 250 + duration: units.longDuration } } } @@ -168,7 +168,7 @@ FocusScope { } Behavior on x { NumberAnimation { - duration: 250 + duration: units.longDuration easing.type: Easing.InOutQuad } } diff --git a/src/declarativeimports/plasmacomponents/qml/TabGroup.qml b/src/declarativeimports/plasmacomponents/qml/TabGroup.qml index 9da387c88..c2e733dcb 100644 --- a/src/declarativeimports/plasmacomponents/qml/TabGroup.qml +++ b/src/declarativeimports/plasmacomponents/qml/TabGroup.qml @@ -207,14 +207,14 @@ Item { to: "Incoming" SequentialAnimation { ScriptAction { script: root.clip = true } - PropertyAnimation { properties: "opacity,x"; easing.type: Easing.InQuad; duration: 250 } + PropertyAnimation { properties: "opacity,x"; easing.type: Easing.InQuad; duration: units.longDuration } ScriptAction { script: {incomingDone(); root.clip = false} } } }, Transition { to: "OutgoingLeft,OutgoingRight" SequentialAnimation { - PropertyAnimation { properties: "opacity,x"; easing.type: Easing.InQuad; duration: 250 } + PropertyAnimation { properties: "opacity,x"; easing.type: Easing.InQuad; duration: units.longDuration } ScriptAction { script: outgoingDone() } } } diff --git a/src/declarativeimports/plasmacomponents/qml/TextField.qml b/src/declarativeimports/plasmacomponents/qml/TextField.qml index b1f5a4d93..0301b7b1e 100644 --- a/src/declarativeimports/plasmacomponents/qml/TextField.qml +++ b/src/declarativeimports/plasmacomponents/qml/TextField.qml @@ -363,7 +363,7 @@ FocusScope { opacity: (textInput.text != "" && clearButtonShown && textField.enabled) ? 1 : 0 Behavior on opacity { NumberAnimation { - duration: 250 + duration: units.longDuration easing.type: Easing.InOutQuad } } diff --git a/src/declarativeimports/plasmacomponents/qml/ToolBar.qml b/src/declarativeimports/plasmacomponents/qml/ToolBar.qml index be4fd9ba0..edb3042b9 100644 --- a/src/declarativeimports/plasmacomponents/qml/ToolBar.qml +++ b/src/declarativeimports/plasmacomponents/qml/ToolBar.qml @@ -39,7 +39,7 @@ Item{ Behavior on height { PropertyAnimation { id: heightAnimation - duration: 250 + duration: units.longDuration } } z: 1000 @@ -201,19 +201,19 @@ Item{ Behavior on opacity { PropertyAnimation { id: containerAOpacityAnimation - duration: 250 + duration: units.longDuration } } Behavior on x { enabled: containerA.animationsEnabled PropertyAnimation { - duration: 250 + duration: units.longDuration } } Behavior on y { enabled: containerA.animationsEnabled PropertyAnimation { - duration: 250 + duration: units.longDuration } } } @@ -223,18 +223,18 @@ Item{ height: parent.height opacity: 0 Behavior on opacity { - PropertyAnimation { duration: 250 } + PropertyAnimation { duration: units.longDuration } } Behavior on x { enabled: containerA.animationsEnabled PropertyAnimation { - duration: 250 + duration: units.longDuration } } Behavior on y { enabled: containerA.animationsEnabled PropertyAnimation { - duration: 250 + duration: units.longDuration } } } diff --git a/src/declarativeimports/plasmacomponents/qml/ToolButton.qml b/src/declarativeimports/plasmacomponents/qml/ToolButton.qml index 3f7a91cbd..df16317db 100644 --- a/src/declarativeimports/plasmacomponents/qml/ToolButton.qml +++ b/src/declarativeimports/plasmacomponents/qml/ToolButton.qml @@ -227,7 +227,7 @@ Item { //internal: if there is no hover status, don't paint on mouse over in touchscreens opacity: (internal.userPressed || checked || !flat || (shadow.hasOverState && mouse.containsMouse && button.enabled)) ? 1 : 0 Behavior on opacity { - PropertyAnimation { duration: 250 } + PropertyAnimation { duration: units.longDuration } } PlasmaCore.Svg { @@ -333,7 +333,7 @@ Item { //internal: if there is no hover status, don't paint on mouse over in touchscreens opacity: (internal.userPressed || checked || !flat || (roundShadow.hasOverState && mouse.containsMouse)) ? 1 : 0 Behavior on opacity { - PropertyAnimation { duration: 250 } + PropertyAnimation { duration: units.longDuration } } } } diff --git a/src/declarativeimports/plasmacomponents/qml/private/ButtonShadow.qml b/src/declarativeimports/plasmacomponents/qml/private/ButtonShadow.qml index e90c0938e..f01747857 100644 --- a/src/declarativeimports/plasmacomponents/qml/private/ButtonShadow.qml +++ b/src/declarativeimports/plasmacomponents/qml/private/ButtonShadow.qml @@ -126,7 +126,7 @@ Item { Transition { PropertyAnimation { properties: "opacity" - duration: 250 + duration: units.longDuration easing.type: Easing.OutQuad } } diff --git a/src/declarativeimports/plasmacomponents/qml/private/InlineDialog.qml b/src/declarativeimports/plasmacomponents/qml/private/InlineDialog.qml index 32ba3e9fc..4c6c157b3 100644 --- a/src/declarativeimports/plasmacomponents/qml/private/InlineDialog.qml +++ b/src/declarativeimports/plasmacomponents/qml/private/InlineDialog.qml @@ -47,7 +47,7 @@ Item { SequentialAnimation { id: appearAnimation NumberAnimation { - duration: 250 + duration: units.longDuration easing.type: Easing.InOutQuad target: dismissArea properties: "opacity" diff --git a/src/declarativeimports/plasmacomponents/qml/private/RoundShadow.qml b/src/declarativeimports/plasmacomponents/qml/private/RoundShadow.qml index 045d381a1..a3e6f4fbc 100644 --- a/src/declarativeimports/plasmacomponents/qml/private/RoundShadow.qml +++ b/src/declarativeimports/plasmacomponents/qml/private/RoundShadow.qml @@ -126,7 +126,7 @@ Item { Transition { PropertyAnimation { properties: "opacity" - duration: 250 + duration: units.longDuration easing.type: Easing.OutQuad } } diff --git a/src/declarativeimports/plasmacomponents/qml/private/ScrollDecoratorDelegate.qml b/src/declarativeimports/plasmacomponents/qml/private/ScrollDecoratorDelegate.qml index 6e226da3c..b25359b8a 100644 --- a/src/declarativeimports/plasmacomponents/qml/private/ScrollDecoratorDelegate.qml +++ b/src/declarativeimports/plasmacomponents/qml/private/ScrollDecoratorDelegate.qml @@ -34,7 +34,7 @@ PlasmaCore.FrameSvgItem { opacity: 0 Behavior on opacity { NumberAnimation { - duration: 250 + duration: units.longDuration easing.type: Easing.OutQuad } } diff --git a/src/declarativeimports/plasmacomponents/qml/private/TextFieldFocus.qml b/src/declarativeimports/plasmacomponents/qml/private/TextFieldFocus.qml index 88dfafc3c..a2093de62 100644 --- a/src/declarativeimports/plasmacomponents/qml/private/TextFieldFocus.qml +++ b/src/declarativeimports/plasmacomponents/qml/private/TextFieldFocus.qml @@ -90,7 +90,7 @@ Item { Transition { PropertyAnimation { properties: "opacity" - duration: 250 + duration: units.longDuration easing.type: Easing.OutQuad } } diff --git a/src/declarativeimports/plasmaextracomponents/qml/App.qml b/src/declarativeimports/plasmaextracomponents/qml/App.qml index 7719a9282..5424bbd21 100644 --- a/src/declarativeimports/plasmaextracomponents/qml/App.qml +++ b/src/declarativeimports/plasmaextracomponents/qml/App.qml @@ -121,7 +121,7 @@ Item { clip: true width: navigationWidth + space Behavior on width { - NumberAnimation { duration: 250; easing.type: Easing.InOutExpo; } + NumberAnimation { duration: units.longDuration; easing.type: Easing.InOutExpo; } } Item { diff --git a/src/declarativeimports/plasmaextracomponents/qml/ScrollArea.qml b/src/declarativeimports/plasmaextracomponents/qml/ScrollArea.qml index 20cd9438b..860c0e7e3 100644 --- a/src/declarativeimports/plasmaextracomponents/qml/ScrollArea.qml +++ b/src/declarativeimports/plasmaextracomponents/qml/ScrollArea.qml @@ -187,7 +187,7 @@ Item { opacity: flickableItem.atYBeginning ? 0 : 1 Behavior on opacity { NumberAnimation { - duration: 250 + duration: units.longDuration easing.type: Easing.InOutQuad } } @@ -207,7 +207,7 @@ Item { opacity: flickableItem.atYEnd ? 0 : 1 Behavior on opacity { NumberAnimation { - duration: 250 + duration: units.longDuration easing.type: Easing.InOutQuad } } @@ -226,7 +226,7 @@ Item { opacity: flickableItem.atXBeginning ? 0 : 1 Behavior on opacity { NumberAnimation { - duration: 250 + duration: units.longDuration easing.type: Easing.InOutQuad } } @@ -245,7 +245,7 @@ Item { opacity: flickableItem.atXEnd ? 0 : 1 Behavior on opacity { NumberAnimation { - duration: 250 + duration: units.longDuration easing.type: Easing.InOutQuad } }