Update and rationalize KDE app "cancel" needles

We have three different needles which all match on a stock KDE
"cancel" button. Let's just have one. Also, update it for latest
Rawhide/F36 KDE.

Signed-off-by: Adam Williamson <awilliam@redhat.com>

needles/kde/apps/kde_cancel_button-20210408.json

@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "kgpg_keypair_cancel"
+    "kde_cancel_button"
   ]
 }

needles/kde/apps/kde_cancel_button-20220225.json

@@ -0,0 +1,15 @@
+{
+    "area": [
+        {
+            "height": 15,
+            "type": "match",
+            "width": 44,
+            "xpos": 631,
+            "ypos": 656
+        }
+    ],
+    "properties": [],
+    "tags": [
+        "kde_cancel_button"
+    ]
+}

needles/kde/apps/kmail_cancel_data-20210717.json

@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "type": "match",
-      "ypos": 694,
-      "width": 20,
-      "xpos": 938,
-      "height": 17
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "kmail_cancel_data"
-  ]
-}

needles/kde/apps/kmail_cancel_data.json

@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "kmail_cancel_data"
-  ],
-  "area": [
-    {
-      "xpos": 657,
-      "ypos": 595,
-      "width": 20,
-      "height": 17,
-      "type": "match"
-    }
-  ]
-}

needles/kde/apps/kontact_provide_data-20210803.json

@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "type": "match",
-      "height": 16,
-      "width": 66,
-      "xpos": 394,
-      "ypos": 599
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "kontact_provide_data"
-  ]
-}

needles/kde/apps/kontact_provide_data-noto-20210408.json

@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 694,
-      "type": "match",
-      "height": 16,
-      "xpos": 938,
-      "width": 66
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "kontact_provide_data"
-  ]
-}

tests/apps_startstop/kde/kgpg.pm

@@ -26,7 +26,7 @@ sub run {
     assert_and_click 'kgpg_done';
     wait_still_screen 2;
     # Cancel the keypair creation
-    assert_and_click 'kgpg_keypair_cancel';
+    assert_and_click 'kde_cancel_button';
     wait_still_screen 2;
     # Check that it is started
     assert_screen 'kgpg_runs';

tests/apps_startstop/kde/kmail.pm

@@ -11,9 +11,9 @@ sub run {
     # Start the application
     menu_launch_type 'kmail';
     # Cancel Kmail data wizard
-    assert_and_click 'kmail_cancel_data';
-    if (check_screen("kmail_cancel_data", 1)) {
-        assert_and_click "kmail_cancel_data";
+    assert_and_click 'kde_cancel_button';
+    if (check_screen("kde_cancel_button", 1)) {
+        click_lastmatch;
     }
     # Check that it is started
     assert_screen 'kmail_runs';

tests/apps_startstop/kde/kontakt.pm

@@ -11,7 +11,7 @@ sub run {
     # Start the application
     menu_launch_type 'kontact';
     # Get rid of personal data
-    assert_and_click 'kontact_provide_data';
+    assert_and_click 'kde_cancel_button';
     if (check_screen("enable_unified_mailboxes", 3)) {
         assert_and_click "enable_unified_mailboxes";
     }