Index: sources/view/valarmstatus.h =================================================================== diff -u -rd8004655ec64da6c8806b9a074a0cb07d799ddf9 -radf89000bad1a50ec33114ea76d65621a1d351d5 --- sources/view/valarmstatus.h (.../valarmstatus.h) (revision d8004655ec64da6c8806b9a074a0cb07d799ddf9) +++ sources/view/valarmstatus.h (.../valarmstatus.h) (revision adf89000bad1a50ec33114ea76d65621a1d351d5) @@ -52,15 +52,22 @@ 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 noAlarm(); void requestActionTransmit(GuiActionType vAction, const QVariantList &vData); + void requestAlarmAcknowledge(AlarmAcknowledgeRequestData); + void requestAlarmSilence(AlarmSilenceRequestData); private: QString alarmPriorityText (GuiAlarmPriority vEnum); @@ -73,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); };