Index: sources/gui/qml/main.qml
===================================================================
diff -u -rbefa8e7e7667c4aa5193022bd80e9f52c2374ad0 -r2124420a19819f672e9180979ff3762dc083eb7f
--- sources/gui/qml/main.qml	(.../main.qml)	(revision befa8e7e7667c4aa5193022bd80e9f52c2374ad0)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision 2124420a19819f672e9180979ff3762dc083eb7f)
@@ -1,13 +1,13 @@
 /*!
  *
- * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2019-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    main.qml
  * \author  (last)      Behrouz NematiPour
- * \date    (last)      28-Feb-2021
+ * \date    (last)      14-Jan-2022
  * \author  (original)  Behrouz NematiPour
  * \date    (original)  24-Sep-2019
  *
@@ -24,7 +24,9 @@
 // View classes
 import VHDAccelerometer                                     0.1
 import VHDSyringePump                                       0.1
-
+import VHDBloodLeak                                         0.1
+import VHDAirTrap                                           0.1
+import VHDAirBubble                                         0.1
 // POST
 import VHDPOSTData                                          0.1
 import VDGPOSTData                                          0.1
@@ -87,6 +89,7 @@
 import VDGValvesStates                                      0.1
 import VTreatmentCreate                                     0.1
 import VDGAccelerometer                                     0.1
+import VDGConductivity                                      0.1
 // In-Treatment - Adjustemnt
 import VTreatmentAdjustmentDuration                         0.1
 import VTreatmentAdjustmentFlows                            0.1
@@ -147,6 +150,7 @@
         interval    : vTreatmentCreate.bloodPressureMeasureInterval
     }
 
+
     VTreatmentDialysateFlow                             { id: vTreatmentDialysateFlow                               }
     VTreatmentPressureOcclusion                         { id: vTreatmentPressureOcclusion                           }
     VTreatmentUltrafiltration                           { id: vTreatmentUltrafiltration                             }
@@ -157,6 +161,9 @@
     VTreatmentStop                                      { id: vTreatmentStop                                        }
     VHDAccelerometer                                    { id: vHDAccelerometer                                      }
     VHDSyringePump                                      { id: vHDSyringePump                                        }
+    VHDAirBubble                                        { id: vHDAirBubble                                          }
+    VHDBloodLeak                                        { id: vHDBloodLeak                                          }
+    VHDAirTrap                                          { id: vHDAirTrap                                            }
     // ---- DG
     VDGDrainPump                                        { id: vDGDrainPump                                          }
     VDGHeaters                                          { id: vDGHeaters                                            }
@@ -168,7 +175,7 @@
     VDGTemperatures                                     { id: vDGTemperatures                                       }
     VDGValvesStates                                     { id: vDGValvesStates                                       }
     VDGAccelerometer                                    { id: vDGAccelerometer                                      }
-
+    VDGConductivity                                     { id: vDGConductivity                                       }
     // --- Pre-Treatment Progress Data
     VPreTreatmentAdjustmentInitTreatment                { id: vPreTreatmentAdjustmentInitTreatment                  }
     VDGFilterFlush                                      { id: vDGFilterFlush                                        }
@@ -318,7 +325,7 @@
     }
 
     // keyboard should always be before AlarmItem to not to covet it.
-    Keyboard            { id: _keyboard                    }
+    VirtualKeyboard     { id: _keyboard                    }
 
     // AlarmItem should always be at the end so nothing covers it
     AlarmItem           { id: _alarmItem        ;   z: 997 }
@@ -340,5 +347,4 @@
         timeout             : _alarmItem.timeout
         backgroundFading    : vHDOperationMode.fault
     }
-
 }