Index: sources/gui/qml/pages/treatment/TreatmentHome.qml =================================================================== diff -u -r7805806e4370be4d9207872e916f478875bd4ba6 -rdb6925e589ca85f2272af31d5f90f41452b342a7 --- sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision 7805806e4370be4d9207872e916f478875bd4ba6) +++ sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision db6925e589ca85f2272af31d5f90f41452b342a7) @@ -19,9 +19,10 @@ // Project // Qml imports -import "../../globals" -import "../../components" -import "sections" +import "qrc:/globals" +import "qrc:/components" +import "qrc:/dialogs" +import "qrc:/pages/treatment/sections" /*! * \brief ManagerHome is the screen @@ -46,11 +47,14 @@ onLogVitalTime: _vitalsTreatmentArea.updateVitalTime() AutoHideInfo { id: _lockDialog + objectName : "lockDialog" + width: 600 height: 600 backgroundColor: "#091E31" Rectangle { id: _mainCircle + objectName: "lockDialogMainCircle" anchors { top: parent.top topMargin: Variables.defaultMargin * 3 @@ -65,6 +69,8 @@ border.width: 3 Image { id : _iconImage + objectName: "lockDialogIcon" + anchors.centerIn : parent height : 80 width : 80 @@ -74,6 +80,8 @@ } Rectangle { id: _innerCircle + objectName: "lockDialogInnerCircle" + anchors.centerIn: parent color: "transparent" border.color: _treatmentParametersMonitor.editEnabled ? "#8FC1FE" : @@ -87,6 +95,8 @@ } Column { id: _column + objectName: "column" + spacing: Variables.defaultMargin anchors { @@ -96,6 +106,8 @@ } Row { id: _topRow + objectName: "topRow" + spacing: Variables.defaultMargin height: cellHeight @@ -105,24 +117,32 @@ height: cellHeight TreatmentTime { id: _treatmentTime + objectName: "treatmentTime" + onClicked: { sectionTimeClicked() } } } - TreatmentSaline { id: _salineTreatmentArea + TreatmentSaline { id: treatmentSaline + objectName: "treatmentSaline" + width: cellWidth + Variables.defaultMargin height: cellHeight } - TreatmentVitals { id: _vitalsTreatmentArea + TreatmentVitals { id: treatmentVitals + objectName: "treatmentVitals" + width: cellWidth + Variables.defaultMargin height: cellHeight onEditClicked: sectionVitalsClicked() // TODO: Keep???? Text { id: _vitalCountdown + objectName: "vitalCountdown" + color : "gray" anchors { top : parent.top @@ -138,24 +158,32 @@ } } - TreatmentPressures { id: _pressureTreatmentArea + 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" + spacing: Variables.defaultMargin height: cellHeight - TreatmentUltrafiltration { id: _ultrafiltrationTreatmentArea; + TreatmentUltrafiltration { id: treatmentUltrafiltration; + objectName: "treatmentUltrafiltration" + width: cellWidth * 3 height: cellHeight onEditClicked : sectionUltrafiltrationClicked() } - TreatmentFlows { id: _treatmentParametersMonitor + TreatmentFlows { id: treatmentFlows + objectName: "treatmentFlows" + width: cellWidth * 4 height: cellHeight