Index: sources/gui/qml/components/NotificationBar.qml =================================================================== diff -u -rc66e8e38c6c26cf108c975a7b068e45fe5b56f89 -r6538cce81515660080d73efea40949f770bedaf7 --- sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision c66e8e38c6c26cf108c975a7b068e45fe5b56f89) +++ sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision 6538cce81515660080d73efea40949f770bedaf7) @@ -30,6 +30,8 @@ property int muteTimeoutSec : 0; property color backgroundColor : Colors.textNotificationNoneBg; + signal pressedNotificationBar(); + function toggleSilence(silence, timeoutSec) { isSilenced = silence; muteTimeoutSec = !isSilenced ? 0 : timeoutSec; @@ -62,62 +64,74 @@ right : parent.right } - Image { - id: _icon - source: "qrc:/images/alarm.svg" - anchors.right: _text.left - anchors.rightMargin: Variables.notificationBarIconMargin; - anchors.verticalCenter: parent.verticalCenter; - sourceSize.height: Variables.notificationBarIconHeight; - sourceSize.width: Variables.notificationBarIconWidth; - } - ColorOverlay { - id: _icon_overlay - anchors.fill: _icon; - source: _icon; - color: _root.backgroundColor; - cached: true; - antialiasing: true; - } + MouseArea { + id: _TouchArea + anchors.fill: parent; - Text { id: _text - color : Colors.textNotificationNoneFg - anchors.centerIn : parent - font.pixelSize : Fonts.fontPixelNotification - horizontalAlignment : Text.AlignHCenter - verticalAlignment : Text.AlignVCenter - } + Image { + id: _icon + source: "qrc:/images/alarm.svg" + anchors.right: _text.left + anchors.rightMargin: Variables.notificationBarIconMargin; + anchors.verticalCenter: parent.verticalCenter; + sourceSize.height: Variables.notificationBarIconHeight; + sourceSize.width: Variables.notificationBarIconWidth; + } - Image { - id: _bell - source: isSilenced ? "qrc:/images/bell-off.svg" : "qrc:/images/bell.svg" - anchors.left: _text.right - anchors.leftMargin: Variables.notificationBarIconMargin; - anchors.verticalCenter: parent.verticalCenter; - sourceSize.height: Variables.notificationBarIconHeight; - sourceSize.width: Variables.notificationBarIconWidth; - } + ColorOverlay { + id: _icon_overlay + anchors.fill: _icon; + source: _icon; + color: _root.backgroundColor; + cached: true; + antialiasing: true; + } - ColorOverlay { - id: _bell_overlay - anchors.fill: _bell; - source: _bell; - color: Colors.textMain; - cached: true; - antialiasing: true; - } + Text { id: _text + color : Colors.textNotificationNoneFg + anchors.centerIn : parent + font.pixelSize : Fonts.fontPixelNotification + horizontalAlignment : Text.AlignHCenter + verticalAlignment : Text.AlignVCenter + } - Text { id: _timeout_text - color : Colors.textMain; - anchors.left : _bell.right - anchors.leftMargin : Variables.notificationBarIconMargin; - anchors.verticalCenter: parent.verticalCenter; - font.pixelSize : Fonts.fontPixelNotification - horizontalAlignment : Text.AlignHCenter - verticalAlignment : Text.AlignVCenter - text: muteTimeoutSec; // will be 60 second or less (see PRS) - visible: isSilenced; + Image { + id: _bell + source: isSilenced ? "qrc:/images/bell-off.svg" : "qrc:/images/bell.svg" + anchors.left: _text.right + anchors.leftMargin: Variables.notificationBarIconMargin; + anchors.verticalCenter: parent.verticalCenter; + sourceSize.height: Variables.notificationBarIconHeight; + sourceSize.width: Variables.notificationBarIconWidth; + } + + ColorOverlay { + id: _bell_overlay + anchors.fill: _bell; + source: _bell; + color: Colors.textMain; + cached: true; + antialiasing: true; + } + + Text { id: _timeout_text + color : Colors.textMain; + anchors.left : _bell.right + anchors.leftMargin : Variables.notificationBarIconMargin; + anchors.verticalCenter: parent.verticalCenter; + font.pixelSize : Fonts.fontPixelNotification + horizontalAlignment : Text.AlignHCenter + verticalAlignment : Text.AlignVCenter + text: muteTimeoutSec; // will be 60 second or less (see PRS) + visible: isSilenced; + } + + + + onClicked: { + pressedNotificationBar(); + } } onLevelChanged: {