Index: sources/view/hd/alarm/VAlarmStatus.h
===================================================================
diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -rf06b3645936db64dff09721cf625a6a8530e3f0a
--- sources/view/hd/alarm/VAlarmStatus.h	(.../VAlarmStatus.h)	(revision a58f91b077c8131bea3dbde0fc338adb113fc9f3)
+++ sources/view/hd/alarm/VAlarmStatus.h	(.../VAlarmStatus.h)	(revision f06b3645936db64dff09721cf625a6a8530e3f0a)
@@ -26,14 +26,12 @@
 #include "GuiGlobals.h"
 #include "MessageGlobals.h"
 #include "format.h"
+#include "VAdjustmentResponseBase.h"
+#include "MListModel.h"
 
 // forward declarations
 class tst_views;
 
-// Project
-#include "main.h" // Doxygen : do not remove
-#include "VAdjustmentResponseBase.h"
-
 namespace View {
 
 /*!
@@ -50,13 +48,14 @@
     // friends
     friend class ::tst_views;
 
+    const QString _location = QString(Storage::Settings_Category_AlarmsImagesLoc).arg(Storage::Settings_Path());
 
-    typedef QMap<QString,QString> InstructionData;
+    typedef QList<QHash<int, QVariant>> InstructionData;
+
     struct AlarmData {
-        QString title   = "";
-        QString message = "";
+        QString title       = "";
+        QString listTitle   = "";
         InstructionData instructions;
-        bool    hasInstruction() { return instructions.count(); }
     };
 
     QMap<quint32, AlarmData> _alarms;
@@ -84,10 +83,8 @@
 
     // ********** STATIC PROPERTIES: The properties which need to be updated by each alarm message received. ********** //
     Q_PROPERTY(QString      title               READ title              NOTIFY alarm_AlarmIDChanged )
-    Q_PROPERTY(QString      message             READ message            NOTIFY alarm_AlarmIDChanged )
-    Q_PROPERTY(QStringList  instructionKeys     READ instructionKeys    NOTIFY alarm_AlarmIDChanged )
-    Q_PROPERTY(QStringList  instructionValues   READ instructionValues  NOTIFY alarm_AlarmIDChanged )
     Q_PROPERTY(QString      text                READ text               NOTIFY alarm_AlarmIDChanged )
+    Q_PROPERTY(MListModel*  instructions        READ instructions       NOTIFY alarm_AlarmIDChanged)
 
     VIEW_DEC_CLASS          ( VAlarmStatus                      )
     VIEW_DEC_SLOT           ( AlarmStatusData                   )
@@ -96,14 +93,20 @@
     ADJUST_TRANSMT_SIGNAL   ( AlarmSilenceRequestData           )
     ADJUST_TRANSMT_SIGNAL   ( AlarmUserActionRequestData        )
 
+public:
+    enum {
+        eRole_Instruction = Qt::UserRole,
+        eRole_Image                     ,
+    } DataRole;
+
 private:
     QString     title               ();
-    QString     message             ();
-    QStringList instructionKeys     ();
-    QStringList instructionValues   ();
     QString     text                ();
     QString     alarmIDText         (GuiAlarmID       vEnum);
+    MListModel* instructions        () { return &_instructionsList; } ;
 
+    MListModel  _instructionsList;
+
 signals:
     void didAlarmRaise();
     void didAlarmEmpty();