Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentAdditional.qml =================================================================== diff -u -r88563177f10f20ced98750b2e40036201728131d -r8a5dbf556a66524fbe4b60ac1573182a0bd27617 --- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentAdditional.qml (.../EndTreatmentAdditional.qml) (revision 88563177f10f20ced98750b2e40036201728131d) +++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentAdditional.qml (.../EndTreatmentAdditional.qml) (revision 8a5dbf556a66524fbe4b60ac1573182a0bd27617) @@ -20,38 +20,18 @@ // Qml imports import "qrc:/globals" import "qrc:/components" +import "qrc:/pages/endtreatment" /*! * \brief the end treatment additional rinseback screen */ -ScreenItem { id: _root +EndTreatmentBase { id: _root objectName: "_EndTreatmentAdditional" - Text { id: _title - anchors { - top: parent.top - topMargin: 65 - horizontalCenter: parent.horizontalCenter - } - color: "white" - text: qsTr("Additional Rinseback") - font.pixelSize: Fonts.fontPixelTitle - } + title.text: qsTr("Additional Rinseback") - TimeText { id: timeout - visible : vTreatmentRinseback.timeoutTotal - anchors { - horizontalCenter: parent.horizontalCenter - top : _title.bottom - topMargin : 15 - } - textPixelSize : 30 - textWeight : Font.Normal - // the TimeText component works with hour and minute mainly - // so changing the seconds to minuts was easier than changing the component - secondsVisible : false - seconds : vTreatmentRinseback.timeoutCountDown * 60 - } + hasTimeout : vTreatmentRinseback.timeoutTotal + timeoutValue: vTreatmentRinseback.timeoutCountDown * 60 ProgressCircle { id: _circle diameter: 335 @@ -63,7 +43,7 @@ Text { id: _textVolume anchors.centerIn: parent - color: "white" + color: Colors.textMain text: vTreatmentRinseback.current.toFixed(0) + " " + qsTr(Variables.unitTextFluid) font.pixelSize: 76 font.weight: Font.ExtraLight @@ -76,15 +56,9 @@ topMargin: 20 horizontalCenter: parent.horizontalCenter } - color: "white" + color: Colors.textMain text: vTreatmentRinseback.rate.toFixed(0) + " " + qsTr(Variables.unitTextFlowRate) font.pixelSize: 23 } } - - onVisibleChanged: { - if (visible) { - _mainMenu.hidden = true - } - } }