Index: sources/gui/qml/pages/treatment/TreatmentHome.qml =================================================================== diff -u -rdb6925e589ca85f2272af31d5f90f41452b342a7 -r68757118f0b5dc5d831f8330ff3fec40dc461aa9 --- sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision db6925e589ca85f2272af31d5f90f41452b342a7) +++ sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision 68757118f0b5dc5d831f8330ff3fec40dc461aa9) @@ -64,7 +64,7 @@ width : height radius : height color: "transparent" - border.color: _treatmentParametersMonitor.editEnabled ? "#6697D2" : + border.color: treatmentFlows.editEnabled ? "#6697D2" : "#A47E38" border.width: 3 @@ -75,17 +75,17 @@ height : 80 width : 80 fillMode: Image.PreserveAspectFit - source : _treatmentParametersMonitor.editEnabled ? "qrc:/images/iUnlock" : - "qrc:/images/iLock" + source : treatmentFlows.editEnabled ? "qrc:/images/iUnlock" : + "qrc:/images/iLock" } Rectangle { id: _innerCircle objectName: "lockDialogInnerCircle" anchors.centerIn: parent color: "transparent" - border.color: _treatmentParametersMonitor.editEnabled ? "#8FC1FE" : - "#CDAF78" + border.color: treatmentFlows.editEnabled ? "#8FC1FE" : + "#CDAF78" border.width: 2 height: parent.height - 20 width: height @@ -111,18 +111,11 @@ spacing: Variables.defaultMargin height: cellHeight - Rectangle { // TIMER GOES HERE - color: "cyan" + TreatmentTime { id: _treatmentTime + objectName: "treatmentTime" width: (cellWidth * 2) - (Variables.defaultMargin * 2) height: cellHeight - - TreatmentTime { id: _treatmentTime - objectName: "treatmentTime" - - onClicked: { - sectionTimeClicked() - } - } + onClicked: sectionTimeClicked() } TreatmentSaline { id: treatmentSaline @@ -199,13 +192,6 @@ } } -// // ---------- Center -// TreatmentTime { id: _treatmentTime -// onClicked: { -// sectionTimeClicked() -// } -// } - onVisibleChanged: { if (visible) { _mainMenu.hidden = true