Index: denali.qrc =================================================================== diff -u -r8f83b92860a33498ea7856e63afef0a10ee11923 -r8a5dbf556a66524fbe4b60ac1573182a0bd27617 --- denali.qrc (.../denali.qrc) (revision 8f83b92860a33498ea7856e63afef0a10ee11923) +++ denali.qrc (.../denali.qrc) (revision 8a5dbf556a66524fbe4b60ac1573182a0bd27617) @@ -4,6 +4,7 @@ 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 @@ -111,6 +112,7 @@ 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/compounds/PressureRangeSlider.qml @@ -185,21 +187,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