From f09f5c608d4c984249762b8403e3f25c5ed69210 Mon Sep 17 00:00:00 2001 From: Mike Noe Date: Sat, 1 Jul 2023 07:19:26 +0000 Subject: [PATCH] Fix reference errors, port to Kirigami Fix reference errors in qml/Outline and plugins/OutputLabel --- src/plugins/outputlocator/qml/OutputLabel.qml | 9 +++++---- src/qml/outline/plasma/outline.qml | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/plugins/outputlocator/qml/OutputLabel.qml b/src/plugins/outputlocator/qml/OutputLabel.qml index 5dc47d706a..0cf43c4448 100644 --- a/src/plugins/outputlocator/qml/OutputLabel.qml +++ b/src/plugins/outputlocator/qml/OutputLabel.qml @@ -6,6 +6,7 @@ import QtQuick import org.kde.plasma.components 3.0 as PlasmaComponents3 +import org.kde.kirigami 2 as Kirigami Rectangle { id: root; @@ -14,16 +15,16 @@ Rectangle { property size resolution; property double scale; - color: theme.backgroundColor + color: Kirigami.Theme.backgroundColor implicitWidth: childrenRect.width + 2 * childrenRect.x implicitHeight: childrenRect.height + 2 * childrenRect.y PlasmaComponents3.Label { id: displayName - x: units.largeSpacing * 2 - y: units.largeSpacing - font.pointSize: theme.defaultFont.pointSize * 3 + x: Kirigami.Units.largeSpacing * 2 + y: Kirigami.Units.largeSpacing + font.pointSize: Kirigami.Theme.defaultFont.pointSize * 3 text: root.outputName; wrapMode: Text.WordWrap; horizontalAlignment: Text.AlignHCenter; diff --git a/src/qml/outline/plasma/outline.qml b/src/qml/outline/plasma/outline.qml index 067b3c8285..fdc9f2fec7 100644 --- a/src/qml/outline/plasma/outline.qml +++ b/src/qml/outline/plasma/outline.qml @@ -8,11 +8,12 @@ import QtQuick import QtQuick.Window import org.kde.kwin import org.kde.ksvg 1.0 as KSvg +import org.kde.kirigami 2 as Kirigami Window { id: window - readonly property int animationDuration: units.longDuration + readonly property int animationDuration: Kirigami.Units.longDuration property bool animationEnabled: false flags: Qt.BypassWindowManagerHint | Qt.FramelessWindowHint