Index: leahi.qrc =================================================================== diff -u -rd2c4e611703fcb97794975dbc28f9a030b84bbf0 -r5c13b67267f6919fd7fcc7b970bd7c0ee7de12d3 --- leahi.qrc (.../leahi.qrc) (revision d2c4e611703fcb97794975dbc28f9a030b84bbf0) +++ leahi.qrc (.../leahi.qrc) (revision 5c13b67267f6919fd7fcc7b970bd7c0ee7de12d3) @@ -26,8 +26,9 @@ sources/gui/qml/pages/settings/SettingsDecommission.qml sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml sources/gui/qml/pages/settings/SettingsLocalization.qml - sources/gui/qml/pages/settings/SettingsUserMode.qml + sources/gui/qml/pages/settings/SettingsAdvancedMode.qml sources/gui/qml/pages/settings/SettingsFeatureConfigurations.qml + sources/gui/qml/pages/settings/SettingsAdvancedInstitutional.qml sources/gui/qml/dialogs/ConfirmDialog.qml @@ -36,6 +37,7 @@ sources/gui/qml/dialogs/AlarmListDialog.qml sources/gui/qml/dialogs/LockDialog.qml sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml + sources/gui/qml/dialogs/EndTreatmentDialog.qml sources/gui/qml/dialogs/diagnostics/DiagnosticsDialog.qml @@ -106,6 +108,8 @@ resources/images/Vitals_Red.png resources/images/check_green.png resources/images/eye_closed.png + resources/images/stepCheck.png + resources/images/complete_check.png sources/gui/qml/components/MainMenu.qml @@ -169,6 +173,8 @@ sources/gui/qml/components/PasswordRequirements.qml sources/gui/qml/components/BaseSwitch.qml sources/gui/qml/components/IdleTimer.qml + sources/gui/qml/components/TreatmentCompleteButton.qml + sources/gui/qml/components/RangedValue.qml sources/gui/qml/compounds/PressureRangeSlider.qml @@ -179,8 +185,12 @@ sources/gui/qml/compounds/BPHREntry.qml sources/gui/qml/compounds/NumPad.qml sources/gui/qml/compounds/LabelUnitContainer.qml + sources/gui/qml/compounds/LabelUnitText.qml sources/gui/qml/compounds/ValueAdjuster.qml sources/gui/qml/compounds/TreatmentAdjustmentUltrafiltrationMetrics.qml + sources/gui/qml/compounds/InstitutionalContainer.qml + sources/gui/qml/compounds/ValueAdjusterCustom.qml + sources/gui/qml/compounds/LabelUnitValueAdjuster.qml qtquickcontrols2.conf @@ -239,13 +249,11 @@ 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/PreTreatmentCreate.qml sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml - sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml @@ -270,14 +278,20 @@ sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml - sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml - sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml - sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltration.qml + sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBolusVolume.qml + sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationStack.qml + sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationEdit.qml + sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationConfirm.qml + sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml + sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentSetPoints.qml + sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStack.qml sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.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 + sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentIsolatedUFDurationEdit.qml + sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentIsolatedUFVolumeEdit.qml + sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentIsolatedUFConfirm.qml sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml