Index: sources/gui/qml/pages/treatment/TreatmentHome.qml =================================================================== diff -u -r9bd436782039b50ac45eb38f561a36706517271b -r56b0b13aa9f9e7ae201bce1843015fe5b4b43d2c --- sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision 9bd436782039b50ac45eb38f561a36706517271b) +++ sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision 56b0b13aa9f9e7ae201bce1843015fe5b4b43d2c) @@ -61,59 +61,55 @@ height: cellHeight TreatmentTime { id: _treatmentTime - objectName: "treatmentTime" - width: (cellWidth * 2) - (Variables.defaultMargin * 2) - height: cellHeight - onClicked: sectionTimeClicked() + objectName : "treatmentTime" + width : (cellWidth * 2) - (Variables.defaultMargin * 2) + height : cellHeight + onClicked : sectionTimeClicked() } TreatmentSaline { id: _treatmentSaline - objectName: "treatmentSaline" - - width: cellWidth + Variables.defaultMargin - height: cellHeight + objectName : "treatmentSaline" + width : cellWidth + Variables.defaultMargin + height : cellHeight } TreatmentVitals { id: _treatmentVitals - objectName: "treatmentVitals" - - width: cellWidth + Variables.defaultMargin - height: cellHeight - onEditClicked: sectionVitalsClicked() + objectName : "treatmentVitals" + width : cellWidth + Variables.defaultMargin + height : cellHeight + onEditClicked : sectionVitalsClicked() } - TreatmentPressures { id: _treatmentPressures - objectName: "treatmentPressures" - - width: (cellWidth * 3) - (Variables.defaultMargin * 2) // without auto layouts needs to fine tune - height: cellHeight - onEditClicked: sectionPressuresClicked() + TreatmentPressures { id: _treatmentPressures + objectName : "treatmentPressures" + width : (cellWidth * 3) - (Variables.defaultMargin * 2) // without auto layouts needs to fine tune + height : cellHeight + onEditClicked : sectionPressuresClicked() } } Row { id: _bottomRow - objectName: "bottomRow" + objectName : "bottomRow" + spacing : Variables.defaultMargin + height : cellHeight - spacing: Variables.defaultMargin - height: cellHeight + TreatmentUltrafiltration { id: _treatmentUltrafiltration; + objectName : "treatmentUltrafiltration" + width : cellWidth * 3 + height : cellHeight - TreatmentUltrafiltration { id: _treatmentUltrafiltration; - objectName: "treatmentUltrafiltration" - - width: cellWidth * 3 - height: cellHeight onEditClicked : sectionUltrafiltrationClicked() } TreatmentFlows { id: _treatmentFlows - objectName: "treatmentFlows" - - width: cellWidth * 4 - height: cellHeight - + objectName : "treatmentFlows" + width : cellWidth * 4 + height : cellHeight + header.setEditActive: ! isTreatmentEnd // LEAHI-PRS-376 + editEnabled : ! _lockDialog.isLocked onEditClicked : sectionFlowClicked() onLockClicked : { - _lockDialog.isLocked = editEnabled + _lockDialog.isLocked = editEnabled _lockDialog.showDialog ( editEnabled ? qsTr("Treatment Parameters Unlocked") : qsTr("Treatment Parameters Locked"),