Index: sources/view/confirm/VConfirm.cpp
===================================================================
diff -u -r3a2114c103d6eaf2807d2f515eeb9e0fbdeabc69 -r981e534e5b3174aab7ec47de3b1ead1511dbb6ef
--- sources/view/confirm/VConfirm.cpp	(.../VConfirm.cpp)	(revision 3a2114c103d6eaf2807d2f515eeb9e0fbdeabc69)
+++ sources/view/confirm/VConfirm.cpp	(.../VConfirm.cpp)	(revision 981e534e5b3174aab7ec47de3b1ead1511dbb6ef)
@@ -33,18 +33,16 @@
 }
 
 /*!
- * \brief   VConfirm::onActionReceive
- * \details received response model data handler
- * \param   vData - model data
+ * \brief View::VConfirm::setConfirmCommand
+ * \param vCommand - confirm command
  */
-void View::VConfirm::onActionReceive(const DuetConfirmHDiData &vData)
+void View::VConfirm::setConfirmCommand(const DuetConfirmHDiData &vData)
 {
-    isPowerOff(false );
-
-    id      ( vData.mId      );
     command ( vData.mCommand );
-
     GuiConfirmCommand cmd = static_cast<GuiConfirmCommand>( _command );
+
+    visible( ( cmd == GuiConfirmCommand::GENERIC_CONFIRM_CMD_REQUEST_OPEN || cmd == GuiConfirmCommand::GENERIC_CONFIRM_CMD_REJECT ) );
+
     switch ( cmd ) {
     case GuiConfirmCommand::GENERIC_CONFIRM_CMD_REQUEST_OPEN    :
         adjustment_Reason   ( GuiConfirmId::GENERIC_CONFIRM_ID_NONE );
@@ -76,42 +74,88 @@
     break;
     case GuiConfirmCommand::NUM_OF_GENERIC_CONFIRM_COMMAND      :       /* No code */     break;
     }
+}
 
-    // TODO: These values shall be read form the Confirm.conf
-    title   ( QString("Title [%1]").arg(_id) );
-    message ( Gui::enumString(static_cast<GuiConfirmId>(vData.mId), "[%1] Unknown Request") ); // For now
-    confirm (tr("CONFIRM"));
-    cancel  (isReject() ? tr("CLOSE") : tr("CANCEL"));
+/*!
+ * \brief View::VConfirm::setConfirmId
+ * \param vId - confirm id
+ */
+void View::VConfirm::setConfirmId(const DuetConfirmHDiData &vData)
+{
+    titleByID   ();
+  messageByID   ();
+  confirmByID   ();
+   cancelByID   ( ! isReject() );
+   cancel       ( tr("CLOSE" ) );
 
-    // *** has to be the last to let the dialog to setup itself before becomes visible. ***
-    visible             ( cmd == GuiConfirmCommand::GENERIC_CONFIRM_CMD_REQUEST_OPEN || cmd == GuiConfirmCommand::GENERIC_CONFIRM_CMD_REJECT );
+   id           ( vData.mId );
+}
 
+/*!
+ * \brief View::VConfirm::setPowerOffCommand
+ */
+void View::VConfirm::setPowerOffCommand()
+{
+    command             ( 0 );
+    adjustment_Reason   ( GuiConfirmId::GENERIC_CONFIRM_ID_NONE );
+    adjustment_Accepted ( false );                                      // it has not been accepted yet.
+    isTimeout           ( false );
+    isReject            ( false );
+    isAccept            ( false );
+}
+
+/*!
+ * \brief View::VConfirm::setPowerOffId
+ */
+void View::VConfirm::setPowerOffId()
+{
+        titleByID       ( false );
+      messageByID       ( false );
+      confirmByID       ( false );
+       cancelByID       ( false );
+
+    title               ( tr("Shutdown")                            );
+    message             ( tr("Are you sure you want to Shutdown?")  );
+    adjustment_Reason   ( GuiConfirmId::GENERIC_CONFIRM_ID_NONE     );  // power off has no rejection reason on the dialog
+    confirm             ( tr("SHUTDOWN")                            );
+    cancel              ( tr("CANCEL")                              );
+
+    id                  ( 0 );
+}
+
+/*!
+ * \brief   VConfirm::onActionReceive
+ * \details received response model data handler
+ * \param   vData - model data
+ */
+void View::VConfirm::onActionReceive(const DuetConfirmHDiData &vData)
+{
+    isPowerOff(false );
+
+    setConfirmCommand   ( vData );
+    setConfirmId        ( vData );
+
     // *** has to be the last to let the information to be set and then emit the signal ***
     // *** otherwise will use the Previous values before being set.                     ***
     adjustment                  ( true );
 
-    // DEBUG:    
-    qDebug() << _id << _command << adjustment_Reason() << _title << _message;
+    // DEBUG:    qDebug() << _id << _command << adjustment_Reason() << _title << _message << _isReject;
 }
 
 void View::VConfirm::onActionReceive(const PowerOffData &vData)
 {
     isPowerOff(true  );
 
-    title               ( tr("Shutdown")                            );
-    message             ( tr("Are you sure you want to Shutdown?")  );
-    adjustment_Reason   ( GuiConfirmId::GENERIC_CONFIRM_ID_NONE     );  // power off has no rejection reason on the dialog
-    confirm             ( tr("SHUTDOWN")                            );
-    cancel              ( tr("CANCEL")                              );
+    setPowerOffCommand  ( );
+    setPowerOffId       ( );
 
     poweroff(vData.mStatus);
 
     // *** has to be the last to let the information to be set and then emit the signal ***
     // *** otherwise will use the Previous values before being set.                     ***
     adjustment                  ( true );
 
-    // DEBUG:
-    qDebug() << _id << _command << adjustment_Reason() << _title << _message;
+    // DEBUG:    qDebug() << _id << _command << adjustment_Reason() << _title << _message << _isReject;
 }
 
 /*!
@@ -120,8 +164,8 @@
  */
 void View::VConfirm::doConfirm(bool vConfirm) {
     DuetConfirmUIrData data;
-    data.mId = id();
-    data.mConfirm = vConfirm;
+    data.mId        =  id();
+    data.mConfirm   = vConfirm;
     emit didAdjustment(data);
 }
 
@@ -133,30 +177,28 @@
 
         for (const auto &group : groups) {
             bool ok = true;
-            quint32 id = group.toInt( &ok ); Q_UNUSED(id)
+            quint32 id = group.toInt( &ok );
             if ( ! ok ) { LOG_DEBUG(QString("Not an confirm ID number [%1]").arg(group)); continue; }
 
-            // AlarmData alarmData;
-            // InstructionData instructionData;
-            // for (const QString &key : _Settings.keys(group)) {
-            //     if         (isTitle     ( key ) ) {
-            //         alarmData.title      = _Settings.value(group, key).toString();
-            //     } else if  (isMessage   ( key ) ) {
-            //         alarmData.message    = _Settings.value(group, key).toString();
-            //     } else {
-            //         instructionData[key] = _Settings.value(group, key).toString();
-            //         alarmData.instructions  = instructionData;
-            //     }
-            // }
-            // _alarms[id] = alarmData;
-            //
-            /// DEBUG:
-            /// TODO: the MSettings model should do the same has been done here and use map instead of separate structure to iterate vertically, while map supports, keys, values.
-            // qDebug() << "@" << id << _alarms[id].title << _alarms[id].message << _alarms[id].instructions.keys() << _alarms[id].instructions.values();
-            // for (const auto &key : _alarms[id].instructions.keys()) {
-            //     qDebug() << "-" << key << _alarms[id].instructions.value(key);
-            // }
+            ConfirmData confirmData;
+            for (const QString &key : _Settings.keys(category, group)) {
+                if         (Storage::Settings::isKeyTitle       ( key ) ) {
+                    confirmData.title      = _Settings.value(category, group, key).toString();
+                } else if  (Storage::Settings::isKeyMessage     ( key ) ) {
+                    confirmData.message    = _Settings.value(category, group, key).toString();
+                } else if  (Storage::Settings::isKeyConfirm     ( key ) ) {
+                    confirmData.confirm    = _Settings.value(category, group, key).toString();
+                } else if  (Storage::Settings::isKeyCancel      ( key ) ) {
+                    confirmData.cancel     = _Settings.value(category, group, key).toString();
+                } else {
+                }
+            }
+            _confirms[id] = confirmData;
+
+            // DEBUG:
+            // TODO: the MSettings model should do the same has been done here and use map instead of separate structure to iterate vertically, while map supports, keys, values.
+            // qDebug() << "@" << id << _confirms[id].title << _confirms[id].message << _confirms[id].confirm << _confirms[id].cancel;
         }
     }
-    // emit alarm_AlarmIDChanged(_alarm_AlarmID); // to get the dialog content in sync with the Alarm.conf in case there is an early alarm.
+    emit idChanged(_id); // to get the dialog content in sync with the Confirm.conf in case there is an early confirm.
 }