Index: sources/gui/qml/pages/settings/SettingsROInput.qml
===================================================================
diff -u -rfb1185f1c17778a9f8b300170d8d635a1532f6b4 -r16aaf5ab7e1c58199754a132d624a470295d3440
--- sources/gui/qml/pages/settings/SettingsROInput.qml	(.../SettingsROInput.qml)	(revision fb1185f1c17778a9f8b300170d8d635a1532f6b4)
+++ sources/gui/qml/pages/settings/SettingsROInput.qml	(.../SettingsROInput.qml)	(revision 16aaf5ab7e1c58199754a132d624a470295d3440)
@@ -26,41 +26,41 @@
  *          which enables the Ro Water Input
  */
 SettingsBase    { id: _root
-    itemIndex       : SettingsStack.RoInput
+    itemIndex           : SettingsStack.RoInput
+    confirmVisible      : false
+    onVisibleChanged    : _roInputComboBox.currentIndex = vRoWaterMode.status
 
-    confirmVisible  : false
-
     contentItem: Item {
-
         LabelUnitContainer { id: _settingsRoInputItem
-            anchors.horizontalCenter        : parent.horizontalCenter
-            width                           : Variables.adjustmentLabelUnitContainerWidth
-            height                          : Variables.adjustmentLabelUnitContainerHeight
-            text                            : qsTr("RO Water Mode")
-            contentArea.anchors.leftMargin  : width * 0.75
+            text                        : qsTr("RO Water Mode")
+            width                       : parent.width / 2
+            anchors.horizontalCenter    : parent.horizontalCenter
 
-            contentItem: BaseSwitch { id: _settingsRoInputSwitch
-                checked             : vSettings.roWaterMode
-//                checked             : vDuetRoWaterDG.status // TODO??
+            contentItem : BaseComboBox { id: _roInputComboBox
+                anchors.rightMargin : Variables.defaultMargin
+                anchors.leftMargin  : anchors.rightMargin
+                anchors.topMargin   : Variables.defaultMargin / 2
+                anchors.bottomMargin: anchors.topMargin
+                centerHorizontally  : true
 
-                onClicked: {
-                    vSettings.roWaterMode = _settingsRoInputSwitch.checked
-//                    vDuetRoWaterDG.doAdjustment ( _settingsRoInputSwitch.checked )
+                currentIndex        : vRoWaterMode.status
+                model               : vTreatmentRanges.roWaterModeOptions
+
+                onActivated: {
+                    vRoWaterMode.doAdjustment ( _roInputComboBox.currentIndex )
                 }
             }
         }
     }
 
-    // TODO
-    Connections { target: vDuetRoWaterDG
+    Connections { target: vRoWaterMode
         function onAdjustmentTriggered(vValue) {
-            if ( vDuetRoWaterDG.adjustment_Accepted ) {
+            if ( vRoWaterMode.adjustment_Accepted ) {
                 _settingsRoInput.notificationText = ""
             }
             else {
-                _settingsRoInput.notificationText = vDuetRoWaterDG.notification // adjustment_ReasonText
+                _settingsRoInput.notificationText = vRoWaterMode.adjustment_ReasonText
             }
-            vSettings.roWaterMode = vDuetRoWaterDG.status
         }
     }
 }