Index: sources/gui/qml/dialogs/NotificationDialog.qml =================================================================== diff -u -r86e9dfbff50cb7e16fd94c16c1c818cef3b47eac -r6f2622be80fcaee8d71baf78404627381157970c --- sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 86e9dfbff50cb7e16fd94c16c1c818cef3b47eac) +++ sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 6f2622be80fcaee8d71baf78404627381157970c) @@ -74,14 +74,14 @@ radius : _root.radius clip : true // the mute button expands so we need to clip the outside unwanted area. - Image { id: _icon - source: "qrc:/images/iAlarm" - anchors.horizontalCenter: _title.horizontalCenter - anchors.verticalCenter: _title.verticalCenter - anchors.horizontalCenterOffset: -_title.width + Variables.dialogIconHorizontalOffset; - height : Variables.alarmListIconDiameter - width : Variables.alarmListIconDiameter - } + // Image { id: _icon + // source: "qrc:/images/iAlarm" + // anchors.horizontalCenter: _title.horizontalCenter + // anchors.verticalCenter: _title.verticalCenter + // anchors.horizontalCenterOffset: -_title.width + Variables.dialogIconHorizontalOffset; + // height : Variables.alarmListIconDiameter + // width : Variables.alarmListIconDiameter + // } Text { id: _title color: Colors.textMain @@ -91,9 +91,12 @@ } MouseArea { id: _minimizeArea - enabled : _root.minVisible - anchors.fill: parent - onClicked : _root.minimizeClicked() + // this object is not exposed so cannot be missused by the child component, so here it can be enabled and being handled by the minVisible property + // enabled : _root.minVisible + anchors.fill : parent + onClicked : { if ( _root.minVisible ) _root.minimizeClicked() } // if can be minimized (minVisible = true ), call the minimizeClinked signal (norma behavior) + onDoubleClicked : { if ( ! _root.minVisible ) _sdcProgressItem.doubleClicked() } // if can NOT be minimized (minVisible = false), call the sdcard.double click to pop the DiagnosticsDialog + // TODO: disable doubleClicked later. this is only for diagnostic purpose when alarm dialog covers the entire screen. } UpDownButton { id: _minimizeButton @@ -134,17 +137,11 @@ hourZero : false minuteZero : true } - - // TODO: disable this later. this is only for diagnostic purpose when alarm dialog covers the entire screen. - MouseArea { - anchors.fill: _icon - onClicked : if ( _minimizeArea.enabled ) _root.minimizeClicked() - onDoubleClicked : _sdcProgressItem.doubleClicked() - } } Rectangle { id: _descReect color: Colors.transparent + clip : true anchors { fill : parent topMargin : 5 + _titleBar .height @@ -216,4 +213,16 @@ selectColor : Qt.darker(_root.backgroundColor, 1.15) } } + + Text { id: _alarmID + text : qsTr("ID") + ":" + _root.alarmID + anchors { + left : parent.left + bottom : parent.bottom + leftMargin : 5 + bottomMargin: 5 + } + color : Colors.textMain + font.pixelSize : Fonts.fontPixelDialogText + } }