Index: sources/view/hd/alarm/VAlarmActiveList.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -rbf98eed099b286ea9fedbda20776579a7b2db0d0 --- sources/view/hd/alarm/VAlarmActiveList.cpp (.../VAlarmActiveList.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/hd/alarm/VAlarmActiveList.cpp (.../VAlarmActiveList.cpp) (revision bf98eed099b286ea9fedbda20776579a7b2db0d0) @@ -42,6 +42,8 @@ ADJUST_VIEW_CONNECTION(AlarmActiveListRequestData ); ACTION_VIEW_CONNECTION(AlarmActiveListResponseData ); ACTION_VIEW_CONNECTION(SettingsData ); + ACTION_VIEW_CONNECTION(AlarmTriggeredData ); + ACTION_VIEW_CONNECTION(AlarmClearedData ); } /*! @@ -129,11 +131,26 @@ } /*! + * \brief View::VAlarmActiveList::onActionReceive + * \details This function is send the request to activeAlarmList screen upon an alarm trigger + */ +void View::VAlarmActiveList::onActionReceive(const AlarmTriggeredData &) { + doRequest(); +} + +/*! + * \brief View::VAlarmActiveList::onActionReceive + * \details This function is send the request to activeAlarmList screen upon an alarm cleared + */ +void View::VAlarmActiveList::onActionReceive(const AlarmClearedData &) { + doRequest(); +} + +/*! * \brief View::VAlarmActiveList::doRequest * \details Sends the request to get the list of active alarms */ -void View::VAlarmActiveList::doRequest() -{ +void View::VAlarmActiveList::doRequest() { AlarmActiveListRequestData data; emit didAdjustment(data); } Index: sources/view/hd/alarm/VAlarmActiveList.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -rbf98eed099b286ea9fedbda20776579a7b2db0d0 --- sources/view/hd/alarm/VAlarmActiveList.h (.../VAlarmActiveList.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/view/hd/alarm/VAlarmActiveList.h (.../VAlarmActiveList.h) (revision bf98eed099b286ea9fedbda20776579a7b2db0d0) @@ -22,6 +22,8 @@ #include "VAdjustmentResponseBase.h" #include "MAlarmActiveList.h" #include "MSettings.h" +#include "MAlarmTriggered.h" +#include "MAlarmCleared.h" namespace View { @@ -75,6 +77,8 @@ VIEW_DEC_CLASS ( VAlarmActiveList ) VIEW_DEC_SLOT ( AlarmActiveListResponseData ) VIEW_DEC_SLOT ( SettingsData ) + VIEW_DEC_SLOT ( AlarmTriggeredData ) + VIEW_DEC_SLOT ( AlarmClearedData ) QString alarmIDText(quint32 vID);