Index: sources/gui/qml/components/SliderCreateTreatment.qml =================================================================== diff -u -rd6869b2442823e77476ace6df006d0d000ec9b7a -rc71deaab48699cffdf9db816dfac2778d79c2238 --- sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision d6869b2442823e77476ace6df006d0d000ec9b7a) +++ sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision c71deaab48699cffdf9db816dfac2778d79c2238) @@ -24,9 +24,17 @@ id: _root property alias text: _text.text - property alias units: _slider.unit + property var units: "" property alias min: _slider.minimum property alias max: _slider.maximum + property alias value: _slider.value + property alias diameter: _slider.diameter + property alias selectedValue: _selected_value + property alias step: _slider.step + property alias stepSnap: _slider.stepSnap + property alias sliderWidth: _slider.width + property alias isActive: _slider.isActive + signal sliderChanged() height: Variables.progressbarRectHeight width: Variables.progressbarRectWidth @@ -47,24 +55,40 @@ id: _selected_value anchors.top: parent.top anchors.right: parent.right - text: "" + text: "-- " + _root.units font.pixelSize: Fonts.fontPixelFluidUnit - color: Colors.textMain; + color: Colors.textDisableButton; } Slider { id : _slider anchors.horizontalCenter: parent.horizontalCenter; anchors.bottom: parent.bottom; width : Variables.progressbarSmallWidth + diameter: Variables.sliderCircleDiameter + color : Colors.createTreatmentInactive + knobColor: Colors.createTreatmentInactive height : 5 minimum : 100 maximum : 500 unit : qsTr("") step : Variables.bloodFlowResolution ticks : true onValueChanged: { - _selected_value.text = value + unit; + _selected_value.text = value + _root.units + sliderChanged() } + onActiveChanged: { + if (isActive) { + _selected_value.color = Colors.textMain + } else { + _selected_value.color = Colors.textDisableButton + } + } + + onProgressRectClicked: setActive(true) + onProgressRectDragged: setActive(true) + onDragged: setActive(true) + onClicked: setActive(true) } }