Index: sources/gui/qml/components/ModalDialog.qml =================================================================== diff -u -r41a604f3fe3a5bb40bddd8c06e5fe88df85e3997 -r5f4b3aacfede4aa545a44c7f3b33ca649b81aac7 --- sources/gui/qml/components/ModalDialog.qml (.../ModalDialog.qml) (revision 41a604f3fe3a5bb40bddd8c06e5fe88df85e3997) +++ sources/gui/qml/components/ModalDialog.qml (.../ModalDialog.qml) (revision 5f4b3aacfede4aa545a44c7f3b33ca649b81aac7) @@ -101,5 +101,5 @@ } } - NotificationBarSmall { id: _notification } + NotificationBarSmall { id: _notification ; height: 60} } Index: sources/gui/qml/compounds/ValueAdjuster.qml =================================================================== diff -u -r477c26a4e1dcbdf7ad0f29ae7a1df4738d4dcce2 -r5f4b3aacfede4aa545a44c7f3b33ca649b81aac7 --- sources/gui/qml/compounds/ValueAdjuster.qml (.../ValueAdjuster.qml) (revision 477c26a4e1dcbdf7ad0f29ae7a1df4738d4dcce2) +++ sources/gui/qml/compounds/ValueAdjuster.qml (.../ValueAdjuster.qml) (revision 5f4b3aacfede4aa545a44c7f3b33ca649b81aac7) @@ -77,7 +77,7 @@ Text { id: _text anchors.centerIn: parent text : _root.isActive ? _root.canOff ? _root.value === 0 ? - "OFF" : + qsTr("OFF") : _root.value.toFixed( _root.decimal ) : _root.value.toFixed( _root.decimal ) : Variables.emptyEntry color : Colors.offWhite Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r41a604f3fe3a5bb40bddd8c06e5fe88df85e3997 -r5f4b3aacfede4aa545a44c7f3b33ca649b81aac7 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 41a604f3fe3a5bb40bddd8c06e5fe88df85e3997) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 5f4b3aacfede4aa545a44c7f3b33ca649b81aac7) @@ -215,6 +215,8 @@ readonly property int adjustmentDialogHeight : applicationHeight * 0.7 readonly property int adjustmentHeaderHeight : 120 readonly property int adjustmentButtonMargin : 30 + readonly property int adjustmentButtonHeight : 60 + readonly property int adjustmentButtonWidth : 200 // ---------- < PRS > Related Section ---------- // blood flow rate Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml =================================================================== diff -u -r41a604f3fe3a5bb40bddd8c06e5fe88df85e3997 -r5f4b3aacfede4aa545a44c7f3b33ca649b81aac7 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision 41a604f3fe3a5bb40bddd8c06e5fe88df85e3997) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision 5f4b3aacfede4aa545a44c7f3b33ca649b81aac7) @@ -32,9 +32,6 @@ notification.textfontSize: 20 notification.visible: vTreatmentVitals.lastRead || vTreatmentAdjustmentVitals.adjustment_ReasonText - readonly property int buttonHeight : 65 - readonly property int buttonWidth : 200 - readonly property string intervalTextString : qsTr("Interval:" ) + " " + (vTreatmentVitals.interval ? (vTreatmentVitals.interval + qsTr("min")) : qsTr("OFF")) + " , " @@ -51,6 +48,8 @@ } function confirm() { + numPad.hide() + _root.close() vTreatmentVitals.doConfirm( _bphrEntry.systolic , _bphrEntry.diastolic , @@ -83,31 +82,65 @@ anchors { bottom : _root.contentItem.bottom - bottomMargin : notification.visible ? Variables.defaultMargin * 4.5 : Variables.defaultMargin * 3 + bottomMargin : Variables.defaultMargin * 6 horizontalCenter: _root.contentItem.horizontalCenter } ConfirmButton { id : _confirmButton - width : _root.buttonWidth - height : _root.buttonHeight + width : Variables.adjustmentButtonWidth + height : Variables.adjustmentButtonHeight enabled : _bphrEntry.isValid anchors { - top : undefined - right : undefined - margins : 0 + top : undefined + right : undefined + horizontalCenter: parent.horizontalCenter + margins : 0 + } - onClicked : { - numPad.hide() - _root.close() - _root.confirm() + onClicked : _root.confirm() + } + + Item { id: _separator + width : Variables.adjustmentLabelUnitContainerWidth + height : 40 + anchors.horizontalCenter: parent.horizontalCenter + + Rectangle { id: _leftLine + anchors{ + verticalCenter : parent.verticalCenter + left : parent.left + right : _text.left + } + height : 1 + color : Colors.panelBorderColor } + + Text { id: _text + anchors.centerIn: parent + text : qsTr("Or") + width : 100 + horizontalAlignment : Text.AlignHCenter + color : Colors.offWhite + font.pixelSize : Fonts.fontPixelValueControl + } + + Rectangle { id: _rightLine + anchors{ + verticalCenter : parent.verticalCenter + left : _text.right + right : parent.right + } + height : 1 + color : Colors.panelBorderColor + } } TouchRect { id : _measureVitalsButton - width : _root.buttonWidth - height : _root.buttonHeight - isDefault : true + width : Variables.adjustmentButtonWidth + height : Variables.adjustmentButtonHeight + isDefault : true + anchors.horizontalCenter: parent.horizontalCenter text { text : qsTr("MEASURE VITALS") @@ -132,10 +165,8 @@ _root.update ( vTreatmentVitals.systolic__rt, vTreatmentVitals.diastolic_rt, vTreatmentVitals.heartRate_rt ) // confirm only if triggered from interval timer and popup is not open - if ( ! _root.visible) { - _root.confirm() - if ( vTreatmentVitals.enableDialog ) { vTreatmentVitals.doTimerStart() } - } + _root.confirm() + if ( vTreatmentVitals.enableDialog ) { vTreatmentVitals.doTimerStart() } } else { // on rejected prompt user to enter vitals manually if ( vTreatmentVitals.enableDialog ) { _root.open () } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml =================================================================== diff -u -r41a604f3fe3a5bb40bddd8c06e5fe88df85e3997 -r5f4b3aacfede4aa545a44c7f3b33ca649b81aac7 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml (.../TreatmentAdjustmentVitalsInterval.qml) (revision 41a604f3fe3a5bb40bddd8c06e5fe88df85e3997) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml (.../TreatmentAdjustmentVitalsInterval.qml) (revision 5f4b3aacfede4aa545a44c7f3b33ca649b81aac7) @@ -29,9 +29,6 @@ height : 500 width : 1000 - readonly property int buttonHeight : 65 // TODO:: SYNC BUTTON DIMENSIONS - readonly property int buttonWidth : 200 - function confirm() { vTreatmentCreate.bloodPressureMeasureInterval = _bpMeasurementIntervalControl.value _root.close() @@ -76,8 +73,8 @@ horizontalCenter: _root.contentItem.horizontalCenter } - width : _root.buttonWidth - height : _root.buttonHeight + width : Variables.adjustmentButtonWidth + height : Variables.adjustmentButtonHeight enabled : _bpMeasurementIntervalControl.isActive anchors { Index: sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp =================================================================== diff -u -r41a604f3fe3a5bb40bddd8c06e5fe88df85e3997 -r5f4b3aacfede4aa545a44c7f3b33ca649b81aac7 --- sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp (.../VCommonAdjustmentVitals.cpp) (revision 41a604f3fe3a5bb40bddd8c06e5fe88df85e3997) +++ sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp (.../VCommonAdjustmentVitals.cpp) (revision 5f4b3aacfede4aa545a44c7f3b33ca649b81aac7) @@ -103,6 +103,7 @@ emit systolicChanged ( 0 ); emit diastolicChanged ( 0 ); emit heartRateChanged ( 0 ); + emit totalCountChanged ( 0 ); } /*!