From 5318fd359ff167e710998c388e92f41823856351 Mon Sep 17 00:00:00 2001 From: Mentalflow <312902918@qq.com> Date: Sat, 29 Jun 2024 20:41:01 +0800 Subject: [PATCH] RibbonBusyBar,RibbonBusyRing,RibbonProgressBar,RibbonProgressRing: Fix wrong spelling. --- lib_source/qml/Qt5/RibbonBusyBar.qml | 8 ++++---- lib_source/qml/Qt5/RibbonBusyRing.qml | 14 +++++++------- lib_source/qml/Qt5/RibbonProgressBar.qml | 4 ++-- lib_source/qml/Qt5/RibbonProgressRing.qml | 10 +++++----- lib_source/qml/Qt6/RibbonBusyBar.qml | 8 ++++---- lib_source/qml/Qt6/RibbonBusyRing.qml | 14 +++++++------- lib_source/qml/Qt6/RibbonProgressBar.qml | 4 ++-- lib_source/qml/Qt6/RibbonProgressRing.qml | 10 +++++----- 8 files changed, 36 insertions(+), 36 deletions(-) diff --git a/lib_source/qml/Qt5/RibbonBusyBar.qml b/lib_source/qml/Qt5/RibbonBusyBar.qml index 58c9fe0..1f62703 100644 --- a/lib_source/qml/Qt5/RibbonBusyBar.qml +++ b/lib_source/qml/Qt5/RibbonBusyBar.qml @@ -17,7 +17,7 @@ BusyIndicator { property real indicatorWidth: 4 property real indicatorHeight: 4 property int indicatorNumber: 5 - property int animationDurarion: 2000 + property int animationDuration: 2000 property bool reversed: false QtObject{ @@ -67,7 +67,7 @@ BusyIndicator { property: "x" from: control.reversed ? barWidth + (index + 1) * indicatorWidth : -(index + 1) * indicatorWidth to: control.reversed ? (index + 1) * indicatorWidth : barWidth - (index + 1) * indicatorWidth - duration: animationDurarion * 9 / 10 + duration: animationDuration * 9 / 10 easing.type: Easing.OutInCubic } @@ -77,7 +77,7 @@ BusyIndicator { property: "x" from: control.reversed ? (index + 1) * indicatorWidth : barWidth - (index + 1) * indicatorWidth to: control.reversed ? -(index + 1) * indicatorWidth - control.indicatorNumber*indicatorWidth : barWidth + (index + 1) * indicatorWidth + control.indicatorNumber*indicatorWidth - duration: animationDurarion / 10 + duration: animationDuration / 10 easing.type: Easing.OutInCubic } @@ -86,7 +86,7 @@ BusyIndicator { property: "opacity" from: 0.5 to: 0 - duration: animationDurarion / 10 + duration: animationDuration / 10 easing.type: Easing.OutExpo } } diff --git a/lib_source/qml/Qt5/RibbonBusyRing.qml b/lib_source/qml/Qt5/RibbonBusyRing.qml index 52ac62a..dca8a81 100644 --- a/lib_source/qml/Qt5/RibbonBusyRing.qml +++ b/lib_source/qml/Qt5/RibbonBusyRing.qml @@ -16,10 +16,10 @@ BusyIndicator { property real radiusWidth: 4 property int lineNumber: RibbonTheme.modernStyle ? 10 : 8 property real default_saturation: 0 - property int animationDurarion: RibbonTheme.modernStyle ? 4000 : 1000 + property int animationDuration: RibbonTheme.modernStyle ? 4000 : 1000 property bool clockwise: true - onAnimationDurarionChanged: { + onAnimationDurationChanged: { running = !running Qt.callLater(()=>running = !running) // Fix Qt 5 animation duration doesn't change } @@ -41,7 +41,7 @@ BusyIndicator { from: clockwise ? lineNumber : 0 to: clockwise ? 0 : lineNumber loops: Animation.Infinite - duration: animationDurarion + duration: animationDuration } Repeater { @@ -77,7 +77,7 @@ BusyIndicator { property: "rotation" from: (clockwise ? 1 : -1) * 0 to: (clockwise ? 1 : -1) * (360 - (index - lineNumber / 4 + 0.5) * private_property.angle * 1.4) - duration: animationDurarion / 2 + duration: animationDuration / 2 easing.type: Easing.OutInQuad } @@ -87,19 +87,19 @@ BusyIndicator { property: "rotation" from: (clockwise ? 1 : -1) * (360 - (index - lineNumber / 4 + 0.5) * private_property.angle * 1.4) to: (clockwise ? 1 : -1) * 720 - duration: animationDurarion / 2 + duration: animationDuration / 2 easing.type: Easing.OutInQuad } SequentialAnimation{ PauseAnimation { - duration: animationDurarion / 2 - animationDurarion / 20 + duration: animationDuration / 2 - animationDuration / 20 } PropertyAnimation { target: repeater.itemAt(index) property: "opacity" from: 0.5 to: 0 - duration: animationDurarion / 20 + duration: animationDuration / 20 easing.type: Easing.OutExpo } } diff --git a/lib_source/qml/Qt5/RibbonProgressBar.qml b/lib_source/qml/Qt5/RibbonProgressBar.qml index 1b173d2..b5e848c 100644 --- a/lib_source/qml/Qt5/RibbonProgressBar.qml +++ b/lib_source/qml/Qt5/RibbonProgressBar.qml @@ -22,7 +22,7 @@ Item{ property int barHeight: 6 property bool showText: true property int textLabelMargin: textLabelPosition === RibbonProgressBar.LabelPosition.Top || textLabelPosition === RibbonProgressBar.LabelPosition.Bottom ? 0 : 5 - property int animationDurarion: 800 + property int animationDuration: 800 property int indeterminateWidth: barWidth * 0.25 property int textLabelPosition: bar.mirrored ? RibbonProgressBar.LabelPosition.Left : RibbonProgressBar.LabelPosition.Right property string text: qsTr("Loading") @@ -86,7 +86,7 @@ Item{ from: -indeterminateWidth to:barWidth+indeterminateWidth loops: Animation.Infinite - duration: animationDurarion + duration: animationDuration easing.type: Easing.OutInQuad } } diff --git a/lib_source/qml/Qt5/RibbonProgressRing.qml b/lib_source/qml/Qt5/RibbonProgressRing.qml index e832a6c..d46f6d4 100644 --- a/lib_source/qml/Qt5/RibbonProgressRing.qml +++ b/lib_source/qml/Qt5/RibbonProgressRing.qml @@ -5,7 +5,7 @@ RibbonProgressBar { id: control barWidth: centerInTextLabel && showText ? Math.max(textLabel.contentWidth + ringWidth * 2 + textLabelMargin * 2, 50) : 50 barHeight: barWidth - animationDurarion: 2000 + animationDuration: 2000 property real ringWidth: 6 property bool centerInTextLabel: false @@ -49,14 +49,14 @@ RibbonProgressBar { SequentialAnimation on startAngle { loops: Animation.Infinite running: control.visible && control.indeterminate - PropertyAnimation { from: 0; to: 450; duration: control.animationDurarion/2; easing.type: Easing.OutSine } - PropertyAnimation { from: 450; to: 1080; duration: control.animationDurarion/2; easing.type: Easing.OutSine } + PropertyAnimation { from: 0; to: 450; duration: control.animationDuration/2; easing.type: Easing.OutSine } + PropertyAnimation { from: 450; to: 1080; duration: control.animationDuration/2; easing.type: Easing.OutSine } } SequentialAnimation on sweepAngle { loops: Animation.Infinite running: control.visible && control.indeterminate - PropertyAnimation { from: 0; to: 180; duration: control.animationDurarion/2; easing.type: Easing.OutSine } - PropertyAnimation { from: 180; to: 0; duration: control.animationDurarion/2; easing.type: Easing.OutSine } + PropertyAnimation { from: 0; to: 180; duration: control.animationDuration/2; easing.type: Easing.OutSine } + PropertyAnimation { from: 180; to: 0; duration: control.animationDuration/2; easing.type: Easing.OutSine } } onStartAngleChanged: { requestPaint() diff --git a/lib_source/qml/Qt6/RibbonBusyBar.qml b/lib_source/qml/Qt6/RibbonBusyBar.qml index 59ea3a6..48459ac 100644 --- a/lib_source/qml/Qt6/RibbonBusyBar.qml +++ b/lib_source/qml/Qt6/RibbonBusyBar.qml @@ -17,7 +17,7 @@ BusyIndicator { property real indicatorWidth: 4 property real indicatorHeight: 4 property int indicatorNumber: 5 - property int animationDurarion: 2000 + property int animationDuration: 2000 property bool reversed: false QtObject{ @@ -67,7 +67,7 @@ BusyIndicator { property: "x" from: control.reversed ? barWidth + (index + 1) * indicatorWidth : -(index + 1) * indicatorWidth to: control.reversed ? (index + 1) * indicatorWidth : barWidth - (index + 1) * indicatorWidth - duration: animationDurarion * 9 / 10 + duration: animationDuration * 9 / 10 easing.type: Easing.OutInCubic } @@ -77,7 +77,7 @@ BusyIndicator { property: "x" from: control.reversed ? (index + 1) * indicatorWidth : barWidth - (index + 1) * indicatorWidth to: control.reversed ? -(index + 1) * indicatorWidth - control.indicatorNumber*indicatorWidth : barWidth + (index + 1) * indicatorWidth + control.indicatorNumber*indicatorWidth - duration: animationDurarion / 10 + duration: animationDuration / 10 easing.type: Easing.OutInCubic } @@ -86,7 +86,7 @@ BusyIndicator { property: "opacity" from: 0.5 to: 0 - duration: animationDurarion / 10 + duration: animationDuration / 10 easing.type: Easing.OutExpo } } diff --git a/lib_source/qml/Qt6/RibbonBusyRing.qml b/lib_source/qml/Qt6/RibbonBusyRing.qml index 77c2451..3f33b32 100644 --- a/lib_source/qml/Qt6/RibbonBusyRing.qml +++ b/lib_source/qml/Qt6/RibbonBusyRing.qml @@ -16,10 +16,10 @@ BusyIndicator { property real radiusWidth: 4 property int lineNumber: RibbonTheme.modernStyle ? 10 : 8 property real default_saturation: 0 - property int animationDurarion: RibbonTheme.modernStyle ? 4000 : 1000 + property int animationDuration: RibbonTheme.modernStyle ? 4000 : 1000 property bool clockwise: true - onAnimationDurarionChanged: { + onAnimationDurationChanged: { running = !running Qt.callLater(()=>running = !running) // Fix Qt 5 animation duration doesn't change } @@ -41,7 +41,7 @@ BusyIndicator { from: clockwise ? lineNumber : 0 to: clockwise ? 0 : lineNumber loops: Animation.Infinite - duration: animationDurarion + duration: animationDuration } Repeater { @@ -77,7 +77,7 @@ BusyIndicator { property: "rotation" from: (clockwise ? 1 : -1) * 0 to: (clockwise ? 1 : -1) * (360 - (index - lineNumber / 4 + 0.5) * private_property.angle * 1.4) - duration: animationDurarion / 2 + duration: animationDuration / 2 easing.type: Easing.OutInQuad } @@ -87,19 +87,19 @@ BusyIndicator { property: "rotation" from: (clockwise ? 1 : -1) * (360 - (index - lineNumber / 4 + 0.5) * private_property.angle * 1.4) to: (clockwise ? 1 : -1) * 720 - duration: animationDurarion / 2 + duration: animationDuration / 2 easing.type: Easing.OutInQuad } SequentialAnimation{ PauseAnimation { - duration: animationDurarion / 2 - animationDurarion / 20 + duration: animationDuration / 2 - animationDuration / 20 } PropertyAnimation { target: repeater.itemAt(index) property: "opacity" from: 0.5 to: 0 - duration: animationDurarion / 20 + duration: animationDuration / 20 easing.type: Easing.OutExpo } } diff --git a/lib_source/qml/Qt6/RibbonProgressBar.qml b/lib_source/qml/Qt6/RibbonProgressBar.qml index accc54d..c5dd9c1 100644 --- a/lib_source/qml/Qt6/RibbonProgressBar.qml +++ b/lib_source/qml/Qt6/RibbonProgressBar.qml @@ -22,7 +22,7 @@ Item{ property int barHeight: 6 property bool showText: true property int textLabelMargin: textLabelPosition === RibbonProgressBar.LabelPosition.Top || textLabelPosition === RibbonProgressBar.LabelPosition.Bottom ? 0 : 5 - property int animationDurarion: 800 + property int animationDuration: 800 property int indeterminateWidth: barWidth * 0.25 property int textLabelPosition: bar.mirrored ? RibbonProgressBar.LabelPosition.Left : RibbonProgressBar.LabelPosition.Right property string text: qsTr("Loading") @@ -86,7 +86,7 @@ Item{ from: -indeterminateWidth to:barWidth+indeterminateWidth loops: Animation.Infinite - duration: animationDurarion + duration: animationDuration easing.type: Easing.OutInQuad } } diff --git a/lib_source/qml/Qt6/RibbonProgressRing.qml b/lib_source/qml/Qt6/RibbonProgressRing.qml index e3c207c..0133a3d 100644 --- a/lib_source/qml/Qt6/RibbonProgressRing.qml +++ b/lib_source/qml/Qt6/RibbonProgressRing.qml @@ -5,7 +5,7 @@ RibbonProgressBar { id: control barWidth: centerInTextLabel && showText ? Math.max(textLabel.contentWidth + ringWidth * 2 + textLabelMargin * 2, 50) : 50 barHeight: barWidth - animationDurarion: 2000 + animationDuration: 2000 property real ringWidth: 6 property bool centerInTextLabel: false @@ -49,14 +49,14 @@ RibbonProgressBar { SequentialAnimation on startAngle { loops: Animation.Infinite running: control.visible && control.indeterminate - PropertyAnimation { from: 0; to: 450; duration: control.animationDurarion/2; easing.type: Easing.OutSine } - PropertyAnimation { from: 450; to: 1080; duration: control.animationDurarion/2; easing.type: Easing.OutSine } + PropertyAnimation { from: 0; to: 450; duration: control.animationDuration/2; easing.type: Easing.OutSine } + PropertyAnimation { from: 450; to: 1080; duration: control.animationDuration/2; easing.type: Easing.OutSine } } SequentialAnimation on sweepAngle { loops: Animation.Infinite running: control.visible && control.indeterminate - PropertyAnimation { from: 0; to: 180; duration: control.animationDurarion/2; easing.type: Easing.OutSine } - PropertyAnimation { from: 180; to: 0; duration: control.animationDurarion/2; easing.type: Easing.OutSine } + PropertyAnimation { from: 0; to: 180; duration: control.animationDuration/2; easing.type: Easing.OutSine } + PropertyAnimation { from: 180; to: 0; duration: control.animationDuration/2; easing.type: Easing.OutSine } } onStartAngleChanged: { requestPaint()