Index: denali.qrc =================================================================== diff -u -r7710fea4486a639caaa3c510add0eac0bcd4ddcc -rb6f86ce89361e33d989f6a9d01eb94c344a6384f --- denali.qrc (.../denali.qrc) (revision 7710fea4486a639caaa3c510add0eac0bcd4ddcc) +++ denali.qrc (.../denali.qrc) (revision b6f86ce89361e33d989f6a9d01eb94c344a6384f) @@ -1,47 +1,75 @@ + sources/gui/qml/pages/MainStack.qml + sources/gui/qml/pages/MainHome.qml 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/UserConfirmation.qml + sources/gui/qml/pages/TreatmentFlowBase.qml + + sources/gui/qml/pages/settings/SettingsBase.qml + sources/gui/qml/pages/settings/SettingsStack.qml + sources/gui/qml/pages/settings/SettingsHome.qml + sources/gui/qml/pages/settings/SettingsDateTime.qml + sources/gui/qml/pages/settings/SettingsWiFi.qml + sources/gui/qml/pages/settings/SettingsDGCleaning.qml + sources/gui/qml/pages/settings/SettingsDGScheduling.qml + sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml + sources/gui/qml/pages/settings/SettingsBluetoothCuff.qml + sources/gui/qml/pages/settings/SettingsExportLogs.qml + sources/gui/qml/pages/settings/SettingsDeviceRegistration.qml + sources/gui/qml/pages/settings/SettingsInformation.qml + sources/gui/qml/pages/settings/SettingsROInput.qml + sources/gui/qml/pages/settings/SettingsRootSSHAccess.qml + sources/gui/qml/pages/settings/SettingsServicePassword.qml + sources/gui/qml/pages/settings/SettingsManufacturingSetup.qml + sources/gui/qml/pages/settings/SettingsFactoryReset.qml + sources/gui/qml/pages/settings/SettingsDecommission.qml + sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml + - sources/gui/qml/dialogs/PowerOff.qml + sources/gui/qml/dialogs/ConfirmDialog.qml sources/gui/qml/dialogs/AutoHideInfo.qml sources/gui/qml/dialogs/NotificationDialog.qml sources/gui/qml/dialogs/AlarmListDialog.qml + sources/gui/qml/dialogs/DiagnosticsDialog.qml - resources/images/Settings_gear_setting_tools-128.png resources/images/Logo d.png - resources/images/Logo Diality.png - resources/images/Power_symbol-128.png + resources/images/Logo DialityT.png resources/images/splash.png - resources/images/ArrowRight.png + resources/images/ArrowRight.png + resources/images/ArrowLeft.png resources/images/logo d Dark Transparent.png resources/images/Close.png - resources/images/alarm.png - resources/images/bell.png + resources/images/bell-on.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 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 - 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 + resources/images/Busy.png + resources/images/BusyDone.png + resources/images/BusyFail.png + resources/images/EjectEnabled.png + resources/images/EjectDisabled.png + resources/images/eye.png + resources/images/Omron-bp7000.png + resources/images/chevron-left.png + resources/images/chevron-right.png + resources/images/DenaliDevice.png sources/gui/qml/components/MainMenu.qml @@ -55,7 +83,6 @@ 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 @@ -75,7 +102,6 @@ sources/gui/qml/components/ConfirmTreatmentTable.qml sources/gui/qml/components/ConfirmTreatmentSubTable.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/ConfirmButton.qml @@ -86,40 +112,109 @@ 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 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/WaitDone.qml + sources/gui/qml/components/TimeCircle.qml + sources/gui/qml/components/Footer.qml + sources/gui/qml/components/TextEntry.qml + sources/gui/qml/components/ScrollBar.qml + sources/gui/qml/compounds/Fader.qml + sources/gui/qml/components/FooterStatic.qml + sources/gui/qml/components/TimeEntry.qml + sources/gui/qml/components/Label.qml + sources/gui/qml/components/EntryDialog.qml + sources/gui/qml/components/SliderArrows.qml + sources/gui/qml/components/QRCode.qml sources/gui/qml/compounds/PressureRangeSlider.qml + sources/gui/qml/compounds/StepNavigationTitleBar.qml + sources/gui/qml/compounds/InstructionView.qml + sources/gui/qml/compounds/CheckListView.qml + sources/gui/qml/compounds/TouchGrid.qml + sources/gui/qml/compounds/BPHREntry.qml qtquickcontrols2.conf sources/gui/qml/main.qml + sources/gui/qml/AlarmItem.qml + sources/gui/qml/PowerItem.qml + sources/gui/qml/KeyboardItem.qml + sources/gui/qml/SDCProgressItem.qml + sources/gui/qml/USBProgressItem.qml + + sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/backspace.svg + sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/check.svg + sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/enter.svg + sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/globe.svg + sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/handwriting.svg + sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/hidekeyboard.svg + sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/search.svg + sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/selectionhandle.svg + sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/shift-normal.svg + sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/shift-active.svg + sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/shift-capslock.svg + sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/textmode.svg + sources/gui/qml/plugins/virtualkeyboard/styles/denali/style.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/en_GB/dialpad.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/en_GB/digits.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/en_GB/handwriting.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/en_GB/main.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/en_GB/numbers.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/en_GB/symbols.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/en_US/dialpad.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/en_US/digits.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/en_US/handwriting.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/en_US/main.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/en_US/numbers.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/en_US/symbols.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/fallback/dialpad.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/fallback/digits.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/fallback/handwriting.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/fallback/main.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/fallback/numbers.qml + sources/gui/qml/plugins/virtualkeyboard/layouts/fallback/symbols.qml + sources/gui/qml/globals/Variables.qml sources/gui/qml/globals/Colors.qml sources/gui/qml/globals/qmldir sources/gui/qml/globals/Fonts.qml - - sources/gui/qml/pages/treatment/TreatmentHome.qml - sources/gui/qml/pages/treatment/TreatmentStack.qml - sources/gui/qml/pages/treatment/TreatmentStart.qml + + sources/gui/qml/pages/disinfect/DisinfectBase.qml + sources/gui/qml/pages/disinfect/DisinfectStack.qml + + sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml + sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml + sources/gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml + sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml + sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml + sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml + + sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.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/pretreatment/connection/PreTreatmentUltrafiltration.qml + sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml + + + sources/gui/qml/pages/treatment/TreatmentStack.qml + sources/gui/qml/pages/treatment/TreatmentHome.qml + sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml + sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml + sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml @@ -140,4 +235,24 @@ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml + + sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml + sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml + sources/gui/qml/pages/endtreatment/EndTreatmentEndStack.qml + sources/gui/qml/pages/endtreatment/EndTreatmentBase.qml + + + sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml + sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml + sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackComplete.qml + sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentAdditional.qml + sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackReconnect.qml + + + + + sources/gui/qml/pages/posttreatment/PostTreatmentBase.qml + sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml + sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml +