Index: sources/gui/qml/pages/treatment/TreatmentHome.qml =================================================================== diff -u -r68757118f0b5dc5d831f8330ff3fec40dc461aa9 -rdff9d50ebfa80ec99313586e1d48662b72940d24 --- sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision 68757118f0b5dc5d831f8330ff3fec40dc461aa9) +++ sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision dff9d50ebfa80ec99313586e1d48662b72940d24) @@ -42,9 +42,9 @@ signal logVitalTime() readonly property int cellWidth : _root.width / 7 - 10 // = screen width / # columns - readonly property int cellHeight: _root.height / 2 - Variables.notificationHeight // = screen height / # rows - header bar + readonly property int cellHeight: _root.height / 2 - Variables.notificationHeight - Variables.defaultMargin // = screen height / # rows - header bar - onLogVitalTime: _vitalsTreatmentArea.updateVitalTime() + onLogVitalTime: _treatmentVitals.updateVitalTime() AutoHideInfo { id: _lockDialog objectName : "lockDialog" @@ -64,7 +64,7 @@ width : height radius : height color: "transparent" - border.color: treatmentFlows.editEnabled ? "#6697D2" : + border.color: _treatmentFlows.editEnabled ? "#6697D2" : "#A47E38" border.width: 3 @@ -75,7 +75,7 @@ height : 80 width : 80 fillMode: Image.PreserveAspectFit - source : treatmentFlows.editEnabled ? "qrc:/images/iUnlock" : + source : _treatmentFlows.editEnabled ? "qrc:/images/iUnlock" : "qrc:/images/iLock" } @@ -84,7 +84,7 @@ anchors.centerIn: parent color: "transparent" - border.color: treatmentFlows.editEnabled ? "#8FC1FE" : + border.color: _treatmentFlows.editEnabled ? "#8FC1FE" : "#CDAF78" border.width: 2 height: parent.height - 20 @@ -118,14 +118,14 @@ onClicked: sectionTimeClicked() } - TreatmentSaline { id: treatmentSaline + TreatmentSaline { id: _treatmentSaline objectName: "treatmentSaline" width: cellWidth + Variables.defaultMargin height: cellHeight } - TreatmentVitals { id: treatmentVitals + TreatmentVitals { id: _treatmentVitals objectName: "treatmentVitals" width: cellWidth + Variables.defaultMargin @@ -151,7 +151,7 @@ } } - TreatmentPressures { id: treatmentPressures + TreatmentPressures { id: _treatmentPressures objectName: "treatmentPressures" width: (cellWidth * 3) - (Variables.defaultMargin * 2) // without auto layouts needs to fine tune @@ -166,15 +166,15 @@ spacing: Variables.defaultMargin height: cellHeight - TreatmentUltrafiltration { id: treatmentUltrafiltration; + TreatmentUltrafiltration { id: _treatmentUltrafiltration; objectName: "treatmentUltrafiltration" width: cellWidth * 3 height: cellHeight onEditClicked : sectionUltrafiltrationClicked() } - TreatmentFlows { id: treatmentFlows + TreatmentFlows { id: _treatmentFlows objectName: "treatmentFlows" width: cellWidth * 4