Index: denali.qrc
===================================================================
diff -u -r4f87126626b76aa04ddcf2ae92e04e118cdcbe01 -rb6f86ce89361e33d989f6a9d01eb94c344a6384f
--- denali.qrc	(.../denali.qrc)	(revision 4f87126626b76aa04ddcf2ae92e04e118cdcbe01)
+++ denali.qrc	(.../denali.qrc)	(revision b6f86ce89361e33d989f6a9d01eb94c344a6384f)
@@ -3,28 +3,46 @@
         <file alias="MainStack.qml">sources/gui/qml/pages/MainStack.qml</file>
         <file alias="MainHome.qml">sources/gui/qml/pages/MainHome.qml</file>
         <file alias="ManagerStack.qml">sources/gui/qml/pages/ManagerStack.qml</file>
-        <file alias="ManagerHome.qml">sources/gui/qml/pages/ManagerHome.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="UserConfirmation.qml">sources/gui/qml/pages/UserConfirmation.qml</file>
+        <file alias="TreatmentFlowBase.qml">sources/gui/qml/pages/TreatmentFlowBase.qml</file>
     </qresource>
+    <qresource prefix="/pages/settings">
+        <file alias="SettingsBase.qml">sources/gui/qml/pages/settings/SettingsBase.qml</file>
+        <file alias="SettingsStack.qml">sources/gui/qml/pages/settings/SettingsStack.qml</file>
+        <file alias="SettingsHome.qml">sources/gui/qml/pages/settings/SettingsHome.qml</file>
+        <file alias="SettingsDateTime.qml">sources/gui/qml/pages/settings/SettingsDateTime.qml</file>
+        <file alias="SettingsWiFi.qml">sources/gui/qml/pages/settings/SettingsWiFi.qml</file>
+        <file alias="SettingsDGCleaning.qml">sources/gui/qml/pages/settings/SettingsDGCleaning.qml</file>
+        <file alias="SettingsDGScheduling.qml">sources/gui/qml/pages/settings/SettingsDGScheduling.qml</file>
+        <file alias="SettingsVolumeBrightness.qml">sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml</file>
+        <file alias="SettingsBluetoothCuff.qml">sources/gui/qml/pages/settings/SettingsBluetoothCuff.qml</file>
+        <file alias="SettingsExportLogs.qml">sources/gui/qml/pages/settings/SettingsExportLogs.qml</file>
+        <file alias="SettingsDeviceRegistration.qml">sources/gui/qml/pages/settings/SettingsDeviceRegistration.qml</file>
+        <file alias="SettingsInformation.qml">sources/gui/qml/pages/settings/SettingsInformation.qml</file>
+        <file alias="SettingsROInput.qml">sources/gui/qml/pages/settings/SettingsROInput.qml</file>
+        <file alias="SettingsRootSSHAccess.qml">sources/gui/qml/pages/settings/SettingsRootSSHAccess.qml</file>
+        <file alias="SettingsServicePassword.qml">sources/gui/qml/pages/settings/SettingsServicePassword.qml</file>
+        <file alias="SettingsManufacturingSetup.qml">sources/gui/qml/pages/settings/SettingsManufacturingSetup.qml</file>
+        <file alias="SettingsFactoryReset.qml">sources/gui/qml/pages/settings/SettingsFactoryReset.qml</file>
+        <file alias="SettingsDecommission.qml">sources/gui/qml/pages/settings/SettingsDecommission.qml</file>
+        <file alias="SettingsInstitutionalRecord.qml">sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml</file>
+    </qresource>
     <qresource prefix="/dialogs">
-        <file alias="PowerOff.qml">sources/gui/qml/dialogs/PowerOff.qml</file>
+        <file alias="ConfirmDialog.qml">sources/gui/qml/dialogs/ConfirmDialog.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="DiagnosticsDialog.qml">sources/gui/qml/dialogs/DiagnosticsDialog.qml</file>
     </qresource>
     <qresource prefix="/images">
-        <file alias="iSettings">resources/images/Settings_gear_setting_tools-128.png</file>
         <file alias="iLogoD">resources/images/Logo d.png</file>
-        <file alias="iLogoDiality">resources/images/Logo Diality.png</file>
-        <file alias="iPower">resources/images/Power_symbol-128.png</file>
+        <file alias="iLogoDiality">resources/images/Logo DialityT.png</file>
         <file alias="iSplash">resources/images/splash.png</file>
         <file alias="iArrowRight">resources/images/ArrowRight.png</file>
         <file alias="iArrowLeft">resources/images/ArrowLeft.png</file>
         <file alias="iLogoDDT">resources/images/logo d Dark Transparent.png</file>
         <file alias="iClose">resources/images/Close.png</file>
