From 5340142c06d3409de5e4acca945d3ac46aeb852a Mon Sep 17 00:00:00 2001
From: James Graham <james.h.graham@protonmail.com>
Date: Sun, 21 Apr 2024 14:37:02 +0000
Subject: [PATCH] Change actionChanged to notificationActionChanged

Change actionChanged to notificationActionChanged to avoid any clashes with ItemDelegate action property signals
---
 src/settings/GlobalNotificationsPage.qml |  2 +-
 src/settings/NotificationRuleItem.qml    | 10 +++++-----
 src/settings/PushNotification.qml        |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/settings/GlobalNotificationsPage.qml b/src/settings/GlobalNotificationsPage.qml
index d338c5041..dc855cdbf 100644
--- a/src/settings/GlobalNotificationsPage.qml
+++ b/src/settings/GlobalNotificationsPage.qml
@@ -177,7 +177,7 @@ FormCard.FormCardPage {
             onDeleteRule: {
                 root.pushRuleModel.removeKeyword(id);
             }
-            onActionChanged: action => root.pushRuleModel.setPushRuleAction(id, action)
+            onNotificatonActionChanged: action => root.pushRuleModel.setPushRuleAction(id, action)
         }
     }
 }
diff --git a/src/settings/NotificationRuleItem.qml b/src/settings/NotificationRuleItem.qml
index 62309066f..c81bcc60c 100644
--- a/src/settings/NotificationRuleItem.qml
+++ b/src/settings/NotificationRuleItem.qml
@@ -23,7 +23,7 @@ FormCard.AbstractFormDelegate {
     readonly property bool notificationsOnModifiable: !deletable
     readonly property bool highlightOn: isNotificationRuleHighlight(ruleAction)
 
-    signal actionChanged(int action)
+    signal notificatonActionChanged(int action)
     signal deleteRule
 
     enabled: ruleAction !== PushRuleAction.Unknown
@@ -78,7 +78,7 @@ FormCard.AbstractFormDelegate {
                 enabled: root.enabled
                 down: checked
                 onToggled: {
-                    root.actionChanged(root.notifcationRuleAction());
+                    root.notificatonActionChanged(root.notifcationRuleAction());
                 }
 
                 QQC2.ToolTip {
@@ -99,7 +99,7 @@ FormCard.AbstractFormDelegate {
                 enabled: (onButton.checked || !root.notificationsOnModifiable) && root.enabled
                 down: checked
                 onToggled: {
-                    root.actionChanged(root.notifcationRuleAction());
+                    root.notificatonActionChanged(root.notifcationRuleAction());
                 }
 
                 QQC2.ToolTip {
@@ -121,7 +121,7 @@ FormCard.AbstractFormDelegate {
                 enabled: (onButton.checked || !root.notificationsOnModifiable) && root.enabled
                 down: checked
                 onToggled: {
-                    root.actionChanged(root.notifcationRuleAction());
+                    root.notificatonActionChanged(root.notifcationRuleAction());
                 }
 
                 QQC2.ToolTip {
@@ -178,7 +178,7 @@ FormCard.AbstractFormDelegate {
                 finished = true;
             }
         }
-        actionChanged(action);
+        notificatonActionChanged(action);
     }
 
     function isNotificationRuleOn(action) {
diff --git a/src/settings/PushNotification.qml b/src/settings/PushNotification.qml
index 355088a1e..953e62a29 100644
--- a/src/settings/PushNotification.qml
+++ b/src/settings/PushNotification.qml
@@ -84,7 +84,7 @@ FormCard.FormCardPage {
                     onDeleteRule: {
                         root.pushRuleModel.removeKeyword(id);
                     }
-                    onActionChanged: action => root.pushRuleModel.setPushRuleAction(id, action)
+                    onNotificatonActionChanged: action => root.pushRuleModel.setPushRuleAction(id, action)
                 }
             }
         }