Index: denali.qrc
===================================================================
diff -u -rcdf80193148db0831cf2c1067732ddc6f6dac5fb -r3c30d57c6cba7595b1e1d6b806d90ca151bc8db2
--- denali.qrc (.../denali.qrc) (revision cdf80193148db0831cf2c1067732ddc6f6dac5fb)
+++ denali.qrc (.../denali.qrc) (revision 3c30d57c6cba7595b1e1d6b806d90ca151bc8db2)
@@ -4,13 +4,15 @@
sources/gui/qml/pages/MainHome.qml
sources/gui/qml/pages/ManagerStack.qml
sources/gui/qml/pages/UserConfirmation.qml
+ sources/gui/qml/pages/TreatmentFlowBase.qml
sources/gui/qml/pages/settings/SettingsBase.qml
sources/gui/qml/pages/settings/SettingsStack.qml
sources/gui/qml/pages/settings/SettingsHome.qml
sources/gui/qml/pages/settings/SettingsDateTime.qml
sources/gui/qml/pages/settings/SettingsWiFi.qml
+ sources/gui/qml/pages/settings/SettingsDG.qml
sources/gui/qml/dialogs/PowerOff.qml
@@ -112,6 +114,9 @@
sources/gui/qml/components/TextEntry.qml
sources/gui/qml/components/ScrollBar.qml
sources/gui/qml/compounds/Fader.qml
+ sources/gui/qml/components/FooterStatic.qml
+ sources/gui/qml/components/TimeEntry.qml
+ sources/gui/qml/components/Label.qml
sources/gui/qml/compounds/PressureRangeSlider.qml
@@ -190,21 +195,16 @@
sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml
sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml
sources/gui/qml/pages/endtreatment/EndTreatmentEndStack.qml
+ sources/gui/qml/pages/endtreatment/EndTreatmentBase.qml
sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml
sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml
sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackComplete.qml
sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentAdditional.qml
-
- sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentRecirculate.qml
- sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentReconnect.qml
-
-
- sources/gui/qml/pages/endtreatment/end/EndTreatmentEnd.qml
- sources/gui/qml/pages/endtreatment/end/EndTreatmentEndPause.qml
-
+
+
sources/gui/qml/pages/posttreatment/PostTreatmentBase.qml
sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml