Index: sources/gui/qml/AlarmItem.qml =================================================================== diff -u -r21041955990385205ec1aca17ef51fc1fd9a4b29 -r2aacff00f09521902b4c0e06eb16c69b2cc31eed --- sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision 21041955990385205ec1aca17ef51fc1fd9a4b29) +++ sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision 2aacff00f09521902b4c0e06eb16c69b2cc31eed) @@ -116,6 +116,8 @@ titleText : vAlarmStatus.title titlePixelSize : Fonts.fontPixelAlarmTitle description : vAlarmStatus.message + instructions : vAlarmStatus.instructionKeys + images : vAlarmStatus.instructionValues alarmID : vAlarmStatus.alarm_AlarmID isSilenced : vAlarmStatus.alarm_Flag_alarmsSilenced timeout : vAlarmStatus.alarm_MuteTimeout @@ -125,8 +127,7 @@ endVisible : ! vAlarmStatus.alarm_Flag_noEndTreatment minVisible : ! vAlarmStatus.alarm_Flag_noMinimize countDown : vTreatmentStop.countDown -// countDownVisible : true// - countDownVisible : vTDOpMode.inTreatment + countDownVisible : vTDOpMode.inTreatment && ( vTDTreatmentStates.txStop || vTDTreatmentStates.txRinseback Index: sources/gui/qml/dialogs/NotificationDialog.qml =================================================================== diff -u -r4cb8bd07db9778b84f89ed438d5295f782f13e9d -r2aacff00f09521902b4c0e06eb16c69b2cc31eed --- sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 4cb8bd07db9778b84f89ed438d5295f782f13e9d) +++ sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 2aacff00f09521902b4c0e06eb16c69b2cc31eed) @@ -30,7 +30,9 @@ property alias titleText : _title.text property alias titlePixelSize : _title.font.pixelSize - property string description : "_desc.text" + property string description : "" + property var instructions : [] + property var images : [] property alias titleBarForeground : _title.color property alias titleBarBackground : _titleBar.color property alias isSilenced : _headerButtonGroup.isSilenced @@ -61,23 +63,21 @@ width : Variables.alarmDialogWidth height : Variables.alarmDialogHeight - /////////////// TODO: Update with actual instructions //////////////// - onDescriptionChanged: { - _model.set(0, { text: vAlarmStatus.title, image: "qrc:/images/iSplash" }) - _model.set(1, { text: vAlarmStatus.message, image: "qrc:/images/iBusy" }) - _model.set(2, { text: vAlarmStatus.text, image: "qrc:/images/iLock" }) + onInstructionsChanged: { + _model.clear(); - _listView.currentIndex = 0 - figureImageSource = _model.get(_listView.currentIndex).image - } + for (var step in instructions) { + _model.append({ text: instructions[step], image: "file:" + images[step] }) + } - ListModel { id: _model - ListElement { text: "I am 1"; image: "qrc:/images/iSplash" } - ListElement { text: "I am 2"; image: "qrc:/images/iBusy" } - ListElement { text: "Step 3"; image: "qrc:/images/iLock" } + if ( _model.count > 0) { + _listView.currentIndex = 0 + figureImageSource = _model.get(_listView.currentIndex).image + } } - ////////////////////////////////////////////////////////////////?///// + ListModel { id: _model } + signal muteClicked() signal minimizeClicked() signal listClicked() @@ -195,7 +195,7 @@ clip : true delegate: Item { id: _delegateControl - width : parent.width + width : _listView.width height : 73 clip : true @@ -343,7 +343,7 @@ left: _timerDescription.right } height: _titleBar.height - textPixelSize : 30 + textPixelSize : 35 textWeight : Font.Bold secondsVisible : false hourZero : false Index: sources/storage/StorageGlobals.cpp =================================================================== diff -u -rbf5b9b7cb86aaf3c4ec85e4ef0b92cba0e836634 -r2aacff00f09521902b4c0e06eb16c69b2cc31eed --- sources/storage/StorageGlobals.cpp (.../StorageGlobals.cpp) (revision bf5b9b7cb86aaf3c4ec85e4ef0b92cba0e836634) +++ sources/storage/StorageGlobals.cpp (.../StorageGlobals.cpp) (revision 2aacff00f09521902b4c0e06eb16c69b2cc31eed) @@ -117,6 +117,7 @@ const char *Settings_Category_InstructionsImagesLoc = "%1/Instructions/" ; const char *Settings_Category_DataList = "Parameters/DataList" ; const char *Settings_Category_Alarms = "Alarms/Alarms" ; + const char *Settings_Category_AlarmsImagesLoc = "%1Alarms/" ; const char *Settings_Category_Events = "Alarms/Events" ; const char *Settings_Category_Rejects = "Alarms/Rejections" ; const char *Settings_Category_MessagesUnhandled = "Messages/Unhandled" ; Index: sources/storage/StorageGlobals.h =================================================================== diff -u -rbf5b9b7cb86aaf3c4ec85e4ef0b92cba0e836634 -r2aacff00f09521902b4c0e06eb16c69b2cc31eed --- sources/storage/StorageGlobals.h (.../StorageGlobals.h) (revision bf5b9b7cb86aaf3c4ec85e4ef0b92cba0e836634) +++ sources/storage/StorageGlobals.h (.../StorageGlobals.h) (revision 2aacff00f09521902b4c0e06eb16c69b2cc31eed) @@ -62,6 +62,7 @@ extern const char *Settings_Category_InstructionsImagesLoc ; extern const char *Settings_Category_DataList ; extern const char *Settings_Category_Alarms ; + extern const char *Settings_Category_AlarmsImagesLoc ; extern const char *Settings_Category_Events ; extern const char *Settings_Category_Rejects ; extern const char *Settings_Category_MessagesUnhandled ; Index: sources/view/hd/alarm/VAlarmStatus.cpp =================================================================== diff -u -r712f4c8a1b2382919300895b4422b831471044a3 -r2aacff00f09521902b4c0e06eb16c69b2cc31eed --- sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 712f4c8a1b2382919300895b4422b831471044a3) +++ sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 2aacff00f09521902b4c0e06eb16c69b2cc31eed) @@ -196,6 +196,9 @@ quint32 id = group.toInt( &ok ); if ( ! ok ) { LOG_DEBUG(QString("Invalid Alarm ID [%1]").arg(group)); continue; } + QString defaultImagePath = QStringLiteral("%1%2") .arg(_location) + .arg("defaultImage.png"); + AlarmData alarmData; InstructionData instructionData; for (const QString &key : _Settings.keys(category, group)) { @@ -204,7 +207,11 @@ } else if (Storage::Settings::isKeyMessage ( key ) ) { alarmData.message = _Settings.value(category, group, key).toString(); } else { - instructionData[key] = _Settings.value(category, group, key).toString(); + + QString imagePath = QStringLiteral("%1%2") .arg(_location) + .arg(_Settings.value(category, group, key).toString()); + + instructionData[key] = QFile::exists(imagePath) ? imagePath : defaultImagePath; alarmData.instructions = instructionData; } } Index: sources/view/hd/alarm/VAlarmStatus.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r2aacff00f09521902b4c0e06eb16c69b2cc31eed --- sources/view/hd/alarm/VAlarmStatus.h (.../VAlarmStatus.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/view/hd/alarm/VAlarmStatus.h (.../VAlarmStatus.h) (revision 2aacff00f09521902b4c0e06eb16c69b2cc31eed) @@ -50,6 +50,7 @@ // friends friend class ::tst_views; + QString _location = QString(Storage::Settings_Category_AlarmsImagesLoc).arg(Storage::Settings_Path()); typedef QMap InstructionData; struct AlarmData {