Index: sources/gui/qml/components/ModalDialog.qml =================================================================== diff -u -r2d0bacfbe1b70055247eb40743405a5f9acb15e3 -rbd476995001c165188e4c86010bf8b0505d2ca35 --- sources/gui/qml/components/ModalDialog.qml (.../ModalDialog.qml) (revision 2d0bacfbe1b70055247eb40743405a5f9acb15e3) +++ sources/gui/qml/components/ModalDialog.qml (.../ModalDialog.qml) (revision bd476995001c165188e4c86010bf8b0505d2ca35) @@ -75,5 +75,5 @@ } } - NotificationBar { id: _notification } + NotificationBarSmall { id: _notification } } Index: sources/gui/qml/dialogs/PowerOff.qml =================================================================== diff -u -r13e65c3d271d503c2e2e2f1f20736652c470f8cc -rbd476995001c165188e4c86010bf8b0505d2ca35 --- sources/gui/qml/dialogs/PowerOff.qml (.../PowerOff.qml) (revision 13e65c3d271d503c2e2e2f1f20736652c470f8cc) +++ sources/gui/qml/dialogs/PowerOff.qml (.../PowerOff.qml) (revision bd476995001c165188e4c86010bf8b0505d2ca35) @@ -33,8 +33,6 @@ property alias cancelText : _cancelTouch.textString property alias cancelVisible : _cancelTouch.visible - notification.iconVisible: false - function footerUpdate() { _footer.update() } Index: sources/gui/qml/pages/MainHome.qml =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -rbd476995001c165188e4c86010bf8b0505d2ca35 --- sources/gui/qml/pages/MainHome.qml (.../MainHome.qml) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/qml/pages/MainHome.qml (.../MainHome.qml) (revision bd476995001c165188e4c86010bf8b0505d2ca35) @@ -59,8 +59,7 @@ } } - NotificationBar { id: _notification - iconVisible: false + NotificationBarSmall { id: _notification anchors.bottomMargin: Variables.mainMenuHeight } Index: sources/gui/qml/pages/MainStack.qml =================================================================== diff -u -rb3a919eb1696079530d537fb2bf8b7e526178997 -rbd476995001c165188e4c86010bf8b0505d2ca35 --- sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision b3a919eb1696079530d537fb2bf8b7e526178997) +++ sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision bd476995001c165188e4c86010bf8b0505d2ca35) @@ -189,7 +189,7 @@ onAdjustmentTriggered: { // this may be handled by alarm and in that case if it is shown, it would be duplicate or simply will be covered by alarm. // if not it is not handled by alarm, removing the comment will make it work properly, since the MainHome modified to support this. - // _mainHome.reasonText = vPreTreatmentAdjustmentInitTreatment.text() + _mainHome.reasonText = vPreTreatmentAdjustmentInitTreatment.adjustment_ReasonText } } } Index: sources/gui/qml/pages/TreatmentFlowBase.qml =================================================================== diff -u -r86e9dfbff50cb7e16fd94c16c1c818cef3b47eac -rbd476995001c165188e4c86010bf8b0505d2ca35 --- sources/gui/qml/pages/TreatmentFlowBase.qml (.../TreatmentFlowBase.qml) (revision 86e9dfbff50cb7e16fd94c16c1c818cef3b47eac) +++ sources/gui/qml/pages/TreatmentFlowBase.qml (.../TreatmentFlowBase.qml) (revision bd476995001c165188e4c86010bf8b0505d2ca35) @@ -164,9 +164,7 @@ text : "" } - NotificationBar { id: _notification - iconVisible: false - } + NotificationBarSmall { id: _notification } Connections { target: vSettings onSettingsChanged : { Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -r7e503c5459ec77a2816d6c7789da9b206cedbe8a -rbd476995001c165188e4c86010bf8b0505d2ca35 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 7e503c5459ec77a2816d6c7789da9b206cedbe8a) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision bd476995001c165188e4c86010bf8b0505d2ca35) @@ -482,10 +482,10 @@ onBicarbonateConcentrate_ValidationFailed : _bicarbonateConcentrate .valid = false onDialyzerType_ValidationFailed : _dialyzerType .valid = false onDialysateTemp_ValidationFailed : _dialysateTemperature .valid = false - onArterialPressureLimitLow_ValidationFailed : _arterialPressureLimits .setLowValid ( false ) - onArterialPressureLimitHigh_ValidationFailed : _arterialPressureLimits .setHighValid ( false ) - onVenousPressureLimitLow_ValidationFailed : _venousPressureLimits .setLowValid ( false ) - onVenousPressureLimitHigh_ValidationFailed : _venousPressureLimits .setHighValid ( false ) + // onArterialPressureLimitLow_ValidationFailed : _arterialPressureLimits .setLowValid ( false ) + // onArterialPressureLimitHigh_ValidationFailed : _arterialPressureLimits .setHighValid ( false ) + // onVenousPressureLimitLow_ValidationFailed : _venousPressureLimits .setLowValid ( false ) + // onVenousPressureLimitHigh_ValidationFailed : _venousPressureLimits .setHighValid ( false ) onBloodPressureMeasureInterval_ValidationFailed : _bloodPressureInterval .valid = false onRinsebackFlowRate_ValidationFailed : _rinsebackFlowRate .valid = false onScrollToParameter: { Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -rbd476995001c165188e4c86010bf8b0505d2ca35 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml (.../TreatmentAdjustmentBase.qml) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml (.../TreatmentAdjustmentBase.qml) (revision bd476995001c165188e4c86010bf8b0505d2ca35) @@ -44,8 +44,6 @@ notificationText = "" } - notification.iconVisible: false - header: Rectangle { id : _headerRect ConfirmButton { id : _confirmButton Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -rbd476995001c165188e4c86010bf8b0505d2ca35 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml (.../TreatmentAdjustmentFlow.qml) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml (.../TreatmentAdjustmentFlow.qml) (revision bd476995001c165188e4c86010bf8b0505d2ca35) @@ -72,6 +72,7 @@ accept() } else { resetFlows() + console.debug(vTreatmentAdjustmentFlows.text()) notification.text = vTreatmentAdjustmentFlows.text() } } Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r13e65c3d271d503c2e2e2f1f20736652c470f8cc -rbd476995001c165188e4c86010bf8b0505d2ca35 --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 13e65c3d271d503c2e2e2f1f20736652c470f8cc) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision bd476995001c165188e4c86010bf8b0505d2ca35) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 30-Sep-2022 + * \date (last) 03-Oct-2022 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 *