From 3a25a6235037ca7fd00e96deb84845d78f7ccd5a Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Fri, 21 Feb 2025 20:29:58 -0500 Subject: [PATCH] Refer to global notification settings as "Default Settings" instead This changes references to "global notification settings" to "default settings", which should hopefully make it clearer what these actually are. Also, a information tip has been added to the settings page to clarify what these settings do and imply that the per-room settings take precedence. --- src/rooms/RoomContextMenu.qml | 2 +- src/settings/GlobalNotificationsPage.qml | 20 ++++++++++++++++++++ src/settings/PushNotification.qml | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/rooms/RoomContextMenu.qml b/src/rooms/RoomContextMenu.qml index 691ce3d61..ed573e199 100644 --- a/src/rooms/RoomContextMenu.qml +++ b/src/rooms/RoomContextMenu.qml @@ -58,7 +58,7 @@ KirigamiComponents.ConvergentContextMenu { icon.name: "notifications" Kirigami.Action { - text: i18n("Follow Global Setting") + text: i18nc("@action:inmenu Notification 'Default Settings'", "Default Settings") icon.name: "globe" checkable: true autoExclusive: true diff --git a/src/settings/GlobalNotificationsPage.qml b/src/settings/GlobalNotificationsPage.qml index 69116e4a8..f3979fa3c 100644 --- a/src/settings/GlobalNotificationsPage.qml +++ b/src/settings/GlobalNotificationsPage.qml @@ -45,6 +45,26 @@ FormCard.FormCardPage { } } + FormCard.FormCard { + Layout.topMargin: Kirigami.Units.largeSpacing + FormCard.AbstractFormDelegate { + contentItem: RowLayout { + spacing: Kirigami.Units.largeSpacing + Kirigami.Icon { + source: "data-information" + width: Kirigami.Units.iconSizes.sizeForLabels + height: Kirigami.Units.iconSizes.sizeForLabels + } + QQC2.Label { + text: i18nc("@info", "These are the default notification settings for all rooms. You can customize notifications per-room in the room list or room settings.") + wrapMode: Text.WordWrap + + Layout.fillWidth: true + } + } + } + } + FormCard.FormHeader { title: i18nc("@title:group", "Room Notifications") } diff --git a/src/settings/PushNotification.qml b/src/settings/PushNotification.qml index 23ff2884f..e88c287bd 100644 --- a/src/settings/PushNotification.qml +++ b/src/settings/PushNotification.qml @@ -28,7 +28,7 @@ FormCard.FormCardPage { FormCard.FormCard { FormCard.FormRadioDelegate { - text: i18n("Follow global setting") + text: i18nc("As in the default notification setting", "Default Settings") checked: room.pushNotificationState === PushNotificationState.Default enabled: room.pushNotificationState !== PushNotificationState.Unknown onToggled: {