786c70db · 59618bb6 · 68e3b72a · 1e58e683 · 567cdbb9 · 1dcb053d
--- a/.gitattributes
+++ b/.gitattributes
+*.vala   diff=java
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,6 +23,7 @@ nightly:
 fedora:latest:
    image: fedora:latest
    stage: fedora
+    when: manual
    needs: []
    before_script:
    - dnf update -y --nogpgcheck

--- a/.gitmodules
+++ b/.gitmodules
+[submodule "subprojects/gtk-frdp"]
+	path = subprojects/gtk-frdp
+	url = https://gitlab.gnome.org/gnome/gtk-frdp.git
+
+[submodule "subprojects/libovf-glib"]
+	path = subprojects/libovf-glib
+	url = https://gitlab.gnome.org/felipeborges/libovf-glib.git
--- a/AUTHORS
+++ b/AUTHORS
-Alexander Larsson <alexl@redhat.com>
-Christophe Fergeau <cfergeau@redhat.com>
-Cosimo Cecchi <cosimoc@redhat.com>
-Marc-André Lureau <marcandre.lureau@gmail.com>
-Zeeshan Ali (Khattak) <zeeshanak@gnome.org>
-
-Designers:
-
-Allan Day <aday@gnome.org>
-Jon McCann <jmccann@redhat.com>
-Jakub Steiner <jsteiner@redhat.com>
-
-Derivate work credits:
-
-empty-boxes.png: Dave Jones <eevblog@yahoo.com.au>
--- a/CodingStyle.txt
+++ b/CodingStyle.txt
-GNOME Boxes Coding Style
-========================
-
-The coding style to respect in this project is very similar to most
-Vala projects. In particular, the following rules are largely adapted
-from the Rygel Coding Style.
-
- * 4-spaces (and not tabs) for indentation.
-
- * ''Prefer'' lines of less than <= 120 columns
-
- * 1-space between function name and braces (both calls and signature
-   declarations)
-
- * Avoid the use of 'this' keyword:
-
- * If function signature/call fits in a single line, do not break it
-   into multiple lines.
-
- * For methods/functions that take variable argument tuples, all the
-   first elements of tuples are indented normally with the subsequent
-   elements of each tuple indented 4-space more. Like this:
-
-        action.get ("ObjectID",
-                        typeof (string),
-                        out this.object_id,
-                    "Filter",
-                        typeof (string),
-                        out this.filter,
-                    "StartingIndex",
-                        typeof (uint),
-                        out this.index,
-                    "RequestedCount",
-                        typeof (uint),
-                        out this.requested_count,
-                    "SortCriteria",
-                        typeof (string),
-                        out this.sort_criteria);
-
- * ''Prefer'' descriptive names over abbreviations (unless well-known)
-   & shortening of names. E.g discoverer over disco.
-
- * Use 'var' in variable declarations wherever possible.
-
- * Use 'as' to cast wherever possible.
-
- * Single statments inside if/else must not be enclosed by '{}'.
-
- * The more you provide docs in comments, but at the same time avoid
-   over-documenting. Here is an example of useless comment:
-
-   // Fetch the document
-   fetch_the_document ();
-
- * Each class should go in a separate .vala file & named according to
-   the class in it. E.g Boxes.SpiceDisplay class should go under
-   spice-display.vala.
-
- * Avoid putting more than 3 'using' statements in each .vala file. If
-   you feel you need to use more, perhaps you should consider
-   refactoring (Move some of the code to a separate class).
-
- * Declare the namespace(s) of the class/errordomain with the
-   class/errordomain itself. Like this:
-
-   private class Boxes.Hello {
-   ...
-   };
-
- * Prefer 'foreach' over 'for'.
-
- * Add a newline to break the code in logical pieces
-
- * Add a newline before each return, throw, break etc. if it
-   is not the only statement in that block
-
-    if (condition_applies ()) {
-      do_something ();
-
-      return false;
-    }
-
-    if (other_condition_applies ())
-      return true;
-
-   Except for the break in a switch:
-
-    switch (val) {
-    case 1:
-        debug ("case 1");
-        do_one ();
-        break;
-
-    default:
-        ...
-    }
-
- * If a function returns several equally important values, they should
-   all be given as out arguments. IOW, prefer this:
-
-     void get_a_and_b (out string a, out string b)
-
-   rather than the un-even, string get_a_and_b (out b)
--- a/HACKING
+++ b/HACKING
-HACKME
-======
-
-If you are just interested in knowing how to post a bug you've found, just
-read the section "Reporting Bugs" in README and follow the instructions.
-
-This file is intended to help new developers to get started with developing
-for Boxes. Feel free to skip sections if you know what they are about.
-
-Another good source for general information is:
-
- https://wiki.gnome.org/Apps/Boxes
-
-1. How to Provide a Good Patch
-==============================
-
-* Read the CodingStyle.txt.
-* Make sure you have just what belongs there in the changeset.
-* Read https://wiki.gnome.org/Git/CommitMessages carefully.
-* The preferred way of appending patches to bugs is via git bz.
-  * As an alternative you can use "git format-patch HEAD~1".
-* The bugtracker has some quite cool features; use them!
-* Click on review to write comments to other or your patches or to comment
-  comments on these patches
-* Dont be afraid about criticism! The review process is probably going to be long.
-* We dont dislike you! We really appreciate your work.
-
-2. Getting Started With Vala
-============================
-
-Check out:
-
- https://wiki.gnome.org/Projects/Vala/Documentation
-
-Vala basics in 5 minutes:
-
- https://www.youtube.com/watch?v=k9hE0mumsCM
-
-Good reference for the libraries used here:
-
- http://www.valadoc.org/
-
-Information about UI-templates:
-
- http://blogs.gnome.org/tvb/2013/05/29/composite-templates-lands-in-vala/
-
-3. Getting Started With Boxes
-=============================
-
-The best way to get started is to fix small bugs. If you don't find them, ask
-on IRC.
-
--- a/HACKING.md
+++ b/HACKING.md
+# Coding guide
+
+If you are interested in reporting an issue, read the section "Reporting Bugs"
+in README.md.
+
+This file is intended to help new developers to get started with developing
+Boxes.
+
+For additional resources, visit the [Boxes Developer Documentation](https://gitlab.gnome.org/GNOME/gnome-boxes/-/wikis/home).
+
+## Contribution guidelines
+
+* Follow our coding style.
+* Include only the necessary changes in your commits.
+* Read our [commit message guidelines](https://wiki.gnome.org/Git/CommitMessages).
+* [Submit a merge-request](https://wiki.gnome.org/Newcomers/SubmitContribution).
+
+## Contributing
+
+ * Tasks that are good for new contributors are marked with the ["Newcomers" label](https://gitlab.gnome.org/GNOME/gnome-boxes/issues?label_name%5B%5D=4.+Newcomers).
+ * [Building the project](https://wiki.gnome.org/Newcomers/BuildProject) from the source code.
+
+## Learn more about Vala
+
+ * [Documentation](https://wiki.gnome.org/Projects/Vala/Documentation)
+ * [API docs](https://valadoc.org)
+
+## Coding style
+
+The coding style used in this project is similar to most Vala projects.
+In particular, the following rules are largely adapted from the Rygel
+Coding Style.
+
+ * 4-spaces (and not tabs) for indentation.
+ * 1-space between function name and braces (both calls and signature
+   declarations).
+ * Prefer lines of less than <= 120 columns.
+ * Prefer `foreach` over `for`.
+ * Prefer descriptive names over abbreviations (unless well-known).
+ * Avoid the use of `this` keyword.
+ * Avoid unnecessary comment blocks. Favor descriptive variable and method names.
+ * Place each `class` should go in a separate `.vala` file and named according to
+   the class in it. E.g `Boxes.SpiceDisplay` -> `spice-display.vala`.
+ * Avoid putting more than 3 `using` statements in each .vala file. If
+   you feel you need to use more, perhaps you should consider
+   refactoring (Move some of the code to a separate class).
+ * If function signature/call fits in a single line, do not break it
+   into multiple lines.
+ * Use `var` in variable declarations wherever possible.
+ * Use `as` to cast wherever possible.
+ * Single statements inside `if`/`else` must not be enclosed by `{}`.
+ * Declare the namespace of the `class`/`errordomain` with the class itself.
+   For example:
+
+```vala
+   private class Boxes.Hello {
+   ...
+   };
+```
+ * Add a newline to break the code in logical pieces
+ * Add a newline before each `return`, `throw`, `break` etc. if it
+   is not the only statement in that block
+
+```vala
+    if (condition_applies ()) {
+      do_something ();
+
+      return false;
+    }
+
+    if (other_condition_applies ())
+      return true;
+```
+
+   Except for the break in a switch:
+
+```vala
+    switch (val) {
+    case 1:
+        debug ("case 1");
+        do_one ();
+        break;
+
+    default:
+        ...
+    }
+```
--- a/MAINTAINERS
+++ b/MAINTAINERS
-See gnome-boxes.doap file
--- a/NEWS
+++ b/NEWS
-41.3 - 07 Jan, 2022
-===================
-
-Changes since 41.2
-
-  - Fix crash with absent storage volumes
-  - Go to display-view after importing a box
+42.beta - 24 Feb, 2022
+======================

-All contributors to this release:
+Changes since 42.alpha

-Felipe Borges <felipeborges@gnome.org>
+  - Show machine.status also in IconView (while installing, importing, cloning...)
+  - Stop snapshotiong VMs after creation
+  - Redesigned starting page of the VM creation assistant
+  - Updated documentation for Preferences dialog and VM creation assistant
+  - Add ctrl-alt-f9 shortcut to forward to the guest
+  - Replace in-app notifications with Toasts
+  - build: remove positional i18n.merge_file arguments
+  - Added/updated/fixed translations:
+    - Basque
+    - Brazilian Portuguese
+    - Catalan
+    - Chinese (China)
+    - Croatian
+    - Czech
+    - Danish
+    - Galician
+    - Hebrew
+    - Indonesian
+    - Italian
+    - Japanese
+    - Lithuanian
+    - Persian
+    - Portuguese
+    - Russian
+    - Slovenian
+    - Spanish
+    - Turkish
+    - Ukrainian

-41.2 - 03 Dec, 2021
-===================
+42.alpha - 11 Jan, 22022
+========================

-Changes since 41.1
+Changes since 41.3

  - Update to the list of downloadable operating systems
  - Fix an issue causing VMs to have no sound
  - Fix an issue preventing users from configuring 3D acceleration
+  - Fix crash with absent storage volumes
+  - Go to display-view after importing a box
+  - Stop bundling libhandy as a subproject
+  - New Preferences dialog
+  - Port box creation Assistant widgets to libhandy
+  - Use content-type to detect media files
+  - Remove selection-mode
+  - New box thumbnail drawing logic (with CSS)
  - Added/updated/fixed translations:
+    - Persian
+    - Portuguese
+    - Russian
+    - Brazilian Portuguese
+    - Ukrainian
+    - Indonesian
+    - Spanish
+    - Lithuanian
+    - Chinese (China)
    - Basque
+    - Friulian
+    - Hebrew
    - Catalan
+    - Swedish
+    - Croatian
    - Latvian
-    - Occitan
-    - Russian
-    - Serbian
-    - Slovak
    - Vietnamese
-
-All contributors to this release:
-
-Aleksandr Melman <Alexmelman88@gmail.com>
-Asier Sarasua Garmendia <asiersarasua@ni.eus>
-Dušan Kazik <prescott66@gmail.com>
-Felipe Borges <felipeborges@gnome.org>
-Jordi Mas <jmas@softcatala.org>
-Ngọc Quân Trần <vnwildman@gmail.com>
-Quentin PAGÈS <pages_quentin@hotmail.com>
-Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>
-Марко Костић <marko.m.kostic@gmail.com>
-
-41.1 - 18 Sep, 2021
-===================
-
-Changes since 41.0
-
-  - Fix regression preventing onboarding dialog from loading
-  - Fix regression preventing VM clone operations from completing
-
-All contributors to this release:
-
-Felipe Borges <felipeborges@gnome.org>
+    - Slovak
+    - Serbian

 41.0 - 17 Sep, 2021
 ===================

--- a/README.md
+++ b/README.md
 # GNOME Boxes

-A simple GNOME 3 application to access remote or virtual systems.
+A simple GNOME 3 application to access virtual machines.

 [![Download on Flathub](https://upload.wikimedia.org/wikipedia/commons/thumb/a/a6/Flathub-badge-en.svg/240px-Flathub-badge-en.svg.png)](https://flathub.org/apps/details/org.gnome.Boxes)

 ## Goals

 * View, access, and use:
-  * remote machines
-  * remote virtual machines
  * local virtual machines
  * When technology permits, set up access for applications on local virtual machines
 * View, access, and use virtual machines on removable media
@@ -28,109 +26,29 @@ A simple GNOME 3 application to access remote or virtual systems.
 ## Use Cases

 * Connect to a local virtual machine for testing.
-* Connecting to a work machine from home.
-* Connect to a work machine over a low quality cellular network.

 ## Runtime Dependencies

 * genisoimage (usually provided by genisoimage package)

-## Reporting Bugs
+## Reporting issues

-If you want to report bugs, please check if there isn't already one on:
+Firstly verify that the issue you are experiencing is not yet reported in [our
+issue tracker](https://gitlab.GNOME.org/GNOME/GNOME-boxes/issues)

- [GNOME Boxes Issues](https://gitlab.GNOME.org/GNOME/GNOME-boxes/issues)
+When reporting issues, please provide as much useful information as you can.
+This can include:

-If one does not exist already, please file a new one.
+* The version of Boxes you are running (Menu -> About, or `gnome-boxes --version` in the command line).
+* Steps to reproduce your problem.
+* An error message, if there is one (in the UI and on the console)
+* If Boxes crashes, attach a [stack trace](https://gitlab.gnome.org/GNOME/gnome-boxes/-/wikis/debugging-crashes)
+* If additional information is necessary, [activate debug messages](https://gitlab.gnome.org/GNOME/gnome-boxes/-/wikis/Debugging-Crashes#activating-debug-messages).
+* A fix/solution (read the HACKING.md file).

-Please provide as much useful information as you can and have. This can
-include
-
-* steps to reproduce your problem
-* the error message, if there is one (in the UI and on the console)
-* a backtrace if the program crashes (See Appendix 1)
-* debug messages if it makes sense (See Appendix 2)
-* a fix if you have one (This greatly increases the chances of this issue
-  getting fixed soon. See HACKING, section 2 for how to provide a good patch.)
-
-The determination of what is useful is your task. If you forget about
-something important, someone will probably ask.
-
-## Contributing
-
-### Finding Bugs
-
-Bugs labelled as "Newcomers" for the project can be found here:
-
-[Newcomers Bugs](https://gitlab.gnome.org/GNOME/gnome-boxes/issues?label_name%5B%5D=4.+Newcomers)
-
-### Building the Project
-
-Instructions for building the project can be found here:
-
-[Build the Project](https://wiki.gnome.org/Newcomers/BuildProject)
-
-## Appendix
-
-### Backtracing
-
-* If you are not using the flatpak gnome-boxes package
-
-```bash
-gdb gnome-boxes
-```
-
-* If you using the flatpak gnome-boxes package
-
-```bash
-flatpak run --command=sh --devel org.gnome.Boxes
-gdb /app/bin/gnome-boxes
-```
-
-Type
-
-```bash
-run
-```
-
-Let the program crash.
-
-Type:
-
-```bash
-backtrace
-```
-
-And copy the output to pastebin.com or a similar webpage and link it in the
-bugtracker with a hint.
-
-### Activating debug messages
-
-To run Boxes with debug message output on the console, just run:
-
-```bash
-G_MESSAGES_DEBUG=Boxes GNOME-boxes
-```
-
-If you want to run your jhbuild version, execute:
-
-```bash
-G_MESSAGES_DEBUG=Boxes jhbuild run GNOME-boxes
-```
-
-or start a shell under jhbuild environment:
-
-```bash
-G_MESSAGES_DEBUG=Boxes jhbuild shell
-```
-
-to be able to use simpler commands from there:
-
-```bash
-GNOME-boxes
-```
+If you forget about something important, we will probably ask.

 ### References

 * [GNOME Boxes](https://wiki.gnome.org/Apps/Boxes)
-* [GNOME Boxes Wiki](https://wiki.GNOME.org/Design/Apps/Boxes)
\ No newline at end of file
+* [GNOME Boxes Wiki](https://wiki.GNOME.org/Design/Apps/Boxes)
--- a/THANKS
+++ b/THANKS
-The Boxes team would like to thank the following contributors:
-
-Christophe Fergeau
-Jakub Steiner
-Marc-André Lureau
-Stefano Facchini
-Tom Goralczyk
-Zeeshan Ali (Khattak)
--- a/build-aux/flatpak/org.gnome.Boxes.json
+++ b/build-aux/flatpak/org.gnome.Boxes.json
@@ -14,8 +14,6 @@
        "--share=network",
        "--device=all",
        "--system-talk-name=org.freedesktop.timedate1",
-        "--system-talk-name=org.freedesktop.Accounts",
-        "--filesystem=/var/lib/AccountsService/icons:ro",
        "--talk-name=org.gnome.ControlCenter",
        "--talk-name=org.freedesktop.secrets",
        "--filesystem=xdg-run/dconf",
@@ -68,8 +66,8 @@
                    "sources": [
                        {
                            "type": "archive",
-                            "url": "https://github.com/lloyd/yajl/archive/2.1.0.tar.gz",
-                            "sha256": "3fb73364a5a30efe615046d07e6db9d09fd2b41c763c5f7d3bfb121cd5c5ac5a"
+                            "url": "https://github.com/lloyd/yajl/archive/refs/tags/2.1.0.tar.gz",
+                            "sha256" : "3fb73364a5a30efe615046d07e6db9d09fd2b41c763c5f7d3bfb121cd5c5ac5a"
                        }
                    ]
                },
@@ -108,8 +106,8 @@
                    "sources": [
                        {
                            "type": "archive",
-                            "url": "http://downloads.sourceforge.net/sourceforge/libtirpc/libtirpc-1.3.1.tar.bz2",
-                            "sha256": "245895caf066bec5e3d4375942c8cb4366adad184c29c618d97f724ea309ee17"
+                            "url": "https://downloads.sourceforge.net/sourceforge/libtirpc/libtirpc-1.3.2.tar.bz2",
+                            "sha256": "e24eb88b8ce7db3b7ca6eb80115dd1284abc5ec32a8deccfed2224fc2532b9fd"
                        }
                    ]
                },
@@ -148,8 +146,8 @@
                    "sources": [
                        {
                            "type": "archive",
-                            "url": "https://libvirt.org/sources/libvirt-7.2.0.tar.xz",
-                            "sha256": "01f459d0c7ba5009622a628dba1a026200e8f4a299fea783b936a71d7e0ed1d0"
+                            "url": "https://libvirt.org/sources/libvirt-7.7.0.tar.xz",
+                            "sha256": "1b616099c18d14b9424a622f2a0bd3e0cfa286414f3416bd1a8173621b2252b2"
                        },
                        {
                            "type": "patch",
@@ -224,8 +222,8 @@
                    "sources": [
                        {
                            "type": "archive",
-                            "url": "https://www.spice-space.org/download/libcacard/libcacard-2.7.0.tar.xz",
-                            "sha256": "16b1a0847d5f9d2290e0785eca40f2e49d1ed80814bfc758c05c76b3c89cdb6f"
+                            "url": "https://www.spice-space.org/download/libcacard/libcacard-2.8.1.tar.xz",
+                            "sha256": "fbbf4de8cb7db5bdff5ecb672ff0dbe6939fb9f344b900d51ba6295329a332e7"
                        }
                    ]
                },
@@ -262,8 +260,8 @@
            "sources": [
                {
                    "type": "archive",
-                    "url": "https://download.qemu.org/qemu-6.0.0.tar.xz",
-                    "sha256": "87bc1a471ca24b97e7005711066007d443423d19aacda3d442558ae032fa30b9"
+                    "url": "https://download.qemu.org/qemu-6.1.0.tar.xz",
+                    "sha256": "eebc089db3414bbeedf1e464beda0a7515aad30f73261abc246c9b27503a3c96"
                }
            ],
            "modules": [
@@ -300,8 +298,8 @@
                    "sources": [
                        {
                            "type": "archive",
-                            "url": "https://github.com/freedesktop/virglrenderer/archive/virglrenderer-0.8.2.tar.gz",
-                            "sha256": "9fa93095cd9a3e5b13c740e5e3b656a989356732bdaf3e22acb7c38a1f1f4411"
+                            "url": "https://github.com/freedesktop/virglrenderer/archive/virglrenderer-0.9.1.tar.gz",
+                            "sha256": "dd4a8008ca7bcaaf56666c94fcd738d705cdeda6313a82b3cea78bc3fb1b1ba5"
                        }
                    ]
                }
@@ -311,13 +309,13 @@
            "name": "gtk-vnc",
            "buildsystem": "meson",
            "config-opts": [
-                "-Dpulseaudio=enable"
+                "-Dpulseaudio=enabled"
            ],
            "sources": [
                {
                    "type": "archive",
-                    "url": "https://download.gnome.org/sources/gtk-vnc/1.0/gtk-vnc-1.0.0.tar.xz",
-                    "sha256": "a81a1f1a79ad4618027628ffac27d3391524c063d9411c7a36a5ec3380e6c080"
+                    "url": "https://download.gnome.org/sources/gtk-vnc/1.2/gtk-vnc-1.2.0.tar.xz",
+                    "sha256": "7aaf80040d47134a963742fb6c94e970fcb6bf52dc975d7ae542b2ef5f34b94a"
                }
            ]
        },

--- a/data/gnome-boxes.gresource.xml
+++ b/data/gnome-boxes.gresource.xml
@@ -8,41 +8,25 @@
    <file>icons/eye-not-looking-symbolic.svg</file>
    <file>icons/eye-open-negative-filled-symbolic.svg</file>
    <file preprocess="xml-stripblanks">ui/app-window.ui</file>
-    <file preprocess="xml-stripblanks">ui/auth-notification.ui</file>
    <file preprocess="xml-stripblanks">ui/collection-toolbar.ui</file>
    <file preprocess="xml-stripblanks">ui/display-page.ui</file>
    <file preprocess="xml-stripblanks">ui/display-toolbar.ui</file>
    <file preprocess="xml-stripblanks">ui/downloads-hub.ui</file>
    <file preprocess="xml-stripblanks">ui/downloads-hub-row.ui</file>
-    <file preprocess="xml-stripblanks">ui/editable-entry.ui</file>
-    <file preprocess="xml-stripblanks">ui/empty-boxes.ui</file>
    <file preprocess="xml-stripblanks">ui/icon-view.ui</file>
    <file preprocess="xml-stripblanks">ui/icon-view-child.ui</file>
    <file preprocess="xml-stripblanks" alias="gtk/help-overlay.ui">ui/kbd-shortcuts-window.ui</file>
    <file preprocess="xml-stripblanks">ui/list-view.ui</file>
    <file preprocess="xml-stripblanks">ui/list-view-row.ui</file>
-    <file preprocess="xml-stripblanks">ui/notification.ui</file>
-    <file preprocess="xml-stripblanks">ui/properties-shared-folder-row.ui</file>
-    <file preprocess="xml-stripblanks">ui/properties-page-widget.ui</file>
-    <file preprocess="xml-stripblanks">ui/properties-toolbar.ui</file>
-    <file preprocess="xml-stripblanks">ui/properties-window.ui</file>
-    <file preprocess="xml-stripblanks">ui/resource-graph.ui</file>
    <file preprocess="xml-stripblanks">ui/searchbar.ui</file>
-    <file preprocess="xml-stripblanks">ui/selectionbar.ui</file>
-    <file preprocess="xml-stripblanks">ui/selection-toolbar.ui</file>
-    <file preprocess="xml-stripblanks">ui/shared-folders.ui</file>
-    <file preprocess="xml-stripblanks">ui/shared-folder-popover.ui</file>
-    <file preprocess="xml-stripblanks">ui/snapshot-list-row.ui</file>
-    <file preprocess="xml-stripblanks">ui/machine-config-editor.ui</file>
+    <file preprocess="xml-stripblanks">ui/thumbnail.ui</file>
    <file preprocess="xml-stripblanks">ui/topbar.ui</file>
+    <file preprocess="xml-stripblanks">ui/toast.ui</file>
    <file preprocess="xml-stripblanks">ui/transfer-info-row.ui</file>
    <file preprocess="xml-stripblanks">ui/transfer-popover.ui</file>
-    <file preprocess="xml-stripblanks">ui/troubleshoot-log.ui</file>
    <file preprocess="xml-stripblanks">ui/troubleshoot-view.ui</file>
    <file preprocess="xml-stripblanks">ui/unattended-setup-box.ui</file>
    <!-- VM Creation Assistant -->
-    <file preprocess="xml-stripblanks">ui/assistant/installation-summary.ui</file>
-    <file preprocess="xml-stripblanks">ui/assistant/downloadable-entry.ui</file>
    <file preprocess="xml-stripblanks">ui/assistant/media-entry.ui</file>
    <file preprocess="xml-stripblanks">ui/assistant/vm-assistant.ui</file>
    <file preprocess="xml-stripblanks">ui/assistant/rhel-download-dialog.ui</file>
@@ -53,6 +37,19 @@
    <file preprocess="xml-stripblanks">ui/assistant/pages/preparation-page.ui</file>
    <file preprocess="xml-stripblanks">ui/assistant/pages/setup-page.ui</file>
    <file preprocess="xml-stripblanks">ui/assistant/pages/review-page.ui</file>
+    <!-- VM Preferences window -->
+    <file preprocess="xml-stripblanks">ui/preferences/cdrom-row.ui</file>
+    <file preprocess="xml-stripblanks">ui/preferences/devices-page.ui</file>
+    <file preprocess="xml-stripblanks">ui/preferences/device-list-row.ui</file>
+    <file preprocess="xml-stripblanks">ui/preferences/memory-row.ui</file>
+    <file preprocess="xml-stripblanks">ui/preferences/preferences-window.ui</file>
+    <file preprocess="xml-stripblanks">ui/preferences/resources-page.ui</file>
+    <file preprocess="xml-stripblanks">ui/preferences/shared-folders-widget.ui</file>
+    <file preprocess="xml-stripblanks">ui/preferences/shared-folder-popover.ui</file>
+    <file preprocess="xml-stripblanks">ui/preferences/shared-folder-row.ui</file>
+    <file preprocess="xml-stripblanks">ui/preferences/snapshot-list-row.ui</file>
+    <file preprocess="xml-stripblanks">ui/preferences/snapshots-page.ui</file>
+
    <!-- Welcome Tutorial -->
    <file preprocess="xml-stripblanks">ui/welcome-tutorial.ui</file>
    <file preprocess="xml-stripblanks">ui/welcome-tutorial-page.ui</file>

--- a/data/gtk-style.css
+++ b/data/gtk-style.css
-@define-color boxes_bg_color shade (@theme_bg_color, 0.5);
-@define-color boxes_bg2_color mix (@theme_bg_color, @boxes_bg_color, 0.5);
-@define-color boxes_selected_color #3465a4;
-
-.boxes-snapshot-list-row {
-    border-bottom: 1px solid @borders;
-}
-
-.boxes-snapshot-list-row.indicator {
-    background-color: @insensitive_fg_color;
-    border: none;
-}
-
-.boxes-snapshot-list-row.indicator.active {
-    background-color: @theme_fg_color;
-}
-
-.boxes-resource-graph {
-    background-color: @boxes_bg_color;
-    border-color: @theme_fg_color;
-    color: @theme_bg_color;
-}
-
 .transparent-bg {
    background-color: transparent;
    background-image: none;
 }

-.content-bg {
-    background-color: @content_view_bg;
-}
-
-.boxes-toplevel {
-    background-color: @theme_bg_color;
-}
-
-.slow-spinner {
-    animation-duration: 2s;
-}
-
 .thumbnail {
-    background: @boxes_bg2_color;
-    border: 1px solid @theme_bg_color;
-}
-
-.bold-label {
-    font-weight: bold;
-}
-
-/******************
- * New Box Wizard *
- ******************/
-
-/* This is the subtitle in the ISOs/media list */
-.boxes-step-label {
-    font-size: smaller;
-    font-weight: normal;
+    background: @theme_base_color;
+    color: @theme_fg_color;
+    border: 1px solid @borders;
 }

-.boxes-wizard-media-os-label {
-    color: #d8d8d8;
-    font-weight: bold;
+.live-thumbnail {
+    background: black;
 }

-.boxes-logo-notice-label {
-    font-size: smaller;
-    font-style: italic;
-}
-
-.boxes-spice-tools-notice-label {
-    font-size: smaller;
-    font-style: italic;
+/* This replaces a separator between the recommended
+ * OS list and the buttons at the bottom. */
+.index-stack {
+    border-bottom: 1px solid @borders;
 }

 .boxes-product-key-entry {
    font-family: monospace;
 }

-/* Ensure the viewport is transparent so the background don't
-   show through the rounded corners */
-.boxes-menu GtkViewport {
-    background-image: none;
-    background-color: transparent;
-    border-style: none;
+/* This is to be removed once we port to AdwToast */
+.boxes-toast {
+     border-radius: 2em;
 }

-.boxes-menu-row {
-    background: @theme_unfocused_base_color;
-}
-
-.boxes-menu-row:hover {
-    background-color: @theme_bg_color;
-}
-
-.sources-list {
-    border-radius: 5px;
-}
-
-separator {
-    background-color: @borders;
-}
-
-.list-expand-button {
-    border-top: 1px solid @borders;
-}
-
-/* Adds a border to the ISOs lists top undershoot */
-.boxes-menu-scrolled.undershoot.top { border-top: 1px solid @borders; }
-
 /* Screenshot flash */
 @keyframes flash_animation {
    50% {

--- a/data/meson.build
+++ b/data/meson.build
@@ -20,7 +20,6 @@ resources = gnome.compile_resources ('org.gnome.Boxes',
 desktop_conf = configuration_data ()
 desktop_conf.set ('icon', application_id)
 desktop = i18n.merge_file (
-  'desktop',
  input: configure_file (
    input: files ('org.gnome.Boxes.desktop.in'),
    output: 'org.gnome.Boxes.desktop.in',
@@ -65,7 +64,7 @@ configure_file (

 appdata_conf = configuration_data()
 appdata_conf.set('appid', application_id)
-appdata_file = i18n.merge_file ('appdata-file',
+appdata_file = i18n.merge_file (
  input: configure_file (
    input: files ('org.gnome.Boxes.appdata.xml.in'),
    output: 'org.gnome.Boxes.appdata.xml.in',

--- a/data/org.gnome.Boxes.appdata.xml.in
+++ b/data/org.gnome.Boxes.appdata.xml.in
@@ -4,21 +4,29 @@
  <id>org.gnome.Boxes.desktop</id>
  <metadata_license>CC0-1.0</metadata_license>
  <project_license>LGPL-2.1+</project_license>
-  <name>GNOME Boxes</name>
+  <name>Boxes</name>
  <summary>Virtualization made simple</summary>
  <description>
    <p>
-      A simple GNOME 3 application to manage virtual systems. Unlike
-      some other virtual machine management software, Boxes is targeted towards
-      typical desktop end-users. For this reason, Boxes will not provide many
-      advanced options to tweak virtual machines. Instead Boxes will focus on
-      getting things working out of the box with very little input from user.
-    </p>
-    <p>
-      You want to install Boxes if you just want a very safe and easy way to try
-      out new operating systems or new (potentially unstable) versions of your
-      favorite operating system(s).
+      Select an operating system and let Boxes download and install it for you
+      in a virtual machine.
    </p>
+
+    <p>Features:</p>
+    <ul>
+      <li>Download freely available operating systems.</li>
+      <li>Automatically install CentOS Stream, Debian, Fedora, Microsoft Windows, OpenSUSE, Red
+      Hat Enterprise Linux, and Ubuntu.</li>
+      <li>Create virtual machines from operating system images with a couple of clicks.</li>
+      <li>Limit the resources (memory and storage) your virtual machines consume from your system.</li>
+      <li>Take snapshots of virtual machines to restore to previous states.</li>
+      <li>Redirect USB devices from your physical machine into virtual machines.</li>
+      <li>3D acceleration for some of the supported operating systems.</li>
+      <li>Automatically resize virtual machines displays to the window size.</li>
+      <li>Share clipboard between your system and virtual machines.</li>
+      <li>Share files to virtual machines by dropping them from your file manager into the Boxes window.</li>
+      <li>Setup Shared Folders between your system and virtual machines.</li>
+    </ul>
  </description>
  <screenshots>
    <screenshot height="1600" width="900" type="default">
@@ -38,18 +46,6 @@
    </screenshot>
  </screenshots>
  <releases>
-    <release version="41.3" date="2022-01-07">
-      <p>GNOME Boxes 41.3 provides additional improvements including a fix for a crash when the storage volume of a box is not accessible.</p>
-    </release>
-
-    <release version="41.2" date="2021-12-03">
-      <p>GNOME Boxes 41.2 provides additional improvements including a fix for the issue causing audio backend mismatch, and an issue when some users were unable to enable or disable 3D acceleration.</p>
-    </release>
-
-    <release version="41.1" date="2021-09-18">
-      <p>GNOME Boxes 41.1 provides additional improvements such as bugfixes and translation updates.</p>
-    </release>
-
    <release version="40.0" date="2021-03-19">
      <p>GNOME Boxes 40.0 culminates six months of feature development, bugfixes, and performance improvements.</p>
    </release>
@@ -76,4 +72,8 @@
  <url type="translate">https://wiki.gnome.org/TranslationProject</url>
  <translation type="gettext">gnome-boxes</translation>
  <content_rating type="oars-1.1" />
+  <custom>
+    <value key="GnomeSoftware::key-colors">[(143, 124, 209)]</value>
+  </custom>
+
 </component>
--- a/data/org.gnome.boxes.gschema.xml
+++ b/data/org.gnome.boxes.gschema.xml
@@ -47,13 +47,6 @@
        Whether Boxes is running for the first time
      </description>
    </key>
-    <key name="override-theme" type="b">
-      <default>true</default>
-      <summary>Override theme</summary>
-      <description>
-        Whether Boxes will override the user's theme
-      </description>
-    </key>

    <key name="shared-folders" type="s">
      <default>""</default>

--- a/data/osinfo/guix-1.3.xml
+++ b/data/osinfo/guix-1.3.xml
+<libosinfo version="0.0.1">
+
+  <!-- Please read README.logos for any questions about usage of product logos in Boxes. !-->
+
+  <os id="http://guix.gnu.org/guix/1.3">
+    <logo>https://gitlab.gnome.org/GNOME/gnome-boxes-logos/-/raw/master/logos/guix.svg</logo>
+  </os>
+
+</libosinfo>
--- a/data/osinfo/meson.build
+++ b/data/osinfo/meson.build
@@ -9,6 +9,7 @@ osinfo_db = [
  ['freedos-1.2.xml', 'gnome-boxes/osinfo/os/freedos.org'],
  ['gnome-nightly.xml', 'gnome-boxes/osinfo/os/gnome.org'],
  ['gnome-3.38.xml', 'gnome-boxes/osinfo/os/gnome.org'],
+  ['guix-1.3.xml', 'gnome-boxes/osinfo/os/guix.gnu.org'],
  ['manjaro-19.0.xml', 'gnome-boxes/osinfo/os/manjaro.org'],
  ['nixos-20.03.xml', 'gnome-boxes/osinfo/os/nixos.org'],
  ['opensuse-10.2.xml', 'gnome-boxes/osinfo/os/opensuse.org'],
@@ -19,6 +20,7 @@ osinfo_db = [
  ['rhel-6.0.xml', 'gnome-boxes/osinfo/os/redhat.com'],
  ['rhel-7.0.xml', 'gnome-boxes/osinfo/os/redhat.com'],
  ['rhel-8.0.xml', 'gnome-boxes/osinfo/os/redhat.com'],
+  ['rocky-8.4.xml', 'gnome-boxes/osinfo/os/rockylinux.org'],
  ['silverblue-28.xml', 'gnome-boxes/osinfo/os/fedoraproject.org']
 ]


--- a/data/osinfo/rocky-8.4.xml
+++ b/data/osinfo/rocky-8.4.xml
+<libosinfo version="0.0.1">
+
+  <!-- Please read README.logos for any questions about usage of product logos in Boxes. !-->
+
+  <os id="http://rockylinux.org/rocky/8.4">
+    <logo>https://gitlab.gnome.org/GNOME/gnome-boxes-logos/-/raw/master/logos/rockylinux.svg</logo>
+  </os>
+
+</libosinfo>