Index: denali.qrc
===================================================================
diff -u -r1b060ccba8bfccf34d6a7a5ddd6d94eb6d149829 -re58be51c4aa52938af250db3ee579e98de08542c
--- denali.qrc (.../denali.qrc) (revision 1b060ccba8bfccf34d6a7a5ddd6d94eb6d149829)
+++ denali.qrc (.../denali.qrc) (revision e58be51c4aa52938af250db3ee579e98de08542c)
@@ -3,11 +3,13 @@
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
sources/gui/qml/dialogs/PowerOff.qml
sources/gui/qml/dialogs/AutoHideInfo.qml
+ sources/gui/qml/dialogs/NotificationDialog.qml
resources/images/Settings_gear_setting_tools-128.png
@@ -17,19 +19,37 @@
resources/images/splash.png
resources/images/ArrowRight.png
resources/images/logo d Dark Transparent.png
+ resources/images/Close.png
+ 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
+ resources/images/PauseGray.png
+ resources/images/Clock-Minus.png
+ resources/images/Clock-Plus.png
+ resources/images/Wave-Minus.png
+ resources/images/Wave-Plus.png
+ resources/images/microsd.png
+ resources/images/check.png
+ resources/images/checkCircle.png
+ resources/images/OffGray.png
+ resources/images/Done.png
sources/gui/qml/components/MainMenu.qml
sources/gui/qml/components/TouchRect.qml
sources/gui/qml/components/TitleText.qml
- sources/gui/qml/components/LogoD.qml
+ sources/gui/qml/components/ImageLogoD.qml
sources/gui/qml/components/ScreenItem.qml
sources/gui/qml/components/StackItem.qml
sources/gui/qml/components/ModalDialog.qml
sources/gui/qml/components/BackButton.qml
sources/gui/qml/components/USBButton.qml
sources/gui/qml/components/ExportButton.qml
sources/gui/qml/components/TouchArea.qml
+ sources/gui/qml/components/SettingsItem.qml
sources/gui/qml/components/TextRect.qml
sources/gui/qml/components/Background.qml
sources/gui/qml/components/Line.qml
@@ -40,8 +60,30 @@
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/ConfirmTreatmentTable.qml
+ sources/gui/qml/components/ConfirmTreatmentSubTable.qml
+ sources/gui/qml/components/SliderDoubleCreateTreatment.qml
+ sources/gui/qml/components/GridSelection.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
+ sources/gui/qml/components/TickMarks.qml
+ sources/gui/qml/components/NotificationBar.qml
+ sources/gui/qml/components/NotificationBarSmall.qml
+ sources/gui/qml/components/UltrafiltrationButton.qml
+ sources/gui/qml/components/ImageWave.qml
+ sources/gui/qml/components/ImageClock.qml
+ sources/gui/qml/components/ImageLogoDDarkTransparent.qml
+ sources/gui/qml/components/PrimingTimer.qml
+ sources/gui/qml/components/ConfirmTreatmentTableEntry.qml
+ sources/gui/qml/components/DebugDataColumn.qml
+ sources/gui/qml/components/CheckListItem.qml
qtquickcontrols2.conf
@@ -58,6 +100,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
@@ -66,7 +111,16 @@
sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml
sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml
sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml
- sources/gui/qml/pages/treatment/sections/TreatmentInfusion.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
+ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml
+ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml
+ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml
+ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml
+ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml
+ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml
+