Index: sources/gui/qml/components/NotificationBar.qml =================================================================== diff -u -r44a85c96ab55e424866ec4cca0270aa218355f82 -r20a67175350b1c20f078bade73a77d48c4647832 --- sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision 44a85c96ab55e424866ec4cca0270aa218355f82) +++ sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision 20a67175350b1c20f078bade73a77d48c4647832) @@ -1,16 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. - * + * * \file NotificationBar.qml - * \author (last) Peter Lucia - * \date (last) 01-Jul-2020 + * \author (last) Behrouz NemaiPour + * \date (last) 06-Aug-2020 * \author (original) Behrouz NematiPour * \date (original) 30-Mar-2020 - * + * */ // Qt @@ -30,14 +30,28 @@ property int muteTimeoutSec : 0 property color backgroundColor : Colors.textNotificationNoneBg + visible : _text.text + height : Variables.notificationHeight + color : Colors.textNotificationNoneBg + //radius : Variables.dialogRadius + anchors { + bottom : parent.bottom + left : parent.left + right : parent.right + } + signal clickedNotificationBar() function toggleSilence(silence, timeoutSec) { isSilenced = silence; muteTimeoutSec = !isSilenced ? 0 : timeoutSec; - _bell.source = isSilenced ? "qrc:/images/bell-off.svg" : "qrc:/images/bell.svg" + _bell.source = isSilenced ? "qrc:/images/iBellOff" : "qrc:/images/iBellOn" } + function setFlashing(enable) { + _timer.running = enable; + } + // Placeholder animation Timer { id: _timer @@ -50,24 +64,9 @@ } } - function setFlashing(enable) { - _timer.running = enable; - } - - visible : _text.text - - height : Variables.notificationHeight - color : Colors.textNotificationNoneBg - //radius : Variables.dialogRadius - anchors { - bottom : parent.bottom - left : parent.left - right : parent.right - } - Image { id: _icon - source: "qrc:/images/alarm.svg" + source: "qrc:/images/iAlarm" anchors.right: _text.left anchors.rightMargin: Variables.notificationBarIconMargin; anchors.verticalCenter: parent.verticalCenter; @@ -86,7 +85,7 @@ Image { id: _bell - source: isSilenced ? "qrc:/images/bell-off.svg" : "qrc:/images/bell.svg" + source: isSilenced ? "qrc:/images/iBellOff" : "qrc:/images/iBellOn" anchors.left: _root.left anchors.leftMargin: Variables.silenceIconMargin; anchors.verticalCenter: parent.verticalCenter;