Index: sources/gui/qml/pages/pretreatment/consumables/PreTreatmentConsumablesSelfTest.qml =================================================================== diff -u -rc0c63c4b149dafea2b02e4cd31f223e392ff7818 -r22bd5aba8d60c1cfda0e0b3bdcb0f54cdc27dafb --- sources/gui/qml/pages/pretreatment/consumables/PreTreatmentConsumablesSelfTest.qml (.../PreTreatmentConsumablesSelfTest.qml) (revision c0c63c4b149dafea2b02e4cd31f223e392ff7818) +++ sources/gui/qml/pages/pretreatment/consumables/PreTreatmentConsumablesSelfTest.qml (.../PreTreatmentConsumablesSelfTest.qml) (revision 22bd5aba8d60c1cfda0e0b3bdcb0f54cdc27dafb) @@ -29,6 +29,8 @@ PreTreatmentBase { id: _root objectName: "_PreTreatmentPrime" + + // TODO : this model (or in general this kind of state models) has to be moved to the C++. function resetModel() { if ( visible ) { for (let i = 0; i < vModel.count; i++) { @@ -38,7 +40,6 @@ } } } - ListModel { id: vModel ListElement { stepName : qsTr("Water Quality Check") @@ -57,12 +58,13 @@ } } + // TODO : this view should be a general Component which is setup by the model from C++ (currently the one above) ListView { id: _listView property int delegateWidth : 350 property int delegateHeight : 60 model: vModel - anchors.centerIn: _preTreatmentConsumablesSelfTest + anchors.centerIn: _root width : _listView.delegateWidth height : _listView.delegateHeight * model.count delegate: @@ -75,7 +77,7 @@ text : stepName anchors.fill: parent color : Colors.textMain - font.pixelSize: 20 + font.pixelSize: Fonts.fontPixelStateListText } Line { length : _delegate.width + 2 * linePad @@ -96,6 +98,18 @@ } } + Text { id: _completeText + visible: vPreTreatmentStates.selfTestConsumables_complete + anchors { + bottom: _root.bottom + bottomMargin: Variables.notificationHeight + 100 // notificationHeight is minimum bottom margin + horizontalCenter: _root.horizontalCenter + } + text: qsTr("Self Test Complete!") + color: Colors.textMain + font.pixelSize: Fonts.fontPixelNotification + } + Connections { target: vPreTreatmentStates onSelfTestConsumables_waterQualityEntered : { if ( vselfTestConsumables_waterQuality ) vModel.get(0).stepStart = true