Index: sources/gui/qml/components/NotificationBar.qml =================================================================== diff -u -r45ce6e781782be5de1480a1e7acecd1d272bcc84 -r43cdee7bb03f7fa0bd5c2bba7f9d011bb06806b1 --- sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision 45ce6e781782be5de1480a1e7acecd1d272bcc84) +++ sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision 43cdee7bb03f7fa0bd5c2bba7f9d011bb06806b1) @@ -29,6 +29,7 @@ property alias timeout : _muteButton.timeout property alias backgroundColor : _root.color property alias iconVisible : _icon.visible + property bool enableMute : true visible : _text.text height : Variables.notificationHeight @@ -41,6 +42,7 @@ } signal maximizeClicked() + signal muteClicked() signal clicked() Image { @@ -78,8 +80,8 @@ // but call the same as the rest of the bar for now // when it has it's own event then the borderColor transparency can be removed as well // to indicate the touchable area. - borderColor: Colors.transparent - onClicked: _root.clicked() + borderColor : _root.enableMute ? Colors.white : Colors.transparent + onClicked : _root.enableMute ? _root.muteClicked(): _root.clicked() } UpDownButton { Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r45ce6e781782be5de1480a1e7acecd1d272bcc84 -r43cdee7bb03f7fa0bd5c2bba7f9d011bb06806b1 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 45ce6e781782be5de1480a1e7acecd1d272bcc84) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 43cdee7bb03f7fa0bd5c2bba7f9d011bb06806b1) @@ -77,7 +77,7 @@ readonly property int sliderTextMargin : 20 readonly property int treatmentSpacing : 60 - readonly property int notificationHeight : 50 + readonly property int notificationHeight : 60 readonly property int notificationIconSize : 36 readonly property int backIconDiameter : 17 @@ -107,7 +107,7 @@ readonly property int ultrafiltrationAdjustmtenOptionWidth : 520 readonly property int ultrafiltrationAdjustmtenOptionHeight : 275 - readonly property int silenceIconMargin : 20 + readonly property int silenceIconMargin : 10 readonly property int notificationBarIconMargin : 10 readonly property int notificationBarIconHeight : 30 readonly property int notificationBarIconWidth : 30 Index: sources/gui/qml/main.qml =================================================================== diff -u -rd619b1355f03ab8e2e53956908bda66fea542224 -r43cdee7bb03f7fa0bd5c2bba7f9d011bb06806b1 --- sources/gui/qml/main.qml (.../main.qml) (revision d619b1355f03ab8e2e53956908bda66fea542224) +++ sources/gui/qml/main.qml (.../main.qml) (revision 43cdee7bb03f7fa0bd5c2bba7f9d011bb06806b1) @@ -155,48 +155,44 @@ _alarm_bar .visible = false } - NotificationBar { id: _alarm_bar - backgroundColor : _alarm_dialog.backgroundColor - textColor : _alarm_dialog.textColor - anchors.bottom : _mainMenu.top - text : vAlarmStatus.text; - isSilenced : vAlarmStatus.alarm_Flag_alarmsSilenced - timeout : vAlarmStatus.alarm_MuteTimeout + NotificationBar { id : _alarm_bar + backgroundColor : _alarm_dialog.backgroundColor + textColor : _alarm_dialog.textColor + anchors.bottom : _mainMenu.top + text : vAlarmStatus.text; + isSilenced : vAlarmStatus.alarm_Flag_alarmsSilenced + timeout : vAlarmStatus.alarm_MuteTimeout - onMaximizeClicked: { - alarmMaximize() - } - - onClicked: { - alarmMaximize() - } + onMuteClicked : vAlarmStatus.doSilence() + onMaximizeClicked : alarmMaximize() + onClicked : alarmMaximize() } - NotificationDialog { id: _alarm_dialog + NotificationDialog { id : _alarm_dialog // this will change later to the actual message text // and the instruction would be in the dialog content - titleText : "Alarm" - description : vAlarmStatus.text - alarmID : vAlarmStatus.alarm_AlarmID - isSilenced : vAlarmStatus.alarm_Flag_alarmsSilenced - timeout : vAlarmStatus.alarm_MuteTimeout - okVisible : vAlarmStatus.alarm_Flag_UserMustAck - resumeVisible : ! vAlarmStatus.alarm_Flag_noResume - rinsebackVisible: ! vAlarmStatus.alarm_Flag_noRinseback - endVisible : ! vAlarmStatus.alarm_Flag_noEndTreatment + titleText : "Alarm" + description : vAlarmStatus.text + alarmID : vAlarmStatus.alarm_AlarmID + isSilenced : vAlarmStatus.alarm_Flag_alarmsSilenced + timeout : vAlarmStatus.alarm_MuteTimeout + okVisible : vAlarmStatus.alarm_Flag_UserMustAck + resumeVisible : ! vAlarmStatus.alarm_Flag_noResume + rinsebackVisible : ! vAlarmStatus.alarm_Flag_noRinseback + endVisible : ! vAlarmStatus.alarm_Flag_noEndTreatment + onMuteClicked : vAlarmStatus.doSilence () + onResumeClicked : vAlarmStatus.doUserActionResume () + onRinsebackClicked : vAlarmStatus.doUserActionRinseback() + onEndClicked : vAlarmStatus.doUserActionEnd () + onOkClicked : vAlarmStatus.doUserActionOK () onMinimizeClicked : { alarmMinimize() // when used minimizes the alarm it can stay minimized until otherwize is set // by the next alarm status received. // see also the "Connections { target: vAlarmStatus" implementation vAlarmStatus.alarm_KeepMinimized = true } - onMuteClicked : vAlarmStatus.doSilence() - onOkClicked : vAlarmStatus.doNotifyUserAction(true ,false, false, false) - onResumeClicked : vAlarmStatus.doNotifyUserAction(false,true , false, false) - onRinsebackClicked : vAlarmStatus.doNotifyUserAction(false,false, true , false) - onEndClicked : vAlarmStatus.doNotifyUserAction(false,false, false, true ) } // 9 - Others @@ -271,17 +267,18 @@ } onDidAlarmRaise: { - if (vAlarmStatus.alarm_Flag_alarmsSilenced) { + let silenceMinimize = false + if (vAlarmStatus.alarm_Flag_alarmsSilenced && silenceMinimize) { // this is the response to the silence request // so the dialog should be closed when the request accepted // if not then if can stay minimized nothing happens // if can't stay minimized then it has to be shown alarmMinimize() } else { - if (! vAlarmStatus.alarm_KeepMinimized) { - alarmMaximize() - } + if (! vAlarmStatus.alarm_KeepMinimized) { + alarmMaximize() + } } } Index: sources/view/hd/alarm/VAlarmStatus.cpp =================================================================== diff -u -rd619b1355f03ab8e2e53956908bda66fea542224 -r43cdee7bb03f7fa0bd5c2bba7f9d011bb06806b1 --- sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision d619b1355f03ab8e2e53956908bda66fea542224) +++ sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 43cdee7bb03f7fa0bd5c2bba7f9d011bb06806b1) @@ -26,18 +26,44 @@ ADJUST_VIEW_CONNECTION(AlarmUserActionRequestData ); } -void View::VAlarmStatus::doNotifyUserAction( - bool vOK , - bool vResume , - bool vRinseback , - bool vEnd ) +/*! + * \brief View::VAlarmStatus::doUserActionResume + * \details send the message to notify that user chose the Resume Treatment button + */ +void View::VAlarmStatus::doUserActionResume() { + AlarmUserActionRequestData data; + data.action = Gui::GuiAlarmUserActions::ALARM_USER_ACTION_RESUME; + emit didAdjustment(data); +} + +/*! + * \brief View::VAlarmStatus::doUserActionRinseback + * \details send the message to notify that user chose the Rinse back button + */ +void View::VAlarmStatus::doUserActionRinseback() { + AlarmUserActionRequestData data; + data.action = Gui::GuiAlarmUserActions::ALARM_USER_ACTION_RINSEBACK; + emit didAdjustment(data); +} + +/*! + * \brief View::VAlarmStatus::doUserActionEnd + * \details send the message to notify that user chose the End Treatment button + */ +void View::VAlarmStatus::doUserActionEnd() { + AlarmUserActionRequestData data; + data.action = Gui::GuiAlarmUserActions::ALARM_USER_ACTION_END_TREATMENT; + emit didAdjustment(data); +} + +/*! + * \brief View::VAlarmStatus::doUserActionOk + * \details send the message to notify that user chose the OK button + */ +void View::VAlarmStatus::doUserActionOk() { AlarmUserActionRequestData data; - if (vOK ) { data.action = Gui::GuiAlarmUserActions::ALARM_USER_ACTION_ACK ; goto lOut; } - if (vResume ) { data.action = Gui::GuiAlarmUserActions::ALARM_USER_ACTION_RESUME ; goto lOut; } - if (vRinseback ) { data.action = Gui::GuiAlarmUserActions::ALARM_USER_ACTION_RINSEBACK ; goto lOut; } - if (vEnd ) { data.action = Gui::GuiAlarmUserActions::ALARM_USER_ACTION_END_TREATMENT ; goto lOut; } -lOut: + data.action = Gui::GuiAlarmUserActions::ALARM_USER_ACTION_ACK; emit didAdjustment(data); } @@ -48,11 +74,18 @@ void View::VAlarmStatus::doSilence() { AlarmSilenceRequestData data; - data.state = 1; + if (_alarm_Flag_alarmsSilenced) + data.state = 1; + else + data.state = 0; emit didAdjustment(data); } - +/*! + * \brief VAlarmStatus::onActionReceive + * \details the message received handler + * \param vData - Data of the received message + */ void VAlarmStatus::onActionReceive(const AlarmStatusData &vData) { GuiAlarmID alarmID = static_cast(vData.mTop); Index: sources/view/hd/alarm/VAlarmStatus.h =================================================================== diff -u -rd619b1355f03ab8e2e53956908bda66fea542224 -r43cdee7bb03f7fa0bd5c2bba7f9d011bb06806b1 --- sources/view/hd/alarm/VAlarmStatus.h (.../VAlarmStatus.h) (revision d619b1355f03ab8e2e53956908bda66fea542224) +++ sources/view/hd/alarm/VAlarmStatus.h (.../VAlarmStatus.h) (revision 43cdee7bb03f7fa0bd5c2bba7f9d011bb06806b1) @@ -89,7 +89,10 @@ void didAlarmEmpty(); public slots: - void doNotifyUserAction(bool vResume, bool vRinseback, bool vEnd, bool vOK); - void doSilence(); + void doUserActionResume (); + void doUserActionRinseback (); + void doUserActionEnd (); + void doUserActionOk (); + void doSilence (); }; }