Drop a pre-F34 path for launching update tool on KDE

Before F34 we had to launch the update tool from the systray.
This isn't the case any more, so we can throw all this code and
these needles away.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2022-05-16 16:04:33 -07:00
parent 8c298851a4
commit a22d3b28b6
9 changed files with 7 additions and 89 deletions

View File

@ -1,17 +0,0 @@
{
"area": [
{
"height": 18,
"type": "match",
"width": 18,
"xpos": 776,
"ypos": 741,
"match": 90
}
],
"properties": [],
"tags": [
"desktop_update_notification_systray",
"desktop_package_tool_update"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 MiB

View File

@ -1,16 +0,0 @@
{
"area": [
{
"height": 18,
"type": "match",
"ypos": 736,
"xpos": 773,
"width": 18
}
],
"properties": [],
"tags": [
"desktop_update_notification_systray",
"desktop_package_tool_update"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 761 KiB

View File

@ -1,16 +0,0 @@
{
"area": [
{
"width": 18,
"ypos": 736,
"type": "match",
"xpos": 760,
"height": 18
}
],
"properties": [],
"tags": [
"desktop_update_notification_systray",
"desktop_package_tool_update"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 765 KiB

View File

@ -1,16 +0,0 @@
{
"area": [
{
"xpos": 791,
"width": 18,
"type": "match",
"ypos": 737,
"height": 18
}
],
"properties": [],
"tags": [
"desktop_update_notification_systray",
"desktop_package_tool_update"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 788 KiB

View File

@ -16,23 +16,9 @@ sub run {
desktop_vt; desktop_vt;
# run the updater # run the updater
# FIXME: when F33 goes EOL, remove all the KDE < F34 stuff below
# and drop 'desktop_package_tool_update' tag from
# desktop_update_notification_systray-kde-20200929.json
if ($desktop eq 'kde') { if ($desktop eq 'kde') {
# KDE team tells me until F34 the 'preferred' update method
# was the systray applet...
if ($relnum < 34) {
# get rid of notifications which get in the way of the things
# we need to click
click_unwanted_notifications;
assert_and_click 'desktop_expand_systray';
}
else {
# ...from F34 onwards, it's Plasma Discover app
menu_launch_type('discover'); menu_launch_type('discover');
} }
}
else { else {
# this launches GNOME Software on GNOME, dunno for any other # this launches GNOME Software on GNOME, dunno for any other
# desktop yet # desktop yet
@ -44,16 +30,13 @@ sub run {
if ($desktop eq 'gnome' && check_screen 'gnome_software_welcome', 10) { if ($desktop eq 'gnome' && check_screen 'gnome_software_welcome', 10) {
send_key 'ret'; send_key 'ret';
} }
# go to the 'update' interface. For GNOME or KDE on F34+, we # go to the 'update' interface. We may be waiting some time at a
# may be waiting some time at a 'Software catalog is being # 'Software catalog is being loaded' screen.
# loaded' screen.
if ($desktop eq 'gnome' || ($desktop eq 'kde' && $relnum > 33)) {
for my $n (1..5) { for my $n (1..5) {
last if (check_screen 'desktop_package_tool_update', 120); last if (check_screen 'desktop_package_tool_update', 120);
mouse_set 10, 10; mouse_set 10, 10;
mouse_hide; mouse_hide;
} }
}
assert_and_click 'desktop_package_tool_update'; assert_and_click 'desktop_package_tool_update';
# wait for things to settle if e.g. GNOME is refreshing # wait for things to settle if e.g. GNOME is refreshing
wait_still_screen 5, 90; wait_still_screen 5, 90;