Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml =================================================================== diff -u -r4265da9e1ca8fef9db38163e4aa91a1a11eb0469 -r41a604f3fe3a5bb40bddd8c06e5fe88df85e3997 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision 4265da9e1ca8fef9db38163e4aa91a1a11eb0469) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision 41a604f3fe3a5bb40bddd8c06e5fe88df85e3997) @@ -23,7 +23,7 @@ TreatmentAdjustmentBase { id: _root contentItem.objectName: "TreatmentAdjustmentVitals" - titleText : qsTr("VITALS") + titleText : qsTr("Vitals") titlePixelSize : Fonts.fontPixelSection height : Variables.numPadHeight width : 1000 @@ -64,7 +64,7 @@ vTreatmentVitals.doTimerStop() } - onClosed: vTreatmentVitals.doTimerStart() + onClosed: if ( vTreatmentVitals.enableDialog ) { vTreatmentVitals.doTimerStart() } onCloseClicked: { numPad.hide() @@ -104,7 +104,7 @@ } } - TouchRect { id : _requestButton + TouchRect { id : _measureVitalsButton width : _root.buttonWidth height : _root.buttonHeight isDefault : true @@ -134,7 +134,7 @@ // confirm only if triggered from interval timer and popup is not open if ( ! _root.visible) { _root.confirm() - vTreatmentVitals.doTimerStart() + if ( vTreatmentVitals.enableDialog ) { vTreatmentVitals.doTimerStart() } } } else { // on rejected prompt user to enter vitals manually