Notification Bell icon should not show for active Info types

victronenergy · Jan 13, 2025 · 91ad16a · 91ad16a
1 parent fed6a37
commit 91ad16a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/components/StatusBar.qml b/components/StatusBar.qml
@@ -192,7 +192,7 @@ Rectangle {
 			anchors.verticalCenter: parent.verticalCenter
 			color: Theme.color_font_primary
 			source: "qrc:/images/notifications.svg"
-			visible: Global.notifications.activeAlarmsModel.count > 0
+			visible: Global.notifications.activeAlarmsAndWarningsModel.count > 0
 		}
 	}
 

diff --git a/data/Notifications.qml b/data/Notifications.qml
@@ -32,9 +32,10 @@ QtObject {
 		filterFunction: (notification) => { return notification.type === VenusOS.Notification_Alarm && !notification.acknowledged }
 		sortFunction: root._notificationSortFunction
 	}
-	readonly property NotificationSortFilterProxyModel activeAlarmsModel: NotificationSortFilterProxyModel {
+	readonly property NotificationSortFilterProxyModel activeAlarmsAndWarningsModel: NotificationSortFilterProxyModel {
 		sourceModel: allNotificationsModel
-		filterFunction: (notification) => { return notification.type === VenusOS.Notification_Alarm && notification.active }
+		filterFunction: (notification) => { return (notification.type === VenusOS.Notification_Alarm ||
+													notification.type === VenusOS.Notification_Warning) && notification.active }
 		sortFunction: root._notificationSortFunction
 	}