Index: sources/gui/qml/pages/settings/SettingsDG.qml =================================================================== diff -u -r6f2622be80fcaee8d71baf78404627381157970c -r153bcdb67dca6c40022318b80d5c7079d48bb37f --- sources/gui/qml/pages/settings/SettingsDG.qml (.../SettingsDG.qml) (revision 6f2622be80fcaee8d71baf78404627381157970c) +++ sources/gui/qml/pages/settings/SettingsDG.qml (.../SettingsDG.qml) (revision 153bcdb67dca6c40022318b80d5c7079d48bb37f) @@ -34,6 +34,8 @@ * on daily cycle at certain time of the day */ SettingsBase { id: _root + readonly property bool enableScheduling: false // TODO : phase 1 doesn't have this feature (disinfection schedule) + QtObject { id: _settingsDG property string status: "" function doConfirm(vWaterFlushScheduleTimeHour , @@ -62,8 +64,8 @@ _heatDisinfectionScheduleTime .isValid && _heatDisinfectionScheduleCycle .isValid - confirmVisible : false // TODO : phase 1 doesn't have this feature (disinfection schedule) - confirmEnabled : _root.isValid + confirmVisible : true + confirmEnabled : _root.enableScheduling firstFocusInput : _waterFlushScheduleTime notificationText: _settingsDG.status onConfirmClicked: { @@ -77,7 +79,7 @@ } Row { id: _container - visible: false // TODO : phase 1 doesn't have this feature (disinfection schedule) + visible: true spacing: 25 y : Qt.inputMethod.visible && _keyboard.visible ? topMarginContent : ( (_root.height - _container.height) / 2 ) Behavior on y { NumberAnimation { duration: Variables.keybardAnimationDuration } } @@ -131,25 +133,19 @@ Footer { anchors.bottomMargin: Variables.mainMenuHeight + Variables.notificationHeight + Variables.minVGap - childrenWidth: 300 + childrenWidth: parent.width / 3 children: [ - TouchRect { text.text: qsTr("Water Flush") - onClicked: vDisinfectAdjustDisinfect .doFlush ()}, - TouchRect { text.text: qsTr("Heat Disinfection") - onClicked: vDisinfectAdjustDisinfect .doDisinfectHeat ()}, - TouchRect { text.text: qsTr("Chemical Disinfection") - onClicked: vDisinfectAdjustDisinfect .doDisinfectChemical()} + TouchRect { text.text: qsTr("DG Cleaning") + onClicked: { vDisinfectAdjustDisinfect .doInitiate () } + } ] } // ----- Responses Connections { target: vDisinfectAdjustDisinfect onAdjustmentTriggered : { - if ( ! visible ) return if ( vDisinfectAdjustDisinfect.adjustment_Accepted ) { _root.notificationText = "" - _mainStack.doSettingsDisinfect() // go to disinfect stack - pop() // back to settings stack main menu } else { _root.notificationText = vDisinfectAdjustDisinfect.text() }