From a5be0341c663df0597c0783bd5df571e058dc1d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20R=C5=AF=C5=BEi=C4=8Dka?= Date: Tue, 16 Jul 2024 11:06:42 +0200 Subject: [PATCH] Rename the system monitor needles. --- .../gnome/apps/apps_run_monitor-20240127.json | 31 ++++++------- .../gnome/apps/apps_run_monitor-20240424.json | 31 ++++++------- .../gnome/apps/apps_run_monitor-20240702.json | 31 ++++++------- needles/gnome/apps/apps_run_monitor.json | 5 +- .../sysmon/apps_run_monitor-20240710.json | 43 +++++++++--------- .../apps/apps_run_monitor-kde-20211112.json | 15 ++++++ ....png => apps_run_monitor-kde-20211112.png} | Bin ...0240227.json => apps_run_monitor-kde.json} | 28 ++++++------ ...-20240227.png => apps_run_monitor-kde.png} | Bin tests/applications/sysmon/aaa_setup.pm | 2 +- .../apps_startstop/kde/plasmasystemmonitor.pm | 2 +- 11 files changed, 99 insertions(+), 89 deletions(-) create mode 100644 needles/kde/apps/apps_run_monitor-kde-20211112.json rename needles/kde/apps/{systemmonitor_runs-20211112.png => apps_run_monitor-kde-20211112.png} (100%) rename needles/kde/apps/{systemmonitor_runs-20240227.json => apps_run_monitor-kde.json} (60%) rename needles/kde/apps/{systemmonitor_runs-20240227.png => apps_run_monitor-kde.png} (100%) diff --git a/needles/gnome/apps/apps_run_monitor-20240127.json b/needles/gnome/apps/apps_run_monitor-20240127.json index 299a4eb7..44e1aae6 100644 --- a/needles/gnome/apps/apps_run_monitor-20240127.json +++ b/needles/gnome/apps/apps_run_monitor-20240127.json @@ -1,16 +1,15 @@ -{ - "area": [ - { - "type": "match", - "width": 51, - "ypos": 162, - "height": 19, - "xpos": 486 - } - ], - "properties": [], - "tags": [ - "apps_run_monitor", - "systemmonitor_runs" - ] -} +{ + "area": [ + { + "xpos": 486, + "ypos": 162, + "width": 51, + "height": 19, + "type": "match" + } + ], + "properties": [], + "tags": [ + "apps_run_monitor" + ] +} \ No newline at end of file diff --git a/needles/gnome/apps/apps_run_monitor-20240424.json b/needles/gnome/apps/apps_run_monitor-20240424.json index b70f4b84..44e1aae6 100644 --- a/needles/gnome/apps/apps_run_monitor-20240424.json +++ b/needles/gnome/apps/apps_run_monitor-20240424.json @@ -1,16 +1,15 @@ -{ - "area": [ - { - "ypos": 162, - "type": "match", - "height": 19, - "xpos": 486, - "width": 51 - } - ], - "properties": [], - "tags": [ - "apps_run_monitor", - "systemmonitor_runs" - ] -} +{ + "area": [ + { + "xpos": 486, + "ypos": 162, + "width": 51, + "height": 19, + "type": "match" + } + ], + "properties": [], + "tags": [ + "apps_run_monitor" + ] +} \ No newline at end of file diff --git a/needles/gnome/apps/apps_run_monitor-20240702.json b/needles/gnome/apps/apps_run_monitor-20240702.json index ccd770cf..80623044 100644 --- a/needles/gnome/apps/apps_run_monitor-20240702.json +++ b/needles/gnome/apps/apps_run_monitor-20240702.json @@ -1,16 +1,15 @@ -{ - "area": [ - { - "xpos": 352, - "ypos": 123, - "type": "match", - "height": 19, - "width": 70 - } - ], - "properties": [], - "tags": [ - "apps_run_monitor", - "systemmonitor_runs" - ] -} +{ + "area": [ + { + "xpos": 352, + "ypos": 123, + "width": 70, + "height": 19, + "type": "match" + } + ], + "properties": [], + "tags": [ + "apps_run_monitor" + ] +} \ No newline at end of file diff --git a/needles/gnome/apps/apps_run_monitor.json b/needles/gnome/apps/apps_run_monitor.json index 632db9ed..d9162c15 100644 --- a/needles/gnome/apps/apps_run_monitor.json +++ b/needles/gnome/apps/apps_run_monitor.json @@ -10,7 +10,6 @@ ], "properties": [], "tags": [ - "apps_run_monitor", - "systemmonitor_runs" + "apps_run_monitor" ] -} +} \ No newline at end of file diff --git a/needles/gnome/apps/sysmon/apps_run_monitor-20240710.json b/needles/gnome/apps/sysmon/apps_run_monitor-20240710.json index eeb8fb90..d3d07bb2 100644 --- a/needles/gnome/apps/sysmon/apps_run_monitor-20240710.json +++ b/needles/gnome/apps/sysmon/apps_run_monitor-20240710.json @@ -1,23 +1,22 @@ -{ - "area": [ - { - "xpos": 327, - "width": 101, - "ypos": 124, - "height": 19, - "type": "match" - }, - { - "xpos": 468, - "ypos": 125, - "width": 90, - "height": 18, - "type": "match" - } - ], - "properties": [], - "tags": [ - "apps_run_monitor", - "systemmonitor_runs" - ] +{ + "area": [ + { + "xpos": 327, + "ypos": 124, + "width": 101, + "height": 19, + "type": "match" + }, + { + "xpos": 468, + "ypos": 125, + "width": 90, + "height": 18, + "type": "match" + } + ], + "properties": [], + "tags": [ + "apps_run_monitor" + ] } \ No newline at end of file diff --git a/needles/kde/apps/apps_run_monitor-kde-20211112.json b/needles/kde/apps/apps_run_monitor-kde-20211112.json new file mode 100644 index 00000000..819230f8 --- /dev/null +++ b/needles/kde/apps/apps_run_monitor-kde-20211112.json @@ -0,0 +1,15 @@ +{ + "area": [ + { + "xpos": 195, + "ypos": 280, + "width": 140, + "height": 20, + "type": "match" + } + ], + "properties": [], + "tags": [ + "apps_run_monitor" + ] +} \ No newline at end of file diff --git a/needles/kde/apps/systemmonitor_runs-20211112.png b/needles/kde/apps/apps_run_monitor-kde-20211112.png similarity index 100% rename from needles/kde/apps/systemmonitor_runs-20211112.png rename to needles/kde/apps/apps_run_monitor-kde-20211112.png diff --git a/needles/kde/apps/systemmonitor_runs-20240227.json b/needles/kde/apps/apps_run_monitor-kde.json similarity index 60% rename from needles/kde/apps/systemmonitor_runs-20240227.json rename to needles/kde/apps/apps_run_monitor-kde.json index 978083d5..86c6a962 100644 --- a/needles/kde/apps/systemmonitor_runs-20240227.json +++ b/needles/kde/apps/apps_run_monitor-kde.json @@ -1,15 +1,15 @@ -{ - "area": [ - { - "type": "match", - "xpos": 423, - "ypos": 5, - "height": 20, - "width": 182 - } - ], - "properties": [], - "tags": [ - "systemmonitor_runs" - ] +{ + "area": [ + { + "xpos": 423, + "ypos": 5, + "width": 182, + "height": 20, + "type": "match" + } + ], + "properties": [], + "tags": [ + "apps_run_monitor" + ] } \ No newline at end of file diff --git a/needles/kde/apps/systemmonitor_runs-20240227.png b/needles/kde/apps/apps_run_monitor-kde.png similarity index 100% rename from needles/kde/apps/systemmonitor_runs-20240227.png rename to needles/kde/apps/apps_run_monitor-kde.png diff --git a/tests/applications/sysmon/aaa_setup.pm b/tests/applications/sysmon/aaa_setup.pm index 9c9470df..3ae13ab9 100644 --- a/tests/applications/sysmon/aaa_setup.pm +++ b/tests/applications/sysmon/aaa_setup.pm @@ -13,7 +13,7 @@ sub run { set_update_notification_timestamp(); # Start the Application menu_launch_type("system monitor"); - assert_screen("systemmonitor_runs"); + assert_screen("apps_run_monitor"); # Make it fill the entire window. send_key("super-up"); diff --git a/tests/apps_startstop/kde/plasmasystemmonitor.pm b/tests/apps_startstop/kde/plasmasystemmonitor.pm index f4d29758..125b0edd 100644 --- a/tests/apps_startstop/kde/plasmasystemmonitor.pm +++ b/tests/apps_startstop/kde/plasmasystemmonitor.pm @@ -10,7 +10,7 @@ sub run { # Start the application menu_launch_type 'system monitor'; # Check that it is started - assert_screen 'systemmonitor_runs', timeout => 60; + assert_screen 'apps_run_monitor', timeout => 60; # Close the application quit_with_shortcut(); }