-        <file alias="iAlarm">resources/images/alarm.png</file>
-        <file alias="iBellOn">resources/images/bell.png</file>
+        <file alias="iBellOn">resources/images/bell-on.png</file>
         <file alias="iBellOff">resources/images/bell-off.png</file>
         <file alias="iBack">resources/images/Back.png</file>
         <file alias="iPauseDarkBlue">resources/images/PauseDarkBlue.png</file>
@@ -35,13 +53,7 @@
         <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>
@@ -50,6 +62,14 @@
         <file alias="iDecelerate">resources/images/Decelerate.png</file>
         <file alias="iBusy">resources/images/Busy.png</file>
         <file alias="iBusyDone">resources/images/BusyDone.png</file>
+        <file alias="iBusyFail">resources/images/BusyFail.png</file>
+        <file alias="iEjectEnabled">resources/images/EjectEnabled.png</file>
+        <file alias="iEjectDisabled">resources/images/EjectDisabled.png</file>
+        <file alias="iEye">resources/images/eye.png</file>
+        <file alias="iCuff-Omron-BP7000">resources/images/Omron-bp7000.png</file>
+        <file alias="iChevronLeft">resources/images/chevron-left.png</file>
+        <file alias="iChevronRight">resources/images/chevron-right.png</file>
+        <file alias="iDenaliDevice">resources/images/DenaliDevice.png</file>
     </qresource>
     <qresource prefix="/components">
         <file alias="MainMenu.qml">sources/gui/qml/components/MainMenu.qml</file>
@@ -63,7 +83,6 @@
         <file alias="USBButton.qml">sources/gui/qml/components/USBButton.qml</file>
         <file alias="ExportButton.qml">sources/gui/qml/components/ExportButton.qml</file>
         <file alias="TouchArea.qml">sources/gui/qml/components/TouchArea.qml</file>
-        <file alias="SettingsItem.qml">sources/gui/qml/components/SettingsItem.qml</file>
         <file alias="TextRect.qml">sources/gui/qml/components/TextRect.qml</file>
         <file alias="Background.qml">sources/gui/qml/components/Background.qml</file>
         <file alias="Line.qml">sources/gui/qml/components/Line.qml</file>
@@ -102,34 +121,80 @@
         <file alias="WaitDone.qml">sources/gui/qml/components/WaitDone.qml</file>
         <file alias="TimeCircle.qml">sources/gui/qml/components/TimeCircle.qml</file>
         <file alias="Footer.qml">sources/gui/qml/components/Footer.qml</file>
+        <file alias="TextEntry.qml">sources/gui/qml/components/TextEntry.qml</file>
+        <file alias="ScrollBar.qml">sources/gui/qml/components/ScrollBar.qml</file>
+        <file alias="Fader.qml">sources/gui/qml/compounds/Fader.qml</file>
+        <file alias="FooterStatic.qml">sources/gui/qml/components/FooterStatic.qml</file>
+        <file alias="TimeEntry.qml">sources/gui/qml/components/TimeEntry.qml</file>
+        <file alias="Label.qml">sources/gui/qml/components/Label.qml</file>
+        <file alias="EntryDialog.qml">sources/gui/qml/components/EntryDialog.qml</file>
+        <file alias="SliderArrows.qml">sources/gui/qml/components/SliderArrows.qml</file>
+        <file alias="QRCode.qml">sources/gui/qml/components/QRCode.qml</file>
     </qresource>
     <qresource prefix="/compounds">
         <file alias="PressureRangeSlider.qml">sources/gui/qml/compounds/PressureRangeSlider.qml</file>
         <file alias="StepNavigationTitleBar.qml">sources/gui/qml/compounds/StepNavigationTitleBar.qml</file>
         <file alias="InstructionView.qml">sources/gui/qml/compounds/InstructionView.qml</file>
         <file alias="CheckListView.qml">sources/gui/qml/compounds/CheckListView.qml</file>
