Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml =================================================================== diff -u -rb12853c86ef9e517667516dc3e47bca07349cedf -rbea36be2766046e63c4e82539a630b5cee7ce1c6 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml (.../TreatmentAdjustmentVitalsInterval.qml) (revision b12853c86ef9e517667516dc3e47bca07349cedf) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml (.../TreatmentAdjustmentVitalsInterval.qml) (revision bea36be2766046e63c4e82539a630b5cee7ce1c6) @@ -26,11 +26,11 @@ titleText : qsTr("Vitals Interval") titlePixelSize : Fonts.fontPixelSection - height : 500 - width : 1000 + height : Variables.smallDialogHeight + width : Variables.smallDialogWidth function confirm() { - vTreatmentCreate.bloodPressureMeasureInterval = vTreatmentRanges.bloodPressureMeasureInterval[_bpMeasurementIntervalControl.currentIndex] + vTreatmentCreate.bloodPressureMeasureInterval = vTreatmentRanges.bloodPressureMeasureInterval[_bpMeasurementIntervalControl.currentIndex] vTreatmentVitals.doTimerStart() _root.close() } @@ -39,8 +39,8 @@ LabelUnitContainer { id: _bpMeasurementInterval anchors { - top : _root.contentItem.top - topMargin : Variables.defaultMargin * 2 + verticalCenter : _root.contentItem.verticalCenter + verticalCenterOffset: Variables.defaultMargin * -3 // better align label with dialog height horizontalCenter: _root.contentItem.horizontalCenter } @@ -50,22 +50,16 @@ width : Variables.adjustmentLabelUnitContainerWidth height : Variables.adjustmentLabelUnitContainerHeight - contentItem : BaseComboBox { id: _bpMeasurementIntervalControl - anchors.rightMargin : Variables.defaultMargin * 2 - anchors.leftMargin : anchors.rightMargin - anchors.topMargin : Variables.defaultMargin / 2 - anchors.bottomMargin: anchors.topMargin + contentItem : ValueAdjusterCustom { id: _bpMeasurementIntervalControl isActive : vTreatmentCreate.bloodPressureMeasureIntervalSet - currentIndex : vTreatmentRanges.bloodPressureMeasureInterval.indexOf(vTreatmentCreate.bloodPressureMeasureInterval.toString()) + value : vTreatmentRanges.bloodPressureMeasureInterval.indexOf(vTreatmentCreate.bloodPressureMeasureInterval.toString()) model : vTreatmentRanges.bloodPressureMeasureInterval + defaultValue : vTreatmentRanges.vitalsInterval canOff : true - centerHorizontally : true - onClear : { - vTreatmentCreate.bloodPressureMeasureIntervalSet = false - } + onDidActiveChange: function(vState) { vTreatmentCreate.bloodPressureMeasureIntervalSet = vState } - onActivated : { + onDidChange : function(vValue) { if ( ! _bpMeasurementInterval.valid ) { vTreatmentCreate.bloodPressureMeasureIntervalRejectReason = Variables.noRejectReason }