Index: denali.qrc
===================================================================
diff -u -r66e87ea403ec12a273553284919684282d87bc6a -rbd560752aaa76183f168f0af6ad97b75b6b57c79
--- denali.qrc (.../denali.qrc) (revision 66e87ea403ec12a273553284919684282d87bc6a)
+++ denali.qrc (.../denali.qrc) (revision bd560752aaa76183f168f0af6ad97b75b6b57c79)
@@ -3,15 +3,24 @@
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/pages/SettingsDeviceInformation.qml
sources/gui/qml/pages/SettingsBluetooth.qml
+ sources/gui/qml/pages/SettingsWifi.qml
+ sources/gui/qml/pages/SettingsDateTimeSet.qml
+ sources/gui/qml/pages/SettingsBrightness.qml
+ sources/gui/qml/pages/SettingsAlarmVolume.qml
sources/gui/qml/dialogs/PowerOff.qml
sources/gui/qml/dialogs/AutoHideInfo.qml
sources/gui/qml/dialogs/NotificationDialog.qml
+ sources/gui/qml/dialogs/AlarmListDialog.qml
sources/gui/qml/dialogs/Alert.qml
+ sources/gui/qml/dialogs/VitalsEntry.qml
+ sources/gui/qml/dialogs/WifiJoinDisconnect.qml
+ sources/gui/qml/dialogs/ServiceLogin.qml
+ sources/gui/qml/dialogs/DisconnectNetwork.qml
resources/images/Settings_gear_setting_tools-128.png
@@ -27,9 +36,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
@@ -39,6 +49,14 @@
resources/images/checkCircle.png
resources/images/OffGray.png
resources/images/Done.png
+ resources/images/audio.png
+ resources/images/mute.png
+ 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
@@ -63,11 +81,13 @@
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/StepBullet.qml
+ sources/gui/qml/components/StepIndicator.qml
sources/gui/qml/components/TimeText.qml
sources/gui/qml/components/ProgressCircle.qml
sources/gui/qml/components/Slider.qml
sources/gui/qml/components/GridSelection.qml
+ sources/gui/qml/components/TitleBarCreateTreatment.qml
sources/gui/qml/components/ProgressBarEx.qml
sources/gui/qml/components/CloseButton.qml
sources/gui/qml/components/TickMarks.qml
@@ -81,13 +101,18 @@
sources/gui/qml/components/DebugDataColumn.qml
sources/gui/qml/components/CheckListItem.qml
sources/gui/qml/components/ConfirmButton.qml
+ sources/gui/qml/components/InformationTable.qml
+ sources/gui/qml/components/InformationTableEntry.qml
+ sources/gui/qml/components/InformationSubTable.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/components/MuteButton.qml
+ sources/gui/qml/components/UpDownButton.qml
+ sources/gui/qml/components/ImageText.qml
+ sources/gui/qml/components/TextEntry.qml
+ sources/gui/qml/components/Keyboard.qml
sources/gui/qml/compounds/PressureRangeSlider.qml
@@ -106,12 +131,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/pretreatment/create/PreTreatmentCreate.qml
+ sources/gui/qml/pages/pretreatment/create/PreTreatmentUltrafiltration.qml
+ sources/gui/qml/pages/pretreatment/create/PreTreatmentConfirm.qml
+ sources/gui/qml/pages/pretreatment/create/PreTreatmentPrime.qml
+ sources/gui/qml/pages/pretreatment/create/PreTreatmentBase.qml
+
sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml
sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml
@@ -132,4 +160,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
+