Index: denali.qrc =================================================================== diff -u -r4df19fe88c454bd54abcdaf983be59464c5ef5bc -rc1474e48907082e10a2eb03adf40f0acd4af9a63 --- denali.qrc (.../denali.qrc) (revision 4df19fe88c454bd54abcdaf983be59464c5ef5bc) +++ denali.qrc (.../denali.qrc) (revision c1474e48907082e10a2eb03adf40f0acd4af9a63) @@ -20,9 +20,9 @@ resources/images/ArrowRight.png resources/images/logo d Dark Transparent.png resources/images/Close.png - resources/images/alarm.svg - resources/images/bell.svg - resources/images/bell-off.svg + resources/images/alarm.png + resources/images/bell.png + resources/images/bell-off.png resources/images/Back.png resources/images/Pause.png resources/images/Resume.png @@ -32,6 +32,8 @@ resources/images/Wave-Minus.png resources/images/Wave-Plus.png resources/images/microsd.png + resources/images/OffGray.png + resources/images/Done.png sources/gui/qml/components/MainMenu.qml @@ -56,9 +58,14 @@ sources/gui/qml/components/RangeRect.qml sources/gui/qml/components/RangeBar.qml sources/gui/qml/components/Circle.qml + sources/gui/qml/components/CircleWithText.qml sources/gui/qml/components/TimeText.qml sources/gui/qml/components/ProgressCircle.qml sources/gui/qml/components/Slider.qml + sources/gui/qml/components/SliderCreateTreatment.qml + sources/gui/qml/components/SliderDoubleCreateTreatment.qml + sources/gui/qml/components/RectSelectCreateTreatment.qml + sources/gui/qml/components/TopMenuBarCreateTreatment.qml sources/gui/qml/components/ProgressBarEx.qml sources/gui/qml/components/CloseButton.qml sources/gui/qml/components/ConfirmButton.qml @@ -70,7 +77,11 @@ sources/gui/qml/components/ImageClock.qml sources/gui/qml/components/ImageLogoDDarkTransparent.qml sources/gui/qml/components/DebugDataColumn.qml + sources/gui/qml/components/RangeSlider.qml + + sources/gui/qml/compounds/PressureRangeSlider.qml + qtquickcontrols2.conf sources/gui/qml/main.qml @@ -86,12 +97,15 @@ sources/gui/qml/pages/treatment/TreatmentHome.qml sources/gui/qml/pages/treatment/TreatmentStack.qml sources/gui/qml/pages/treatment/TreatmentCreate.qml + sources/gui/qml/pages/treatment/TreatmentBegin.qml + sources/gui/qml/pages/treatment/TreatmentConfirm.qml + sources/gui/qml/pages/treatment/TreatmentPrime.qml sources/gui/qml/pages/treatment/TreatmentStart.qml sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml - sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml + sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml sources/gui/qml/pages/treatment/sections/TreatmentTime.qml @@ -105,5 +119,6 @@ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml + sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml