Index: sources/gui/qml/dialogs/NotificationDialog.qml =================================================================== diff -u -r45ce6e781782be5de1480a1e7acecd1d272bcc84 -re1eed343ea59863ce6f04253b85f3a636786dab2 --- sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 45ce6e781782be5de1480a1e7acecd1d272bcc84) +++ sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision e1eed343ea59863ce6f04253b85f3a636786dab2) @@ -40,7 +40,11 @@ property bool endVisible : false property bool okVisible : false - visible: description + // 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 + // this behaviour doesn't look nice on the screen and it bounces + visible: description && ! isSilenced signal muteClicked() signal minimizeClicked() @@ -121,6 +125,13 @@ bottomMargin : spacing } + // IMPORTANT NOTE: + // It has been granteed by FW that there should never be more than 3 buttons on the ScreenItem + // Regarding the discussion there should be only 3 situations: + // 1 - Different combination of the Resume,Rinseback,End + // 2 - OK button for user to only ack the alarm + // 3 - No button at all for the situations that the alarm can't be resolved by user. + // :: OK button and the other 3 buttons (Resume,Rinseback,End) should never come together TouchRect { id : _resumeTouchRect visible : resumeVisible button.onPressed: resumeClicked() Index: sources/view/hd/alarm/VAlarmStatus.cpp =================================================================== diff -u -r45ce6e781782be5de1480a1e7acecd1d272bcc84 -re1eed343ea59863ce6f04253b85f3a636786dab2 --- sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 45ce6e781782be5de1480a1e7acecd1d272bcc84) +++ sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision e1eed343ea59863ce6f04253b85f3a636786dab2) @@ -48,11 +48,18 @@ return; } - alarm_Priority (vData.mState ); - alarm_AlarmID (vData.mTop ); - alarm_EscalateIn (vData.mEscalatesIn ); - alarm_MuteTimeout (vData.mMuteTimeout ); + // Look for this tag: #First_Time_Message_Sent_With_Silenced + // this has to be first to make sure in the Notification dialog when we decided to show the dialog, + // we should also consider checking the alarms Silenced and if it is already silenced, + // even though there should be a text but should not show the dialog + // otherwise it bounces + alarm_Flag_alarmsSilenced (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_ALARMS_SILENCED )); + alarm_Priority (vData.mState ); + alarm_AlarmID (vData.mTop ); + alarm_EscalateIn (vData.mEscalatesIn ); + alarm_MuteTimeout (vData.mMuteTimeout ); + alarm_Flag_systemFault (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_SYSTEM_FAULT )); alarm_Flag_stop (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_STOP )); alarm_Flag_noClear (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_NO_CLEAR )); @@ -62,7 +69,6 @@ alarm_Flag_noNewTreatment (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_NO_NEW_TREATMENT )); alarm_Flag_UserMustAck (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_USER_MUST_ACK )); alarm_Flag_alarmsToEscalate (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_ALARMS_TO_ESCALATE )); - alarm_Flag_alarmsSilenced (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_ALARMS_SILENCED )); alarm_Flag_alarmsLampOn (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_LAMP_ON )); // (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_UNUSED_1 )); // (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_UNUSED_2 ));