Index: denali.qrc =================================================================== diff -u -r7710fea4486a639caaa3c510add0eac0bcd4ddcc -r3702984c4572607055ab3ede4d45792e74595991 --- denali.qrc (.../denali.qrc) (revision 7710fea4486a639caaa3c510add0eac0bcd4ddcc) +++ denali.qrc (.../denali.qrc) (revision 3702984c4572607055ab3ede4d45792e74595991) @@ -3,7 +3,6 @@ sources/gui/qml/pages/ManagerStack.qml sources/gui/qml/pages/SettingsStack.qml sources/gui/qml/pages/SettingsHome.qml - sources/gui/qml/pages/Diagnostics.qml sources/gui/qml/pages/ManagerHome.qml @@ -25,9 +24,10 @@ resources/images/bell.png resources/images/bell-off.png resources/images/Back.png - resources/images/Pause.png - resources/images/Resume.png + resources/images/PauseDarkBlue.png + resources/images/PauseLightBlue.png resources/images/PauseGray.png + resources/images/Resume.png resources/images/Clock-Minus.png resources/images/Clock-Plus.png resources/images/Wave-Minus.png @@ -42,6 +42,9 @@ resources/images/chevron-down.png resources/images/chevron-up.png resources/images/list.png + resources/images/End.png + resources/images/Accelerate.png + resources/images/Decelerate.png sources/gui/qml/components/MainMenu.qml @@ -93,6 +96,7 @@ sources/gui/qml/components/RangeSlider.qml sources/gui/qml/components/MuteButton.qml sources/gui/qml/components/UpDownButton.qml + sources/gui/qml/components/ImageText.qml sources/gui/qml/compounds/PressureRangeSlider.qml @@ -140,4 +144,24 @@ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml + + sources/gui/qml/pages/postTreatment/PostTreatmentBloodPrime.qml + sources/gui/qml/pages/postTreatment/PostTreatmentRinsebackStack.qml + sources/gui/qml/pages/postTreatment/PostTreatmentRecirculateStack.qml + sources/gui/qml/pages/postTreatment/PostTreatmentEndStack.qml + + + sources/gui/qml/pages/postTreatment/rinseback/PostTreatmentRinsebackInit.qml + sources/gui/qml/pages/postTreatment/rinseback/PostTreatmentRinseback.qml + sources/gui/qml/pages/postTreatment/rinseback/PostTreatmentRinsebackComplete.qml + sources/gui/qml/pages/postTreatment/rinseback/PostTreatmentAdditional.qml + + + sources/gui/qml/pages/postTreatment/recirculate/PostTreatmentRecirculate.qml + sources/gui/qml/pages/postTreatment/recirculate/PostTreatmentReconnect.qml + + + sources/gui/qml/pages/postTreatment/end/PostTreatmentEnd.qml + sources/gui/qml/pages/postTreatment/end/PostTreatmentEndPause.qml +