Index: leahi.pro
===================================================================
diff -u -radf593e5ad91c1e689564298bf8d411d7847b158 -rb33a0dc4ca14c3bf58831d49d1910c39a091e658
--- leahi.pro	(.../leahi.pro)	(revision adf593e5ad91c1e689564298bf8d411d7847b158)
+++ leahi.pro	(.../leahi.pro)	(revision b33a0dc4ca14c3bf58831d49d1910c39a091e658)
@@ -157,6 +157,8 @@
     sources/model/confirm/MDuetConfirmTDi.h \
     sources/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.h \
     sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.h \
+    sources/model/dd/adjustment/settings/MAdjustRoWaterModeResponse.h \
+    sources/model/dd/adjustment/settings/MRoWaterModeResponse.h \
     sources/model/dd/data/MDDBloodLeakData.h \
     sources/model/dd/data/MDDConcentratePumpData.h \
     sources/model/dd/data/MDDConductivityData.h \
@@ -181,7 +183,9 @@
     sources/model/td/adjustment/settings/MAdjustTDSerialNumberResponse.h \
     sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.h \
     sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.h \
+    sources/model/td/adjustment/settings/MAdjustTDAlarmVolumeResponse.h \
     sources/model/td/adjustment/settings/MTDAdvancedInstitutionalRecordResponse.h \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFStateResponse.h \
     sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.h \
     sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsAlarmLimitsResponse.h \
     sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.h \
@@ -264,8 +268,10 @@
     sources/view/fp/data/VFPROPumpData.h \
     sources/view/fp/data/VFPRORejectionPercentageData.h \
     sources/view/fp/data/VFPTemperatureData.h \
+    sources/view/settings/VAdjustRoWaterMode.h \
     sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.h \
     sources/view/settings/VAdvancedInstitutionalRecord.h \
+    sources/view/settings/VRoWaterMode.h \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.h \
     sources/view/td/data/VTDAirBubbleData.h \
     sources/view/td/data/VTDAirPumpData.h \
@@ -305,6 +311,8 @@
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFDurationEdit.h \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFVolumeEdit.h \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFConfirm.h \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFState.h \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.h \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentSaline.h \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.h \
@@ -357,7 +365,6 @@
     sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.h \
     sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.h \
     sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.h \
-    sources/model/dg/adjustment/settings/MDuetRoWaterDG.h \
     \ # ---------- Models - Alarm
     sources/model/hd/alarm/MAlarmStatusData.h \
     sources/model/hd/alarm/MAlarmTriggered.h \
@@ -368,8 +375,6 @@
     \ # ---------- Models - HD - Adjustment
     sources/model/hd/adjustment/MAdjustRequestsBase.h \
     sources/model/hd/adjustment/settings/MAdjustHDRequests.h \
-    \ # ---------- Models - HD - Adjustment - Settings
-    sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.h \
     \ # ---------- Models - HD - Adjustment - Pre-Treatment
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.h \
@@ -452,7 +457,6 @@
     sources/view/settings/VAdjustmentServiceMode.h \
     sources/view/settings/VAdjustmentServiceDates.h \
     sources/view/settings/VAdjustmentDGCleaningUsage.h \
-    sources/view/settings/VDuetRoWaterDG.h \
     sources/view/settings/VCloudSync.h \
     sources/view/settings/VHDUsageInfo.h \
     sources/view/settings/VAdjustmentInstitutionalRecord.h \
@@ -530,6 +534,8 @@
     sources/model/confirm/MDuetConfirmTDi.cpp \
     sources/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.cpp \
     sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.cpp \
+    sources/model/dd/adjustment/settings/MAdjustRoWaterModeResponse.cpp \
+    sources/model/dd/adjustment/settings/MRoWaterModeResponse.cpp \
     sources/model/dd/data/MDDBloodLeakData.cpp \
     sources/model/dd/data/MDDConcentratePumpData.cpp \
     sources/model/dd/data/MDDConductivityData.cpp \
@@ -555,6 +561,7 @@
     sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.cpp \
     sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.cpp \
     sources/model/td/adjustment/settings/MTDAdvancedInstitutionalRecordResponse.cpp \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFStateResponse.cpp \
     sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.cpp \
     sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsAlarmLimitsResponse.cpp \
     sources/model/td/data/MTDAirBubbleData.cpp \
@@ -653,7 +660,6 @@
     sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.cpp \
     sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.cpp \
     sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.cpp \
-    sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp \
     \ # ---------- Models - Alarm
     sources/model/hd/alarm/MAlarmStatusData.cpp \
     sources/model/hd/alarm/MAlarmMapping.cpp \
@@ -666,6 +672,7 @@
     sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.cpp \
     sources/model/td/adjustment/settings/MTDInstitutionalRecordResponse.cpp \
     sources/model/td/adjustment/settings/MAdjustTDInstitutionalRecordResponse.cpp \
+    sources/model/td/adjustment/settings/MAdjustTDAlarmVolumeResponse.cpp \
     \ # ---------- Models - TD - Adjustment - Pre-Treatment
     sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp \
     sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp \
@@ -678,8 +685,6 @@
     sources/model/td/adjustment/treatment/MTreatmentAdjustRecirculateResponse.cpp \
     \ # ---------- Models - DD - Adjustment - Settings
     sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.cpp \
-    \ # ---------- Models - HD - Adjustment - Settings
-    sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.cpp \
     \ # ---------- Models - HD - Adjustment - Pre-Treatment
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.cpp \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp \
@@ -742,8 +747,10 @@
     sources/view/VGeneralEvent.cpp \
     sources/device/DeviceView.cpp \
     \ # ---------- Views - TD - States Data
+    sources/view/settings/VAdjustRoWaterMode.cpp \
     sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.cpp \
     sources/view/settings/VAdvancedInstitutionalRecord.cpp \
+    sources/view/settings/VRoWaterMode.cpp \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.cpp \
     sources/view/td/data/VTDAirBubbleData.cpp \
     sources/view/td/data/VTDAirPumpData.cpp \
@@ -783,6 +790,8 @@
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFDurationEdit.cpp \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFVolumeEdit.cpp \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFConfirm.cpp \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFState.cpp \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.cpp \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentSaline.cpp \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.cpp \
@@ -815,7 +824,6 @@
     sources/view/settings/VAdjustmentAlarmVolume.cpp \
     sources/view/settings/VAdjustmentServiceMode.cpp \
     sources/view/settings/VAdjustmentServiceDates.cpp \
-    sources/view/settings/VDuetRoWaterDG.cpp \
     sources/view/settings/VCloudSync.cpp \
     sources/view/settings/VAdjustmentDGCleaningUsage.cpp \
     sources/view/settings/VHDUsageInfo.cpp \