Index: sources/view/hd/alarm/VAlarmStatus.h
===================================================================
diff -u -r5d784780bbec88cd8531bb56fbcc6e6fe2703236 -rf7d7e8b10c7626f3c6b8450876721a452ebd730f
--- sources/view/hd/alarm/VAlarmStatus.h	(.../VAlarmStatus.h)	(revision 5d784780bbec88cd8531bb56fbcc6e6fe2703236)
+++ sources/view/hd/alarm/VAlarmStatus.h	(.../VAlarmStatus.h)	(revision f7d7e8b10c7626f3c6b8450876721a452ebd730f)
@@ -26,14 +26,12 @@
 #include "GuiGlobals.h"
 #include "MessageGlobals.h"
 #include "format.h"
+#include "VAdjustmentResponseBase.h"
+#include "VAlarmInstructionsModel.h"
 
 // forward declarations
 class tst_views;
 
-// Project
-#include "main.h" // Doxygen : do not remove
-#include "VAdjustmentResponseBase.h"
-
 namespace View {
 
 /*!
@@ -57,7 +55,7 @@
         QString title   = "";
         QString message = "";
         InstructionData instructions;
-        bool    hasInstruction() { return instructions.count(); }
+//        bool    hasInstruction() { return instructions.count(); }
     };
 
     QMap<quint32, AlarmData> _alarms;
@@ -86,9 +84,10 @@
     // ********** 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(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(VAlarmInstructionsModel* instructionModel READ instructionModel NOTIFY alarm_AlarmIDChanged)
 
     VIEW_DEC_CLASS          ( VAlarmStatus                      )
     VIEW_DEC_SLOT           ( AlarmStatusData                   )
@@ -100,11 +99,12 @@
 private:
     QString     title               ();
     QString     message             ();
-    QStringList instructionKeys     ();
-    QStringList instructionValues   ();
     QString     text                ();
     QString     alarmIDText         (GuiAlarmID       vEnum);
+    VAlarmInstructionsModel*         instructionModel() { return &_alarmInstructionsList; } ;
 
+    VAlarmInstructionsModel         _alarmInstructionsList;
+
 signals:
     void didAlarmRaise();
     void didAlarmEmpty();