Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml =================================================================== diff -u -rfdddcd8b25b5acc99f8c044c998af0e95752063c -r7a1dcc43829f3e6435064abf93b55ffb012a8697 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision fdddcd8b25b5acc99f8c044c998af0e95752063c) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision 7a1dcc43829f3e6435064abf93b55ffb012a8697) @@ -44,14 +44,7 @@ property alias numPad : _numPad - readonly property string intervalTextString : qsTr("Interval:" ) - + " " + (vTreatmentVitals.interval ? (vTreatmentVitals.interval + qsTr("min")) : qsTr("OFF")) - + " , " - + qsTr("Last Read:") - + " " + vTreatmentVitals.lastRead readonly property string rejectionTextString : qsTr("Rejected Reason: %1").arg(vTreatmentAdjustmentVitals.adjustment_ReasonText) - readonly property string notificationTextString : vTreatmentAdjustmentVitals.adjustment_ReasonText ? rejectionTextString : - intervalTextString function update(vSystolic, vDiastolic ,vHeartRate) { _bphrEntry.systolic = vSystolic ? vSystolic : "" @@ -81,7 +74,7 @@ onOpened: { _bphrEntry.setInitialFocus() - notificationText = notificationTextString + notificationText = rejectionTextString } onCloseClicked: { @@ -90,18 +83,15 @@ } BPHREntry { id: _bphrEntry - anchors { - fill: parent - topMargin: Variables.defaultMargin * 2 - } + anchors.fill: parent } Column { id: _buttonRow - spacing: Variables.defaultMargin * 1.5 + spacing: Variables.defaultMargin anchors { bottom : _root.contentItem.bottom - bottomMargin : Variables.defaultMargin * 5 + bottomMargin : Variables.defaultMargin * 4 horizontalCenter: _root.contentItem.horizontalCenter } @@ -213,7 +203,7 @@ _bphrEntry.diastolic = "" _bphrEntry.heartRate = "" } - notificationText = notificationTextString + notificationText = rejectionTextString } // FW no response timeout