+        <file alias="TouchGrid.qml">sources/gui/qml/compounds/TouchGrid.qml</file>
+        <file alias="BPHREntry.qml">sources/gui/qml/compounds/BPHREntry.qml</file>
     </qresource>
     <qresource prefix="/">
         <file>qtquickcontrols2.conf</file>
         <file alias="main.qml">sources/gui/qml/main.qml</file>
         <file alias="AlarmItem.qml">sources/gui/qml/AlarmItem.qml</file>
         <file alias="PowerItem.qml">sources/gui/qml/PowerItem.qml</file>
+        <file alias="KeyboardItem.qml">sources/gui/qml/KeyboardItem.qml</file>
+        <file alias="SDCProgressItem.qml">sources/gui/qml/SDCProgressItem.qml</file>
+        <file alias="USBProgressItem.qml">sources/gui/qml/USBProgressItem.qml</file>
     </qresource>
+    <qresource prefix="/plugins/QtQuick/VirtualKeyboard">
+        <file alias="Styles/denali/images/iBackspace.svg">sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/backspace.svg</file>
+        <file alias="Styles/denali/images/iCheck.svg">sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/check.svg</file>
+        <file alias="Styles/denali/images/iEnter.svg">sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/enter.svg</file>
+        <file alias="Styles/denali/images/iGlobe.svg">sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/globe.svg</file>
+        <file alias="Styles/denali/images/iHandwriting.svg">sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/handwriting.svg</file>
+        <file alias="Styles/denali/images/iHidekeyboard.svg">sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/hidekeyboard.svg</file>
+        <file alias="Styles/denali/images/iSearch.svg">sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/search.svg</file>
+        <file alias="Styles/denali/images/iSelectionHandle.svg">sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/selectionhandle.svg</file>
+        <file alias="Styles/denali/images/iShiftNormal.svg">sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/shift-normal.svg</file>
+        <file alias="Styles/denali/images/iShiftActive.svg">sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/shift-active.svg</file>
+        <file alias="Styles/denali/images/iShiftCapsLock.svg">sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/shift-capslock.svg</file>
+        <file alias="Styles/denali/images/iTextmode.svg">sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/textmode.svg</file>
+        <file alias="Styles/denali/style.qml">sources/gui/qml/plugins/virtualkeyboard/styles/denali/style.qml</file>
+        <file alias="Layouts/en_GB/dialpad.qml">sources/gui/qml/plugins/virtualkeyboard/layouts/en_GB/dialpad.qml</file>
+        <file alias="Layouts/en_GB/digits.qml">sources/gui/qml/plugins/virtualkeyboard/layouts/en_GB/digits.qml</file>
+        <file alias="Layouts/en_GB/handwriting.qml">sources/gui/qml/plugins/virtualkeyboard/layouts/en_GB/handwriting.qml</file>
+        <file alias="Layouts/en_GB/main.qml">sources/gui/qml/plugins/virtualkeyboard/layouts/en_GB/main.qml</file>
+        <file alias="Layouts/en_GB/numbers.qml">sources/gui/qml/plugins/virtualkeyboard/layouts/en_GB/numbers.qml</file>
+        <file alias="Layouts/en_GB/symbols.qml">sources/gui/qml/plugins/virtualkeyboard/layouts/en_GB/symbols.qml</file>
+        <file alias="Layouts/en_US/dialpad.qml">sources/gui/qml/plugins/virtualkeyboard/layouts/en_US/dialpad.qml</file>
+        <file alias="Layouts/en_US/digits.qml">sources/gui/qml/plugins/virtualkeyboard/layouts/en_US/digits.qml</file>
+        <file alias="Layouts/en_US/handwriting.qml">sources/gui/qml/plugins/virtualkeyboard/layouts/en_US/handwriting.qml</file>
+        <file alias="Layouts/en_US/main.qml">sources/gui/qml/plugins/virtualkeyboard/layouts/en_US/main.qml</file>
+        <file alias="Layouts/en_US/numbers.qml">sources/gui/qml/plugins/virtualkeyboard/layouts/en_US/numbers.qml</file>
+        <file alias="Layouts/en_US/symbols.qml">sources/gui/qml/plugins/virtualkeyboard/layouts/en_US/symbols.qml</file>
+        <file alias="Layouts/fallback/dialpad.qml">sources/gui/qml/plugins/virtualkeyboard/layouts/fallback/dialpad.qml</file>
+        <file alias="Layouts/fallback/digits.qml">sources/gui/qml/plugins/virtualkeyboard/layouts/fallback/digits.qml</file>
+        <file alias="Layouts/fallback/handwriting.qml">sources/gui/qml/plugins/virtualkeyboard/layouts/fallback/handwriting.qml</file>
+        <file alias="Layouts/fallback/main.qml">sources/gui/qml/plugins/virtualkeyboard/layouts/fallback/main.qml</file>
+        <file alias="Layouts/fallback/numbers.qml">sources/gui/qml/plugins/virtualkeyboard/layouts/fallback/numbers.qml</file>
+        <file alias="Layouts/fallback/symbols.qml">sources/gui/qml/plugins/virtualkeyboard/layouts/fallback/symbols.qml</file>
+    </qresource>
     <qresource prefix="/translation"/>
     <qresource prefix="/globals">
         <file alias="Variables.qml">sources/gui/qml/globals/Variables.qml</file>
         <file alias="Colors.qml">sources/gui/qml/globals/Colors.qml</file>
         <file alias="qmldir">sources/gui/qml/globals/qmldir</file>
         <file alias="Fonts.qml">sources/gui/qml/globals/Fonts.qml</file>
     </qresource>
