Index: denali.qrc =================================================================== diff -u -r73b965e55528619f22a12ae3b3408c9dcecc9144 -r20a67175350b1c20f078bade73a77d48c4647832 --- denali.qrc (.../denali.qrc) (revision 73b965e55528619f22a12ae3b3408c9dcecc9144) +++ denali.qrc (.../denali.qrc) (revision 20a67175350b1c20f078bade73a77d48c4647832) @@ -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 @@ -31,6 +31,7 @@ resources/images/Clock-Plus.png resources/images/Wave-Minus.png resources/images/Wave-Plus.png + resources/images/microsd.png sources/gui/qml/components/MainMenu.qml @@ -55,9 +56,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 @@ -68,6 +74,7 @@ sources/gui/qml/components/ImageWave.qml sources/gui/qml/components/ImageClock.qml sources/gui/qml/components/ImageLogoDDarkTransparent.qml + sources/gui/qml/components/DebugDataColumn.qml qtquickcontrols2.conf @@ -84,6 +91,9 @@ 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 @@ -93,6 +103,7 @@ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml sources/gui/qml/pages/treatment/sections/TreatmentTime.qml + sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml