Index: denali.qrc
===================================================================
diff -u -r846a9ebc350e33be4affab3cc4c136248900015d -r66e87ea403ec12a273553284919684282d87bc6a
--- denali.qrc (.../denali.qrc) (revision 846a9ebc350e33be4affab3cc4c136248900015d)
+++ denali.qrc (.../denali.qrc) (revision 66e87ea403ec12a273553284919684282d87bc6a)
@@ -5,11 +5,13 @@
sources/gui/qml/pages/SettingsHome.qml
sources/gui/qml/pages/Diagnostics.qml
sources/gui/qml/pages/ManagerHome.qml
+ sources/gui/qml/pages/SettingsBluetooth.qml
sources/gui/qml/dialogs/PowerOff.qml
sources/gui/qml/dialogs/AutoHideInfo.qml
sources/gui/qml/dialogs/NotificationDialog.qml
+ sources/gui/qml/dialogs/Alert.qml
resources/images/Settings_gear_setting_tools-128.png
@@ -20,9 +22,10 @@
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/alarm.png
+ resources/images/alert.png
+ resources/images/bell.png
+ resources/images/bell-off.png
resources/images/Back.png
resources/images/Pause.png
resources/images/Resume.png
@@ -32,6 +35,10 @@
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
@@ -60,15 +67,9 @@
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/RectSelectCreateTreatment.qml
- sources/gui/qml/components/TopMenuBarCreateTreatment.qml
+ sources/gui/qml/components/GridSelection.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
@@ -77,10 +78,20 @@
sources/gui/qml/components/ImageClock.qml
sources/gui/qml/components/ImageLogoDDarkTransparent.qml
sources/gui/qml/components/PrimingTimer.qml
- ConfirmTreatmentTableEntry.qml
- ProgressLine.qml
sources/gui/qml/components/DebugDataColumn.qml
+ sources/gui/qml/components/CheckListItem.qml
+ sources/gui/qml/components/ConfirmButton.qml
+ sources/gui/qml/components/pretreatment/SliderCreateTreatment.qml
+ sources/gui/qml/components/pretreatment/ConfirmTreatmentTable.qml
+ sources/gui/qml/components/pretreatment/ConfirmTreatmentSubTable.qml
+ sources/gui/qml/components/pretreatment/ConfirmTreatmentTableEntry.qml
+ sources/gui/qml/components/pretreatment/TopMenuBarCreateTreatment.qml
+ sources/gui/qml/components/pretreatment/SliderDoubleCreateTreatment.qml
+ sources/gui/qml/components/RangeSlider.qml
+
+ sources/gui/qml/compounds/PressureRangeSlider.qml
+
qtquickcontrols2.conf
sources/gui/qml/main.qml
@@ -104,11 +115,12 @@
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
sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml
+ sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml
sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml
@@ -118,5 +130,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