Index: sources/view/hd/alarm/VAlarmStatus.h =================================================================== diff -u -r053733c0980921ac85961bbf9c0076e2dd65c96c -r8c7b9550b05f223be9d094e850e06f9ed80adb70 --- sources/view/hd/alarm/VAlarmStatus.h (.../VAlarmStatus.h) (revision 053733c0980921ac85961bbf9c0076e2dd65c96c) +++ sources/view/hd/alarm/VAlarmStatus.h (.../VAlarmStatus.h) (revision 8c7b9550b05f223be9d094e850e06f9ed80adb70) @@ -27,7 +27,7 @@ #include "MessageGlobals.h" #include "format.h" #include "VAdjustmentResponseBase.h" -#include "VAlarmInstructionsModel.h" +#include "MListModel.h" // forward declarations class tst_views; @@ -53,7 +53,8 @@ typedef QList> InstructionData; struct AlarmData { - QString title = ""; + QString title = ""; + QString listTitle = ""; InstructionData instructions; }; @@ -82,8 +83,9 @@ // ********** 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 listTitle READ listTitle NOTIFY alarm_AlarmIDChanged ) Q_PROPERTY(QString text READ text NOTIFY alarm_AlarmIDChanged ) - Q_PROPERTY(VAlarmInstructionsModel* instructionModel READ instructionModel NOTIFY alarm_AlarmIDChanged) + Q_PROPERTY(MListModel* instructions READ instructions NOTIFY alarm_AlarmIDChanged) VIEW_DEC_CLASS ( VAlarmStatus ) VIEW_DEC_SLOT ( AlarmStatusData ) @@ -92,13 +94,20 @@ ADJUST_TRANSMT_SIGNAL ( AlarmSilenceRequestData ) ADJUST_TRANSMT_SIGNAL ( AlarmUserActionRequestData ) +public: + enum { + eRole_Instruction = Qt::UserRole, + eRole_Image , + } DataRole; + private: QString title (); + QString listTitle (); QString text (); QString alarmIDText (GuiAlarmID vEnum); - VAlarmInstructionsModel* instructionModel() { return &_alarmInstructionsList; } ; + MListModel* instructions() { return &_instructionsList; } ; - VAlarmInstructionsModel _alarmInstructionsList; + MListModel _instructionsList; signals: void didAlarmRaise();