Index: sources/gui/qml/AlarmItem.qml =================================================================== diff -u -r79a6cfcb10472261f3ec26eaf0baf6f1245cd311 -r6f2622be80fcaee8d71baf78404627381157970c --- sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision 79a6cfcb10472261f3ec26eaf0baf6f1245cd311) +++ sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision 6f2622be80fcaee8d71baf78404627381157970c) @@ -39,12 +39,13 @@ VAlarmStatus { id: vAlarmStatus } VAlarmActiveList { id: vAlarmActiveList } - readonly property alias backgroundColor: _alarmDialog.backgroundColor - readonly property alias textColor : _alarmDialog.textColor - readonly property alias text : vAlarmStatus.text - readonly property alias isSilenced : vAlarmStatus.alarm_Flag_alarmsSilenced - readonly property alias timeout : vAlarmStatus.alarm_MuteTimeout - readonly property alias alarm_AlarmID : vAlarmStatus.alarm_AlarmID + readonly property alias backgroundColor: _alarmDialog.backgroundColor + readonly property alias textColor : _alarmDialog.textColor + readonly property string title : vAlarmStatus.title + readonly property string message : vAlarmStatus.message + readonly property alias isSilenced : vAlarmStatus.alarm_Flag_alarmsSilenced + readonly property alias timeout : vAlarmStatus.alarm_MuteTimeout + readonly property alias alarm_AlarmID : vAlarmStatus.alarm_AlarmID function clearAlarm() { vAlarmStatus.doClearCondition() @@ -111,8 +112,8 @@ NotificationDialog { id : _alarmDialog // this will change later to the actual message text // and the instruction would be in the dialog content - titleText : qsTr("Alarm") + " " + "[" + vAlarmStatus.alarm_AlarmID + "]" - description : vAlarmStatus.text + titleText : vAlarmStatus.title + description : vAlarmStatus.message alarmID : vAlarmStatus.alarm_AlarmID isSilenced : vAlarmStatus.alarm_Flag_alarmsSilenced timeout : vAlarmStatus.alarm_MuteTimeout