Index: denali.qrc
===================================================================
diff -u -r0470ff6f209ff0c5089f8f0849b6da04f60f8f41 -rbd560752aaa76183f168f0af6ad97b75b6b57c79
--- denali.qrc	(.../denali.qrc)	(revision 0470ff6f209ff0c5089f8f0849b6da04f60f8f41)
+++ denali.qrc	(.../denali.qrc)	(revision bd560752aaa76183f168f0af6ad97b75b6b57c79)
@@ -3,14 +3,24 @@
         <file alias="ManagerStack.qml">sources/gui/qml/pages/ManagerStack.qml</file>
         <file alias="SettingsStack.qml">sources/gui/qml/pages/SettingsStack.qml</file>
         <file alias="SettingsHome.qml">sources/gui/qml/pages/SettingsHome.qml</file>
-        <file alias="Diagnostics.qml">sources/gui/qml/pages/Diagnostics.qml</file>
         <file alias="ManagerHome.qml">sources/gui/qml/pages/ManagerHome.qml</file>
+        <file alias="SettingsDeviceInformation.qml">sources/gui/qml/pages/SettingsDeviceInformation.qml</file>
         <file alias="SettingsBluetooth.qml">sources/gui/qml/pages/SettingsBluetooth.qml</file>
+        <file alias="SettingsWifi.qml">sources/gui/qml/pages/SettingsWifi.qml</file>
+        <file alias="SettingsDateTimeSet.qml">sources/gui/qml/pages/SettingsDateTimeSet.qml</file>
+        <file alias="SettingsBrightness.qml">sources/gui/qml/pages/SettingsBrightness.qml</file>
+        <file alias="SettingsAlarmVolume.qml">sources/gui/qml/pages/SettingsAlarmVolume.qml</file>
     </qresource>
     <qresource prefix="/dialogs">
         <file alias="PowerOff.qml">sources/gui/qml/dialogs/PowerOff.qml</file>
         <file alias="AutoHideInfo.qml">sources/gui/qml/dialogs/AutoHideInfo.qml</file>
         <file alias="NotificationDialog.qml">sources/gui/qml/dialogs/NotificationDialog.qml</file>
+        <file alias="AlarmListDialog.qml">sources/gui/qml/dialogs/AlarmListDialog.qml</file>
+        <file alias="Alert.qml">sources/gui/qml/dialogs/Alert.qml</file>
+        <file alias="VitalsEntry.qml">sources/gui/qml/dialogs/VitalsEntry.qml</file>
+        <file alias="WifiJoinDisconnect.qml">sources/gui/qml/dialogs/WifiJoinDisconnect.qml</file>
+        <file alias="ServiceLogin.qml">sources/gui/qml/dialogs/ServiceLogin.qml</file>
+        <file alias="DisconnectNetwork.qml">sources/gui/qml/dialogs/DisconnectNetwork.qml</file>
     </qresource>
     <qresource prefix="/images">
         <file alias="iSettings">resources/images/Settings_gear_setting_tools-128.png</file>
@@ -21,18 +31,32 @@
         <file alias="iArrow">resources/images/ArrowRight.png</file>
         <file alias="iLogoDDT">resources/images/logo d Dark Transparent.png</file>
         <file alias="iClose">resources/images/Close.png</file>
-        <file alias="alarm.png">resources/images/alarm.png</file>
-        <file alias="bell.png">resources/images/bell.png</file>
-        <file alias="bell-off.png">resources/images/bell-off.png</file>
+        <file alias="iAlarm">resources/images/alarm.png</file>
+        <file alias="iAlert">resources/images/alert.png</file>
+        <file alias="iBellOn">resources/images/bell.png</file>
+        <file alias="iBellOff">resources/images/bell-off.png</file>
         <file alias="iBack">resources/images/Back.png</file>
-        <file alias="iPause">resources/images/Pause.png</file>
-        <file alias="iResume">resources/images/Resume.png</file>
+        <file alias="iPauseDarkBlue">resources/images/PauseDarkBlue.png</file>
+        <file alias="iPauseLightBlue">resources/images/PauseLightBlue.png</file>
         <file alias="iPauseGray">resources/images/PauseGray.png</file>
+        <file alias="iResume">resources/images/Resume.png</file>
         <file alias="iClock-">resources/images/Clock-Minus.png</file>
         <file alias="iClock+">resources/images/Clock-Plus.png</file>
         <file alias="iWave-">resources/images/Wave-Minus.png</file>
         <file alias="iWave+">resources/images/Wave-Plus.png</file>
         <file alias="iMicroSD">resources/images/microsd.png</file>
+        <file alias="iCheck">resources/images/check.png</file>
+        <file alias="iCheckCircle">resources/images/checkCircle.png</file>
+        <file alias="iOffGray">resources/images/OffGray.png</file>
+        <file alias="iDone">resources/images/Done.png</file>
+        <file alias="iAudio">resources/images/audio.png</file>
+        <file alias="iMute">resources/images/mute.png</file>
+        <file alias="iChevronDown">resources/images/chevron-down.png</file>
+        <file alias="iChevronUp">resources/images/chevron-up.png</file>
+        <file alias="iList">resources/images/list.png</file>
+        <file alias="iRedCrossWCircle">resources/images/End.png</file>
+        <file alias="iAccelerate">resources/images/Accelerate.png</file>
+        <file alias="iDecelerate">resources/images/Decelerate.png</file>
     </qresource>
     <qresource prefix="/components">
         <file alias="MainMenu.qml">sources/gui/qml/components/MainMenu.qml</file>
@@ -57,19 +81,15 @@
         <file alias="RangeRect.qml">sources/gui/qml/components/RangeRect.qml</file>
         <file alias="RangeBar.qml">sources/gui/qml/components/RangeBar.qml</file>
         <file alias="Circle.qml">sources/gui/qml/components/Circle.qml</file>
-        <file alias="CircleWithText.qml">sources/gui/qml/components/CircleWithText.qml</file>
+        <file alias="StepBullet.qml">sources/gui/qml/components/StepBullet.qml</file>
+        <file alias="StepIndicator.qml">sources/gui/qml/components/StepIndicator.qml</file>
         <file alias="TimeText.qml">sources/gui/qml/components/TimeText.qml</file>
         <file alias="ProgressCircle.qml">sources/gui/qml/components/ProgressCircle.qml</file>
         <file alias="Slider.qml">sources/gui/qml/components/Slider.qml</file>
-        <file alias="SliderCreateTreatment.qml">sources/gui/qml/components/SliderCreateTreatment.qml</file>
-        <file alias="ConfirmTreatmentTable.qml">sources/gui/qml/components/ConfirmTreatmentTable.qml</file>
-        <file alias="ConfirmTreatmentSubTable.qml">sources/gui/qml/components/ConfirmTreatmentSubTable.qml</file>
-        <file alias="SliderDoubleCreateTreatment.qml">sources/gui/qml/components/SliderDoubleCreateTreatment.qml</file>
-        <file alias="RectSelectCreateTreatment.qml">sources/gui/qml/components/RectSelectCreateTreatment.qml</file>
-        <file alias="TopMenuBarCreateTreatment.qml">sources/gui/qml/components/TopMenuBarCreateTreatment.qml</file>
+        <file alias="GridSelection.qml">sources/gui/qml/components/GridSelection.qml</file>
+        <file alias="TitleBarCreateTreatment.qml">sources/gui/qml/components/TitleBarCreateTreatment.qml</file>
         <file alias="ProgressBarEx.qml">sources/gui/qml/components/ProgressBarEx.qml</file>
         <file alias="CloseButton.qml">sources/gui/qml/components/CloseButton.qml</file>
-        <file alias="ConfirmButton.qml">sources/gui/qml/components/ConfirmButton.qml</file>
         <file alias="TickMarks.qml">sources/gui/qml/components/TickMarks.qml</file>
         <file alias="NotificationBar.qml">sources/gui/qml/components/NotificationBar.qml</file>
         <file alias="NotificationBarSmall.qml">sources/gui/qml/components/NotificationBarSmall.qml</file>
@@ -78,10 +98,25 @@
         <file alias="ImageClock.qml">sources/gui/qml/components/ImageClock.qml</file>
         <file alias="ImageLogoDDT.qml">sources/gui/qml/components/ImageLogoDDarkTransparent.qml</file>
         <file alias="PrimingTimer.qml">sources/gui/qml/components/PrimingTimer.qml</file>
-        <file>ConfirmTreatmentTableEntry.qml</file>
-        <file>ProgressLine.qml</file>
         <file alias="DebugDataColumn.qml">sources/gui/qml/components/DebugDataColumn.qml</file>
+        <file alias="CheckListItem.qml">sources/gui/qml/components/CheckListItem.qml</file>
+        <file alias="ConfirmButton.qml">sources/gui/qml/components/ConfirmButton.qml</file>
+        <file alias="InformationTable.qml">sources/gui/qml/components/InformationTable.qml</file>
+        <file alias="InformationTableEntry.qml">sources/gui/qml/components/InformationTableEntry.qml</file>
+        <file alias="InformationSubTable.qml">sources/gui/qml/components/InformationSubTable.qml</file>
+        <file alias="pretreatment/SliderCreateTreatment.qml">sources/gui/qml/components/pretreatment/SliderCreateTreatment.qml</file>
+        <file alias="pretreatment/TopMenuBarCreateTreatment.qml">sources/gui/qml/components/pretreatment/TopMenuBarCreateTreatment.qml</file>
+        <file alias="pretreatment/SliderDoubleCreateTreatment.qml">sources/gui/qml/components/pretreatment/SliderDoubleCreateTreatment.qml</file>
+        <file alias="RangeSlider.qml">sources/gui/qml/components/RangeSlider.qml</file>
+        <file alias="MuteButton.qml">sources/gui/qml/components/MuteButton.qml</file>
+        <file alias="UpDownButton.qml">sources/gui/qml/components/UpDownButton.qml</file>
+        <file alias="ImageText.qml">sources/gui/qml/components/ImageText.qml</file>
+        <file alias="TextEntry.qml">sources/gui/qml/components/TextEntry.qml</file>
+        <file alias="Keyboard.qml">sources/gui/qml/components/Keyboard.qml</file>
     </qresource>
+    <qresource prefix="/compounds">
+        <file alias="PressureRangeSlider.qml">sources/gui/qml/compounds/PressureRangeSlider.qml</file>
+    </qresource>
     <qresource prefix="/">
         <file>qtquickcontrols2.conf</file>
         <file alias="main.qml">sources/gui/qml/main.qml</file>
@@ -96,20 +131,24 @@
     <qresource prefix="/pages/treatment">
         <file alias="TreatmentHome.qml">sources/gui/qml/pages/treatment/TreatmentHome.qml</file>
         <file alias="TreatmentStack.qml">sources/gui/qml/pages/treatment/TreatmentStack.qml</file>
-        <file alias="TreatmentCreate.qml">sources/gui/qml/pages/treatment/TreatmentCreate.qml</file>
-        <file alias="TreatmentBegin.qml">sources/gui/qml/pages/treatment/TreatmentBegin.qml</file>
-        <file alias="TreatmentConfirm.qml">sources/gui/qml/pages/treatment/TreatmentConfirm.qml</file>
-        <file alias="TreatmentPrime.qml">sources/gui/qml/pages/treatment/TreatmentPrime.qml</file>
         <file alias="TreatmentStart.qml">sources/gui/qml/pages/treatment/TreatmentStart.qml</file>
     </qresource>
+    <qresource prefix="/pages/pretreatment/create">
+        <file alias="PreTreatmentCreate.qml">sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml</file>
+        <file alias="PreTreatmentUltrafiltration.qml">sources/gui/qml/pages/pretreatment/create/PreTreatmentUltrafiltration.qml</file>
+        <file alias="PreTreatmentConfirm.qml">sources/gui/qml/pages/pretreatment/create/PreTreatmentConfirm.qml</file>
+        <file alias="PreTreatmentPrime.qml">sources/gui/qml/pages/pretreatment/create/PreTreatmentPrime.qml</file>
+        <file alias="PreTreatmentBase.qml">sources/gui/qml/pages/pretreatment/create/PreTreatmentBase.qml</file>
+    </qresource>
     <qresource prefix="/pages/treatment/sections">
         <file alias="TreatmentFlows.qml">sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml</file>
         <file alias="TreatmentVitals.qml">sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml</file>
-        <file alias="TreatmentPressure.qml">sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml</file>
+        <file alias="TreatmentPressures.qml">sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml</file>
         <file alias="TreatmentUltrafiltration.qml">sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml</file>
         <file alias="TreatmentFluid.qml">sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml</file>
         <file alias="TreatmentTime.qml">sources/gui/qml/pages/treatment/sections/TreatmentTime.qml</file>
         <file alias="TreatmentSaline.qml">sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml</file>
+        <file alias="TreatmentHeparin.qml">sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml</file>
     </qresource>
     <qresource prefix="/pages/treatment/adjustments">
         <file alias="TreatmentAdjustmentFlow.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml</file>
@@ -119,5 +158,26 @@
         <file alias="TreatmentAdjustmentUltrafiltrationPaused.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml</file>
         <file alias="TreatmentAdjustmentUltrafiltrationEdit.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml</file>
         <file alias="TreatmentAdjustmentUltrafiltrationConfirm.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml</file>
+        <file alias="TreatmentAdjustmentPressuresLimits.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml</file>
     </qresource>
+    <qresource prefix="/pages/posttreatment">
+        <file alias="PostTreatmentBloodPrime.qml">sources/gui/qml/pages/postTreatment/PostTreatmentBloodPrime.qml</file>
+        <file alias="PostTreatmentRinsebackStack.qml">sources/gui/qml/pages/postTreatment/PostTreatmentRinsebackStack.qml</file>
+        <file alias="PostTreatmentRecirculateStack.qml">sources/gui/qml/pages/postTreatment/PostTreatmentRecirculateStack.qml</file>
+        <file alias="PostTreatmentEndStack.qml">sources/gui/qml/pages/postTreatment/PostTreatmentEndStack.qml</file>
+    </qresource>
+    <qresource prefix="/pages/posttreatment/rinseback">
+        <file alias="PostTreatmentRinsebackInit.qml">sources/gui/qml/pages/postTreatment/rinseback/PostTreatmentRinsebackInit.qml</file>
+        <file alias="PostTreatmentRinseback.qml">sources/gui/qml/pages/postTreatment/rinseback/PostTreatmentRinseback.qml</file>
+        <file alias="PostTreatmentRinsebackComplete.qml">sources/gui/qml/pages/postTreatment/rinseback/PostTreatmentRinsebackComplete.qml</file>
+        <file alias="PostTreatmentAdditional.qml">sources/gui/qml/pages/postTreatment/rinseback/PostTreatmentAdditional.qml</file>
+    </qresource>
+    <qresource prefix="/pages/posttreatment/recirculate">
+        <file alias="PostTreatmentRecirculate.qml">sources/gui/qml/pages/postTreatment/recirculate/PostTreatmentRecirculate.qml</file>
+        <file alias="PostTreatmentReconnect.qml">sources/gui/qml/pages/postTreatment/recirculate/PostTreatmentReconnect.qml</file>
+    </qresource>
+    <qresource prefix="/pages/posttreatment/end">
+        <file alias="PostTreatmentEnd.qml">sources/gui/qml/pages/postTreatment/end/PostTreatmentEnd.qml</file>
+        <file alias="PostTreatmentEndPaused.qml">sources/gui/qml/pages/postTreatment/end/PostTreatmentEndPause.qml</file>
+    </qresource>
 </RCC>