Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml =================================================================== diff -u -rb07595ece768d4093d78ca1ef068a993ff4f70a3 -r596aa427447d3757005ae759c64c52ebb26b9503 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision b07595ece768d4093d78ca1ef068a993ff4f70a3) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision 596aa427447d3757005ae759c64c52ebb26b9503) @@ -24,13 +24,17 @@ TreatmentAdjustmentBase { id: _root contentItem.objectName: "TreatmentAdjustmentVitals" titleText : qsTr("VITALS") + titlePixelSize : Fonts.fontPixelSection height : Variables.numPadHeight - width : 850 + width : 1000 x : numPad.isOpened ? Math.round((Variables.applicationWidth - width) / 2) - 200 : Math.round((Variables.applicationWidth - width) / 2) 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")) + " , " @@ -67,32 +71,25 @@ vTreatmentVitals.doSkip() } - BPHREntry { id: _bphrEntry } + BPHREntry { id: _bphrEntry + anchors { + fill: parent + topMargin: Variables.defaultMargin * 2 + } + } - Row { id: _buttonRow - spacing: Variables.defaultMargin * 4 + Column { id: _buttonRow + spacing: Variables.defaultMargin anchors { bottom : _root.contentItem.bottom - bottomMargin : notification.visible ? Variables.defaultMargin * 4.5 : Variables.defaultMargin * 2 + bottomMargin : notification.visible ? Variables.defaultMargin * 4.5 : Variables.defaultMargin * 3 horizontalCenter: _root.contentItem.horizontalCenter } - TouchRect { id : _requestButton - width : Variables.confirmButtonWidth - height : Variables.contentHeight - isDefault : true - - text { - text : qsTr("REQUEST") - font.bold : true - font.pixelSize : Fonts.fontPixelConfirm - } - - onClicked: vTreatmentAdjustmentVitals.doRequest() - } - ConfirmButton { id : _confirmButton + width : _root.buttonWidth + height : _root.buttonHeight enabled : _bphrEntry.isValid anchors { @@ -107,6 +104,20 @@ } } + TouchRect { id : _requestButton + width : _root.buttonWidth + height : _root.buttonHeight + isDefault : true + + text { + text : qsTr("MEASURE VITALS") + font.bold : true + font.pixelSize : Fonts.fontPixelConfirm + } + + onClicked: vTreatmentAdjustmentVitals.doRequest() + } + Behavior on anchors.bottomMargin { NumberAnimation { duration: 300} } }