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