Index: denali.pro.user =================================================================== diff -u -r7077e38c74db9cccb5496ffefcf8936c0916de76 -r8f83b92860a33498ea7856e63afef0a10ee11923 --- denali.pro.user (.../denali.pro.user) (revision 7077e38c74db9cccb5496ffefcf8936c0916de76) +++ denali.pro.user (.../denali.pro.user) (revision 8f83b92860a33498ea7856e63afef0a10ee11923) @@ -1,6 +1,6 @@ - + EnvironmentId Index: denali.qrc =================================================================== diff -u -r7077e38c74db9cccb5496ffefcf8936c0916de76 -r8f83b92860a33498ea7856e63afef0a10ee11923 --- denali.qrc (.../denali.qrc) (revision 7077e38c74db9cccb5496ffefcf8936c0916de76) +++ denali.qrc (.../denali.qrc) (revision 8f83b92860a33498ea7856e63afef0a10ee11923) @@ -110,6 +110,7 @@ sources/gui/qml/components/Footer.qml sources/gui/qml/components/TextEntry.qml sources/gui/qml/components/ScrollBar.qml + sources/gui/qml/compounds/Fader.qml sources/gui/qml/compounds/PressureRangeSlider.qml Index: sources/gui/qml/AlarmItem.qml =================================================================== diff -u -r7077e38c74db9cccb5496ffefcf8936c0916de76 -r8f83b92860a33498ea7856e63afef0a10ee11923 --- sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision 7077e38c74db9cccb5496ffefcf8936c0916de76) +++ sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision 8f83b92860a33498ea7856e63afef0a10ee11923) @@ -91,6 +91,7 @@ rinsebackVisible : ! vAlarmStatus.alarm_Flag_noRinseback endVisible : ! vAlarmStatus.alarm_Flag_noEndTreatment minVisible : ! vAlarmStatus.alarm_Flag_noMinimize + titleFading : vHDOperationMode.fault onMuteClicked : vAlarmStatus.doSilence () onResumeClicked : vAlarmStatus.doUserActionResume () @@ -111,6 +112,7 @@ timeout : vAlarmStatus.alarm_MuteTimeout onMuteClicked : vAlarmStatus.doSilence() onMinimizeClicked : alarmMinimize() + titleFading : vHDOperationMode.fault } Connections { target: vAlarmStatus Index: sources/gui/qml/components/NotificationBar.qml =================================================================== diff -u -r1a8e9578b27bb3877116675d0b2361ce4f5b5539 -r8f83b92860a33498ea7856e63afef0a10ee11923 --- sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision 1a8e9578b27bb3877116675d0b2361ce4f5b5539) +++ sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision 8f83b92860a33498ea7856e63afef0a10ee11923) @@ -47,6 +47,14 @@ signal listClicked() signal maximizeClicked() + property bool backgroundFading : false + Fader { + fadingProperyTarget : _root + fadingProperyRunning: backgroundFading + fadingProperyName : "backgroundColor" + fadingProperyValue : backgroundColor + } + Image { id: _muteImage source: "qrc:/images/iAlarm" anchors.right: _text.left Index: sources/gui/qml/compounds/Fader.qml =================================================================== diff -u --- sources/gui/qml/compounds/Fader.qml (revision 0) +++ sources/gui/qml/compounds/Fader.qml (revision 8f83b92860a33498ea7856e63afef0a10ee11923) @@ -0,0 +1,49 @@ +/*! + * + * 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 BackButton.qml + * \author (last) Behrouz NematiPour + * \date (last) 11-May-2021 + * \author (original) Behrouz NematiPour + * \date (original) 11-May-2021 + * + */ + +// Qt +import QtQuick 2.12 + +// Project +// Qml imports + +/*! + * \brief Denali project Fader Component can provide a consistent fading colors of the specified property. + */ +SequentialAnimation { + property var fadingProperyTarget : target + property bool fadingProperyRunning: false + property string fadingProperyName : "" + property var fadingProperyValue : undefined + + loops : Animation.Infinite + alwaysRunToEnd : true + running : // TODO : it has some bugs if while is runnig background changes, but since it has been used for fault mode we may not get any other message level. + fadingProperyTarget.visible + && fadingProperyRunning + ColorAnimation { + target : fadingProperyTarget + property : fadingProperyName + to : Qt.darker(fadingProperyValue) + duration : 1000 + } + + ColorAnimation { + target : fadingProperyTarget + property : fadingProperyName + to : fadingProperyValue + duration : 1000 + } +} Index: sources/gui/qml/dialogs/AlarmListDialog.qml =================================================================== diff -u -r1a8e9578b27bb3877116675d0b2361ce4f5b5539 -r8f83b92860a33498ea7856e63afef0a10ee11923 --- sources/gui/qml/dialogs/AlarmListDialog.qml (.../AlarmListDialog.qml) (revision 1a8e9578b27bb3877116675d0b2361ce4f5b5539) +++ sources/gui/qml/dialogs/AlarmListDialog.qml (.../AlarmListDialog.qml) (revision 8f83b92860a33498ea7856e63afef0a10ee11923) @@ -40,6 +40,14 @@ signal muteClicked() signal minimizeClicked() + property bool titleFading : false + Fader { + fadingProperyTarget : _root + fadingProperyRunning: titleFading + fadingProperyName : "titleBarBackground" + fadingProperyValue : titleBarBackground + } + Rectangle { id: _titleBar color : Colors.backgroundButtonSelect height : Variables.mainMenuHeight Index: sources/gui/qml/dialogs/NotificationDialog.qml =================================================================== diff -u -r7077e38c74db9cccb5496ffefcf8936c0916de76 -r8f83b92860a33498ea7856e63afef0a10ee11923 --- sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 7077e38c74db9cccb5496ffefcf8936c0916de76) +++ sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 8f83b92860a33498ea7856e63afef0a10ee11923) @@ -41,6 +41,14 @@ property bool okVisible : false property bool minVisible : true + property bool titleFading : false + Fader { + fadingProperyTarget : _root + fadingProperyRunning: titleFading + fadingProperyName : "titleBarBackground" + fadingProperyValue : titleBarBackground + } + // Look for this tag: #First_Time_Message_Sent_With_Silenced // the isSilenced is helping not to show this dialog maximized and // then if the silence is set minimize it immediately Index: sources/gui/qml/main.qml =================================================================== diff -u -r7077e38c74db9cccb5496ffefcf8936c0916de76 -r8f83b92860a33498ea7856e63afef0a10ee11923 --- sources/gui/qml/main.qml (.../main.qml) (revision 7077e38c74db9cccb5496ffefcf8936c0916de76) +++ sources/gui/qml/main.qml (.../main.qml) (revision 8f83b92860a33498ea7856e63afef0a10ee11923) @@ -247,5 +247,6 @@ text : _alarmItem.text isSilenced : _alarmItem.isSilenced timeout : _alarmItem.timeout + backgroundFading : vHDOperationMode.fault } } Index: sources/gui/qml/pages/MainStack.qml =================================================================== diff -u -r65558208e4968de9a5470ff5fda1ee2a9d00c793 -r8f83b92860a33498ea7856e63afef0a10ee11923 --- sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 65558208e4968de9a5470ff5fda1ee2a9d00c793) +++ sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 8f83b92860a33498ea7856e63afef0a10ee11923) @@ -79,7 +79,7 @@ } Connections { target: vHDOperationMode - onFaultChanged : { page( _faultModeScreen , vfault )} + // onFaultChanged : { page( _faultModeScreen , vfault )} // may needed later. onServiceChanged : { page( _serviceModeScreen , vservice )} onInitChanged : { page( _initialModeScreen , vinit )}