Index: sources/view/valarmstatus.h =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -radf89000bad1a50ec33114ea76d65621a1d351d5 --- sources/view/valarmstatus.h (.../valarmstatus.h) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/view/valarmstatus.h (.../valarmstatus.h) (revision adf89000bad1a50ec33114ea76d65621a1d351d5) @@ -52,20 +52,26 @@ PROPERTY( bool , alarm_Flag_bypassDialyzer , false) PROPERTY( bool , alarm_Flag_alarmsToEscalate , false) PROPERTY( bool , alarm_Flag_alarmsSilenced , false) + PROPERTY( bool , alarm_Flag_UserAcknowledged , false) + PROPERTY( bool , minimizeAlarm , false) // coco end + Q_PROPERTY(QString text READ text NOTIFY alarm_AlarmIDChanged) Q_PROPERTY(QString id READ id NOTIFY alarm_AlarmIDChanged) + + signals: void raiseAlarm(); - void hideAlarm(); + void noAlarm(); void requestActionTransmit(GuiActionType vAction, const QVariantList &vData); + void requestAlarmAcknowledge(AlarmAcknowledgeRequestData); + void requestAlarmSilence(AlarmSilenceRequestData); private: QString alarmPriorityText (GuiAlarmPriority vEnum); QString alarmIDText (GuiAlarmID vEnum); - QList acknowledgedAlarms; private slots: void onActionReceive(const AlarmStatusData &vData); @@ -74,8 +80,9 @@ public slots: QString text(); QString id(); - void requestOkay(GuiAlarmID alarmID); - void requestSilence(); + void onRequestOkay(GuiAlarmID alarmID); + void onRequestSilence(); + void onSetMinimize(bool minimize); };