From e349c487897208f54d538f10d523cd59d1956d97 Mon Sep 17 00:00:00 2001 From: m2Giles <69128853+m2Giles@users.noreply.github.com> Date: Sat, 18 May 2024 20:47:39 -0400 Subject: [PATCH] fix(aurora): kf.svg log spam and splash gear size --- .../contents/splash/Splash.qml | 30 ++++++++----------- .../kinoite/usr/share/qt5/qtlogging.ini | 6 ++++ .../kinoite/usr/share/qt6/qtlogging.ini | 6 ++++ 3 files changed, 25 insertions(+), 17 deletions(-) create mode 100644 system_files/kinoite/usr/share/qt5/qtlogging.ini create mode 100644 system_files/kinoite/usr/share/qt6/qtlogging.ini diff --git a/system_files/kinoite/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/Splash.qml b/system_files/kinoite/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/Splash.qml index bd7bd7a0c7c..29ef25a5c23 100644 --- a/system_files/kinoite/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/Splash.qml +++ b/system_files/kinoite/usr/share/plasma/look-and-feel/dev.getaurora.aurora.desktop/contents/splash/Splash.qml @@ -4,9 +4,8 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.5 -import QtQuick.Window 2.2 -import org.kde.plasma.core 2.0 as PlasmaCore +import QtQuick +import org.kde.kirigami 2 as Kirigami Rectangle { id: root @@ -25,11 +24,6 @@ Rectangle { } } - width: 1280 - height: 800 - - Component.onCompleted: stage = 2 - Item { id: content anchors.fill: parent @@ -38,25 +32,27 @@ Rectangle { Image { id: logo //match SDDM/lockscreen avatar positioning - property real size: PlasmaCore.Units.gridUnit * 24 + readonly property real size: Kirigami.Units.gridUnit * 8 anchors.centerIn: parent + asynchronous: true source: "images/aurora_logo.svgz" - sourceSize.width: 128 - sourceSize.height: 128 + sourceSize.width: size + sourceSize.height: size } // TODO: port to PlasmaComponents3.BusyIndicator Image { id: busyIndicator //in the middle of the remaining space - y: parent.height - (parent.height - logo.y) / 3 - height/2 + y: parent.height - (parent.height - logo.y) / 2 - height/2 anchors.horizontalCenter: parent.horizontalCenter + asynchronous: true source: "images/busywidget.svgz" - sourceSize.height: PlasmaCore.Units.gridUnit - sourceSize.width: PlasmaCore.Units.gridUnit + sourceSize.height: Kirigami.Units.gridUnit * 2 + sourceSize.width: Kirigami.Units.gridUnit * 2 RotationAnimator on rotation { id: rotationAnimator from: 0 @@ -67,7 +63,7 @@ Rectangle { duration: 2000 loops: Animation.Infinite // Don't want it to animate at all if the user has disabled animations - running: PlasmaCore.Units.longDuration > 1 + running: Kirigami.Units.longDuration > 1 } } } @@ -78,7 +74,7 @@ Rectangle { target: content from: 0 to: 1 - duration: PlasmaCore.Units.veryLongDuration * 2 + duration: Kirigami.Units.veryLongDuration * 2 easing.type: Easing.InOutQuad } -} +} \ No newline at end of file diff --git a/system_files/kinoite/usr/share/qt5/qtlogging.ini b/system_files/kinoite/usr/share/qt5/qtlogging.ini new file mode 100644 index 00000000000..51ef79ebcbc --- /dev/null +++ b/system_files/kinoite/usr/share/qt5/qtlogging.ini @@ -0,0 +1,6 @@ +[Rules] +*.debug=false +qt.qpa.xcb.xcberror.warning=false +kf.svg.info=false +kf.svg.debug=false +kf.svg.warning=false \ No newline at end of file diff --git a/system_files/kinoite/usr/share/qt6/qtlogging.ini b/system_files/kinoite/usr/share/qt6/qtlogging.ini new file mode 100644 index 00000000000..51ef79ebcbc --- /dev/null +++ b/system_files/kinoite/usr/share/qt6/qtlogging.ini @@ -0,0 +1,6 @@ +[Rules] +*.debug=false +qt.qpa.xcb.xcberror.warning=false +kf.svg.info=false +kf.svg.debug=false +kf.svg.warning=false \ No newline at end of file