diff --git a/plasmoid/contents/ui/GlowPoint.qml b/plasmoid/contents/ui/GlowPoint.qml index 7247e8bbc..c6947ec44 100644 --- a/plasmoid/contents/ui/GlowPoint.qml +++ b/plasmoid/contents/ui/GlowPoint.qml @@ -29,7 +29,7 @@ Item{ property bool roundCorners: true property bool showAttention: false - property int animation: plasmoid.configuration.durationTime*units.longDuration + property int animation: root.durationTime*units.longDuration property color attentionColor: colorScopePalette.negativeTextColor // "#ffff1717" property color basicColor: "blue" diff --git a/plasmoid/contents/ui/TaskDelegate.qml b/plasmoid/contents/ui/TaskDelegate.qml index 2bf195d65..aed6e9776 100644 --- a/plasmoid/contents/ui/TaskDelegate.qml +++ b/plasmoid/contents/ui/TaskDelegate.qml @@ -70,7 +70,7 @@ MouseArea{ property bool mouseEntered: false property bool pressed: false - property int animationTime: plasmoid.configuration.durationTime * 1.2 * units.shortDuration + property int animationTime: root.durationTime * 1.2 * units.shortDuration property int hoveredIndex: icList.hoveredIndex property int itemIndex: index property int lastButtonClicked: -1; @@ -127,7 +127,7 @@ MouseArea{ Behavior on opacity { // NumberAnimation { duration: (IsStartup || (IsLauncher) ) ? 0 : 400 } - NumberAnimation { duration: plasmoid.configuration.durationTime*units.longDuration } + NumberAnimation { duration: root.durationTime*units.longDuration } } @@ -877,7 +877,7 @@ MouseArea{ ///item's added Animation SequentialAnimation{ id:showWindowAnimation - property int speed: windowSystem.compositingActive ? plasmoid.configuration.durationTime* (1.2*units.longDuration) : 0 + property int speed: windowSystem.compositingActive ? root.durationTime* (1.2*units.longDuration) : 0 PropertyAnimation { target: wrapper @@ -954,7 +954,7 @@ MouseArea{ Timer { id: hoveredTimer - interval: 2*plasmoid.configuration.durationTime*units.longDuration + interval: 2*root.durationTime*units.longDuration repeat: false @@ -1012,8 +1012,8 @@ MouseArea{ //launchers delay A LOT to reappear, e.g google-chrome //I will blacklist google-chrome as I have not found any other case for this bug //to appear, but even this way there are cases that still appears... - property int mainDelay: (AppId == "google-chrome") ? 0 : 2*plasmoid.configuration.durationTime*showWindowAnimation.speed - property int windowDelay: mainItemContainer.isStartup ? 3*plasmoid.configuration.durationTime*units.longDuration : mainDelay + property int mainDelay: (AppId == "google-chrome") ? 0 : 2*root.durationTime*showWindowAnimation.speed + property int windowDelay: mainItemContainer.isStartup ? 3*root.durationTime*units.longDuration : mainDelay Component { id: delayShowWindow diff --git a/plasmoid/contents/ui/TaskGroupItem.qml b/plasmoid/contents/ui/TaskGroupItem.qml index c16f157b4..972818f99 100644 --- a/plasmoid/contents/ui/TaskGroupItem.qml +++ b/plasmoid/contents/ui/TaskGroupItem.qml @@ -69,7 +69,7 @@ Item{ property int stateWidth: mainItemContainer.isGroupParent ? (wrapper.regulatorWidth - secondPoint.width) : wrapper.regulatorWidth - spacer.width property int stateHeight: mainItemContainer.isGroupParent ? wrapper.regulatorHeight - secondPoint.height : wrapper.regulatorHeight - spacer.height - property int animationTime: plasmoid.configuration.durationTime* (0.7*units.longDuration) + property int animationTime: root.durationTime* (0.7*units.longDuration) property bool isActive: mainItemContainer.hasActive || (root.showPreviews && windowsPreviewDlg.activeItem && (windowsPreviewDlg.activeItem === mainItemContainer)) diff --git a/plasmoid/contents/ui/TaskIconItem.qml b/plasmoid/contents/ui/TaskIconItem.qml index 10827c4b5..da9a3bb06 100644 --- a/plasmoid/contents/ui/TaskIconItem.qml +++ b/plasmoid/contents/ui/TaskIconItem.qml @@ -111,7 +111,7 @@ Item{ states: State { name: "reparented" - ParentChange { target: shadowedImage; parent: panel; } + ParentChange { target: shadowedImage; parent: root; } } //Corize to use when a window is removed.... @@ -194,7 +194,7 @@ Item{ from: "animating" to: "*" - AnchorAnimation { duration: 1.5*plasmoid.configuration.durationTime*units.longDuration } + AnchorAnimation { duration: 1.5*root.durationTime*units.longDuration } } ] } @@ -233,7 +233,7 @@ Item{ source: iconImageBuffer Behavior on opacity { - NumberAnimation { duration: plasmoid.configuration.durationTime*units.longDuration } + NumberAnimation { duration: root.durationTime*units.longDuration } } } @@ -319,7 +319,7 @@ Item{ id: clickedAnimation property bool pressed: mainItemContainer.pressed - property int speed: plasmoid.configuration.durationTime*units.longDuration + property int speed: root.durationTime*units.longDuration ParallelAnimation{ PropertyAnimation { @@ -404,7 +404,7 @@ Item{ id:launcherAnimation property bool launchedAlready: false - property int speed: plasmoid.configuration.durationTime * 0.8 * units.longDuration + property int speed: root.durationTime * 0.8 * units.longDuration SequentialAnimation{ ParallelAnimation{ @@ -429,7 +429,7 @@ Item{ target: wrapper property: (icList.orientation == Qt.Vertical) ? "tempScaleWidth" : "tempScaleHeight" to: 1 - duration: 3*plasmoid.configuration.durationTime*launcherAnimation.speed + duration: 3*root.durationTime*launcherAnimation.speed easing.type: Easing.OutBounce } @@ -438,7 +438,7 @@ Item{ target: wrapper property: (icList.orientation == Qt.Vertical) ? "tempScaleHeight" : "tempScaleWidth" to: 1 - duration: plasmoid.configuration.durationTime*launcherAnimation.speed + duration: root.durationTime*launcherAnimation.speed easing.type: Easing.OutBounce } @@ -446,7 +446,7 @@ Item{ target: wrapper property: "scale" to: 1 - duration: plasmoid.configuration.durationTime*launcherAnimation.speed + duration: root.durationTime*launcherAnimation.speed easing.type: Easing.OutQuad } } @@ -522,7 +522,7 @@ Item{ SequentialAnimation{ id:newWindowAnimation - property int speed: plasmoid.configuration.durationTime*units.longDuration + property int speed: root.durationTime*units.longDuration property bool isDemandingAttention: (IsDemandingAttention === true) ? true : false property bool entered: mainItemContainer.mouseEntered property bool needsThicknessSent: false //flag to check if the signal for thickness was sent @@ -550,7 +550,7 @@ Item{ target: wrapper property: (icList.orientation == Qt.Vertical) ? "tempScaleWidth" : "tempScaleHeight" to: 1 - duration: 3*plasmoid.configuration.durationTime*newWindowAnimation.speed + duration: 3*root.durationTime*newWindowAnimation.speed easing.type: Easing.OutBounce } } @@ -680,7 +680,7 @@ Item{ ParallelAnimation{ id: componentRemoveAnimation - property int speed: 2*plasmoid.configuration.durationTime*units.longDuration + property int speed: 2*root.durationTime*units.longDuration property Item removingItem: parent property int toPoint: 0 @@ -752,7 +752,7 @@ Item{ Transition{ id: isDraggedTransition to: "isDragged" - property int speed: plasmoid.configuration.durationTime*units.longDuration + property int speed: root.durationTime*units.longDuration SequentialAnimation{ ParallelAnimation{ @@ -795,7 +795,7 @@ Item{ id: defaultTransition from: "isDragged" to: "*" - property int speed: plasmoid.configuration.durationTime*units.longDuration + property int speed: root.durationTime*units.longDuration SequentialAnimation{ ParallelAnimation{ diff --git a/plasmoid/contents/ui/main.qml b/plasmoid/contents/ui/main.qml index 49c1193d0..38effbdb9 100644 --- a/plasmoid/contents/ui/main.qml +++ b/plasmoid/contents/ui/main.qml @@ -478,7 +478,7 @@ Item { property int smallSize: Math.max(3.7*root.statesLineSize, 16) Behavior on opacity{ - NumberAnimation { duration: plasmoid.configuration.durationTime*units.longDuration } + NumberAnimation { duration: root.durationTime*units.longDuration } } /// plasmoid's default panel @@ -495,7 +495,7 @@ Item { verticalTileMode: BorderImage.Stretch Behavior on opacity{ - NumberAnimation { duration: plasmoid.configuration.durationTime*units.longDuration } + NumberAnimation { duration: root.durationTime*units.longDuration } } } @@ -541,7 +541,7 @@ Item { plasmoid.configuration.panelSize + belower.width Behavior on opacity{ - NumberAnimation { duration: plasmoid.configuration.durationTime*units.longDuration } + NumberAnimation { duration: root.durationTime*units.longDuration } } @@ -641,7 +641,7 @@ Item { //more of a trouble moveDisplaced: Transition { - NumberAnimation { properties: "x,y"; duration: plasmoid.configuration.durationTime*units.shortDuration; easing.type: Easing.Linear } + NumberAnimation { properties: "x,y"; duration: root.durationTime*units.shortDuration; easing.type: Easing.Linear } } ///this transition can not be used with dragging !!!! I breaks