Index: sources/view/hd/alarm/VAlarmStatus.h =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rb61d8a3e01fef66eee8095c9cddf835d9bb32b66 --- sources/view/hd/alarm/VAlarmStatus.h (.../VAlarmStatus.h) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/view/hd/alarm/VAlarmStatus.h (.../VAlarmStatus.h) (revision b61d8a3e01fef66eee8095c9cddf835d9bb32b66) @@ -60,28 +60,35 @@ 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); public slots: QString text(); QString id(); - void requestOkay(GuiAlarmID alarmID); - void requestSilence(); + void onRequestOkay(GuiAlarmID alarmID); + void onRequestSilence(); + void onSetMinimize(bool minimize); }; }