Index: AlarmMapping.csv =================================================================== diff -u -r3c10146198b48da18d2e8b242e0605461fdc92e8 -refb549a694539630ba7c1d8e348f598052b85f0f --- AlarmMapping.csv (.../AlarmMapping.csv) (revision 3c10146198b48da18d2e8b242e0605461fdc92e8) +++ AlarmMapping.csv (.../AlarmMapping.csv) (revision efb549a694539630ba7c1d8e348f598052b85f0f) @@ -218,7 +218,7 @@ 217,"HD blood prime volume check failure." 218,"HD syringe detected alarm." 219,"HD syringe pump syringe removed alarm." - 220,"HD battery pack SOC is too low." + 220,"Not used." 221,"HD Saline bag is empty." 222,"HD dialysate temperature too high alarm." 223,"HD dialysate temperature too low alarm." Index: denali.pro.user =================================================================== diff -u -re5577fbd781ded0678882680d5d31f08f56c9c68 -refb549a694539630ba7c1d8e348f598052b85f0f --- denali.pro.user (.../denali.pro.user) (revision e5577fbd781ded0678882680d5d31f08f56c9c68) +++ denali.pro.user (.../denali.pro.user) (revision efb549a694539630ba7c1d8e348f598052b85f0f) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/gui/qml/AlarmItem.qml =================================================================== diff -u -r6f2622be80fcaee8d71baf78404627381157970c -refb549a694539630ba7c1d8e348f598052b85f0f --- sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision 6f2622be80fcaee8d71baf78404627381157970c) +++ sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision efb549a694539630ba7c1d8e348f598052b85f0f) @@ -112,8 +112,11 @@ NotificationDialog { id : _alarmDialog // this will change later to the actual message text // and the instruction would be in the dialog content + titleText : vAlarmStatus.title + titlePixelSize : Fonts.fontPixelAlarmTitle description : vAlarmStatus.message + descriptionPixelSize: Fonts.fontPixelAlarmMessage alarmID : vAlarmStatus.alarm_AlarmID isSilenced : vAlarmStatus.alarm_Flag_alarmsSilenced timeout : vAlarmStatus.alarm_MuteTimeout Index: sources/gui/qml/components/ModalDialog.qml =================================================================== diff -u -r2d0bacfbe1b70055247eb40743405a5f9acb15e3 -refb549a694539630ba7c1d8e348f598052b85f0f --- sources/gui/qml/components/ModalDialog.qml (.../ModalDialog.qml) (revision 2d0bacfbe1b70055247eb40743405a5f9acb15e3) +++ sources/gui/qml/components/ModalDialog.qml (.../ModalDialog.qml) (revision efb549a694539630ba7c1d8e348f598052b85f0f) @@ -75,5 +75,5 @@ } } - NotificationBar { id: _notification } + NotificationBarSmall { id: _notification } } Index: sources/gui/qml/components/NotificationBar.qml =================================================================== diff -u -r6f2622be80fcaee8d71baf78404627381157970c -refb549a694539630ba7c1d8e348f598052b85f0f --- sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision 6f2622be80fcaee8d71baf78404627381157970c) +++ sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision efb549a694539630ba7c1d8e348f598052b85f0f) @@ -24,6 +24,7 @@ Rectangle { id: _root objectName: "NotificationBar" // SquishQt property alias text : _text.text + property alias textPixelSize : _text.font.pixelSize property alias textColor : _text.color property alias isSilenced : _muteButton.isSilenced property alias timeout : _muteButton.timeout Index: sources/gui/qml/components/TimeText.qml =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -refb549a694539630ba7c1d8e348f598052b85f0f --- sources/gui/qml/components/TimeText.qml (.../TimeText.qml) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/qml/components/TimeText.qml (.../TimeText.qml) (revision efb549a694539630ba7c1d8e348f598052b85f0f) @@ -41,7 +41,7 @@ readonly property string time : _private.time color : Colors.transparent - width : _hourText.contentWidth + _timeSeparator.contentWidth + _minuteText.contentWidth + width : _hourText.contentWidth + _timeSeparator.contentWidth + _minuteText.contentWidth + _timeSeparator.contentWidth height: _timeSeparator.height QtObject { id: _private Index: sources/gui/qml/components/WaitDone.qml =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -refb549a694539630ba7c1d8e348f598052b85f0f --- sources/gui/qml/components/WaitDone.qml (.../WaitDone.qml) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/qml/components/WaitDone.qml (.../WaitDone.qml) (revision efb549a694539630ba7c1d8e348f598052b85f0f) @@ -45,10 +45,6 @@ duration: 7200 } Behavior on opacity { OpacityAnimator { duration: 1200 } } - MouseArea { id: _mousearea - anchors.fill: parent - onClicked: done = true - } } Image { id: _checkIndicator Index: sources/gui/qml/dialogs/NotificationDialog.qml =================================================================== diff -u -r6f2622be80fcaee8d71baf78404627381157970c -refb549a694539630ba7c1d8e348f598052b85f0f --- sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 6f2622be80fcaee8d71baf78404627381157970c) +++ sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision efb549a694539630ba7c1d8e348f598052b85f0f) @@ -28,7 +28,9 @@ contentItem.objectName: "_NotificationDialog" // SquishQt property alias titleText : _title.text + property alias titlePixelSize : _title.font.pixelSize property alias description : _desc.text + property alias descriptionPixelSize : _desc.font.pixelSize property alias titleBarForeground : _title.color property alias titleBarBackground : _titleBar.color property alias isSilenced : _muteButton.isSilenced @@ -87,7 +89,11 @@ color: Colors.textMain font.pixelSize: Fonts.fontPixelTitle text: qsTr("Notification") - anchors.centerIn: _titleBar; + + width: _titleBar.width + verticalAlignment : Text.AlignVCenter + horizontalAlignment : Text.AlignHCenter + anchors.centerIn: _titleBar } MouseArea { id: _minimizeArea @@ -128,8 +134,8 @@ height: _titleBar.height anchors { verticalCenter : _titleBar.verticalCenter - right : _titleBar.right - rightMargin : _minimizeButton.width * 2 + right : _minimizeButton.left + rightMargin : 15 } textPixelSize : 30 textWeight : Font.Normal @@ -145,7 +151,7 @@ anchors { fill : parent topMargin : 5 + _titleBar .height - bottomMargin : 5 + _buttonGroup .height + _buttonGroup.spacing + bottomMargin : 5 + _buttonGroup .height } Text { id: _desc Index: sources/gui/qml/globals/Fonts.qml =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -refb549a694539630ba7c1d8e348f598052b85f0f --- sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision efb549a694539630ba7c1d8e348f598052b85f0f) @@ -28,6 +28,10 @@ readonly property int fontPixelSection : 36 readonly property int fontPixelDialogText : 22 + readonly property int fontPixelAlarmTitle : 32 + readonly property int fontPixelAlarmBarTitle : 30 + readonly property int fontPixelAlarmMessage : 28 + readonly property int fontPixelTouchAreaTitle : 16 readonly property int fontPixelTextRectTitle : 25 Index: sources/gui/qml/main.qml =================================================================== diff -u -r1c00e533ef2aa923b8ecd2fdcd292c13907caf90 -refb549a694539630ba7c1d8e348f598052b85f0f --- sources/gui/qml/main.qml (.../main.qml) (revision 1c00e533ef2aa923b8ecd2fdcd292c13907caf90) +++ sources/gui/qml/main.qml (.../main.qml) (revision efb549a694539630ba7c1d8e348f598052b85f0f) @@ -357,6 +357,7 @@ backgroundColor : _alarmItem.backgroundColor textColor : _alarmItem.textColor text : _alarmItem.title + textPixelSize : Fonts.fontPixelAlarmBarTitle isSilenced : _alarmItem.isSilenced timeout : _alarmItem.timeout backgroundFading : vHDOperationMode.fault Index: sources/gui/qml/pages/MainHome.qml =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -refb549a694539630ba7c1d8e348f598052b85f0f --- sources/gui/qml/pages/MainHome.qml (.../MainHome.qml) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/qml/pages/MainHome.qml (.../MainHome.qml) (revision efb549a694539630ba7c1d8e348f598052b85f0f) @@ -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 -r153bcdb67dca6c40022318b80d5c7079d48bb37f -refb549a694539630ba7c1d8e348f598052b85f0f --- sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 153bcdb67dca6c40022318b80d5c7079d48bb37f) +++ sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision efb549a694539630ba7c1d8e348f598052b85f0f) @@ -118,6 +118,9 @@ if (visible) { _mainMenu.hidden = false // initially our landing screen is _initialModeScreen which should not have the Main menu. } + else { + _mainHome.reasonText = "" + } } } Index: sources/gui/qml/pages/TreatmentFlowBase.qml =================================================================== diff -u -r6f2622be80fcaee8d71baf78404627381157970c -refb549a694539630ba7c1d8e348f598052b85f0f --- sources/gui/qml/pages/TreatmentFlowBase.qml (.../TreatmentFlowBase.qml) (revision 6f2622be80fcaee8d71baf78404627381157970c) +++ sources/gui/qml/pages/TreatmentFlowBase.qml (.../TreatmentFlowBase.qml) (revision efb549a694539630ba7c1d8e348f598052b85f0f) @@ -164,9 +164,7 @@ text : "" } - NotificationBar { id: _notification - iconVisible: false - } + NotificationBarSmall { id: _notification } Connections { target: vSettings onInstructionsChanged : { Index: sources/gui/qml/pages/settings/SettingsDG.qml =================================================================== diff -u -re5577fbd781ded0678882680d5d31f08f56c9c68 -refb549a694539630ba7c1d8e348f598052b85f0f --- sources/gui/qml/pages/settings/SettingsDG.qml (.../SettingsDG.qml) (revision e5577fbd781ded0678882680d5d31f08f56c9c68) +++ sources/gui/qml/pages/settings/SettingsDG.qml (.../SettingsDG.qml) (revision efb549a694539630ba7c1d8e348f598052b85f0f) @@ -78,6 +78,10 @@ _heatDisinfectionScheduleCycle .text ) } + onVisibleChanged: { + if ( ! visible ) _root.notificationText = "" + } + Row { id: _container visible: false // phase 1 // true spacing: 25 Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -refb549a694539630ba7c1d8e348f598052b85f0f --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml (.../TreatmentAdjustmentBase.qml) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml (.../TreatmentAdjustmentBase.qml) (revision efb549a694539630ba7c1d8e348f598052b85f0f) @@ -44,7 +44,7 @@ notificationText = "" } - notification.iconVisible: false + // notification.iconVisible: false header: Rectangle { id : _headerRect Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r3c10146198b48da18d2e8b242e0605461fdc92e8 -refb549a694539630ba7c1d8e348f598052b85f0f --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 3c10146198b48da18d2e8b242e0605461fdc92e8) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision efb549a694539630ba7c1d8e348f598052b85f0f) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 29-Aug-2022 + * \date (last) 30-Aug-2022 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * @@ -253,7 +253,7 @@ /*0217*/case GuiAlarmID::ALARM_ID_BLOOD_PRIME_VOLUME_CHECK_FAILURE : { result = QObject::tr("HD blood prime volume check failure." ); break; } /* 217*/ /*0218*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_DETECTED : { result = QObject::tr("HD syringe detected alarm." ); break; } /* 218*/ /*0219*/case GuiAlarmID::ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED : { result = QObject::tr("HD syringe pump syringe removed alarm." ); break; } /* 219*/ -/*0220*/case GuiAlarmID::ALARM_ID_HD_BATTERY_PACK_CHARGE_TOO_LOW : { result = QObject::tr("HD battery pack SOC is too low." ); break; } /* 220*/ +/*0220*/case GuiAlarmID::ALARM_ID___AVAILABLE_1 : { result = QObject::tr("Not used." ); break; } /* 220*/ /*0221*/case GuiAlarmID::ALARM_ID_EMPTY_SALINE_BAG : { result = QObject::tr("HD Saline bag is empty." ); break; } /* 221*/ /*0222*/case GuiAlarmID::ALARM_ID_DIALYSATE_TEMPERATURE_HIGH : { result = QObject::tr("HD dialysate temperature too high alarm." ); break; } /* 222*/ /*0223*/case GuiAlarmID::ALARM_ID_DIALYSATE_TEMPERATURE_LOW : { result = QObject::tr("HD dialysate temperature too low alarm." ); break; } /* 223*/