Index: sources/gui/qml/main.qml
===================================================================
diff -u -rc71deaab48699cffdf9db816dfac2778d79c2238 -rd1907168ef46faa6de1ada400cad789f8379041f
--- sources/gui/qml/main.qml	(.../main.qml)	(revision c71deaab48699cffdf9db816dfac2778d79c2238)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision d1907168ef46faa6de1ada400cad789f8379041f)
@@ -1,16 +1,16 @@
 /*!
- * 
+ *
  * Copyright (c) 2019-2020 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) Peter Lucia
  * \date (last) 26-Jun-2020
  * \author (original) Behrouz NematiPour
  * \date (original) 24-Sep-2019
- * 
+ *
  */
 
 // Qt
@@ -30,16 +30,24 @@
 import VTreatmentTime                               0.1;
 import VAlarmStatus                                 0.1;
 import VPowerOff                                    0.1;
+import VHDOperationMode                             0.1;
 
 import VTreatmentAdjustmentDuration                 0.1;
 import VTreatmentAdjustmentFlows                    0.1;
 import VTreatmentAdjustmentUltrafiltrationState     0.1;
 import VTreatmentAdjustmentUltrafiltrationEdit      0.1;
 import VTreatmentAdjustmentUltrafiltrationConfirm   0.1;
 
-import VLoadCellReadings                            0.1;
-import VTemperatureSensors                          0.1;
 import VCreateTreatment                             0.1;
+import VDGDrainPump                                 0.1;
+import VDGHeaters                                   0.1;
+import VDGLoadCellReadings                          0.1;
+import VDGOperationMode                             0.1;
+import VDGPressures                                 0.1;
+import VDGROPump                                    0.1;
+import VDGReservoir                                 0.1;
+import VDGTemperatures                              0.1;
+import VDGValvesStates                              0.1;
 
 //  Qml imports
 import "qrc:/globals"
@@ -61,13 +69,14 @@
         onDidActionReceive: {
             //console.debug(vAction, vData)
             switch(vAction) {
-            case GuiActions.PowerOffBroadcast:
+            case GuiActions.ID_ShuttingDown:
                 _autoHideInfo.showDialog(
                             qsTr("System is shutting down"),
                             5000 // if any error happens and shutdown is not successful then after 5 seconds dialog hides.
                             )
                 break;
             }
+
         }
     }
 
@@ -88,22 +97,30 @@
                     _alarm_bar.visible = true;
                 }
             }
-        }        
+        }
 
         onHideAlarm: {
             _alarm_bar.visible = false;
             _alarm_dialog.visible = false;
         }
     }
-    VPowerOff                                   { id: vPowerOff }
+    VPowerOff                                   { id: vPowerOff                                     }
+    VHDOperationMode                            { id: vHDOperationMode                              }
     VTreatmentBloodFlow                         { id: vTreatmentBloodFlow                           }
     VTreatmentDialysateFlow                     { id: vTreatmentDialysateFlow                       }
     VTreatmentPressureOcclusion                 { id: vTreatmentPressureOcclusion                   }
     VTreatmentUltrafiltration                   { id: vTreatmentUltrafiltration                     }
     VTreatmentTime                              { id: vTreatmentTime                                }
 
-    VLoadCellReadings                           { id: vLoadCellReadings                             }
-    VTemperatureSensors                         { id: vTemperatureSensors                           }
+    VDGDrainPump                                { id: vDGDrainPump                                  }
+    VDGHeaters                                  { id: vDGHeaters                                    }
+    VDGLoadCellReadings                         { id: vDGLoadCellReadings                           }
+    VDGOperationMode                            { id: vDGOperationMode                              }
+    VDGPressures                                { id: vDGPressures                                  }
+    VDGROPump                                   { id: vDGROPump                                     }
+    VDGReservoir                                { id: vDGReservoir                                  }
+    VDGTemperatures                             { id: vDGTemperatures                               }
+    VDGValvesStates                             { id: vDGValvesStates                               }
 
     VTreatmentAdjustmentDuration                { id: vTreatmentAdjustmentDuration                  }
     VTreatmentAdjustmentFlows                   { id: vTreatmentAdjustmentFlows                     }
@@ -139,10 +156,10 @@
 
     PowerOff { id: _powerOffDialog
         onAccepted: {
-            _GuiView.doActionTransmit(GuiActions.PowerOff, GuiActions.Accepted)
+            _GuiView.doActionTransmit(GuiActions.ID_PowerOff, GuiActions.Accepted)
         }
         onRejected: {
-            _GuiView.doActionTransmit(GuiActions.PowerOff, GuiActions.Rejected)
+            _GuiView.doActionTransmit(GuiActions.ID_PowerOff, GuiActions.Rejected)
         }
     }