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.
This commit is contained in:
@@ -58,7 +58,7 @@ KirigamiComponents.ConvergentContextMenu {
|
|||||||
icon.name: "notifications"
|
icon.name: "notifications"
|
||||||
|
|
||||||
Kirigami.Action {
|
Kirigami.Action {
|
||||||
text: i18n("Follow Global Setting")
|
text: i18nc("@action:inmenu Notification 'Default Settings'", "Default Settings")
|
||||||
icon.name: "globe"
|
icon.name: "globe"
|
||||||
checkable: true
|
checkable: true
|
||||||
autoExclusive: true
|
autoExclusive: true
|
||||||
|
|||||||
@@ -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 {
|
FormCard.FormHeader {
|
||||||
title: i18nc("@title:group", "Room Notifications")
|
title: i18nc("@title:group", "Room Notifications")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ FormCard.FormCardPage {
|
|||||||
|
|
||||||
FormCard.FormCard {
|
FormCard.FormCard {
|
||||||
FormCard.FormRadioDelegate {
|
FormCard.FormRadioDelegate {
|
||||||
text: i18n("Follow global setting")
|
text: i18nc("As in the default notification setting", "Default Settings")
|
||||||
checked: room.pushNotificationState === PushNotificationState.Default
|
checked: room.pushNotificationState === PushNotificationState.Default
|
||||||
enabled: room.pushNotificationState !== PushNotificationState.Unknown
|
enabled: room.pushNotificationState !== PushNotificationState.Unknown
|
||||||
onToggled: {
|
onToggled: {
|
||||||
|
|||||||
Reference in New Issue
Block a user