Mentalflow
/
RibbonUI
mirror of https://github.com/mentalfl0w/RibbonUI.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RibbonBusyBar,RibbonBusyRing,RibbonProgressBar,RibbonProgressRing: Fix wrong spelling.

This commit is contained in:
Mentalflow 2024-06-29 20:41:01 +08:00
parent f3597a25b7
commit 5318fd359f
Signed by: Mentalflow
GPG Key ID: 5AE68D4401A2EE71
8 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib_source/qml/Qt5/RibbonBusyBar.qml
View File

@ -17,7 +17,7 @@ BusyIndicator {
property real indicatorWidth: 4 property real indicatorWidth: 4
property real indicatorHeight: 4 property real indicatorHeight: 4
property int indicatorNumber: 5 property int indicatorNumber: 5
property int animationDurarion: 2000 property int animationDuration: 2000
property bool reversed: false property bool reversed: false
QtObject{ QtObject{
@ -67,7 +67,7 @@ BusyIndicator {
property: "x" property: "x"
from: control.reversed ? barWidth + (index + 1) * indicatorWidth : -(index + 1) * indicatorWidth from: control.reversed ? barWidth + (index + 1) * indicatorWidth : -(index + 1) * indicatorWidth
to: control.reversed ? (index + 1) * indicatorWidth : barWidth - (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 easing.type: Easing.OutInCubic
} }
@ -77,7 +77,7 @@ BusyIndicator {
property: "x" property: "x"
from: control.reversed ? (index + 1) * indicatorWidth : barWidth - (index + 1) * indicatorWidth 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 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 easing.type: Easing.OutInCubic
} }
@ -86,7 +86,7 @@ BusyIndicator {
property: "opacity" property: "opacity"
from: 0.5 from: 0.5
to: 0 to: 0
duration: animationDurarion / 10 duration: animationDuration / 10
easing.type: Easing.OutExpo easing.type: Easing.OutExpo
} }
} }

14
lib_source/qml/Qt5/RibbonBusyRing.qml
View File

@ -16,10 +16,10 @@ BusyIndicator {
property real radiusWidth: 4 property real radiusWidth: 4
property int lineNumber: RibbonTheme.modernStyle ? 10 : 8 property int lineNumber: RibbonTheme.modernStyle ? 10 : 8
property real default_saturation: 0 property real default_saturation: 0
property int animationDurarion: RibbonTheme.modernStyle ? 4000 : 1000 property int animationDuration: RibbonTheme.modernStyle ? 4000 : 1000
property bool clockwise: true property bool clockwise: true
onAnimationDurarionChanged: { onAnimationDurationChanged: {
running = !running running = !running
Qt.callLater(()=>running = !running) // Fix Qt 5 animation duration doesn't change Qt.callLater(()=>running = !running) // Fix Qt 5 animation duration doesn't change
} }
@ -41,7 +41,7 @@ BusyIndicator {
from: clockwise ? lineNumber : 0 from: clockwise ? lineNumber : 0
to: clockwise ? 0 : lineNumber to: clockwise ? 0 : lineNumber
loops: Animation.Infinite loops: Animation.Infinite
duration: animationDurarion duration: animationDuration
} }
Repeater { Repeater {
@ -77,7 +77,7 @@ BusyIndicator {
property: "rotation" property: "rotation"
from: (clockwise ? 1 : -1) * 0 from: (clockwise ? 1 : -1) * 0
to: (clockwise ? 1 : -1) * (360 - (index - lineNumber / 4 + 0.5) * private_property.angle * 1.4) 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 easing.type: Easing.OutInQuad
} }
@ -87,19 +87,19 @@ BusyIndicator {
property: "rotation" property: "rotation"
from: (clockwise ? 1 : -1) * (360 - (index - lineNumber / 4 + 0.5) * private_property.angle * 1.4) from: (clockwise ? 1 : -1) * (360 - (index - lineNumber / 4 + 0.5) * private_property.angle * 1.4)
to: (clockwise ? 1 : -1) * 720 to: (clockwise ? 1 : -1) * 720
duration: animationDurarion / 2 duration: animationDuration / 2
easing.type: Easing.OutInQuad easing.type: Easing.OutInQuad
} }
SequentialAnimation{ SequentialAnimation{
PauseAnimation { PauseAnimation {
duration: animationDurarion / 2 - animationDurarion / 20 duration: animationDuration / 2 - animationDuration / 20
} }
PropertyAnimation { PropertyAnimation {
target: repeater.itemAt(index) target: repeater.itemAt(index)
property: "opacity" property: "opacity"
from: 0.5 from: 0.5
to: 0 to: 0
duration: animationDurarion / 20 duration: animationDuration / 20
easing.type: Easing.OutExpo easing.type: Easing.OutExpo
} }
} }

4
lib_source/qml/Qt5/RibbonProgressBar.qml
View File

@ -22,7 +22,7 @@ Item{
property int barHeight: 6 property int barHeight: 6
property bool showText: true property bool showText: true
property int textLabelMargin: textLabelPosition === RibbonProgressBar.LabelPosition.Top || textLabelPosition === RibbonProgressBar.LabelPosition.Bottom ? 0 : 5 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 indeterminateWidth: barWidth * 0.25
property int textLabelPosition: bar.mirrored ? RibbonProgressBar.LabelPosition.Left : RibbonProgressBar.LabelPosition.Right property int textLabelPosition: bar.mirrored ? RibbonProgressBar.LabelPosition.Left : RibbonProgressBar.LabelPosition.Right
property string text: qsTr("Loading") property string text: qsTr("Loading")
@ -86,7 +86,7 @@ Item{
from: -indeterminateWidth from: -indeterminateWidth
to:barWidth+indeterminateWidth to:barWidth+indeterminateWidth
loops: Animation.Infinite loops: Animation.Infinite
duration: animationDurarion duration: animationDuration
easing.type: Easing.OutInQuad easing.type: Easing.OutInQuad
} }
} }

10
lib_source/qml/Qt5/RibbonProgressRing.qml
View File

@ -5,7 +5,7 @@ RibbonProgressBar {
id: control id: control
barWidth: centerInTextLabel && showText ? Math.max(textLabel.contentWidth + ringWidth * 2 + textLabelMargin * 2, 50) : 50 barWidth: centerInTextLabel && showText ? Math.max(textLabel.contentWidth + ringWidth * 2 + textLabelMargin * 2, 50) : 50
barHeight: barWidth barHeight: barWidth
animationDurarion: 2000 animationDuration: 2000
property real ringWidth: 6 property real ringWidth: 6
property bool centerInTextLabel: false property bool centerInTextLabel: false
@ -49,14 +49,14 @@ RibbonProgressBar {
SequentialAnimation on startAngle { SequentialAnimation on startAngle {
loops: Animation.Infinite loops: Animation.Infinite
running: control.visible && control.indeterminate running: control.visible && control.indeterminate
PropertyAnimation { from: 0; to: 450; 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.animationDurarion/2; easing.type: Easing.OutSine } PropertyAnimation { from: 450; to: 1080; duration: control.animationDuration/2; easing.type: Easing.OutSine }
} }
SequentialAnimation on sweepAngle { SequentialAnimation on sweepAngle {
loops: Animation.Infinite loops: Animation.Infinite
running: control.visible && control.indeterminate running: control.visible && control.indeterminate
PropertyAnimation { from: 0; to: 180; 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.animationDurarion/2; easing.type: Easing.OutSine } PropertyAnimation { from: 180; to: 0; duration: control.animationDuration/2; easing.type: Easing.OutSine }
} }
onStartAngleChanged: { onStartAngleChanged: {
requestPaint() requestPaint()

8
lib_source/qml/Qt6/RibbonBusyBar.qml
View File

@ -17,7 +17,7 @@ BusyIndicator {
property real indicatorWidth: 4 property real indicatorWidth: 4
property real indicatorHeight: 4 property real indicatorHeight: 4
property int indicatorNumber: 5 property int indicatorNumber: 5
property int animationDurarion: 2000 property int animationDuration: 2000
property bool reversed: false property bool reversed: false
QtObject{ QtObject{
@ -67,7 +67,7 @@ BusyIndicator {
property: "x" property: "x"
from: control.reversed ? barWidth + (index + 1) * indicatorWidth : -(index + 1) * indicatorWidth from: control.reversed ? barWidth + (index + 1) * indicatorWidth : -(index + 1) * indicatorWidth
to: control.reversed ? (index + 1) * indicatorWidth : barWidth - (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 easing.type: Easing.OutInCubic
} }
@ -77,7 +77,7 @@ BusyIndicator {
property: "x" property: "x"
from: control.reversed ? (index + 1) * indicatorWidth : barWidth - (index + 1) * indicatorWidth 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 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 easing.type: Easing.OutInCubic
} }
@ -86,7 +86,7 @@ BusyIndicator {
property: "opacity" property: "opacity"
from: 0.5 from: 0.5
to: 0 to: 0
duration: animationDurarion / 10 duration: animationDuration / 10
easing.type: Easing.OutExpo easing.type: Easing.OutExpo
} }
} }

14
lib_source/qml/Qt6/RibbonBusyRing.qml
View File

@ -16,10 +16,10 @@ BusyIndicator {
property real radiusWidth: 4 property real radiusWidth: 4
property int lineNumber: RibbonTheme.modernStyle ? 10 : 8 property int lineNumber: RibbonTheme.modernStyle ? 10 : 8
property real default_saturation: 0 property real default_saturation: 0
property int animationDurarion: RibbonTheme.modernStyle ? 4000 : 1000 property int animationDuration: RibbonTheme.modernStyle ? 4000 : 1000
property bool clockwise: true property bool clockwise: true
onAnimationDurarionChanged: { onAnimationDurationChanged: {
running = !running running = !running
Qt.callLater(()=>running = !running) // Fix Qt 5 animation duration doesn't change Qt.callLater(()=>running = !running) // Fix Qt 5 animation duration doesn't change
} }
@ -41,7 +41,7 @@ BusyIndicator {
from: clockwise ? lineNumber : 0 from: clockwise ? lineNumber : 0
to: clockwise ? 0 : lineNumber to: clockwise ? 0 : lineNumber
loops: Animation.Infinite loops: Animation.Infinite
duration: animationDurarion duration: animationDuration
} }
Repeater { Repeater {
@ -77,7 +77,7 @@ BusyIndicator {
property: "rotation" property: "rotation"
from: (clockwise ? 1 : -1) * 0 from: (clockwise ? 1 : -1) * 0
to: (clockwise ? 1 : -1) * (360 - (index - lineNumber / 4 + 0.5) * private_property.angle * 1.4) 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 easing.type: Easing.OutInQuad
} }
@ -87,19 +87,19 @@ BusyIndicator {
property: "rotation" property: "rotation"
from: (clockwise ? 1 : -1) * (360 - (index - lineNumber / 4 + 0.5) * private_property.angle * 1.4) from: (clockwise ? 1 : -1) * (360 - (index - lineNumber / 4 + 0.5) * private_property.angle * 1.4)
to: (clockwise ? 1 : -1) * 720 to: (clockwise ? 1 : -1) * 720
duration: animationDurarion / 2 duration: animationDuration / 2
easing.type: Easing.OutInQuad easing.type: Easing.OutInQuad
} }
SequentialAnimation{ SequentialAnimation{
PauseAnimation { PauseAnimation {
duration: animationDurarion / 2 - animationDurarion / 20 duration: animationDuration / 2 - animationDuration / 20
} }
PropertyAnimation { PropertyAnimation {
target: repeater.itemAt(index) target: repeater.itemAt(index)
property: "opacity" property: "opacity"
from: 0.5 from: 0.5
to: 0 to: 0
duration: animationDurarion / 20 duration: animationDuration / 20
easing.type: Easing.OutExpo easing.type: Easing.OutExpo
} }
} }

4
lib_source/qml/Qt6/RibbonProgressBar.qml
View File

@ -22,7 +22,7 @@ Item{
property int barHeight: 6 property int barHeight: 6
property bool showText: true property bool showText: true
property int textLabelMargin: textLabelPosition === RibbonProgressBar.LabelPosition.Top || textLabelPosition === RibbonProgressBar.LabelPosition.Bottom ? 0 : 5 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 indeterminateWidth: barWidth * 0.25
property int textLabelPosition: bar.mirrored ? RibbonProgressBar.LabelPosition.Left : RibbonProgressBar.LabelPosition.Right property int textLabelPosition: bar.mirrored ? RibbonProgressBar.LabelPosition.Left : RibbonProgressBar.LabelPosition.Right
property string text: qsTr("Loading") property string text: qsTr("Loading")
@ -86,7 +86,7 @@ Item{
from: -indeterminateWidth from: -indeterminateWidth
to:barWidth+indeterminateWidth to:barWidth+indeterminateWidth
loops: Animation.Infinite loops: Animation.Infinite
duration: animationDurarion duration: animationDuration
easing.type: Easing.OutInQuad easing.type: Easing.OutInQuad
} }
} }

10
lib_source/qml/Qt6/RibbonProgressRing.qml
View File

@ -5,7 +5,7 @@ RibbonProgressBar {
id: control id: control
barWidth: centerInTextLabel && showText ? Math.max(textLabel.contentWidth + ringWidth * 2 + textLabelMargin * 2, 50) : 50 barWidth: centerInTextLabel && showText ? Math.max(textLabel.contentWidth + ringWidth * 2 + textLabelMargin * 2, 50) : 50
barHeight: barWidth barHeight: barWidth
animationDurarion: 2000 animationDuration: 2000
property real ringWidth: 6 property real ringWidth: 6
property bool centerInTextLabel: false property bool centerInTextLabel: false
@ -49,14 +49,14 @@ RibbonProgressBar {
SequentialAnimation on startAngle { SequentialAnimation on startAngle {
loops: Animation.Infinite loops: Animation.Infinite
running: control.visible && control.indeterminate running: control.visible && control.indeterminate
PropertyAnimation { from: 0; to: 450; 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.animationDurarion/2; easing.type: Easing.OutSine } PropertyAnimation { from: 450; to: 1080; duration: control.animationDuration/2; easing.type: Easing.OutSine }
} }
SequentialAnimation on sweepAngle { SequentialAnimation on sweepAngle {
loops: Animation.Infinite loops: Animation.Infinite
running: control.visible && control.indeterminate running: control.visible && control.indeterminate
PropertyAnimation { from: 0; to: 180; 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.animationDurarion/2; easing.type: Easing.OutSine } PropertyAnimation { from: 180; to: 0; duration: control.animationDuration/2; easing.type: Easing.OutSine }
} }
onStartAngleChanged: { onStartAngleChanged: {
requestPaint() requestPaint()