Index: denali.qrc =================================================================== diff -u -r3702984c4572607055ab3ede4d45792e74595991 -r4f87126626b76aa04ddcf2ae92e04e118cdcbe01 --- denali.qrc (.../denali.qrc) (revision 3702984c4572607055ab3ede4d45792e74595991) +++ denali.qrc (.../denali.qrc) (revision 4f87126626b76aa04ddcf2ae92e04e118cdcbe01) @@ -1,9 +1,11 @@ + sources/gui/qml/pages/MainStack.qml + sources/gui/qml/pages/MainHome.qml sources/gui/qml/pages/ManagerStack.qml + sources/gui/qml/pages/ManagerHome.qml sources/gui/qml/pages/SettingsStack.qml sources/gui/qml/pages/SettingsHome.qml - sources/gui/qml/pages/ManagerHome.qml sources/gui/qml/dialogs/PowerOff.qml @@ -17,7 +19,8 @@ resources/images/Logo Diality.png resources/images/Power_symbol-128.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 @@ -45,6 +48,8 @@ resources/images/End.png resources/images/Accelerate.png resources/images/Decelerate.png + resources/images/Busy.png + resources/images/BusyDone.png sources/gui/qml/components/MainMenu.qml @@ -78,7 +83,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 @@ -89,21 +93,27 @@ 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/compounds/PressureRangeSlider.qml + sources/gui/qml/compounds/StepNavigationTitleBar.qml + sources/gui/qml/compounds/InstructionView.qml + sources/gui/qml/compounds/CheckListView.qml qtquickcontrols2.conf sources/gui/qml/main.qml + sources/gui/qml/AlarmItem.qml + sources/gui/qml/PowerItem.qml @@ -113,17 +123,27 @@ 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/treatment/TreatmentUltrafiltrationItem.qml + + sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml + sources/gui/qml/pages/pretreatment/PreTreatmentMainStack.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/sections/TreatmentFlows.qml sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml