Index: sources/gui/qml/PowerItem.qml
===================================================================
diff -u -rb5afbc61af03dd2e84acf8439cb6be1f022a2921 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9
--- sources/gui/qml/PowerItem.qml	(.../PowerItem.qml)	(revision b5afbc61af03dd2e84acf8439cb6be1f022a2921)
+++ sources/gui/qml/PowerItem.qml	(.../PowerItem.qml)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
@@ -1,13 +1,13 @@
 /*!
  *
- * Copyright (c) 2021-2022 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2021-2024 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    PowerItem.qml
  * \author  (last)      Behrouz NematiPour
- * \date    (last)      23-Sep-2021
+ * \date    (last)      30-Aug-2023
  * \author  (original)  Behrouz NematiPour
  * \date    (original)  01-Mar-2021
  *
@@ -21,9 +21,6 @@
 import Gui.View     0.1
 import Gui.Actions  0.1
 
-// Confirm
-import VConfirm     0.1
-
 //  Qml imports
 import "qrc:/globals"
 import "qrc:/components"
@@ -36,19 +33,22 @@
 Item { id: _root
     anchors.fill: parent
 
-    VConfirm     { id: vConfirm      }
+    property bool isOpen: false
+
     AutoHideInfo { id: _autoHideInfo }
 
-    PowerOff { id: _powerOffDialog
-        visible         :   vConfirm.visible
+    ConfirmDialog { id: _powerOffDialog
+        idText          :   vConfirm.id
         titleText       :   vConfirm.title
         messageText     :   vConfirm.message
         confirmText     :   vConfirm.confirm
-        confirmVisible  : ! vConfirm.isReject
         cancelText      :   vConfirm.cancel
+        confirmVisible  : ! vConfirm.isReject
         notificationText:   vConfirm.adjustment_ReasonText
+        autoClose       :   vConfirm.isPowerOff || vConfirm.isReject
 
         onVisibleChanged: {
+            _root.isOpen = visible
             if (visible) _alarmItem.alarmHide()
             else         _alarmItem.alarmMaximize()
         }
@@ -71,15 +71,24 @@
     }
 
     function open() {
+        _root.isOpen = true
         _powerOffDialog.open()
+        _confirmDialog.close()      // close the user confirmation dialog if the power off is requested
         _alarmItem.alarmMinimize()
     }
 
     function close() {
+        _root.isOpen = false
         _powerOffDialog.close()
         _alarmItem.alarmMaximize()
     }
 
+    function cancel() {
+        _root.isOpen = false
+        _powerOffDialog.close()
+        if ( vConfirm.needConfirm ) vConfirm.doConfirm( false )
+    }
+
     function reject() { // the power off is the only confirm has separate reject dialog, because the button is not only on UI and is HW as well.
         _autoHideInfo.showDialog(
                     qsTr("Cannot shutdown during 'Treatment'"), // '%1').arg()
@@ -89,7 +98,7 @@
 
     // ---- Connections
     Connections { target: _GuiView
-        onDidActionReceive: {
+        function onDidActionReceive( vAction, vData ) {
             switch(vAction) {
             case GuiActions.ID_ShuttingDown:
                 _autoHideInfo.showDialog (
@@ -102,23 +111,23 @@
     }
 
     Connections { target: vConfirm
-        onIsRejectChanged: {
+        function onIsRejectChanged              ( vValue ) {
             _powerOffDialog.footerUpdate()
         }
 
-        onVisibleChanged: {
-            if ( vvisible ) open  ()
-            else            close ()
+        function onVisibleChanged               ( vValue ) {
+            if ( vValue ) open  ()
+            else          close ()
         }
 
-        onPoweroffTriggered: {
-            switch (vpoweroff) {
+        function onPoweroffTriggered            ( vValue ) {
+            switch ( vValue ) {
             case GuiActions.Command : open  (); break;
             case GuiActions.Timeout : close (); break;
             case GuiActions.Rejected: reject(); break;
             }
         }
-        onAdjustmentTriggered: {
+        function onAdjustmentTriggered          ( vValue ) {
             // DEBUG:
             // console.debug('\n' +
             //               'id                      : ' + vConfirm.id                     + '\n' +