Index: leahi.qrc
===================================================================
diff -u -r7c12b8ce1964a37e856ebcae205f8b4ed19f3c6a -r18e4634800357ac1d8bc1da1cad04836ba85d33c
--- leahi.qrc (.../leahi.qrc) (revision 7c12b8ce1964a37e856ebcae205f8b4ed19f3c6a)
+++ leahi.qrc (.../leahi.qrc) (revision 18e4634800357ac1d8bc1da1cad04836ba85d33c)
@@ -5,6 +5,7 @@
sources/gui/qml/pages/ManagerStack.qml
sources/gui/qml/pages/UserConfirmation.qml
sources/gui/qml/pages/TreatmentFlowBase.qml
+ sources/gui/qml/pages/MainInitialization.qml
sources/gui/qml/pages/settings/SettingsBase.qml
@@ -39,6 +40,9 @@
sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml
sources/gui/qml/dialogs/EndTreatmentDialog.qml
sources/gui/qml/dialogs/RinsebackCompleteDialog.qml
+ sources/gui/qml/dialogs/UfVolumeAdjustment.qml
+ sources/gui/qml/dialogs/HeparinRxAdjustment.qml
+ sources/gui/qml/dialogs/AlarmDialog.qml
sources/gui/qml/dialogs/diagnostics/DiagnosticsDialog.qml
@@ -122,6 +126,11 @@
resources/images/water_sample.png
resources/images/ArrowDownDisabled.png
resources/images/ArrowUpDisabled.png
+ resources/images/pause.png
+ resources/images/play.png
+ resources/images/recirculate_main.png
+ resources/images/bloodpump.png
+ resources/images/edit_yellow.png
sources/gui/qml/components/MainMenu.qml
@@ -169,6 +178,7 @@
sources/gui/qml/components/Footer.qml
sources/gui/qml/components/TextEntry.qml
sources/gui/qml/components/ScrollBar.qml
+ sources/gui/qml/components/ScrollBar2.qml
sources/gui/qml/components/FooterStatic.qml
sources/gui/qml/components/TimeEntry.qml
sources/gui/qml/components/Label.qml
@@ -190,6 +200,7 @@
sources/gui/qml/components/SubStepIndicator.qml
sources/gui/qml/components/SDCInfo.qml
sources/gui/qml/components/BaseChart.qml
+ sources/gui/qml/components/HelpNotification.qml
sources/gui/qml/compounds/PressureRangeSlider.qml
@@ -207,6 +218,8 @@
sources/gui/qml/compounds/ValueAdjusterCustom.qml
sources/gui/qml/compounds/LabelUnitValueAdjuster.qml
sources/gui/qml/compounds/SettingsSlider.qml
+ sources/gui/qml/compounds/AutoStepController.qml
+ sources/gui/qml/compounds/InteractiveImage.qml
qtquickcontrols2.conf
@@ -270,6 +283,8 @@
sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml
+ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml
+ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateTreatmentSettings.qml
sources/gui/qml/pages/treatment/TreatmentStack.qml
@@ -279,6 +294,7 @@
sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml
sources/gui/qml/pages/treatment/TreatmentHeparin.qml
sources/gui/qml/pages/treatment/TreatmentHDF.qml
+ sources/gui/qml/pages/treatment/TreatmentTrends.qml
sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml
@@ -313,15 +329,15 @@
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/recirculate/EndTreatmentRecirculateProgress.qml
+
sources/gui/qml/pages/posttreatment/PostTreatmentBase.qml
sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml