vlc | branch: master | Prince Gupta <guptaprince8...@gmail.com> | Tue Dec 29 22:31:39 2020 +0530| [a0b135cb00ac048bbaef9d1fa251d24ca550694e] | committer: Pierre Lamot
qml: update ScanProgressBar Signed-off-by: Pierre Lamot <pie...@videolabs.io> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a0b135cb00ac048bbaef9d1fa251d24ca550694e --- modules/gui/qt/widgets/qml/ScanProgressBar.qml | 97 ++++++++++++++++++-------- 1 file changed, 68 insertions(+), 29 deletions(-) diff --git a/modules/gui/qt/widgets/qml/ScanProgressBar.qml b/modules/gui/qt/widgets/qml/ScanProgressBar.qml index cc971f51e1..590e2e96bc 100644 --- a/modules/gui/qt/widgets/qml/ScanProgressBar.qml +++ b/modules/gui/qt/widgets/qml/ScanProgressBar.qml @@ -22,64 +22,103 @@ import QtQuick.Templates 2.4 as T import "qrc:///style/" T.ProgressBar { - visible: !medialib.idle - id: control + from: 0 to: 100 - height: progressText_id.height value: medialib.parsingProgress indeterminate: medialib.discoveryPending + visible: !medialib.idle + height: contentItem.implicitHeight + width: implicitWidth - contentItem: Item { - implicitHeight: 24 - implicitWidth: 120 + contentItem: Column { + spacing: VLCStyle.margin_normal + width: control.width + height: implicitHeight + visible: control.visible Rectangle { - width: control.indeterminate ? parent.width : (control.visualPosition * parent.width) - height: parent.height + id: bg + + width: parent.width + height: VLCStyle.heightBar_xsmall color: VLCStyle.colors.bgAlt + function fromRGB(r, g, b, a) { + return Qt.rgba( r / 255, g / 255, b / 255, a / 255) + } + Rectangle { - width: control.width * 0.2 - height: parent.height - visible: control.indeterminate - color: VLCStyle.colors.buffer + id: progressBar + + width: parent.height + height: parent.width * control.visualPosition + rotation: -90 + y: width + transformOrigin: Item.TopLeft + visible: !control.indeterminate + gradient: Gradient { + GradientStop { position: 0.00; color: bg.fromRGB(248, 154, 6, 200) } + GradientStop { position: 0.48; color: bg.fromRGB(226, 90, 1, 255) } + GradientStop { position: 0.89; color: bg.fromRGB(248, 124, 6, 255) } + GradientStop { position: 1.00; color: bg.fromRGB(255, 136, 0, 100) } + } + } - property double pos: 0 - x: (pos / 1000) * (parent.width * 0.8) + Rectangle { + id: indeterminateBar + + property real pos: 0 + + anchors.centerIn: parent + anchors.horizontalCenterOffset: ((bg.width - indeterminateBar.height) / 2) * pos + width: parent.height + height: parent.width * .24 + rotation: 90 + visible: control.indeterminate + gradient: Gradient { + GradientStop { position: 0.00; color: bg.fromRGB(248, 154, 6, 0) } + GradientStop { position: 0.09; color: bg.fromRGB(253, 136, 0, 0) } + GradientStop { position: 0.48; color: bg.fromRGB(226, 90, 1, 255) } + GradientStop { position: 0.89; color: bg.fromRGB(248, 124, 6, 255) } + GradientStop { position: 1.00; color: bg.fromRGB(255, 136, 0, 0) } + } SequentialAnimation on pos { id: loadingAnim - running: control.indeterminate + loops: Animation.Infinite - PropertyAnimation { - from: 0.0 - to: 1000 + + NumberAnimation { + from: - 1 + to: 1 duration: 2000 - easing.type: "OutBounce" + easing.type: Easing.OutBounce } + PauseAnimation { duration: 500 } - PropertyAnimation { - from: 1000 - to: 0.0 + + NumberAnimation { + to: - 1 + from: 1 duration: 2000 - easing.type: "OutBounce" + easing.type: Easing.OutBounce } + PauseAnimation { duration: 500 } } } } - } - background: Rectangle { - implicitHeight: 24 - implicitWidth: 120 - radius: 2 - color: VLCStyle.colors.bg + SubtitleLabel { + text: medialib.discoveryPending ? medialib.discoveryEntryPoint : (medialib.parsingProgress + "%") + font.weight: Font.Normal + width: parent.width + } } } _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits