Index: sources/gui/GuiGlobals.cpp
===================================================================
diff -u -r28f3f8dd18981262995386d29d3c2ab31418bfc4 -r13e65c3d271d503c2e2e2f1f20736652c470f8cc
--- sources/gui/GuiGlobals.cpp	(.../GuiGlobals.cpp)	(revision 28f3f8dd18981262995386d29d3c2ab31418bfc4)
+++ sources/gui/GuiGlobals.cpp	(.../GuiGlobals.cpp)	(revision 13e65c3d271d503c2e2e2f1f20736652c470f8cc)
@@ -1,45 +1,93 @@
 /*!
  *
- * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2020-2022 Diality Inc. - All Rights Reserved.
  * \copyright
  * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
- * \file GuiGlobals.cpp
- * \author (last) Peter Lucia
- * \date (last) 15-Oct-2020
- * \author (original) Behrouz NematiPour
- * \date (original) 26-Aug-2020
+ * \file    GuiGlobals.cpp
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      18-Apr-2022
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  26-Aug-2020
  *
  */
 #include "GuiGlobals.h"
 
 // Qt
+#include <QQmlEngine>
 #include <QQuickItem>
 
 // Project
 #include "Logger.h"
 #include "GuiView.h"
 #include "VEventSpy.h"
+#include "VGeneralEvent.h"
 
+// POST
+#include "VHDPOSTData.h"
+#include "VDGPOSTData.h"
+
+// Confirm
+#include "VConfirm.h"
+
+// Device
+#include "DeviceView.h"
+
 // Project
-#include "MModel.h"
 #include "VView.h"
-
+// Settings
+#include "VSettings.h"
 #include "VAlarmStatus.h"
-#include "VPowerOff.h"
-
+#include "VAlarmActiveList.h"
+#include "VAdjustmentVersions.h"
+#include "VAdjustmentServiceMode.h"
+#include "VAdjustmentServiceDates.h"
+#include "VDateTime.h"
+#include "VNetworkModel.h"
+#include "VAdjustmentAlarmVolume.h"
+#include "VBluetooth.h"
+// states data
+#include "VHDOperationModeData.h"
+#include "VPreTreatmentStatesData.h"
+#include "VHDTreatmentStatesData.h"
+#include "VPostTreatmentStatesData.h"
+#include "VDisinfectStatesData.h"
+// Common treatment
+#include "VCommonAdjustmentVitals.h"
+// Pre-treatment
+#include "VPreTreatmentAdjustmentInitTreatment.h"
+#include "VDGFilterFlushData.h"
+#include "VPreTreatmentAdjustmentWaterSample.h"
+#include "VPreTreatmentAdjustmentConsumablesConfirm.h"
+#include "VPreTreatmentSelfTestNoCartridgeData.h"
+#include "VPreTreatmentAdjustmentDisposablesConfirm.h"
+#include "VPreTreatmentSelfTestDryData.h"
+#include "VPreTreatmentAdjustmentDisposablesPrime.h"
+#include "VPreTreatmentDisposablesPrimeData.h"
+#include "VPreTreatmentAdjustmentPatientConnectionBegin.h"
+#include "VPreTreatmentAdjustmentUltrafiltrationInit.h"
+#include "VPreTreatmentAdjustmentPatientConnectionConfirm.h"
+#include "VPreTreatmentAdjustmentStartTreatment.h"
+// In-treatment - Data
 #include "VTreatmentBloodFlow.h"
 #include "VTreatmentDialysateFlow.h"
 #include "VTreatmentUltrafiltration.h"
 #include "VTreatmentPressureOcclusion.h"
 #include "VTreatmentTime.h"
 #include "VTreatmentRanges.h"
-#include "VHDOperationModeData.h"
 #include "VTreatmentSalineData.h"
 #include "VTreatmentHeparinData.h"
-#include "VHDTreatmentStatesData.h"
-
+#include "VTreatmentRinsebackData.h"
+#include "VTreatmentRecirculateData.h"
+#include "VTreatmentBloodPrimeData.h"
+#include "VTreatmentStopData.h"
+#include "VHDAccelerometerData.h"
+#include "VHDSyringePumpData.h"
+#include "VHDBloodLeakData.h"
+#include "VHDAirBubbleData.h"
+#include "VHDAirTrapData.h"
+// DG data
 #include "VDGDrainPumpData.h"
 #include "VDGHeatersData.h"
 #include "VDGLoadCellReadingsData.h"
@@ -49,20 +97,33 @@
 #include "VDGReservoirData.h"
 #include "VDGTemperaturesData.h"
 #include "VDGValvesStatesData.h"
+#include "VDGAccelerometerData.h"
+#include "VDGConductivityData.h"
+// -----
 #include "VTreatmentCreate.h"
-#include "VPriming.h"
-#include "VTreatmentBegin.h"
-#include "VTreatmentEnd.h"
+// ----- In-Treatment Adjustments
 #include "VTreatmentAdjustmentDuration.h"
 #include "VTreatmentAdjustmentFlows.h"
-#include "VTreatmentAdjustmentUltrafiltrationInit.h"
 #include "VTreatmentAdjustmentUltrafiltrationState.h"
 #include "VTreatmentAdjustmentUltrafiltrationEdit.h"
 #include "VTreatmentAdjustmentUltrafiltrationConfirm.h"
 #include "VTreatmentAdjustmentSaline.h"
 #include "VTreatmentAdjustmentHeparin.h"
+#include "VTreatmentAdjustmentRinseback.h"
+#include "VTreatmentAdjustmentRecirculate.h"
 #include "VTreatmentAdjustmentPressuresLimits.h"
+// ----- Post-Treatment Adjustments
+#include "VPostTreatmentAdjustPatientDisconnectionConfirm.h"
+#include "VPostTreatmentAdjustDisposablesRemovalConfirm.h"
+#include "VPostTreatmentAdjustTreatmentLog.h"
+// ----- Disinfection
+#include "VDisinfectDGData.h"
+#include "VDisinfectAdjustDisinfect.h"
+#include "VDisinfectAdjustChemicalConfirm.h"
+// -----
+#include "VTreatmentAdjustmentEnd.h"
 
+
 namespace Gui {
     MainView  *_viewer   = nullptr;
 
@@ -94,7 +155,7 @@
     void registerQmlTypes()
     {
         //using namespace View;
-        qmlRegisterType             <GuiView        >("Gui.View"   , 0, 1, "GuiView");
+        qmlRegisterType             <GuiView        >("Gui.View"     , 0, 1, "GuiView");
         qmlRegisterUncreatableType  <GuiActions     >("Gui.Actions"  , 0, 1, "GuiActions" , QStringLiteral("Used only for enumerations no need to have an object"));
         qmlRegisterSingletonType    <View::VEventSpy>("Gui.VEventSpy", 0, 1, "GuiEventSpy", [](QQmlEngine *, QJSEngine *) -> QObject * {
             return &_VEventSpy;
@@ -114,7 +175,7 @@
         registerQmlTypes();
 
         QObject::connect(_viewer, &MainView::statusChanged, qApp, [=](MainView::Status vStatus) {
-            // coco begin validated: this portion of the code is handling application initialization
+            // disabled coco begin validated: this portion of the code is handling application initialization
             // and if not initialized correctly will terminate the application .
             // So it had been manually tested.
             bool ok = vStatus == MainView::Ready;
@@ -127,10 +188,12 @@
                 }
                 QCoreApplication::exit(-1);
             }
-            // coco end
+            // disabled coco end
         }, Qt::QueuedConnection );
 
         LOG_DEBUG("MainView Starting");
+        _viewer->engine()->addImportPath("qrc:/plugins");
+        //DEBUG: qDebug() << _viewer->engine()->importPathList();
         _viewer->setSource(QStringLiteral("qrc:/main.qml"));
         LOG_DEBUG("MainView started");
         return true;