-    <qresource prefix="/pages/treatment">
-        <file alias="TreatmentStack.qml">sources/gui/qml/pages/treatment/TreatmentStack.qml</file>
-        <file alias="TreatmentStart.qml">sources/gui/qml/pages/treatment/TreatmentStart.qml</file>
-        <file alias="TreatmentUltrafiltrationItem.qml">sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml</file>
+    <qresource prefix="/pages/disinfect">
+        <file alias="DisinfectBase.qml">sources/gui/qml/pages/disinfect/DisinfectBase.qml</file>
+        <file alias="DisinfectStack.qml">sources/gui/qml/pages/disinfect/DisinfectStack.qml</file>
     </qresource>
     <qresource prefix="/pages/pretreatment">
         <file alias="PreTreatmentBase.qml">sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml</file>
-        <file alias="PreTreatmentMainStack.qml">sources/gui/qml/pages/pretreatment/PreTreatmentMainStack.qml</file>
+        <file alias="PreTreatmentStack.qml">sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml</file>
         <file alias="PreTreatmentWaterSampleStack.qml">sources/gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml</file>
         <file alias="PreTreatmentConsumablesStack.qml">sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml</file>
         <file alias="PreTreatmentDisposablesStack.qml">sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml</file>
@@ -144,6 +209,12 @@
         <file alias="PreTreatmentUltrafiltration.qml">sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml</file>
         <file alias="PreTreatmentConnectionStack.qml">sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml</file>
     </qresource>
+    <qresource prefix="/pages/treatment">
+        <file alias="TreatmentStack.qml">sources/gui/qml/pages/treatment/TreatmentStack.qml</file>
+        <file alias="TreatmentHome.qml">sources/gui/qml/pages/treatment/TreatmentHome.qml</file>
+        <file alias="TreatmentBloodPrime.qml">sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml</file>
+        <file alias="TreatmentUltrafiltrationItem.qml">sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.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>
@@ -164,24 +235,24 @@
         <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 prefix="/pages/endtreatment">
+        <file alias="EndTreatmentRinsebackStack.qml">sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml</file>
+        <file alias="EndTreatmentRecirculateStack.qml">sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml</file>
+        <file alias="EndTreatmentEndStack.qml">sources/gui/qml/pages/endtreatment/EndTreatmentEndStack.qml</file>
+        <file alias="EndTreatmentBase.qml">sources/gui/qml/pages/endtreatment/EndTreatmentBase.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 prefix="/pages/endtreatment/rinseback">
+        <file alias="EndTreatmentRinsebackInit.qml">sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml</file>
+        <file alias="EndTreatmentRinseback.qml">sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml</file>
+        <file alias="EndTreatmentRinsebackComplete.qml">sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackComplete.qml</file>
+        <file alias="EndTreatmentAdditional.qml">sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentAdditional.qml</file>
+        <file alias="EndTreatmentRinsebackReconnect.qml">sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackReconnect.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 prefix="/pages/endtreatment/recirculate"/>
+    <qresource prefix="/pages/endtreatment/end"/>
+    <qresource prefix="/pages/posttreatment">
+        <file alias="PostTreatmentBase.qml">sources/gui/qml/pages/posttreatment/PostTreatmentBase.qml</file>
+        <file alias="PostTreatmentStack.qml">sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml</file>
+        <file alias="PostTreatmentReview.qml">sources/gui/qml/pages/posttreatment/PostTreatmentReview.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>