Index: SDDs/AlarmInstructions/AlarmListDialog.dot =================================================================== diff -u -rbd9f83f8c6902127d8ac9821d59136dd69335c3a -r5d784780bbec88cd8531bb56fbcc6e6fe2703236 --- SDDs/AlarmInstructions/AlarmListDialog.dot (.../AlarmListDialog.dot) (revision bd9f83f8c6902127d8ac9821d59136dd69335c3a) +++ SDDs/AlarmInstructions/AlarmListDialog.dot (.../AlarmListDialog.dot) (revision 5d784780bbec88cd8531bb56fbcc6e6fe2703236) @@ -34,7 +34,7 @@ // qml types qAlarmListTitleBar [shape=ellipse, label="Rectangle\nid : _titleBar", fontsize="30pt"]; - qAlarmListContent [shape=ellipse, label="Rectangle\nFlickable\nid : _content", fontsize="30pt"]; + qAlarmListContent [shape=ellipse, label="Rectangle\nid : _content", fontsize="30pt"]; qTouchGridRow [shape=ellipse, label="Grid\nRepeater\nTouchRect.qml", fontsize="30pt"]; qTouchGridID [shape=ellipse, label="Text\nvAlarmActiveList.alarmIDs", fontsize="30pt"]; qTouchGridText [shape=ellipse, label="Text\nvAlarmActiveList.alarmTexts", fontsize="30pt"]; Index: sources/gui/qml/components/AlarmButtonRow.qml =================================================================== diff -u -r21041955990385205ec1aca17ef51fc1fd9a4b29 -r5d784780bbec88cd8531bb56fbcc6e6fe2703236 --- sources/gui/qml/components/AlarmButtonRow.qml (.../AlarmButtonRow.qml) (revision 21041955990385205ec1aca17ef51fc1fd9a4b29) +++ sources/gui/qml/components/AlarmButtonRow.qml (.../AlarmButtonRow.qml) (revision 5d784780bbec88cd8531bb56fbcc6e6fe2703236) @@ -7,22 +7,18 @@ Item { id: _root property color backgroundColor : Colors.Transparent - - property alias muteVisible : _muteButton.visible property alias minMaxVisible: _minMaxButton.visible - property alias lsitVisible : _alarmsList.visible - property alias timeout : _muteButton.timeout property alias isSilenced : _muteButton.isSilenced - property bool isMaxButton : false property bool isMinButton : false + readonly property int spacing : Variables.defaultMargin * 4.5 + signal muteClicked() signal minMaxClicked() signal listClicked() - property int spacing : Variables.defaultMargin * 4.5 MuteButton { id: _muteButton anchors{ Index: sources/gui/qml/dialogs/AlarmListDialog.qml =================================================================== diff -u -r21041955990385205ec1aca17ef51fc1fd9a4b29 -r5d784780bbec88cd8531bb56fbcc6e6fe2703236 --- sources/gui/qml/dialogs/AlarmListDialog.qml (.../AlarmListDialog.qml) (revision 21041955990385205ec1aca17ef51fc1fd9a4b29) +++ sources/gui/qml/dialogs/AlarmListDialog.qml (.../AlarmListDialog.qml) (revision 5d784780bbec88cd8531bb56fbcc6e6fe2703236) @@ -126,41 +126,33 @@ } } - Flickable { id : _flickable - visible : vAlarmActiveList.adjustment_Accepted + TouchGrid { id: _alarmGrid anchors { top : _content.top topMargin : Variables.minVGap bottom : _root.bottom bottomMargin : Variables.mainMenuHeight + Variables.minVGap horizontalCenter: parent.horizontalCenter } + visible : vAlarmActiveList.adjustment_Accepted + + alignCenter : false width : _content.width - Variables.minVGap * 2 // * 2 : for each side height : _content.height - Variables.minVGap * 2 - _titleBar.height // * 2 : for each side - contentWidth : _content.width - Variables.minVGap * 2 - contentHeight : _alarmGrid.height - boundsBehavior : Flickable.StopAtBounds - interactive : false - - TouchGrid { id: _alarmGrid - alignCenter : false - height : rowCount * ( rowSpacing + itemHeight ) - width : parent.width - colCount : 1 - rowCount : vAlarmActiveList.alarmIDs.length - itemHeight : 75 - itemWidth : _content.width - Variables.minVGap * (2 + 1) // * 2 : for each side & the +1 to not cover the scrollbar - rowSpacing : 0 - colSpacing : 0 - lineColor : Colors.alarmDialogText - textColor : Colors.alarmDialogText - itemsText : vAlarmActiveList.alarmIDs - itemsValue : vAlarmActiveList.alarmTexts - itemsTouchable : [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ] - itemsValueLeftMargin : 80 // if decreased maybe covered by title - itemsUnitLeftMargin : 470 // if increased will be covered by chevron if touchable - onItemClicked : _root.itemClicked(vIndex) - } + colCount : 1 + rowCount : vAlarmActiveList.alarmIDs.length + itemHeight : 75 + itemWidth : _content.width - Variables.minVGap * (2 + 1) // * 2 : for each side & the +1 to not cover the scrollbar + rowSpacing : 0 + colSpacing : 0 + lineColor : Colors.alarmDialogText + textColor : Colors.alarmDialogText + itemsText : vAlarmActiveList.alarmIDs + itemsValue : vAlarmActiveList.alarmTexts + itemsTouchable : [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ] + itemsValueLeftMargin : 80 // if decreased maybe covered by title + itemsUnitLeftMargin : 470 // if increased will be covered by chevron if touchable + onItemClicked : _root.itemClicked(vIndex) } } } Index: sources/gui/qml/dialogs/NotificationDialog.qml =================================================================== diff -u -r2aacff00f09521902b4c0e06eb16c69b2cc31eed -r5d784780bbec88cd8531bb56fbcc6e6fe2703236 --- sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 2aacff00f09521902b4c0e06eb16c69b2cc31eed) +++ sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 5d784780bbec88cd8531bb56fbcc6e6fe2703236) @@ -64,7 +64,7 @@ height : Variables.alarmDialogHeight onInstructionsChanged: { - _model.clear(); + _model.clear() for (var step in instructions) { _model.append({ text: instructions[step], image: "file:" + images[step] }) @@ -144,22 +144,22 @@ clip : true anchors { - top : _titleBar.bottom - topMargin: _root.headerOverlap * -1 - left: parent.left - right: parent.right - bottom: _timerRect.top + top : _titleBar.bottom + topMargin : _root.headerOverlap * -1 + left : parent.left + right : parent.right + bottom : _timerRect.top } Item { id: _infoItem anchors { left : parent.left leftMargin : Variables.defaultMargin * 2 - top :parent.top + top : parent.top topMargin : Variables.defaultMargin * 3 } - height: 35 - width: parent.width / 2 + height : 35 + width : parent.width / 2 NotificationBarSmall { id: _infoItem1 color : "transparent" @@ -174,17 +174,17 @@ Row { id: _alarmContentRow anchors { - top: _infoItem.bottom - bottom: parent.bottom - left: parent.left - leftMargin: Variables.defaultMargin * 4 - right: parent.right - rightMargin: Variables.defaultMargin * 3 - margins: Variables.defaultMargin + top : _infoItem.bottom + bottom : parent.bottom + left : parent.left + leftMargin : Variables.defaultMargin * 4 + right : parent.right + rightMargin : Variables.defaultMargin * 3 + margins : Variables.defaultMargin } - spacing: Variables.defaultMargin * 3 - width : _descriptionRect.width + spacing : Variables.defaultMargin * 3 + width : _descriptionRect.width ListView {id: _listView model : _model @@ -207,10 +207,10 @@ Text { id: _stepNumberRect anchors.centerIn: parent - text: index + 1 - color: Colors.white - font.pixelSize: 20 - font.weight: Font.Medium + text : index + 1 + color : Colors.white + font.pixelSize : 20 + font.weight : Font.Medium } layer.enabled : true @@ -247,12 +247,12 @@ leftMargin: _delegateText.contentWidth + Variables.defaultMargin verticalCenter: parent.verticalCenter } - height : parent.height - font.pixelSize: 22 - font.italic : true - color : "#18559E" - text : ("(%1)").arg(_root.figureTextString) - visible : _delegateControl.ListView.isCurrentItem && _root.showFigureText + height : parent.height + font.pixelSize : 22 + font.italic : true + color : "#18559E" + text : ("(%1)").arg(_root.figureTextString) + visible : _delegateControl.ListView.isCurrentItem && _root.showFigureText } MouseArea { Index: sources/view/hd/alarm/VAlarmStatus.cpp =================================================================== diff -u -r2aacff00f09521902b4c0e06eb16c69b2cc31eed -r5d784780bbec88cd8531bb56fbcc6e6fe2703236 --- sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 2aacff00f09521902b4c0e06eb16c69b2cc31eed) +++ sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 5d784780bbec88cd8531bb56fbcc6e6fe2703236) @@ -196,9 +196,6 @@ 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)) { @@ -208,9 +205,12 @@ alarmData.message = _Settings.value(category, group, key).toString(); } else { - QString imagePath = QStringLiteral("%1%2") .arg(_location) - .arg(_Settings.value(category, group, key).toString()); + const QString imagePath = QStringLiteral("%1%2").arg(_location) + .arg(_Settings.value(category, group, key).toString()); + const QString defaultImagePath = QStringLiteral("%1%2") .arg(_location) + .arg("defaultImage.png"); + instructionData[key] = QFile::exists(imagePath) ? imagePath : defaultImagePath; alarmData.instructions = instructionData; } Index: sources/view/hd/alarm/VAlarmStatus.h =================================================================== diff -u -r2aacff00f09521902b4c0e06eb16c69b2cc31eed -r5d784780bbec88cd8531bb56fbcc6e6fe2703236 --- sources/view/hd/alarm/VAlarmStatus.h (.../VAlarmStatus.h) (revision 2aacff00f09521902b4c0e06eb16c69b2cc31eed) +++ sources/view/hd/alarm/VAlarmStatus.h (.../VAlarmStatus.h) (revision 5d784780bbec88cd8531bb56fbcc6e6fe2703236) @@ -50,7 +50,7 @@ // friends friend class ::tst_views; - QString _location = QString(Storage::Settings_Category_AlarmsImagesLoc).arg(Storage::Settings_Path()); + const QString _location = QString(Storage::Settings_Category_AlarmsImagesLoc).arg(Storage::Settings_Path()); typedef QMap InstructionData; struct AlarmData {