Compare commits
35 Commits
a0b34d2bfe
...
fbaf1652d8
| Author | SHA1 | Date |
|---|---|---|
Lukas Ruzicka
|
fbaf1652d8 | |
Adam Williamson
|
5cd9c83e73 | |
|
Adam Williamson
|
a7ec8ada2b | |
|
Adam Williamson
|
4c53e53e87 | |
|
Adam Williamson
|
46c0719e66 | |
|
Adam Williamson
|
09f1317691 | |
|
Adam Williamson
|
18edc46417 | |
|
Adam Williamson
|
56281a41bd | |
|
Adam Williamson
|
c6d808ed23 | |
|
Adam Williamson
|
691e82b1f9 | |
|
Adam Williamson
|
bdae22d7de | |
|
Adam Williamson
|
b614a38d6c | |
|
Adam Williamson
|
ce2c511588 | |
|
Adam Williamson
|
9f2d44a181 | |
|
Adam Williamson
|
f4bd3c6f58 | |
|
Adam Williamson
|
d65aac4c83 | |
|
Adam Williamson
|
f9cda76860 | |
|
Adam Williamson
|
5a548fd3c7 | |
|
Adam Williamson
|
b976fb2d58 | |
|
Adam Williamson
|
4b3ee64ee8 | |
|
Adam Williamson
|
dd20d1f224 | |
|
Adam Williamson
|
7b29a8f1b2 | |
|
Lukas Ruzicka
|
d3a6beda3d | |
|
Adam Williamson
|
34eba25858 | |
|
Adam Williamson
|
a8f547f5ef | |
|
Adam Williamson
|
86c975e49a | |
|
Adam Williamson
|
7465985c50 | |
|
Adam Williamson
|
a07ad20240 | |
|
Adam Williamson
|
fcbb00d0ac | |
|
Adam Williamson
|
adedf40b6f | |
|
Adam Williamson
|
2880edced1 | |
|
Adam Williamson
|
96c75c5e28 | |
|
Adam Williamson
|
6b6cd20956 | |
|
Adam Williamson
|
394794989b | |
|
Adam Williamson
|
4938c0e5ae |
39
lib/utils.pm
|
|
@ -476,7 +476,7 @@ sub get_workarounds {
|
|||
my %workarounds = (
|
||||
"38" => [],
|
||||
"39" => [],
|
||||
"40" => ["FEDORA-2024-01fd5aa621"],
|
||||
"40" => [],
|
||||
"41" => [],
|
||||
);
|
||||
my $advortasks = $workarounds{$version};
|
||||
|
|
@ -496,7 +496,8 @@ sub disable_updates_repos {
|
|||
both => 0,
|
||||
@_
|
||||
);
|
||||
# FIXME as of 2023-06-20 dnf5 doesn't have config-manager plugin yet :(
|
||||
# we used to do this with config-manager, but the syntax differs
|
||||
# on dnf 4 vs. dnf 5 and really sed is just as easy
|
||||
assert_script_run 'sed -i -e "s,enabled=1,enabled=0,g" /etc/yum.repos.d/fedora-updates-testing.repo';
|
||||
assert_script_run 'sed -i -e "s,enabled=1,enabled=0,g" /etc/yum.repos.d/fedora-updates.repo' if ($args{both});
|
||||
unless (script_run 'test -f /etc/yum.repos.d/fedora-updates-testing-modular.repo') {
|
||||
|
|
@ -1230,6 +1231,7 @@ sub advisory_check_nonmatching_packages {
|
|||
# older version from the frozen release repo
|
||||
my %args = (
|
||||
fatal => 1,
|
||||
wrapper => "",
|
||||
@_
|
||||
);
|
||||
# can't do anything useful when testing a side tag
|
||||
|
|
@ -1241,6 +1243,11 @@ sub advisory_check_nonmatching_packages {
|
|||
# unnecessarily in post_fail_hook
|
||||
return if (get_var("_ACNMP_DONE"));
|
||||
script_run 'touch /tmp/installedupdatepkgs.txt';
|
||||
my $rpmcmd = "rpm";
|
||||
my $timeout = 180;
|
||||
my $wrapper = $args{wrapper};
|
||||
$rpmcmd = "$wrapper rpm" if ($wrapper);
|
||||
$timeout = 360 if ($wrapper);
|
||||
# this creates /tmp/installedupdatepkgs.txt as a sorted list of installed
|
||||
# packages with the same name as packages from the update, in the same form
|
||||
# as /mnt/updatepkgs.txt. The '--last | head -1' tries to handle the
|
||||
|
|
@ -1254,7 +1261,7 @@ sub advisory_check_nonmatching_packages {
|
|||
# (we need four to reach bash, and half of them get eaten by perl or
|
||||
# something along the way). Yes, it only works with *single* quotes. Yes,
|
||||
# I hate escaping
|
||||
script_run 'for pkg in $(cat /mnt/updatepkgnames.txt); do rpm -q $pkg && rpm -q $pkg --last | head -1 | cut -d" " -f1 | sed -e \'s,\^,\\\\\\\\^,g\' | xargs rpm -q --qf "%{SOURCERPM} %{NAME} %{EPOCHNUM} %{VERSION} %{RELEASE}\n" >> /tmp/installedupdatepkgs.txt; done', timeout => 180;
|
||||
script_run 'for pkg in $(cat /mnt/updatepkgnames.txt); do ' . $rpmcmd . ' -q $pkg && ' . $rpmcmd . ' -q $pkg --last | head -1 | cut -d" " -f1 | sed -e \'s,\^,\\\\\\\\^,g\' | xargs ' . $rpmcmd . ' -q --qf "%{SOURCERPM} %{NAME} %{EPOCHNUM} %{VERSION} %{RELEASE}\n" >> /tmp/installedupdatepkgs.txt; done', timeout => $timeout;
|
||||
script_run 'sort -u -o /tmp/installedupdatepkgs.txt /tmp/installedupdatepkgs.txt';
|
||||
# for debugging, may as well always upload these, can't hurt anything
|
||||
upload_logs "/tmp/installedupdatepkgs.txt", failok => 1;
|
||||
|
|
@ -1274,7 +1281,7 @@ sub advisory_check_nonmatching_packages {
|
|||
my $message = "Package(s) from update not installed when it should have been! See script output";
|
||||
$message = "Script failed unexpectedly!" if ($ret == 1);
|
||||
if ($args{fatal}) {
|
||||
set_var("_ACNMP_DONE", "1");
|
||||
set_var("_ACNMP_DONE", "1") unless $wrapper;
|
||||
die $message;
|
||||
}
|
||||
else {
|
||||
|
|
@ -1476,6 +1483,8 @@ sub check_prerelease {
|
|||
$prerelease = 1 if ($build =~ /\.n\.\d+/ && !get_var("LIVE"));
|
||||
# if it's a respin compose we *MUST NOT* see tags
|
||||
$prerelease = 0 if ($build =~ /Respin/);
|
||||
# bail if we've decided we don't care
|
||||
return if ($prerelease > 1);
|
||||
# we *could* go to a console and parse fedora-release-common
|
||||
# to decide if a nightly live image should have tags or not, but
|
||||
# it seems absurd as we're almost reinventing the code that
|
||||
|
|
@ -1483,14 +1492,20 @@ sub check_prerelease {
|
|||
# really a big deal either way whether a nightly live image has
|
||||
# the tags or not. So we don't.
|
||||
|
||||
# For all prerelease requiring ISOs, assert that prerelease is there.
|
||||
if ($prerelease == 1) {
|
||||
assert_screen "prerelease_note";
|
||||
}
|
||||
elsif ($prerelease == 0) {
|
||||
# If the prerelease note is shown, where it should not be, die!
|
||||
if (check_screen "prerelease_note") {
|
||||
die "The PRERELEASE tag is shown, but it should NOT be.";
|
||||
my $gotpr = 0;
|
||||
# sigh, perl and booleans...
|
||||
$gotpr = 1 if (check_screen "prerelease_note", 15);
|
||||
my $msg = $prerelease ? "Pre-release warning not shown!" : "Pre-release warning shown when it should not be!";
|
||||
unless ($prerelease == $gotpr) {
|
||||
# FIXME we haven't got pre-release handling right with osbuild yet
|
||||
# https://pagure.io/fedora-iot/issue/57
|
||||
# https://github.com/osbuild/images/issues/515
|
||||
my $flavor = get_var('FLAVOR');
|
||||
if ($flavor =~ m/IoT|osbuild/) {
|
||||
record_soft_failure $msg;
|
||||
}
|
||||
else {
|
||||
die $msg;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
13
main.pm
|
|
@ -122,7 +122,16 @@ sub load_upgrade_tests() {
|
|||
autotest::loadtest "tests/${pu}.pm";
|
||||
}
|
||||
}
|
||||
autotest::loadtest "tests/upgrade_run.pm";
|
||||
# If we want the upgrade run with GUI tools, we need
|
||||
# to load a GUI set of tests
|
||||
if (get_var("GUI_UPGRADE")) {
|
||||
autotest::loadtest("tests/graphical_upgrade_prerequisites.pm");
|
||||
autotest::loadtest("tests/graphical_upgrade_run.pm");
|
||||
}
|
||||
# otherwise go with the CLI variant
|
||||
else {
|
||||
autotest::loadtest "tests/upgrade_run.pm";
|
||||
}
|
||||
# handle additional postinstall tests
|
||||
if (get_var("POSTINSTALL")) {
|
||||
set_var('POSTINSTALL', "upgrade_postinstall " . get_var("POSTINSTALL"));
|
||||
|
|
@ -239,7 +248,6 @@ sub _load_early_postinstall_tests {
|
|||
# Appropriate login method for install type
|
||||
if (get_var("DESKTOP")) {
|
||||
_load_instance("tests/_graphical_wait_login", $instance);
|
||||
_load_instance("tests/_snapshot_only") if (get_var("LOGIN_SNAPSHOT"));
|
||||
}
|
||||
# Test non-US input at this point, on language tests
|
||||
if (get_var("SWITCHED_LAYOUT") || get_var("INPUT_METHOD")) {
|
||||
|
|
@ -255,7 +263,6 @@ sub _load_early_postinstall_tests {
|
|||
# the installation is interrupted on purpose.
|
||||
unless (get_var("DESKTOP") || get_var("CRASH_REPORT")) {
|
||||
_load_instance("tests/_console_wait_login", $instance);
|
||||
_load_instance("tests/_snapshot_only") if (get_var("LOGIN_SNAPSHOT"));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"xpos": 591,
|
||||
"width": 42,
|
||||
"ypos": 46,
|
||||
"height": 19,
|
||||
"type": "match"
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"apps_run_calendar"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 83 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"ypos": 61,
|
||||
"type": "match",
|
||||
"height": 21,
|
||||
"width": 76,
|
||||
"xpos": 546
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"apps_run_clocks"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 17 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"xpos": 458,
|
||||
"width": 65,
|
||||
"ypos": 90,
|
||||
"height": 21,
|
||||
"type": "match"
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"apps_run_contacts"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 53 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"height": 22,
|
||||
"type": "match",
|
||||
"ypos": 90,
|
||||
"width": 138,
|
||||
"xpos": 443
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"apps_run_diskusage"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 63 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"xpos": 479,
|
||||
"width": 66,
|
||||
"type": "match",
|
||||
"height": 20,
|
||||
"ypos": 90
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"apps_run_fonts"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 83 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"xpos": 446,
|
||||
"width": 129,
|
||||
"ypos": 119,
|
||||
"type": "match",
|
||||
"height": 19
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"apps_run_gvim"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 659 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"xpos": 483,
|
||||
"width": 37,
|
||||
"height": 19,
|
||||
"type": "match",
|
||||
"ypos": 39
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"apps_run_logs"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 54 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"ypos": 162,
|
||||
"type": "match",
|
||||
"height": 19,
|
||||
"xpos": 486,
|
||||
"width": 51
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"apps_run_monitor"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 157 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"xpos": 445,
|
||||
"width": 131,
|
||||
"type": "match",
|
||||
"height": 19,
|
||||
"ypos": 131
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"apps_run_scan"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 9.9 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"xpos": 271,
|
||||
"ypos": 113,
|
||||
"width": 142,
|
||||
"height": 24,
|
||||
"type": "match"
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"apps_run_seahorse"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 624 KiB |
|
|
@ -0,0 +1,16 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"ypos": 115,
|
||||
"type": "match",
|
||||
"height": 21,
|
||||
"xpos": 494,
|
||||
"width": 71
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"apps_run_texteditor",
|
||||
"apps_run_editor"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 17 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"ypos": 378,
|
||||
"type": "match",
|
||||
"height": 23,
|
||||
"width": 84,
|
||||
"xpos": 45
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"apps_settings_menu_background"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 34 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"ypos": 159,
|
||||
"height": 64,
|
||||
"type": "match",
|
||||
"width": 137,
|
||||
"xpos": 229
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"archiver_archive_created"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 36 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"xpos": 238,
|
||||
"width": 116,
|
||||
"height": 55,
|
||||
"type": "match",
|
||||
"ypos": 169
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"archiver_archive_extracted"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 60 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"xpos": 693,
|
||||
"width": 48,
|
||||
"height": 19,
|
||||
"type": "match",
|
||||
"ypos": 308
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"archiver_button_create"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 42 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"xpos": 315,
|
||||
"width": 90,
|
||||
"ypos": 497,
|
||||
"type": "match",
|
||||
"height": 22
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"archiver_context_archive"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 126 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"width": 58,
|
||||
"xpos": 311,
|
||||
"height": 21,
|
||||
"type": "match",
|
||||
"ypos": 204
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"archiver_context_extract"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 41 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"xpos": 626,
|
||||
"width": 96,
|
||||
"height": 43,
|
||||
"type": "match",
|
||||
"ypos": 562
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"archiver_select_tarxz"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 135 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"width": 80,
|
||||
"xpos": 20,
|
||||
"type": "match",
|
||||
"height": 20,
|
||||
"ypos": 322
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"gnome_open_location_pictures"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 36 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"width": 144,
|
||||
"xpos": 260,
|
||||
"type": "match",
|
||||
"height": 128,
|
||||
"ypos": 166
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"calc_about_shown"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 850 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"ypos": 378,
|
||||
"height": 21,
|
||||
"type": "match",
|
||||
"width": 37,
|
||||
"xpos": 381
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"calc_button_mod"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 893 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"width": 88,
|
||||
"xpos": 173,
|
||||
"type": "match",
|
||||
"height": 29,
|
||||
"ypos": 185
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"calc_credits_shown"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 765 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"xpos": 363,
|
||||
"width": 121,
|
||||
"height": 23,
|
||||
"type": "match",
|
||||
"ypos": 487
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"calc_menu_about"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 884 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"ypos": 292,
|
||||
"type": "match",
|
||||
"height": 34,
|
||||
"xpos": 162,
|
||||
"width": 147
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"calc_result_O9qsL"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 899 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"ypos": 225,
|
||||
"type": "match",
|
||||
"height": 108,
|
||||
"xpos": 428,
|
||||
"width": 171
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"chars_about_shown"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 171 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"width": 67,
|
||||
"xpos": 56,
|
||||
"type": "match",
|
||||
"height": 80,
|
||||
"ypos": 90
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"chars_character_copied"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 221 KiB |
|
|
@ -0,0 +1,22 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"xpos": 358,
|
||||
"width": 72,
|
||||
"type": "match",
|
||||
"height": 21,
|
||||
"ypos": 229
|
||||
},
|
||||
{
|
||||
"ypos": 397,
|
||||
"height": 20,
|
||||
"type": "match",
|
||||
"xpos": 357,
|
||||
"width": 65
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"chars_credits_shown"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 166 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"ypos": 226,
|
||||
"type": "match",
|
||||
"height": 27,
|
||||
"width": 189,
|
||||
"xpos": 392
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"chars_legal_shown"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 167 KiB |
|
|
@ -0,0 +1,22 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"xpos": 598,
|
||||
"width": 66,
|
||||
"ypos": 513,
|
||||
"height": 22,
|
||||
"type": "match"
|
||||
},
|
||||
{
|
||||
"type": "match",
|
||||
"height": 85,
|
||||
"ypos": 300,
|
||||
"width": 113,
|
||||
"xpos": 457
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"chars_love_eyes_dialogue"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 183 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"height": 20,
|
||||
"type": "match",
|
||||
"ypos": 405,
|
||||
"xpos": 45,
|
||||
"width": 68
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"chars_select_activities"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 286 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"width": 120,
|
||||
"xpos": 47,
|
||||
"ypos": 268,
|
||||
"height": 23,
|
||||
"type": "match"
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"chars_select_animals"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 233 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"xpos": 42,
|
||||
"width": 46,
|
||||
"ypos": 537,
|
||||
"type": "match",
|
||||
"height": 23
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"chars_select_flags"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 276 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"width": 93,
|
||||
"xpos": 44,
|
||||
"type": "match",
|
||||
"height": 22,
|
||||
"ypos": 313
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"chars_select_food"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 331 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"height": 22,
|
||||
"type": "match",
|
||||
"ypos": 223,
|
||||
"xpos": 44,
|
||||
"width": 101
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"chars_select_people"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 346 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"height": 22,
|
||||
"type": "match",
|
||||
"ypos": 493,
|
||||
"width": 65,
|
||||
"xpos": 43
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"chars_select_symbols"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 304 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"height": 19,
|
||||
"type": "match",
|
||||
"ypos": 360,
|
||||
"width": 106,
|
||||
"xpos": 47
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"chars_select_travel"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 210 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"ypos": 115,
|
||||
"type": "match",
|
||||
"height": 18,
|
||||
"width": 509,
|
||||
"xpos": 235
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"clocks_alarm_inactive"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 8.5 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"width": 102,
|
||||
"xpos": 230,
|
||||
"height": 28,
|
||||
"type": "match",
|
||||
"ypos": 106
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"clocks_alarm_snooze_confirmed"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 18 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"width": 74,
|
||||
"xpos": 466,
|
||||
"ypos": 495,
|
||||
"height": 22,
|
||||
"type": "match"
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"clocks_button_add_alarm"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 16 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"xpos": 485,
|
||||
"width": 55,
|
||||
"type": "match",
|
||||
"height": 20,
|
||||
"ypos": 629
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"clocks_button_alarm_snooze"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 36 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"height": 22,
|
||||
"type": "match",
|
||||
"ypos": 569,
|
||||
"width": 51,
|
||||
"xpos": 488
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"clocks_button_alarm_stop"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 36 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"xpos": 526,
|
||||
"width": 96,
|
||||
"ypos": 43,
|
||||
"height": 23,
|
||||
"type": "match"
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"clocks_button_stopwatch"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 16 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"ypos": 46,
|
||||
"type": "match",
|
||||
"height": 19,
|
||||
"width": 65,
|
||||
"xpos": 665
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"clocks_button_timer"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 16 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"ypos": 264,
|
||||
"type": "match",
|
||||
"height": 20,
|
||||
"xpos": 374,
|
||||
"width": 41
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"clocks_button_timer_minute"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 20 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"height": 17,
|
||||
"type": "match",
|
||||
"ypos": 45,
|
||||
"width": 68,
|
||||
"xpos": 294
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"clocks_button_world"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 16 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"ypos": 187,
|
||||
"type": "match",
|
||||
"height": 23,
|
||||
"xpos": 216,
|
||||
"width": 124
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"clocks_city_added_bratislava"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 22 KiB |
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"xpos": 220,
|
||||
"width": 84,
|
||||
"ypos": 188,
|
||||
"type": "match",
|
||||
"height": 21
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"clocks_city_added_reykjavik"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 26 KiB |
|
|
@ -0,0 +1,22 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"height": 64,
|
||||
"type": "match",
|
||||
"ypos": 336,
|
||||
"xpos": 488,
|
||||
"width": 21
|
||||
},
|
||||
{
|
||||
"height": 57,
|
||||
"type": "match",
|
||||
"ypos": 700,
|
||||
"width": 90,
|
||||
"xpos": 411
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"clocks_city_details"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 12 KiB |
|
|
@ -0,0 +1,22 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"xpos": 485,
|
||||
"width": 58,
|
||||
"type": "match",
|
||||
"height": 19,
|
||||
"ypos": 157
|
||||
},
|
||||
{
|
||||
"height": 33,
|
||||
"type": "match",
|
||||
"ypos": 259,
|
||||
"width": 92,
|
||||
"xpos": 355
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"clocks_credits_shown"
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 31 KiB |