Index: sources/gui/qml/components/ProgressBar.qml =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8 --- sources/gui/qml/components/ProgressBar.qml (.../ProgressBar.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/gui/qml/components/ProgressBar.qml (.../ProgressBar.qml) (revision 77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8) @@ -28,12 +28,15 @@ property alias progress : _progressRect property int progressWidth : _progressRect.width property alias value : _progressRect.value + property alias progressRadius : _progressRect.radius property alias color : _progressRect.color property alias bgColor : _root.color property alias marker : _marker property alias markerHeight : _marker.height + property string unitText : "" + property bool showMarker : true property alias decimal : _root.decimal property alias minimum : _root.minimum @@ -47,7 +50,7 @@ maximum : 0 minText.visible : true - maxText.visible : true + maxText.visible : true // Since this Component is the base Component of the ProgressBarEx // we need to use the z order @@ -60,7 +63,6 @@ maximum : _root.maximum value : _root.value - color : Colors.highlightProgressBar onClicked : progressClicked() } @@ -72,8 +74,10 @@ height : Variables.rangeMarkerHeight hasHandle : true + unitText : _root.unitText decimal : _root.decimal value : _root.value + visible : _root.showMarker } }