Commit 69541321 authored by Noah Davis's avatar Noah Davis 🌵
Browse files

Remove unneeded impl/Units properties, update to Kirigami 2.19

I was experimenting with them before, but am no longer using them for
anything. Also, some of them are part of Kirigami now, but I need to
import Kirigami 2.19.
parent 9b07e3d8
Pipeline #138533 passed with stage
in 1 minute and 1 second
......@@ -3,7 +3,7 @@
*/
import QtQuick 2.15
import org.kde.kirigami 2.14 as Kirigami
import org.kde.kirigami 2.19 as Kirigami
import "." as Impl
......@@ -30,7 +30,7 @@ Loader {
opacity: parent.opacity
Behavior on opacity {
OpacityAnimator {
duration: Impl.Units.shortDuration
duration: Kirigami.Units.shortDuration
easing.type: Easing.OutCubic
}
}
......
......@@ -4,7 +4,7 @@
import QtQuick 2.15
import QtQuick.Templates 2.15 as T
import org.kde.kirigami 2.14 as Kirigami
import org.kde.kirigami 2.19 as Kirigami
import "." as Impl
......@@ -70,14 +70,14 @@ Kirigami.ShadowedRectangle {
Behavior on color {
enabled: highlightBackground
ColorAnimation {
duration: Impl.Units.shortDuration
duration: Kirigami.Units.shortDuration
easing.type: Easing.OutCubic
}
}
Behavior on border.color {
enabled: highlightBorder
ColorAnimation {
duration: Impl.Units.shortDuration
duration: Kirigami.Units.shortDuration
easing.type: Easing.OutCubic
}
}
......
......@@ -4,7 +4,7 @@
import QtQuick 2.15
import QtQuick.Templates 2.15 as T
import org.kde.kirigami 2.14 as Kirigami
import org.kde.kirigami 2.19 as Kirigami
import org.kde.breeze 1.0
import "." as Impl
......@@ -45,14 +45,14 @@ Rectangle {
Behavior on color {
enabled: highlightBackground
ColorAnimation {
duration: Impl.Units.shortDuration
duration: Kirigami.Units.shortDuration
easing.type: Easing.OutCubic
}
}
Behavior on border.color {
enabled: highlightBorder
ColorAnimation {
duration: Impl.Units.shortDuration
duration: Kirigami.Units.shortDuration
easing.type: Easing.OutCubic
}
}
......@@ -149,7 +149,7 @@ Rectangle {
property: "width"
from: checkmark.width
to: 0
duration: Impl.Units.shortDuration
duration: Kirigami.Units.shortDuration
//Intentionally not using an easing curve
}
......
......@@ -12,7 +12,7 @@
import QtQuick 2.15
import QtQuick.Templates 2.15 as T
import org.kde.kirigami 2.14 as Kirigami
import org.kde.kirigami 2.19 as Kirigami
import "." as Impl
......@@ -54,14 +54,14 @@ Rectangle {
Behavior on color {
enabled: highlightBackground
ColorAnimation {
duration: Impl.Units.shortDuration
duration: Kirigami.Units.shortDuration
easing.type: Easing.OutCubic
}
}
Behavior on border.color {
enabled: highlightBorder
ColorAnimation {
duration: Impl.Units.shortDuration
duration: Kirigami.Units.shortDuration
easing.type: Easing.OutCubic
}
}
......
......@@ -6,7 +6,7 @@
import QtQuick 2.15
import QtQuick.Window 2.15
import QtQuick.Templates 2.15
import org.kde.kirigami 2.14 as Kirigami
import org.kde.kirigami 2.19 as Kirigami
import "." as Impl
......@@ -59,14 +59,14 @@ Item {
SmoothedAnimation {
velocity: 200
reversingMode: SmoothedAnimation.Immediate
duration: Kirigami.Settings.tabletMode ? Impl.Units.shortDuration : 0//Impl.Units.veryShortDuration
duration: Kirigami.Settings.tabletMode ? Kirigami.Units.shortDuration : 0//Kirigami.Units.veryShortDuration
}
}
Behavior on y {
SmoothedAnimation {
velocity: 200
reversingMode: SmoothedAnimation.Immediate
duration: Kirigami.Settings.tabletMode ? Impl.Units.shortDuration : 0//Impl.Units.veryShortDuration
duration: Kirigami.Settings.tabletMode ? Kirigami.Units.shortDuration : 0//Kirigami.Units.veryShortDuration
}
}
*/
......
......@@ -6,7 +6,7 @@
import QtQuick 2.15
import QtQuick.Window 2.15
import QtQuick.Templates 2.15
import org.kde.kirigami 2.14 as Kirigami
import org.kde.kirigami 2.19 as Kirigami
import "." as Impl
......@@ -33,7 +33,7 @@ Loader {
//opacity: target.activeFocus ? 1 : 0
implicitHeight: {
let h = Impl.Units.gridUnit
let h = Kirigami.Units.gridUnit
return h - (h % 2 == 0 ? 1 : 0)
}
implicitWidth: implicitHeight
......@@ -104,7 +104,7 @@ Loader {
SmoothedAnimation {
velocity: 200
reversingMode: SmoothedAnimation.Immediate
duration: Impl.Units.shortDuration
duration: Kirigami.Units.shortDuration
}
}
Behavior on y {
......@@ -112,7 +112,7 @@ Loader {
SmoothedAnimation {
velocity: 200
reversingMode: SmoothedAnimation.Immediate
duration: Impl.Units.shortDuration
duration: Kirigami.Units.shortDuration
}
}
......
......@@ -4,7 +4,7 @@
import QtQuick 2.15
import QtQuick.Templates 2.15 as T
import org.kde.kirigami 2.14 as Kirigami
import org.kde.kirigami 2.19 as Kirigami
import "." as Impl
......@@ -59,7 +59,7 @@ Loader {
Behavior on color {
enabled: control.down
ColorAnimation {
duration: Impl.Units.shortDuration
duration: Kirigami.Units.shortDuration
easing.type: Easing.OutCubic
onRunningChanged: root.backgroundAnimationRunning = running
}
......@@ -67,7 +67,7 @@ Loader {
Behavior on border.color {
enabled: highlightBorder
ColorAnimation {
duration: Impl.Units.shortDuration
duration: Kirigami.Units.shortDuration
easing.type: Easing.OutCubic
onRunningChanged: root.borderAnimationRunning = running
}
......
......@@ -3,7 +3,7 @@
*/
import QtQuick 2.6
import org.kde.kirigami 2.14 as Kirigami
import org.kde.kirigami 2.19 as Kirigami
import "." as Impl
......
......@@ -4,7 +4,7 @@
import QtQuick 2.15
import QtQuick.Templates 2.15 as T
import org.kde.kirigami 2.14 as Kirigami
import org.kde.kirigami 2.19 as Kirigami
import org.kde.breeze 1.0
import "." as Impl
......@@ -77,7 +77,7 @@ IconLabelLayout {
Behavior on opacity {
enabled: firstLayoutCompleted
OpacityAnimator {
duration: Impl.Units.shortDuration
duration: Kirigami.Units.shortDuration
}
}
}
......@@ -95,19 +95,19 @@ IconLabelLayout {
Behavior on x {
enabled: firstLayoutCompleted
XAnimator {
duration: Impl.Units.shortDuration
duration: Kirigami.Units.shortDuration
}
}
Behavior on y {
enabled: firstLayoutCompleted
YAnimator {
duration: Impl.Units.shortDuration
duration: Kirigami.Units.shortDuration
}
}
Behavior on opacity {
enabled: firstLayoutCompleted
OpacityAnimator {
duration: Impl.Units.shortDuration
duration: Kirigami.Units.shortDuration
}
}
}
......
......@@ -5,7 +5,7 @@
import QtQuick 2.15
import QtQuick.Layouts 1.15
import QtQuick.Templates 2.15 as T
import org.kde.kirigami 2.14 as Kirigami
import org.kde.kirigami 2.19 as Kirigami
import "." as Impl
......
......@@ -3,7 +3,7 @@
*/
import QtQuick 2.15
import org.kde.kirigami 2.14 as Kirigami
import org.kde.kirigami 2.19 as Kirigami
import "." as Impl
......
......@@ -3,7 +3,7 @@
*/
import QtQuick 2.15
import org.kde.kirigami 2.14 as Kirigami
import org.kde.kirigami 2.19 as Kirigami
import "." as Impl
......@@ -26,7 +26,7 @@ Loader {
opacity: parent.opacity
Behavior on opacity {
OpacityAnimator {
duration: Impl.Units.shortDuration
duration: Kirigami.Units.shortDuration
easing.type: Easing.OutCubic
}
}
......
......@@ -3,7 +3,7 @@
*/
import QtQuick 2.15
import org.kde.kirigami 2.14 as Kirigami
import org.kde.kirigami 2.19 as Kirigami
import "." as Impl
......
......@@ -3,7 +3,7 @@
*/
import QtQuick 2.15
import org.kde.kirigami 2.14 as Kirigami
import org.kde.kirigami 2.19 as Kirigami
import "." as Impl
......@@ -26,7 +26,7 @@ Loader {
opacity: parent.opacity
Behavior on opacity {
OpacityAnimator {
duration: Impl.Units.shortDuration
duration: Kirigami.Units.shortDuration
easing.type: Easing.OutCubic
}
}
......
......@@ -4,7 +4,7 @@
import QtQuick 2.15
import QtQuick.Templates 2.15 as T
import org.kde.kirigami 2.14 as Kirigami
import org.kde.kirigami 2.19 as Kirigami
import "." as Impl
......@@ -74,7 +74,7 @@ Loader {
Behavior on color {
enabled: highlightBackground
ColorAnimation {
duration: Impl.Units.shortDuration
duration: Kirigami.Units.shortDuration
easing.type: Easing.OutCubic
onRunningChanged: root.backgroundAnimationRunning = running
}
......@@ -82,7 +82,7 @@ Loader {
Behavior on border.color {
enabled: highlightBackground
ColorAnimation {
duration: Impl.Units.shortDuration
duration: Kirigami.Units.shortDuration
easing.type: Easing.OutCubic
onRunningChanged: root.borderAnimationRunning = running
}
......
......@@ -3,7 +3,7 @@
*/
import QtQuick 2.15
import org.kde.kirigami 2.14 as Kirigami
import org.kde.kirigami 2.19 as Kirigami
import "." as Impl
......@@ -11,7 +11,7 @@ Rectangle {
color: Qt.rgba(0,0,0,0.2)
Behavior on opacity {
OpacityAnimator {
duration: Impl.Units.longDuration
duration: Kirigami.Units.longDuration
}
}
}
......@@ -3,7 +3,7 @@
*/
import QtQuick 2.15
import org.kde.kirigami 2.14 as Kirigami
import org.kde.kirigami 2.19 as Kirigami
import "." as Impl
......@@ -11,7 +11,7 @@ Rectangle {
color: Qt.rgba(0,0,0,0.4)
Behavior on opacity {
OpacityAnimator {
duration: Impl.Units.longDuration
duration: Kirigami.Units.longDuration
}
}
}
......@@ -4,7 +4,7 @@
import QtQuick 2.15
import QtQuick.Templates 2.15 as T
import org.kde.kirigami 2.14 as Kirigami
import org.kde.kirigami 2.19 as Kirigami
import "." as Impl
......@@ -38,7 +38,7 @@ Rectangle {
Behavior on color {
enabled: control.down || control.checked
ColorAnimation {
duration: Impl.Units.shortDuration
duration: Kirigami.Units.shortDuration
easing.type: Easing.OutCubic
}
}
......@@ -46,7 +46,7 @@ Rectangle {
Behavior on border.color {
enabled: control.down || control.checked || control.visualFocus || control.hovered
ColorAnimation {
duration: Impl.Units.shortDuration
duration: Kirigami.Units.shortDuration
easing.type: Easing.OutCubic
}
}
......@@ -114,7 +114,7 @@ Rectangle {
from: "unchecked"
to: "checked"
ScaleAnimator {
duration: Impl.Units.shortDuration
duration: Kirigami.Units.shortDuration
easing.type: Easing.OutQuad
}
}
......
......@@ -4,7 +4,7 @@
import QtQuick 2.15
import QtQuick.Templates 2.15 as T
import org.kde.kirigami 2.14 as Kirigami
import org.kde.kirigami 2.19 as Kirigami
import "." as Impl
......@@ -32,7 +32,7 @@ Rectangle {
Behavior on color {
enabled: root.pressed
ColorAnimation {
duration: Impl.Units.shortDuration
duration: Kirigami.Units.shortDuration
easing.type: Easing.OutCubic
}
}
......@@ -49,9 +49,9 @@ Rectangle {
transitions: Transition {
from: "active"
SequentialAnimation {
PauseAnimation { duration: Impl.Units.veryLongDuration }
PauseAnimation { duration: Kirigami.Units.veryLongDuration }
OpacityAnimator {
duration: Impl.Units.longDuration
duration: Kirigami.Units.longDuration
to: 0.0
}
}
......
......@@ -5,7 +5,7 @@
import QtQuick 2.15
import QtQuick.Templates 2.15 as Templates
import org.kde.kirigami 2.14 as Kirigami
import org.kde.kirigami 2.19 as Kirigami
import "." as Impl
......@@ -69,7 +69,7 @@ Rectangle {
Behavior on anchors.leftMargin {
enabled: fill.loaded && !Kirigami.Settings.hasTransientTouchInput
SmoothedAnimation {
duration: Impl.Units.longDuration
duration: Kirigami.Units.longDuration
velocity: 800
//SmoothedAnimations have a hardcoded InOutQuad easing
}
......@@ -77,21 +77,21 @@ Rectangle {
Behavior on anchors.rightMargin {
enabled: fill.loaded && !Kirigami.Settings.hasTransientTouchInput
SmoothedAnimation {
duration: Impl.Units.longDuration
duration: Kirigami.Units.longDuration
velocity: 800
}
}
Behavior on anchors.topMargin {
enabled: fill.loaded && !Kirigami.Settings.hasTransientTouchInput
SmoothedAnimation {
duration: Impl.Units.longDuration
duration: Kirigami.Units.longDuration
velocity: 800
}
}
Behavior on anchors.bottomMargin {
enabled: fill.loaded && !Kirigami.Settings.hasTransientTouchInput
SmoothedAnimation {
duration: Impl.Units.longDuration
duration: Kirigami.Units.longDuration
velocity: 800
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment