Index: sources/view/hd/alarm/VAlarmStatus.cpp =================================================================== diff -u -rb45c898bb2fef51abb9460a1306f07eaa8dcbab0 -r8c7b9550b05f223be9d094e850e06f9ed80adb70 --- sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision b45c898bb2fef51abb9460a1306f07eaa8dcbab0) +++ sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 8c7b9550b05f223be9d094e850e06f9ed80adb70) @@ -25,6 +25,11 @@ ACTION_VIEW_CONNECTION(SettingsData ); ADJUST_VIEW_CONNECTION(AlarmSilenceRequestData ); ADJUST_VIEW_CONNECTION(AlarmUserActionRequestData ); + + _instructionsList.setRoleNames({ + { eRole_Instruction , "instruction" }, + { eRole_Image , "image" }, + }); } /*! @@ -154,7 +159,7 @@ || ( _alarm_Flag_alarmsSilencedChanged && ! _alarm_Flag_alarmsSilenced ) ){ - _alarmInstructionsList = _alarms[_alarm_AlarmID].instructions; + _instructionsList = _alarms[_alarm_AlarmID].instructions; emit didAlarmRaise(); } } @@ -179,7 +184,8 @@ return alarmIDText(static_cast(alarm_AlarmID())); } -QString VAlarmStatus::title () { if ( ! _alarm_AlarmID ) return {}; QString s = _alarms[_alarm_AlarmID].title ; if ( ! s.isEmpty()) return s; else return tr("Alarm") ; } +QString VAlarmStatus::title () { if ( ! _alarm_AlarmID ) return {}; QString s = _alarms[_alarm_AlarmID].title ; if ( ! s.isEmpty()) return s; else return tr("Alarm") ; } +QString VAlarmStatus::listTitle () { if ( ! _alarm_AlarmID ) return {}; QString s = _alarms[_alarm_AlarmID].listTitle ; if ( ! s.isEmpty()) return s; else return tr("Alarm") ; } /*! * \brief View::VAlarmStatus::onActionReceive @@ -200,12 +206,14 @@ for (const QString &key : _Settings.keys(category, group)) { if (Storage::Settings::isKeyTitle ( key ) ) { alarmData.title = _Settings.value(category, group, key).toString(); + } else if (Storage::Settings::isKeyListTitle ( key ) ) { + alarmData.listTitle = _Settings.value(category, group, key).toString(); } else { const QString imagePath = QStringLiteral("%1%2").arg(_location) .arg(_Settings.value(category, group, key).toString()); QHash instructionStep; - instructionStep.insert(VAlarmInstructionsModel::eRole_Instruction, key); - instructionStep.insert(VAlarmInstructionsModel::eRole_Image, QFile::exists(imagePath) ? "file:" + imagePath : + instructionStep.insert(eRole_Instruction, key); + instructionStep.insert(eRole_Image, QFile::exists(imagePath) ? "file:" + imagePath : QStringLiteral("file:%1%2").arg(_location) .arg("defaultImage.png"));