ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change actionChanged to notificationActionChanged

Browse Source 
Change actionChanged to notificationActionChanged to avoid any clashes with ItemDelegate action property signals

(cherry picked from commit 5340142c06)
This commit is contained in:
James Graham
2024-04-21 14:37:02 +00:00
committed by Tobias Fella
parent 6ec9cc2475
commit 40c3519737
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/settings/GlobalNotificationsPage.qml
View File

@@ -177,7 +177,7 @@ FormCard.FormCardPage {
onDeleteRule: { onDeleteRule: {
root.pushRuleModel.removeKeyword(id); root.pushRuleModel.removeKeyword(id);
} }
onActionChanged: action => root.pushRuleModel.setPushRuleAction(id, action) onNotificatonActionChanged: action => root.pushRuleModel.setPushRuleAction(id, action)
} }
} }
} }

10
src/settings/NotificationRuleItem.qml
View File

@@ -23,7 +23,7 @@ FormCard.AbstractFormDelegate {
readonly property bool notificationsOnModifiable: !deletable readonly property bool notificationsOnModifiable: !deletable
readonly property bool highlightOn: isNotificationRuleHighlight(ruleAction) readonly property bool highlightOn: isNotificationRuleHighlight(ruleAction)
signal actionChanged(int action) signal notificatonActionChanged(int action)
signal deleteRule signal deleteRule
enabled: ruleAction !== PushRuleAction.Unknown enabled: ruleAction !== PushRuleAction.Unknown
@@ -78,7 +78,7 @@ FormCard.AbstractFormDelegate {
enabled: root.enabled enabled: root.enabled
down: checked down: checked
onToggled: { onToggled: {
root.actionChanged(root.notifcationRuleAction()); root.notificatonActionChanged(root.notifcationRuleAction());
} }
QQC2.ToolTip { QQC2.ToolTip {
@@ -99,7 +99,7 @@ FormCard.AbstractFormDelegate {
enabled: (onButton.checked || !root.notificationsOnModifiable) && root.enabled enabled: (onButton.checked || !root.notificationsOnModifiable) && root.enabled
down: checked down: checked
onToggled: { onToggled: {
root.actionChanged(root.notifcationRuleAction()); root.notificatonActionChanged(root.notifcationRuleAction());
} }
QQC2.ToolTip { QQC2.ToolTip {
@@ -121,7 +121,7 @@ FormCard.AbstractFormDelegate {
enabled: (onButton.checked || !root.notificationsOnModifiable) && root.enabled enabled: (onButton.checked || !root.notificationsOnModifiable) && root.enabled
down: checked down: checked
onToggled: { onToggled: {
root.actionChanged(root.notifcationRuleAction()); root.notificatonActionChanged(root.notifcationRuleAction());
} }
QQC2.ToolTip { QQC2.ToolTip {
@@ -178,7 +178,7 @@ FormCard.AbstractFormDelegate {
finished = true; finished = true;
} }
} }
actionChanged(action); notificatonActionChanged(action);
} }
function isNotificationRuleOn(action) { function isNotificationRuleOn(action) {

2
src/settings/PushNotification.qml
View File

@@ -84,7 +84,7 @@ FormCard.FormCardPage {
onDeleteRule: { onDeleteRule: {
root.pushRuleModel.removeKeyword(id); root.pushRuleModel.removeKeyword(id);
} }
onActionChanged: action => root.pushRuleModel.setPushRuleAction(id, action) onNotificatonActionChanged: action => root.pushRuleModel.setPushRuleAction(id, action)
} }
} }
} }