Index: denali.qrc
===================================================================
diff -u -r73091a6f5717c0fc88e236c06c618ad361f30a3c -rc0c63c4b149dafea2b02e4cd31f223e392ff7818
--- denali.qrc (.../denali.qrc) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c)
+++ denali.qrc (.../denali.qrc) (revision c0c63c4b149dafea2b02e4cd31f223e392ff7818)
@@ -47,6 +47,8 @@
resources/images/End.png
resources/images/Accelerate.png
resources/images/Decelerate.png
+ resources/images/Busy.png
+ resources/images/BusyDone.png
sources/gui/qml/components/MainMenu.qml
@@ -80,7 +82,6 @@
sources/gui/qml/components/ConfirmTreatmentTable.qml
sources/gui/qml/components/ConfirmTreatmentSubTable.qml
sources/gui/qml/components/GridSelection.qml
- sources/gui/qml/components/TitleBarCreateTreatment.qml
sources/gui/qml/components/ProgressBarEx.qml
sources/gui/qml/components/CloseButton.qml
sources/gui/qml/components/ConfirmButton.qml
@@ -99,9 +100,11 @@
sources/gui/qml/components/MuteButton.qml
sources/gui/qml/components/UpDownButton.qml
sources/gui/qml/components/ImageText.qml
+ sources/gui/qml/components/WaitDone.qml
sources/gui/qml/compounds/PressureRangeSlider.qml
+ sources/gui/qml/compounds/PreTreatmentTitleBar.qml
qtquickcontrols2.conf
@@ -123,17 +126,27 @@
sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml
- sources/gui/qml/pages/pretreatment/PreTreatmentCreateStack.qml
- sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml
+ sources/gui/qml/pages/pretreatment/PreTreatmentMainStack.qml
+ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml
sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
sources/gui/qml/pages/pretreatment/create/PreTreatmentConfirm.qml
+
+ sources/gui/qml/pages/pretreatment/sample/PreTreatmentSampleStack.qml
+ sources/gui/qml/pages/pretreatment/sample/PreTreatmentFilterFlush.qml
+ sources/gui/qml/pages/pretreatment/sample/PreTreatmentSampleResult.qml
+ sources/gui/qml/pages/pretreatment/sample/PreTreatmentWaterSample.qml
+ sources/gui/qml/pages/pretreatment/sample/PreTreatmentResultFail.qml
+
+
+ sources/gui/qml/pages/pretreatment/consumables/PreTreatmentConsumablesStack.qml
+ sources/gui/qml/pages/pretreatment/consumables/PreTreatmentConsumablesSelfTest.qml
+
sources/gui/qml/pages/pretreatment/prime/PreTreatmentUltrafiltration.qml
sources/gui/qml/pages/pretreatment/prime/PreTreatmentPrime.qml
- sources/gui/qml/pages/pretreatment/prime/PreTreatmentFilterFlush.qml
sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml