Index: leahi.qrc
===================================================================
diff -u -r1164ea502e3fabdb55aa41923e0e566505f197ef -rdfb5f7070961fd2a34c2cb8d897ecc43c4f46598
--- leahi.qrc	(.../leahi.qrc)	(revision 1164ea502e3fabdb55aa41923e0e566505f197ef)
+++ leahi.qrc	(.../leahi.qrc)	(revision dfb5f7070961fd2a34c2cb8d897ecc43c4f46598)
@@ -38,6 +38,7 @@
         <file alias="LockDialog.qml">sources/gui/qml/dialogs/LockDialog.qml</file>
         <file alias="AcidConcentrateAdjustment.qml">sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml</file>
         <file alias="EndTreatmentDialog.qml">sources/gui/qml/dialogs/EndTreatmentDialog.qml</file>
+        <file alias="RinsebackCompleteDialog.qml">sources/gui/qml/dialogs/RinsebackCompleteDialog.qml</file>
     </qresource>
     <qresource prefix="/dialogs/diagnostics">
         <file alias="DiagnosticsDialog.qml">sources/gui/qml/dialogs/diagnostics/DiagnosticsDialog.qml</file>
@@ -53,6 +54,12 @@
         <file alias="HeaderbarPrescription.qml">sources/gui/qml/dialogs/headerbar/HeaderbarPrescription.qml</file>
         <file alias="HeaderbarInformation.qml">sources/gui/qml/dialogs/headerbar/HeaderbarInformation.qml</file>
     </qresource>
+    <qresource prefix="/dialogs/watersample">
+        <file alias="WaterSampleDialog.qml">sources/gui/qml/dialogs/watersample/WaterSampleDialog.qml</file>
+        <file alias="WaterSampleBase.qml">sources/gui/qml/dialogs/watersample/WaterSampleBase.qml</file>
+        <file alias="WaterSamplePage.qml">sources/gui/qml/dialogs/watersample/WaterSamplePage.qml</file>
+        <file alias="WaterSampleDialysatePage.qml">sources/gui/qml/dialogs/watersample/WaterSampleDialysatePage.qml</file>
+    </qresource>
     <qresource prefix="/images">
         <file alias="iLogoD">resources/images/Logo d.png</file>
         <file alias="iLogoDiality">resources/images/Logo DialityT.png</file>
@@ -112,6 +119,9 @@
         <file alias="iVolume">resources/images/Volume.png</file>
         <file alias="iWaterSampleFail">resources/images/water_sample_fail.png</file>
         <file alias="iWaterSamplePass">resources/images/water_sample_pass.png</file>
+        <file alias="iWaterSample">resources/images/water_sample.png</file>
+        <file alias="iArrowDownDisabled">resources/images/ArrowDownDisabled.png</file>
+        <file alias="iArrowUpDisabled">resources/images/ArrowUpDisabled.png</file>
     </qresource>
     <qresource prefix="/components">
         <file alias="MainMenu.qml">sources/gui/qml/components/MainMenu.qml</file>
@@ -179,6 +189,7 @@
         <file alias="RangedValue.qml">sources/gui/qml/components/RangedValue.qml</file>
         <file alias="SubStepIndicator.qml">sources/gui/qml/components/SubStepIndicator.qml</file>
         <file alias="SDCInfo.qml">sources/gui/qml/components/SDCInfo.qml</file>
+        <file alias="BaseChart.qml">sources/gui/qml/components/BaseChart.qml</file>
     </qresource>
     <qresource prefix="/compounds">
         <file alias="PressureRangeSlider.qml">sources/gui/qml/compounds/PressureRangeSlider.qml</file>
@@ -252,11 +263,9 @@
     <qresource prefix="/pages/pretreatment">
         <file alias="PreTreatmentBase.qml">sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml</file>
         <file alias="PreTreatmentStack.qml">sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml</file>
-        <file alias="PreTreatmentWaterSample.qml">sources/gui/qml/pages/pretreatment/PreTreatmentWaterSample.qml</file>
         <file alias="PreTreatmentSelfTests.qml">sources/gui/qml/pages/pretreatment/PreTreatmentSelfTests.qml</file>
         <file alias="PreTreatmentPrime.qml">sources/gui/qml/pages/pretreatment/PreTreatmentPrime.qml</file>
         <file alias="PreTreatmentInstallStack.qml">sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml</file>
-        <file alias="PreTreatmentUltrafiltration.qml">sources/gui/qml/pages/pretreatment/PreTreatmentUltrafiltration.qml</file>
     </qresource>
     <qresource prefix="/pages/pretreatment/create">
         <file alias="PreTreatmentCreate.qml">sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml</file>
@@ -269,6 +278,7 @@
         <file alias="TreatmentSection.qml">sources/gui/qml/pages/treatment/TreatmentSection.qml</file>
         <file alias="TreatmentSectionHeader.qml">sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml</file>
         <file alias="TreatmentHeparin.qml">sources/gui/qml/pages/treatment/TreatmentHeparin.qml</file>
+        <file alias="TreatmentHDF.qml">sources/gui/qml/pages/treatment/TreatmentHDF.qml</file>
     </qresource>
     <qresource prefix="/pages/treatment/sections">
         <file alias="TreatmentFlows.qml">sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml</file>
@@ -279,6 +289,7 @@
         <file alias="TreatmentSaline.qml">sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml</file>
         <file alias="TreatmentPressureComponent.qml">sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml</file>
         <file alias="TreatmentFlowsComponent.qml">sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml</file>
+        <file alias="TreatmentHDFComponent.qml">sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml</file>
     </qresource>
     <qresource prefix="/pages/treatment/adjustments">
         <file alias="TreatmentAdjustmentBase.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml</file>
@@ -297,6 +308,7 @@
         <file alias="TreatmentAdjustmentIsolatedUFConfirm.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentIsolatedUFConfirm.qml</file>
         <file alias="TreatmentAdjustmentVitals.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml</file>
         <file alias="TreatmentAdjustmentVitalsInterval.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml</file>
+        <file alias="TreatmentAdjustmentHDF.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentHDF.qml</file>
     </qresource>
     <qresource prefix="/pages/endtreatment">
         <file alias="EndTreatmentRinsebackStack.qml">sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml</file>
@@ -307,9 +319,6 @@
     <qresource prefix="/pages/endtreatment/rinseback">
         <file alias="EndTreatmentRinsebackInit.qml">sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml</file>
         <file alias="EndTreatmentRinseback.qml">sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml</file>
-        <file alias="EndTreatmentRinsebackComplete.qml">sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackComplete.qml</file>
-        <file alias="EndTreatmentAdditional.qml">sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentAdditional.qml</file>
-        <file alias="EndTreatmentRinsebackReconnect.qml">sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackReconnect.qml</file>
     </qresource>
     <qresource prefix="/pages/endtreatment/recirculate"/>
     <qresource prefix="/pages/endtreatment/end"/>