Release v3.0.6

Fix Qemu VM wizard after PyQt6 migration
Fix issues after PyQt6 migration
2026-06-08 03:23:44 +03:00 · 2026-01-28 22:30:37 +08:00 · 2026-01-28 22:23:44 +08:00 · 2026-01-28 18:54:17 +08:00 · 2026-01-27 22:06:32 +08:00 · 2026-01-27 22:05:56 +08:00
312 changed files with 95499 additions and 92645 deletions
--- a/.github/workflows/add-new-issues-to-project.yml
+++ b/.github/workflows/add-new-issues-to-project.yml
@@ -0,0 +1,16 @@
+name: Add new issues to GNS3 project
+
+on:
+  issues:
+    types:
+      - opened
+
+jobs:
+  add-to-project:
+    name: Add issue to project
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/add-to-project@v1.0.1
+        with:
+          project-url: https://github.com/orgs/GNS3/projects/3
+          github-token: ${{ secrets.ADD_NEW_ISSUES_TO_PROJECT }}
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -0,0 +1,93 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+  schedule:
+    - cron: '17 22 * * 6'
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners (GitHub.com only)
+    # Consider using larger runners or machines with greater resources for possible analysis time improvements.
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
+    permissions:
+      # required for all workflows
+      security-events: write
+
+      # required to fetch internal or private CodeQL packs
+      packages: read
+
+      # only required for workflows in private repositories
+      actions: read
+      contents: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - language: python
+          build-mode: none
+        # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
+        # Use `c-cpp` to analyze code written in C, C++ or both
+        # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
+        # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
+        # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
+        # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
+        # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+        build-mode: ${{ matrix.build-mode }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+    # If the analyze step fails for one of the languages you are analyzing with
+    # "We were unable to automatically build your code", modify the matrix above
+    # to set the build mode to "manual" for that language. Then modify this step
+    # to build your code.
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+    - if: matrix.build-mode == 'manual'
+      shell: bash
+      run: |
+        echo 'If you are using a "manual" build mode for one or more of the' \
+          'languages you are analyzing, replace this with the commands to build' \
+          'your code, for example:'
+        echo '  make bootstrap'
+        echo '  make release'
+        exit 1
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:${{matrix.language}}"
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -12,7 +12,7 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
    - name: Build and run Docker image
      run: |
        docker build -t gns3-gui-test .
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,4 @@ __pycache__

 # Virtualenv
 env
+venv
--- a/.whitesource
+++ b/.whitesource
@@ -2,7 +2,8 @@
  "scanSettings": {
    "configMode": "AUTO",
    "configExternalURL": "",
-    "projectToken" : ""
+    "projectToken" : "",
+    "baseBranches": ["master", "2.2", "3.0"]
  },
  "checkRunSettings": {
    "vulnerableCheckRunConclusionLevel": "failure"
--- a/2
+++ b/2
@@ -1,2 +0,0 @@
-Jeremy Grossmann
-Julien Duponchelle
--- a/347
+++ b/347
@@ -1,5 +1,351 @@
 # Change Log

+## 3.0.6 28/01/2026
+
+* Fixing tab name in MobaXterm
+* PyQt6 migration
+* Add XDG Config Home support
+* Support for Python 3.14
+* Clicking the "console connect to all nodes" opens all consoles in name order with case-insensitively
+
+
+## 2.2.56 21/01/2026
+
+* Fixing tab name in MobaXterm
+* PyQt6 migration
+* Add XDG Config Home support
+
+## 2.2.55 19/11/2025
+
+* Fix SyntaxWarning: invalid escape sequence. Fixes #3760
+* Support for Python 3.14
+* Clicking the "console connect to all nodes" opens all consoles in name order with case-insensitively
+
+## 3.0.5 14/05/2025
+
+* Merge remote-tracking branch 'origin/2.2' into 3.0
+* Merge remote-tracking branch 'origin/2.2' into 3.0
+* Development on 2.2.55.dev1
+* Release v2.2.54
+* Development on 2.2.54.dev1
+* Replace "Docker hub" by "Docker repository" because it is possible to use different repositories
+* Upgrade dependencies
+* Fix bring console in front when clicking on "Open all consoles". Fixes #3706
+* Upgrade dependencies
+* Allow password greater than 8 characters. Ref #3714
+* Development on 3.0.5.dev1
+* Add -F arg to wmctrl. Ref #3706
+
+## 2.2.54 21/04/2025
+
+* Replace "Docker hub" by "Docker repository" because it is possible to use different repositories
+* Upgrade dependencies
+* Fix bring console in front when clicking on "Open all consoles". Fixes #3706
+* Add -F arg to wmctrl. Ref #3706
+
+## 3.0.4 25/02/2025
+
+* Upgrade dependencies
+* Fix auto idle-pc for IOS templates
+* Add user info and password change for logged-in user. Fixes #3698
+
+## 3.0.3 22/01/2025
+
+* Set minimum duration for progress dialog when uploading. Ref https://github.com/GNS3/gns3-gui/issues/3682
+* Add logs when uploading images to the controller
+* Option to disable SSL certificate verification for future connections. Fixes https://github.com/GNS3/gns3-gui/issues/3694
+* Fix packet capture when connected to a controller with SSL. Fixes https://github.com/GNS3/gns3-gui/issues/3696
+* Update status after importing an image when installing a new appliance. Fixes #3691
+* Update file browser filters to find IOU images without extension. Fixes #3692
+* Upgrade dependencies
+
+## 2.2.53 21/01/2025
+
+* Update file browser filters for all files and IOU images
+* Upgrade dependencies
+* Fix Linux Mint default terminal configuration
+
+## 3.0.2 03/01/2025
+
+* Add button to create templates based on images that are not used by any yet.
+* Add "prune" images button in image management dialog.
+* Use the controller image endpoint to install appliances
+* Drop Python 3.8
+* Add image info tooltip in image management dialog.
+* Upgrade dependencies
+* Apply grid color via css property
+
+## 3.0.1 27/12/2024
+
+* Fix issue when image is already on the local server. Fixes https://github.com/GNS3/gns3-gui/issues/3678
+* Fix image uploading when image name differs with the image name recorded in the appliance. Fixes https://github.com/GNS3/gns3-gui/issues/3682
+* Fix Linux Mint default terminal configuration
+
+## 3.0.0 20/12/2024
+
+* Change title of QMessageBox
+
+## 2.2.52 02/12/2024
+
+* Add iol extension filter. Ref #3664
+* Remove maximum 64GB RAM limitation for QEMU VMs. Fixes #3658
+* Bring to front support for consoles on Linux.
+* Relax setuptools requirement to allow for easier Debian packaging on Ubuntu Focal & Jammy
+
+## 3.0.0rc2 20/11/2024
+
+* Remove maximum 64GB RAM limitation for QEMU VMs. Fixes #3658
+* Fix GUI connection to server.
+* Bring to front support for consoles on Linux.
+* Relax setuptools requirement to allow for easier Debian packaging on Ubuntu Focal & Jammy
+* Do not include tokens in notification logs
+* Python 3.13 support
+
+
+## 2.2.51 07/11/2024
+
+* Python 3.13 support
+* Upgrade dependencies
+* Add keyboard shortcut for Add Link
+
+## 2.2.50 21/10/2024
+
+* Fix issue when pid file contains invalid data
+* Add comment to indicate sentry-sdk is optional. Ref https://github.com/GNS3/gns3-server/issues/2423
+* Improve information provided when uploading invalid appliance image. Fixes #3637
+* Use "experimental features" option to force listening for HTTP notification streams. Ref #3579
+* Fix to allow packet capture on more than 6 links. Fixes #3594
+* Support for configuring MAC address in Docker containers
+* Add KRDC to pre-configured VNC console commands
+
+## 3.0.0rc1 11/08/2024
+
+* Add keep the original compute IDs option when exporting a project
+
+## 2.2.49 06/08/2024
+
+* Upgrade jsonschema and sentry-sdk packages
+* Upgrade to PyQt5 v5.15.11
+* Add shortcuts info dialog
+* Added Key Shortcuts
+
+## 2.2.48.1 12/07/2024
+
+* No changes
+
+## 2.2.48 08/07/2024
+
+* Use "experimental features" to allow bypassing hostname validation. Ref #3524
+* Update appliance_v8.json. Ref https://github.com/GNS3/gns3-registry/pull/897
+* Option to keep the compute IDs unchanged when exporting a project
+* Upgrade sentry-sdk and psutil packages
+* Switch to PyQt5 5.15.10 for macOS build
+
+## 3.0.0b3 19/05/2024
+
+* Fix updating IOS router
+* Ensure Python >= 3.8 is used in pyproject.toml
+
+## 2.2.47 15/05/2024
+
+* Remove maximum size for capture dialog. Ref #3576
+* Change sentry-sdk version
+* Upgrade aiohttp, sentry-sdk and truststore
+* Upgrade jsonschema and aiohttp
+* Drop Python 3.7
+* Remove dev requirements for Python 3.6
+* Add NAT symbols
+* Only show log message if event has "message"
+
+## 3.0.0b2 07/04/2024
+
+* Enable local controller support on Linux
+* Support for custom Qemu path in templates and nodes
+* Round CPUs value in Docker templates and VMs. Ref https://github.com/GNS3/gns3-gui/issues/3572
+
+## 2.2.46 26/02/2024
+
+* Add GNS3 console command "env" to show what environment variables are used. Ref https://github.com/GNS3/gns3-server/issues/2306
+* Add CTRL+C shortcut to copy status bar message. Ref #3561
+* Key modifier (ALT) to ignore snap to grid. Fixes #3538
+* Increase timeout to 5s for status bar messages. The coordinates message has no timeout and can be reset when clicking on the scene. Ref #3561
+* Add reset GUI state feature. Ref #3549
+* Fix for hiding Windows terminal. Ref #3290
+* Drop support for Python 3.6
+* Upgrade sentry-sdk, psutil and distro dependencies
+
+## 2.2.45 12/01/2024
+
+* Add missing console_type values in appliance_v8.json. Ref https://github.com/GNS3/gns3-registry/issues/849
+* Handle moved project notifications on controller stream
+* Add debug for PATH env variable
+* Add custom executable paths on Windows
+* Add --suppressApplicationTitle for Windows terminal. Fixes https://github.com/GNS3/gns3-gui/issues/3544
+* Upgrade sentry-sdk and aiohttp
+
+## 3.0.0b1 27/11/2023
+
+* Upgrade sentry-sdk to v1.37.1
+* Deactivate showing a percentage in progress bar. Ref #3543
+
+## 3.0.0a6 15/11/2023
+
+* Possible fix for stuck image upload. Ref https://github.com/GNS3/gns3-server/issues/2310
+* Fix timeout issue when creating Qemu disk image. Fixes https://github.com/GNS3/gns3-server/issues/2313
+* Add ISO file to images filter in Image Manager. Ref https://github.com/GNS3/gns3-server/issues/2310
+* Update custom command help and protect against double quote in project name
+* Refactor command variables support
+* Pass os.environ in Popen()
+* Add the ability to edit width and height in the style edit dialog.
+
+## 2.2.44.1 07/11/2023
+
+* No changes
+
+## 2.2.44 06/11/2023
+
+* Fix timeout issue when creating Qemu disk image. Fixes https://github.com/GNS3/gns3-server/issues/2313
+* Refactor command variables support
+* Add vendor_logo_url in appliance schemas. Ref https://github.com/GNS3/gns3-registry/pull/825
+* Add Qemu IGB network device
+* Add the ability to edit width and height in the style edit dialog.
+
+## 3.0.0a5 27/10/2023
+
+* Upgrade to actions/checkout@v3 and actions/setup-python@v3
+* Fix cannot change default VLAN for an access port for builtin Ethernet switch. Fixes #3528
+* Add Qemu IGB network device
+
+## 3.0.0a4 18/10/2023
+
+* New packaging relying only pyproject.toml
+* Apply Snap-to-grid of drawing items not on their center position. Fixes #3465
+* Allow computes to be dynamically or manually allocated
+* Add UEFI boot mode option for Qemu VMs
+* Adjust some values in pyproject.toml
+* Migrate to pyproject.toml
+* Mark VMware and VirtualBox support as deprecated
+* Fix RecursionError with invalid credentials. Fixes #3374
+* Allow raw images by default. Fixes https://github.com/GNS3/gns3-server/issues/2097
+* Dot not allow "no border" style for line items
+* Use "none" for solid line style in drawing items
+* Fix editing Docker container config generates exception and empty config. Fixes #3371
+* Fix cannot detect images by default when trying to upload them in the Image Manager. Fixes #3367
+* Fix unable to set VNC console resolution. Fixes  #3365
+* Set default symbol theme to "Affinity-square-blue"
+* Fix creating a custom Ethernet switch template
+* Update decorative symbols (for Wizards etc.)
+* Use generic symbol names
+* Set raw image param when uploading an image from the appliance wizard
+* Fix incorrect param in getCompute()
+* Checks for valid hostname on server side for Dynamips, IOU, Qemu and Docker nodes
+* Fix incorrect call to QProgress.setValue() with float
+* Reactivate project importation
+* Support compression levels
+* Add zstandard compression
+* Upgrade dependencies
+* Remove Qemu binary requirement
+* Use controller API to list images
+* Use new API endpoints to create/resize Qemu disk images.
+* Drop Python 3.6 support and require Python >= 3.7
+* Improvements when connecting and updating computes
+* Use current directory when searching for images. Fixes #3198
+* Refactor server settings and wizard
+* Disable local server and GNS3 VM preferences
+* Image uploading to controller and project export
+* HTTP client refactoring completed
+* Start HTTP client refactoring
+* Upgrade dependencies
+* Handle empty compute_id in preferences. Ref #3265
+* Remove direct upload to compute
+* Send JWT token in query string when connecting to websocket. Ref https://github.com/GNS3/gns3-server/pull/1992
+* Option to delete orphaned image files from disk when template is removed. Fixes #3249
+* Remove Qemu legacy networking code
+* Isolate and unisolate support. Fixes https://github.com/GNS3/gns3-gui/issues/3190
+* Support authentication using JWT tokens
+* Change Qemu disk descriptions. Fixes #3035
+* Edit only text mode config files
+* Hide config import/export when configFiles attribute is empty
+* Qemu disk interfaces must be set to "none" by default. Ref #3035
+* Do not allow image to be configured on Qemu VM secondary slave disk if create config disk option is enabled.
+* Add explicit option to automatically create or not the config disk. Off by default.
+* Auxiliary console support for Qemu. Ref #2873 Improvements for auxiliary console support for Docker and Dynamips.
+* Support to reset all console connections. Ref https://github.com/GNS3/gns3-server/issues/1619
+* Support to reset links. Fixes https://github.com/GNS3/gns3-server/issues/1620
+* Fix bug when recent files cannot be seen in the new project dialog.
+* Wait for the controller to be online before allowing actions like creating or opening a project. Fixes #2907
+* Show progress dialog immediately when connecting to server. Ref #2907
+* QEMU config disk - enable QEMU config import/export
+* Add total RAM, CPUs and disk size to servers summary as well as disk usage in percent. Fixes https://github.com/GNS3/gns3-server/issues/1532
+* Resource constraints for Docker VMs.
+* Wait for readme to be updated before exporting the project.
+* Support for "usage" for "Cloud" nodes. Fixes https://github.com/GNS3/gns3-gui/issues/2887 Allow "usage" for all builtin nodes (not exposed in Ui).
+
+## 2.2.43 19/09/2023
+
+* Add KiTTY to preconfigured telnet consoles. Fixes #3507
+* Fix generic icon in Wayland. Ref #3501
+* Support for appliance format version 8.
+* Use importlib instead of pkg_resources
+* Upgrade to PyQt 5.15.9 and pywin32
+* Add support for appliance version 8 format
+
+## 2.2.42 09/08/2023
+
+* Use the system's certificate store for SSL connections
+* Give a node some time to start before opening the console (for console auto start). Fixes #3474
+* Use Mate Terminal by default if installed on Debian, Ubuntu and Linux Mint.
+* Support for gnome-terminal tabs to be opened in the same window.
+* Remove import urllib3 and let sentry_sdk import and patch it. Fixes https://github.com/GNS3/gns3-gui/issues/3498
+* Add import sys in sudo.py
+* Rounded Rectangle support
+
+## 2.2.41 12/07/2023
+
+* Use alternative method to set the correct permissions for uBridge on macOS
+* Remove sending stats to GA
+* Catch urllib3 exceptions when sending crash report. Ref https://github.com/GNS3/gns3-gui/issues/3483
+* Backport UEFI boot mode support for Qemu VMs
+* Add debug for dropEvent. Ref https://github.com/GNS3/gns3-server/issues/2242
+
+## 2.2.40.1 10/06/2023
+
+* No changes
+
+## 2.2.40 06/06/2023
+
+* Change log messages for Websocket errors
+* Do not proceed if an appliance symbol cannot be downloaded. Ref #3466
+* Delete a node or link from topology summary view using Delete key. Ref #3445
+* Fix "Start the capture visualization program" checkbox works only one (first) time for a given link. Fixes #3442
+* Let the selected link style applied when editing a link. Fixes #3460
+* Fix hovered color shown in style editing dialog. Fixes #3460
+
+## 2.2.39 08/05/2023
+
+* Fix nodes are not snapped to the grid at the moment of creation
+* Upgrade distro and aiohttp dependencies
+
+## 2.2.38 28/02/2023
+
+* Add long description content type in setup.py
+* Automatically add new issues to GNS3 project
+* Development 2.2.38.dev1
+
+## 2.2.37 25/01/2023
+
+* Upgrade to PyQt5 v5.15.7
+* Changed Windows Terminal telnet console profile from OS X to windows ref: issue #3193
+
+## 2.2.36 04/01/2023
+
+* Add Trusted Platform Module (TPM) support for Qemu VMs
+* Add "on_close" setting to appliance schema. Fixes https://github.com/GNS3/gns3-server/issues/2148
+* Add default 'ide' disk interface when manually creating Qemu VM template. Fixes #3360
+* Fix zoom factor is multiplied when loading projects. Fixes #3408
+* Remove deprecated PuTTY option in preferences. Ref https://github.com/GNS3/gns3-gui/discussions/3415
+
+
 ## 3.0.0a3 27/12/2022

 * Catch timeout error while updating appliance files
@@ -13,6 +359,7 @@
 * Replace deprecated distro.linux_distribution() call
 * Add a fix for the CVE-2007-4559

+
 ## 2.2.35.1 10/11/2022

 * Re-release Web-Ui v2.2.35
--- a/504
+++ b/504
@@ -1,504 +0,0 @@
-GNU Public License (GPL)
------------------------
-
-  GNS3 is released under the GPLv3 (see LICENSE) with the additional
-  exemption that compiling, linking, and/or using OpenSSL is allowed.
-
-GNS3 trademark
--------------
-
-  "GNS3" is a trademark of GNS3 Technologies, Inc.
-
-Windows Driver Kit
------------------
-
-  The Windows binary distribution includes devcon.exe, a Microsoft(R)
-  Windows Driver Kit (WDK) sample in object code form which is
-  redistributed under the terms of the WDK License terms.
-
-  With respect to binaries built using the Microsoft(R) Windows
-  Driver Kit (WDK), GPLv3 does not extend to any WDK Distributable Code.
-  All WDK Distributable Code is considered by the licensors of GNS3
-  to constitute, or be equivalent to, "System Libraries" as defined in
-  section 1 of GPLv3.
-
-OpenSSL License
---------------
-
-  The OpenSSL toolkit stays under a dual license, i.e. both the conditions of
-  the OpenSSL License and the original SSLeay license apply to the toolkit.
-  See below for the actual license texts. Actually both licenses are BSD-style
-  Open Source licenses. In case of any license issues related to OpenSSL
-  please contact openssl-core@openssl.org.
-
-/* ====================================================================
- * Copyright (c) 1998-2003 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
- Original SSLeay License
- -----------------------
-
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-=====================================================================================================
-Several fantastic pieces of free and open-source software have really get GNS3 to  where it is today.
-A few require that we include their license agreements within our software.
-=====================================================================================================
-
-License notice for Qt
---------------------
-http://doc.qt.io/qt-4.8/gpl.html
-
-License notice for PyQt
-----------------------
-http://www.gnu.org/licenses/gpl.html
-
-License notice for jsonschema
-----------------------------
-https://github.com/Julian/jsonschema/blob/master/COPYING
-
-Copyright (c) 2013 Julian Berman
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-License notice for aiohttp
--------------------------
-https://github.com/KeepSafe/aiohttp/blob/master/LICENSE.txt
-
-Copyright (c) 2013, 2014, 2015 Nikolay Kim and Andrew Svetlov
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-License notice for Jinja
------------------------
-https://github.com/KeepSafe/aiohttp/blob/master/LICENSE.txt
-
-Copyright (c) 2009 by the Jinja Team, see AUTHORS for more details.
-
-Some rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-    * The names of the contributors may not be used to endorse or
-      promote products derived from this software without specific
-      prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-License notice for raven
------------------------
-https://github.com/getsentry/raven-python/blob/master/LICENSE
-
-Copyright (c) 2015 Functional Software, Inc and individual contributors.
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-    * The names of the contributors may not be used to endorse or
-      promote products derived from this software without specific
-      prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-License notice for pywin32
--------------------------
-https://github.com/SublimeText/Pywin32/blob/master/License.txt
-
-Unless stated in the specfic source file, this work is
-Copyright (c) 1996-2008, Greg Stein and Mark Hammond.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the distribution.
-
-Neither names of Greg Stein, Mark Hammond nor the name of contributors may be used
-to endorse or promote products derived from this software without
-specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS
-IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-License notice for Winpcap
--------------------------
-https://www.winpcap.org/misc/copyright.htm
-
-Copyright (c) 1999 - 2005 NetGroup, Politecnico di Torino (Italy).
-Copyright (c) 2005 - 2010 CACE Technologies, Davis (California).
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-    * The names of the contributors may not be used to endorse or
-      promote products derived from this software without specific
-      prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-License notice for cpulimit
---------------------------
-https://github.com/opsengine/cpulimit/blob/master/LICENSE
-
-Copyright (C) 2005-2012, by:  Angelo Marletta <angelo dot marletta at gmail dot com>
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-License notice for Cygwin
-------------------------
-https://cygwin.com/licensing.html
-
-License notice for SuperPutty
-----------------------------
-https://github.com/jimradford/superputty/blob/master/License.txt
-
-Copyright (c) 2009 Jim Radford http://www.jimradford.com
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-License notice for Putty
------------------------
-http://www.chiark.greenend.org.uk/~sgtatham/putty/licence.html
-
-PuTTY is copyright 1997-2015 Simon Tatham.
-
-Portions copyright Robert de Bath, Joris van Rantwijk, Delian Delchev, Andreas Schultz, Jeroen Massar,
-Wez Furlong, Nicolas Barry, Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus Kuhn,
-Colin Watson, Christopher Staite, and CORE SDI S.A.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-License notice for iouyap
-------------------------
-https://github.com/GNS3/iouyap/blob/master/LICENSE
-
-License notice for Dynamips
---------------------------
-https://github.com/GNS3/dynamips/blob/master/COPYING
-
-License notice for Qemu
-----------------------
-http://wiki.qemu.org/License
-
-License notice for VPCS
-----------------------
-
-Copyright (c) 2007-2013, Paul Meng (mirnshi@gmail.com)
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
-
-License notice for Python
-------------------------
-https://www.python.org/download/releases/3.4.2/license/
-
-License notice for BusyBox
---------------------------
-BusyBox is distributed under version 2 of the General Public License
-https://busybox.net/license.html
-
-Source code is available here:
-https://github.com/GNS3/busybox
-
-
-Licence notice for zipstream
-----------------------------
-zipstream is distributed under version 3 of the General Public License
-https://github.com/allanlei/python-zipstream/blob/master/LICENSE
-
-Source code is available here:
-https://pypi.python.org/pypi/zipstream
-
-
-Licence notice for aiohttp_cors
-------------------------------
-Copyright 2015 Vladimir Rutsky <vladimir@rutsky.org>.
-
-Licensed under the Apache License, Version 2.0, see LICENSE file for details.
-
-https://github.com/aio-libs/aiohttp_cors
--- a/8
+++ b/8
@@ -1,16 +1,16 @@
 # Run tests inside a container
-FROM ubuntu:18.04
+FROM ubuntu:latest
 MAINTAINER GNS3 Team

 RUN apt-get update
-RUN apt-get install -y --force-yes python3.6 python3-pyqt5 python3-pip python3-pyqt5.qtsvg python3-pyqt5.qtwebsockets python3.6-dev xvfb
+RUN apt-get install -y --force-yes python3 python3-pyqt5 python3-pip python3-pyqt5.qtsvg python3-pyqt5.qtwebsockets python3-dev xvfb
 RUN apt-get clean

 ADD dev-requirements.txt /dev-requirements.txt
 ADD requirements.txt /requirements.txt
-RUN pip3 install --no-cache-dir -r /dev-requirements.txt
+RUN python3 -m pip install --break-system-packages --no-cache-dir -r /dev-requirements.txt

 ADD . /src
 WORKDIR /src

-CMD xvfb-run python3.6 -m pytest -vv
+CMD xvfb-run python3 -m pytest -vv
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,10 +1,6 @@
-include README.rst
-include AUTHORS
+include README.md
 include LICENSE
-include MANIFEST.in
-include requirements.txt
-recursive-include tests *
+include CHANGELOG
 recursive-include gns3 *
-recursive-include resources *
 recursive-exclude * __pycache__
 recursive-exclude * *.py[co]
--- a/README.md
+++ b/README.md
@@ -1,27 +1,41 @@
-# GNS3-gui
+GNS3-gui
+========

 [![GitHub Actions tests](https://github.com/GNS3/gns3-gui/workflows/testing/badge.svg)](https://github.com/GNS3/gns3-gui/actions?query=workflow%3Atesting)
 [![Latest PyPi version](https://img.shields.io/pypi/v/gns3-gui.svg)](https://pypi.python.org/pypi/gns3-gui)
 [![Snyk scanning](https://snyk.io/test/github/GNS3/gns3-gui/badge.svg)](https://snyk.io/test/github/GNS3/gns3-gui)

-## Installation
+Installation
+------------

 Please see the documentation on our [website](https://docs.gns3.com)

-## Software dependencies
+Software dependencies
+---------------------

-PyQt5 which is either part of the Linux distribution or installable from PyPi. The other Python dependencies are automatically installed during the GNS3 GUI installation and are listed in [requirements.txt](https://github.com/GNS3/gns3-gui/blob/3.0/requirements.txt>)
+PyQt6 which is either part of the Linux distribution or installable from
+PyPi. The other Python dependencies are automatically installed during
+the GNS3 GUI installation and are listed
+[here](https://github.com/GNS3/gns3-gui/blob/3.0/requirements.txt)

-For connecting to nodes using Telnet, a Telnet client is required. On Linux that's a terminal emulator like xterm, gnome-terminal, konsole plus the telnet program. For connecting to nodes with a GUI, a VNC client is required, optionally a SPICE client can be used for Qemu nodes.
+For connecting to nodes using Telnet, a Telnet client is required. On
+Linux that's a terminal emulator like xterm, gnome-terminal, konsole
+plus the telnet program. For connecting to nodes with a GUI, a VNC
+client is required, optionally a SPICE client can be used for Qemu
+nodes.

-For using packet captures within GNS3, Wireshark should be installed. It's recommended, but if you don't need that functionality you can go without it.
+For using packet captures within GNS3, Wireshark should be installed.
+It's recommended, but if you don't need that functionality you can go
+without it.

-## Development
+Development
+-----------

-If you want to update the interface, modify the .ui files using QT tools. And:
+If you want to update the interface, modify the .ui files using QT
+tools. And:

-```shell
-cd scripts 
+``` {.bash}
+cd scripts
 python build_pyqt.py
 ```

@@ -29,18 +43,16 @@ python build_pyqt.py

 If you want to see the full logs in the internal shell you can type:

-```shell
+``` {.bash}
 debug 2
 ```
-    

 Or start the app with --debug flag.

-Due to the fact PyQT intercept you can use a web debugger for inspecting stuff:
-https://github.com/Kozea/wdb
-
-## Security issues
-
-Please contact us at security@gns3.net
+Due to the fact PyQT intercept you can use a web debugger for inspecting
+stuff: <https://github.com/Kozea/wdb>

+Security issues
+---------------

+Please contact us at <security@gns3.net>
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -0,0 +1,5 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+Please use GitHub's report a vulnerability feature. More information can be found in https://docs.github.com/en/code-security/security-advisories/guidance-on-reporting-and-writing/privately-reporting-a-security-vulnerability
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,20 +0,0 @@
-version: '{build}-{branch}'
-
-image: Visual Studio 2022
-
-platform: x64
-
-environment:
-    PYTHON: "C:\\Python37-x64"
-    DISTUTILS_USE_SDK: "1"
-
-install:
-   - cinst nmap
-   - "%PYTHON%\\python.exe -m pip install -U pip setuptools"  # upgrade pip & setuptools first
-   - "%PYTHON%\\python.exe -m pip install -r dev-requirements.txt"
-   - "%PYTHON%\\python.exe -m pip install -r win-requirements.txt"
-
-build: off
-
-test_script:
-   - "%PYTHON%\\python.exe -m pytest -v"
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -1,5 +1,2 @@
-r requirements.txt
-
-pytest==7.2.0
-flake8==5.0.4  # v5.0.4 is the last to support Python 3.7
-pytest-timeout==2.1.0
+pytest==8.4.2  # version 8.4.2 is the last one supporting Python 3.9
+pytest-timeout==2.4.0
--- a/gns3/application.py
+++ b/gns3/application.py
@@ -28,27 +28,16 @@ log = logging.getLogger(__name__)


 class Application(QtWidgets.QApplication):
-    file_open_signal = QtCore.pyqtSignal(str)
+    file_open_signal = QtCore.Signal(str)

-    def __init__(self, argv, hdpi=True):
+    def __init__(self, argv):

        self.setStyle(QtWidgets.QStyleFactory.create("Fusion"))
-        # both Qt and PyQt must be version >= 5.6 in order to enable high DPI scaling
-        if parse_version(QtCore.QT_VERSION_STR) >= parse_version("5.6") and parse_version(QtCore.PYQT_VERSION_STR) >= parse_version("5.6"):
-            # only available starting Qt version 5.6
-            if hdpi:
-                if sys.platform.startswith("linux"):
-                    local_config_path = LocalConfig.instance().configFilePath()
-                    log.warning("HDPI mode is enabled. HDPI support on Linux is not fully stable and GNS3 may crash depending of your version of Linux. "
-                                f"To disabled HDPI mode please edit '{local_config_path}' and set 'hdpi' to 'false'")
-                self.setAttribute(QtCore.Qt.AA_EnableHighDpiScaling)
-                self.setAttribute(QtCore.Qt.AA_UseHighDpiPixmaps)
-            else:
-                log.info("HDPI mode is disabled")
-                self.setAttribute(QtCore.Qt.AA_DisableHighDpiScaling)
-
        super().__init__(argv)

+        # this is tell Wayland what is the name of the desktop file (gns3.desktop)
+        self.setDesktopFileName("gns3")
+
        # this info is necessary for QSettings
        self.setOrganizationName("GNS3")
        self.setOrganizationDomain("gns3.net")
@@ -60,7 +49,7 @@ class Application(QtWidgets.QApplication):
        self.open_file_at_startup = None

    def event(self, event):
-        # When you double click file you receive an event
+        # When you double click on a file, you receive an event
        # and not the file as command line parameter
        if sys.platform.startswith("darwin"):
            if isinstance(event, QtGui.QFileOpenEvent):
--- a/gns3/compute_summary_view.py
+++ b/gns3/compute_summary_view.py
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

 """
-Compute summary view that list all the compute, their status.
+Compute summary view that list all the computes and their status.
 """

 from .qt import QtGui, QtCore, QtWidgets
@@ -97,7 +97,7 @@ class ComputeItem(QtWidgets.QTreeWidgetItem):
                self._status = "stopped"
                self.setToolTip(0, "{} is stopped or cannot be reached".format(self._compute.name()))
                self.setIcon(0, QtGui.QIcon(':/icons/led_red.svg'))
-        self._parent.sortItems(0, QtCore.Qt.AscendingOrder)
+        self._parent.sortItems(0, QtCore.Qt.SortOrder.AscendingOrder)

        # add nodes belonging to this compute
        self.takeChildren()
@@ -113,7 +113,7 @@ class ComputeItem(QtWidgets.QTreeWidgetItem):
                else:
                    item.setIcon(0, QtGui.QIcon(':/icons/led_red.svg'))
                self.addChild(item)
-        self.sortChildren(0, QtCore.Qt.AscendingOrder)
+        self.sortChildren(0, QtCore.Qt.SortOrder.AscendingOrder)


 class ComputeSummaryView(QtWidgets.QTreeWidget):
@@ -145,15 +145,15 @@ class ComputeSummaryView(QtWidgets.QTreeWidget):
    def _showContextualMenu(self, pos):

        item = self.currentItem()
-        if item:
+        if item and isinstance(item, ComputeItem):
            compute = item.getCompute()
            if not compute.connected():
                menu = QtWidgets.QMenu()
-                connect_action = QtWidgets.QAction("Connect to server", menu)
+                connect_action = QtGui.QAction("Connect to server", menu)
                connect_action.setIcon(get_icon("start.svg"))
                connect_action.triggered.connect(lambda: ComputeManager.instance().connectToCompute(compute.id()))
                menu.addAction(connect_action)
-                menu.exec_(pos)
+                menu.exec(pos)

    def _computeConnectSlot(self, compute_id):
        """
--- a/gns3/console_cmd.py
+++ b/gns3/console_cmd.py
@@ -19,6 +19,7 @@
 Handles commands typed in the GNS3 console.
 """

+import os
 import sys
 import cmd
 import struct
@@ -34,6 +35,14 @@ log = logging.getLogger(__name__)

 class ConsoleCmd(cmd.Cmd):

+    def do_env(self, args):
+        """
+        Show the environment variables used by GNS3.
+        """
+
+        for key, val in os.environ.items():
+            print("{}={}".format(key, val))
+
    def do_version(self, args):
        """
        Show the version of GNS3 and its dependencies.
--- a/gns3/console_view.py
+++ b/gns3/console_view.py
@@ -22,7 +22,7 @@ import inspect
 import datetime
 import platform

-from .qt import QtCore, QtWidgets
+from .qt import QtCore, QtGui
 from .topology import Topology
 from .version import __version__
 from .console_cmd import ConsoleCmd
@@ -117,10 +117,10 @@ class ConsoleView(PyCutExt, ConsoleCmd):
        """

        menu = self.createStandardContextMenu()
-        delete_all_action = QtWidgets.QAction("Delete All", menu)
+        delete_all_action = QtGui.QAction("Delete All", menu)
        delete_all_action.triggered.connect(self._deleteAllActionSlot)
        menu.addAction(delete_all_action)
-        menu.exec_(event.globalPos());
+        menu.exec(event.globalPos())

    def _deleteAllActionSlot(self):
        """
--- a/gns3/controller.py
+++ b/gns3/controller.py
@@ -21,7 +21,9 @@ import tempfile
 import json
 import pathlib

+from urllib.parse import urlparse
 from .qt import QtCore, QtGui, QtWebSockets, qpartial, qslot
+
 from .symbol import Symbol
 from .local_config import LocalConfig
 from .settings import CONTROLLER_SETTINGS
@@ -235,7 +237,7 @@ class Controller(QtCore.QObject):

    def request(self, method, path, *args, **kwargs):
        """
-        Forward the query to the HTTP client or controller depending of the path
+        Forward the query to the HTTP client or controller depending on the path
        """

        if self._http_client:
@@ -391,6 +393,17 @@ class Controller(QtCore.QObject):
        if callback:
            callback(result, error=error, **kwargs)

+
+    def createDiskImage(self, disk_name, options, callback):
+        """
+        Create a disk image on the controller
+
+        :param callback: callback for the reply from the server
+        """
+
+        self.post(f"/images/qemu/{disk_name}", callback, body=options)
+
+
    @qslot
    def refreshProjectList(self, *args):
        self.get("/projects", self._projectListCallback)
@@ -422,7 +435,7 @@ class Controller(QtCore.QObject):
        self._notification_stream = None

        # Qt websocket before Qt 5.6 doesn't support auth
-        if parse_version(QtCore.QT_VERSION_STR) < parse_version("5.6.0") or parse_version(QtCore.PYQT_VERSION_STR) < parse_version("5.6.0"):
+        if parse_version(QtCore.QT_VERSION_STR) < parse_version("5.6.0") or parse_version(QtCore.PYQT_VERSION_STR) < parse_version("5.6.0") or LocalConfig.instance().experimental():
            self._notification_stream = Controller.instance().request(
                "GET",
                "/notifications",
@@ -431,11 +444,22 @@ class Controller(QtCore.QObject):
                timeout=None,
                show_progress=False
            )
+            url = urlparse(self._http_client.url() + '/notifications')
+            log.info(f"Listening for controller notifications on {url.scheme}://{url.netloc}{url.path}")
        else:
            self._notification_stream = self._http_client.connectWebSocket(self._websocket, "/notifications/ws")
            self._notification_stream.textMessageReceived.connect(self._websocket_event_received)
            self._notification_stream.error.connect(self._websocket_error)
            self._notification_stream.sslErrors.connect(self._sslErrorsSlot)
+            self._notification_stream.disconnected.connect(self._websocket_disconnected)
+            url = urlparse(self._notification_stream.requestUrl().toString())
+            log.info(f"Listening for controller notifications on {url.scheme}://{url.netloc}{url.path}")
+
+    def _websocket_disconnected(self):
+
+        self._connected = False
+        self.disconnected_signal.emit()
+        self.stopListenNotifications()

    def stopListenNotifications(self):
        if self._notification_stream:
@@ -454,8 +478,9 @@ class Controller(QtCore.QObject):

    @qslot
    def _websocket_error(self, error):
+
        if self._notification_stream:
-            log.error("Websocket notification stream error: {}".format(self._notification_stream.errorString()))
+            log.error("Websocket controller notification stream error: {}".format(self._notification_stream.errorString()))
            self.stopListenNotifications()

    @qslot
@@ -484,11 +509,21 @@ class Controller(QtCore.QObject):
        elif result["action"] == "compute.created" or result["action"] == "compute.updated":
            from .compute_manager import ComputeManager
            ComputeManager.instance().computeDataReceivedCallback(result["event"])
-        elif result["action"] == "log.error":
-            log.error(result["event"]["message"])
-        elif result["action"] == "log.warning":
-            log.warning(result["event"]["message"])
-        elif result["action"] == "log.info":
-            log.info(result["event"]["message"], extra={"show": True})
+        elif result["action"] == "project.closed":
+            from .topology import Topology
+            project = Topology.instance().project()
+            if project and project.id() == result["event"]["project_id"]:
+                Topology.instance().setProject(None)
+        elif result["action"] == "project.updated":
+            from .topology import Topology
+            project = Topology.instance().project()
+            if project and project.id() == result["event"]["project_id"]:
+                project.projectUpdatedCallback(result["event"])
+        elif result["action"] == "log.error" and result["event"].get("message"):
+            log.error(result["event"].get("message"))
+        elif result["action"] == "log.warning" and result["event"].get("message"):
+            log.warning(result["event"].get("message"))
+        elif result["action"] == "log.info" and result["event"].get("message"):
+            log.info(result["event"].get("message"), extra={"show": True})
        elif result["action"] == "ping":
            pass
--- a/gns3/crash_report.py
+++ b/gns3/crash_report.py
@@ -29,7 +29,6 @@ except ImportError:
    # Sentry SDK is not installed with deb package in order to simplify packaging
    SENTRY_SDK_AVAILABLE = False

-from .utils.get_resource import get_resource
 from .version import __version__, __version_info__

 import logging
@@ -51,7 +50,7 @@ class CrashReport:
    Report crash to a third party service
    """

-    DSN = "https://e53718a5b9234e56a2fd3634e6fa07c9@o19455.ingest.sentry.io/38506"
+    DSN = "https://3385f7a13ef84851fef5de4aef7d25dd@o19455.ingest.us.sentry.io/38506"
    _instance = None

    def __init__(self):
@@ -64,22 +63,16 @@ class CrashReport:
        self._sentry_initialized = False

        if SENTRY_SDK_AVAILABLE:
-            cacert = None
-            if hasattr(sys, "frozen"):
-                cacert_resource = get_resource("cacert.pem")
-                if cacert_resource is not None and os.path.isfile(cacert_resource):
-                    cacert = cacert_resource
-                else:
-                    log.error("The SSL certificate bundle file '{}' could not be found".format(cacert_resource))
-
            # Don't send log records as events.
            sentry_logging = LoggingIntegration(level=logging.INFO, event_level=None)
-
-            sentry_sdk.init(dsn=CrashReport.DSN,
-                            release=__version__,
-                            ca_certs=cacert,
-                            default_integrations=False,
-                            integrations=[sentry_logging])
+            try:
+                sentry_sdk.init(dsn=CrashReport.DSN,
+                                release=__version__,
+                                default_integrations=False,
+                                integrations=[sentry_logging])
+            except Exception as e:
+                log.error("Crash report could not be sent: {}".format(e))
+                return

            tags = {
                "os:name": platform.system(),
--- a/gns3/dialogs/appliance_wizard.py
+++ b/gns3/dialogs/appliance_wizard.py
@@ -87,7 +87,7 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
                images_directories.append(emulator_images_dir)

        images_directories.append(os.path.dirname(self._path))
-        download_directory = QtCore.QStandardPaths.writableLocation(QtCore.QStandardPaths.DownloadLocation)
+        download_directory = QtCore.QStandardPaths.writableLocation(QtCore.QStandardPaths.StandardLocation.DownloadLocation)
        if download_directory != "" and download_directory != os.path.dirname(self._path):
            images_directories.append(download_directory)

@@ -100,9 +100,11 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
        self.setWindowTitle("Install {} appliance".format(self._appliance["name"]))

        # add a custom button to show appliance information
-        self.setButtonText(QtWidgets.QWizard.CustomButton1, "&Appliance info")
-        self.setOption(QtWidgets.QWizard.HaveCustomButton1, True)
-        self.customButtonClicked.connect(self._showApplianceInfoSlot)
+        if self._appliance["registry_version"] < 8:
+            # FIXME: show appliance info for v8
+            self.setButtonText(QtWidgets.QWizard.WizardButton.CustomButton1, "&Appliance info")
+            self.setOption(QtWidgets.QWizard.WizardOption.HaveCustomButton1, True)
+            self.customButtonClicked.connect(self._showApplianceInfoSlot)

        # customize the server selection
        self.uiRemoteRadioButton.toggled.connect(self._remoteServerToggledSlot)
@@ -139,15 +141,15 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):

        # add symbol
        if self._appliance["category"] == "guest":
-            if self._appliance.emulator() == "docker":
+            if self._appliance.template_type() == "docker":
                symbol = ":/symbols/docker_guest.svg"
-            elif self._appliance.emulator() == "qemu":
+            elif self._appliance.template_type() == "qemu":
                symbol = ":/symbols/qemu_guest.svg"
            else:
                symbol = ":/symbols/computer.svg"
        else:
            symbol = ":/symbols/{}.svg".format(self._appliance["category"])
-        self.page(page_id).setPixmap(QtWidgets.QWizard.LogoPixmap, QtGui.QPixmap(symbol))
+        self.page(page_id).setPixmap(QtWidgets.QWizard.WizardPixmap.LogoPixmap, QtGui.QPixmap(symbol))

        if self.page(page_id) == self.uiServerWizardPage:

@@ -172,12 +174,32 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):

        elif self.page(page_id) == self.uiFilesWizardPage:
            if Controller.instance().isRemote() or self._compute_id != "local":
-                self._registry.getRemoteImageList(self._appliance.emulator(), self._compute_id)
+                self._registry.getRemoteImageList()
            else:
                self.images_changed_signal.emit()

+        elif self.page(page_id) == self.uiInstructionsPage:
+
+            installation_instructions = self._appliance.get("installation_instructions", "No installation instructions available")
+            self.uiInstructionsTextEdit.setText(installation_instructions.strip())
+
        elif self.page(page_id) == self.uiUsageWizardPage:
-            self.uiUsageTextEdit.setText("The template will be available in the {} category.\n\n{}".format(self._appliance["category"].replace("_", " "), self._appliance.get("usage", "")))
+            # TODO: allow taking these info fields at the version level in v8
+            category = self._appliance["category"].replace("_", " ")
+            usage = self._appliance.get("usage", "No usage information available")
+            if self._appliance["registry_version"] >= 8:
+                default_username = self._appliance.get("default_username")
+                default_password = self._appliance.get("default_password")
+                if default_username and default_password:
+                    usage += "\n\nDefault username: {}\nDefault password: {}".format(default_username, default_password)
+
+            usage_info = """
+The template will be available in the {} category.
+            
+Usage: {}
+""".format(category, usage)
+
+            self.uiUsageTextEdit.setText(usage_info.strip())

    def _uiServerWizardPage_isComplete(self):
        return self.uiRemoteRadioButton.isEnabled() or self.uiLocalRadioButton.isEnabled()
@@ -190,7 +212,7 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
            log.error("Error while uploading image '{}': {}".format(image_path, result["message"]))
        else:
            log.info("Image '{}' has been successfully uploaded".format(image_path))
-            self._registry.getRemoteImageList(self._appliance.emulator(), self._compute_id)
+            self._registry.getRemoteImageList()

    def _showApplianceInfoSlot(self):
        """
@@ -260,10 +282,10 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
        msgbox = QtWidgets.QMessageBox(self)
        msgbox.setWindowTitle("Appliance information")
        msgbox.setStyleSheet("QLabel{min-width: 600px;}") # TODO: resize details box QTextEdit{min-height: 500px;}
-        msgbox.setSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
+        msgbox.setSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding)
        msgbox.setText(text_info)
        msgbox.setDetailedText(self._appliance["description"])
-        msgbox.exec_()
+        msgbox.exec()

    @qslot
    def _refreshVersions(self, *args):
@@ -307,12 +329,12 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
                    image_widget.setForeground(2, QtGui.QBrush(QtGui.QColor("red")))
                else:
                    image_widget.setForeground(2, QtGui.QBrush(QtGui.QColor("green")))
-                    image_widget.setToolTip(2, image["path"])
+                    image_widget.setToolTip(0, f'{image["status"]} with path: {image["path"]}')

                # Associated data stored are col 0: version, col 1: image
-                image_widget.setData(0, QtCore.Qt.UserRole, version)
-                image_widget.setData(1, QtCore.Qt.UserRole, image)
-                image_widget.setData(2, QtCore.Qt.UserRole, self._appliance)
+                image_widget.setData(0, QtCore.Qt.ItemDataRole.UserRole, version)
+                image_widget.setData(1, QtCore.Qt.ItemDataRole.UserRole, image)
+                image_widget.setData(2, QtCore.Qt.ItemDataRole.UserRole, self._appliance)
                top.addChild(image_widget)

            font = top.font(0)
@@ -326,10 +348,10 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
                expand = False
                top.setForeground(2, QtGui.QBrush(QtGui.QColor("green")))

-            top.setData(1, QtCore.Qt.DisplayRole, human_size(size))
-            top.setData(2, QtCore.Qt.DisplayRole, status)
-            top.setData(0, QtCore.Qt.UserRole, version)
-            top.setData(2, QtCore.Qt.UserRole, self._appliance)
+            top.setData(1, QtCore.Qt.ItemDataRole.DisplayRole, human_size(size))
+            top.setData(2, QtCore.Qt.ItemDataRole.DisplayRole, status)
+            top.setData(0, QtCore.Qt.ItemDataRole.UserRole, version)
+            top.setData(2, QtCore.Qt.ItemDataRole.UserRole, self._appliance)
            self.uiApplianceVersionTreeWidget.addTopLevelItem(top)
            if expand:
                top.setExpanded(True)
@@ -361,11 +383,13 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):

        for version in self._appliance["versions"]:
            for image in version["images"].values():
-                img = self._registry.search_image_file(self._appliance.emulator(),
-                                                       image["filename"],
-                                                       image.get("md5sum"),
-                                                       image.get("filesize"),
-                                                       strict_md5_check=not self.allowCustomFiles.isChecked())
+                img = self._registry.search_image_file(
+                    self._appliance.template_type(),
+                    image["filename"],
+                    image.get("md5sum"),
+                    image.get("filesize"),
+                    strict_md5_check=not self.allowCustomFiles.isChecked()
+                )
                if img:
                    if img.location == "local":
                        image["status"] = "Found locally"
@@ -392,7 +416,7 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
        if current is None or sip.isdeleted(current):
            return

-        image = current.data(1, QtCore.Qt.UserRole)
+        image = current.data(1, QtCore.Qt.ItemDataRole.UserRole)
        if image is not None:
            if "direct_download_url" in image or "download_url" in image:
                self.uiDownloadPushButton.show()
@@ -413,7 +437,7 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
        if current is None or sip.isdeleted(current):
            return

-        data = current.data(1, QtCore.Qt.UserRole)
+        data = current.data(1, QtCore.Qt.ItemDataRole.UserRole)
        if data is not None:
            if "direct_download_url" in data:
                QtGui.QDesktopServices.openUrl(QtCore.QUrl(data["direct_download_url"]))
@@ -433,16 +457,16 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
        if current is None:
            QtWidgets.QMessageBox.critical(self.parent(), "Base version", "Please select a base version")
            return
-        base_version = current.data(0, QtCore.Qt.UserRole)
+        base_version = current.data(0, QtCore.Qt.ItemDataRole.UserRole)

-        new_version_name, ok = QtWidgets.QInputDialog.getText(self, "Creating a new version", "Create a new version for this appliance.\nPlease share your experience on the GNS3 community if this version works.\n\nVersion name:", QtWidgets.QLineEdit.Normal, base_version.get("name"))
+        new_version_name, ok = QtWidgets.QInputDialog.getText(self, "Creating a new version", "Create a new version for this appliance.\nPlease share your experience on the GNS3 community if this version works.\n\nVersion name:", QtWidgets.QLineEdit.EchoMode.Normal, base_version.get("name"))
        if ok:
            new_version = {"name": new_version_name}
            new_version["images"] = {}

            for disk_type in base_version["images"]:
                base_filename = base_version["images"][disk_type]["filename"]
-                filename, ok = QtWidgets.QInputDialog.getText(self, "Image", "Disk image filename for {}".format(disk_type), QtWidgets.QLineEdit.Normal, base_filename)
+                filename, ok = QtWidgets.QInputDialog.getText(self, "Image", "Disk image filename for {}".format(disk_type), QtWidgets.QLineEdit.EchoMode.Normal, base_filename)
                if not ok:
                    filename = base_filename
                new_version["images"][disk_type] = {"filename": filename, "version": new_version_name}
@@ -467,19 +491,29 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
        current = self.uiApplianceVersionTreeWidget.currentItem()
        if not current:
            return
-        disk = current.data(1, QtCore.Qt.UserRole)
+        disk = current.data(1, QtCore.Qt.ItemDataRole.UserRole)

        path, _ = QtWidgets.QFileDialog.getOpenFileName()
        if len(path) == 0:
            return

-        image = Image(self._appliance.emulator(), path, filename=disk["filename"])
+        image = Image(self._appliance.template_type(), path, filename=disk["filename"])
        try:
            if "md5sum" in disk and image.md5sum != disk["md5sum"]:
-                reply = QtWidgets.QMessageBox.question(self, "Add appliance",
-                                                       "This is not the correct file. The MD5 sum is {} and should be {}.\nDo you want to accept it at your own risks?".format(image.md5sum, disk["md5sum"]),
-                                                       QtWidgets.QMessageBox.Yes | QtWidgets.QMessageBox.No)
-                if reply == QtWidgets.QMessageBox.No:
+                reply = QtWidgets.QMessageBox.question(
+                    self,
+                    "Add appliance",
+                    "This is not the correct file.\n\n"
+                    "MD5 checksum\n"
+                    f"actual:\t{image.md5sum}\n"
+                    f"expected:\t{disk['md5sum']}\n\n"
+                    "File size\n"
+                    f"actual:\t{image.filesize} bytes\n"
+                    f"expected:\t{disk['filesize']} bytes\n\n"
+                    "Do you want to accept it at your own risks?",
+                    QtWidgets.QMessageBox.StandardButton.Yes | QtWidgets.QMessageBox.StandardButton.No
+                )
+                if reply == QtWidgets.QMessageBox.StandardButton.No:
                    return
        except OSError as e:
            QtWidgets.QMessageBox.warning(self.parent(), "Add appliance", "Can't access to the image file {}: {}.".format(path, str(e)))
@@ -488,6 +522,12 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
        image_upload_manger = ImageUploadManager(image, Controller.instance(), self.parent())
        image_upload_manger.upload()

+        # refresh the images list
+        if Controller.instance().isRemote() or self._compute_id != "local":
+            self._registry.getRemoteImageList()
+        else:
+            self.images_changed_signal.emit()
+
    def _install(self, version):
        """
        Install the appliance in GNS3
@@ -497,8 +537,8 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):

        if version is None:
            appliance_configuration = self._appliance.copy()
-            if "docker" not in appliance_configuration:
-                # only Docker do not have version
+            if self._appliance.template_type() != "docker":
+                # only Docker do not have versions
                return False
        else:
            try:
@@ -510,30 +550,15 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
        template_manager = TemplateManager().instance()
        while len(appliance_configuration["name"]) == 0 or not template_manager.is_name_available(appliance_configuration["name"]):
            QtWidgets.QMessageBox.warning(self.parent(), "Add template", "The name \"{}\" is already used by another template".format(appliance_configuration["name"]))
-            appliance_configuration["name"], ok = QtWidgets.QInputDialog.getText(self.parent(), "Add template", "New name:", QtWidgets.QLineEdit.Normal, appliance_configuration["name"])
+            appliance_configuration["name"], ok = QtWidgets.QInputDialog.getText(self.parent(), "Add template", "New name:", QtWidgets.QLineEdit.EchoMode.Normal, appliance_configuration["name"])
            if not ok:
                return False
            appliance_configuration["name"] = appliance_configuration["name"].strip()

-        new_template = ApplianceToTemplate().new_template(appliance_configuration, self._compute_id, self._symbols, parent=self)
+        new_template = ApplianceToTemplate().new_template(appliance_configuration, self._compute_id, version, self._symbols, parent=self)
        TemplateManager.instance().createTemplate(Template(new_template), callback=self._templateCreatedCallback)
        return False

-        #worker = WaitForLambdaWorker(lambda: self._create_template(appliance_configuration, self._compute_id), allowed_exceptions=[ConfigException, OSError])
-        #progress_dialog = ProgressDialog(worker, "Add template", "Installing a new template...", None, busy=True, parent=self)
-        #progress_dialog.show()
-        #if progress_dialog.exec_():
-        #    QtWidgets.QMessageBox.information(self.parent(), "Add template", "{} template has been installed!".format(appliance_configuration["name"]))
-        #    return True
-        #return False
-
-        # worker = WaitForLambdaWorker(lambda: config.save(), allowed_exceptions=[ConfigException, OSError])
-        # progress_dialog = ProgressDialog(worker, "Add appliance", "Install the appliance...", None, busy=True, parent=self)
-        # progress_dialog.show()
-        # if progress_dialog.exec_():
-        #     QtWidgets.QMessageBox.information(self.parent(), "Add appliance", "{} installed!".format(appliance_configuration["name"]))
-        #     return True
-
    def _templateCreatedCallback(self, result, error=False, **kwargs):

        if error is True:
@@ -558,8 +583,8 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
            if image["location"] == "local":
                if not Controller.instance().isRemote() and self._compute_id == "local" and image["path"].startswith(ImageManager.instance().getDirectory()):
                    log.debug("{} is already on the local server".format(image["path"]))
-                    return
-                image = Image(self._appliance.emulator(), image["path"], filename=image["filename"])
+                    return True
+                image = Image(self._appliance.template_type(), image["path"], filename=image["filename"])
                image_upload_manager = ImageUploadManager(image, Controller.instance(), self.parent())
                if not image_upload_manager.upload():
                    return False
@@ -567,8 +592,11 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):

    def nextId(self):
        if self.currentPage() == self.uiServerWizardPage:
-            if "docker" in self._appliance:
+            if self._appliance.template_type() == "docker":
                # skip Qemu binary selection and files pages if this is a Docker appliance
+                return super().nextId() + 2
+            elif not self._appliance.get("installation_instructions"):
+                # skip the installation instructions page if there are no instructions
                return super().nextId() + 1
        return super().nextId()

@@ -585,18 +613,18 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
            current = self.uiApplianceVersionTreeWidget.currentItem()
            if current is None or sip.isdeleted(current):
                return False
-            version = current.data(0, QtCore.Qt.UserRole)
+            version = current.data(0, QtCore.Qt.ItemDataRole.UserRole)
            if version is None:
                return False
-            appliance = current.data(2, QtCore.Qt.UserRole)
+            appliance = current.data(2, QtCore.Qt.ItemDataRole.UserRole)
            try:
                self._appliance.search_images_for_version(version["name"])
            except ApplianceError as e:
                QtWidgets.QMessageBox.critical(self, "Appliance", "Cannot install {} version {}: {}".format(appliance["name"], version["name"], e))
                return False
            reply = QtWidgets.QMessageBox.question(self, "Appliance", "Would you like to install {} version {}?".format(appliance["name"], version["name"]),
-                                                   QtWidgets.QMessageBox.Yes, QtWidgets.QMessageBox.No)
-            if reply == QtWidgets.QMessageBox.No:
+                                                   QtWidgets.QMessageBox.StandardButton.Yes, QtWidgets.QMessageBox.StandardButton.No)
+            if reply == QtWidgets.QMessageBox.StandardButton.No:
                return False

            return self._uploadImages(appliance["name"], version["name"])
@@ -611,7 +639,7 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
                return False
            current = self.uiApplianceVersionTreeWidget.currentItem()
            if current:
-                version = current.data(0, QtCore.Qt.UserRole)
+                version = current.data(0, QtCore.Qt.ItemDataRole.UserRole)
                return self._install(version["name"])
            else:
                return self._install(None)
@@ -628,8 +656,8 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
                if ComputeManager.instance().localPlatform():
                    if (ComputeManager.instance().localPlatform().startswith("darwin") or ComputeManager.instance().localPlatform().startswith("win")):
                        if "qemu" in self._appliance:
-                            reply = QtWidgets.QMessageBox.question(self, "Appliance", "Qemu on Windows and macOS is not supported by the GNS3 team. Do you want to continue?", QtWidgets.QMessageBox.Yes, QtWidgets.QMessageBox.No)
-                            if reply == QtWidgets.QMessageBox.No:
+                            reply = QtWidgets.QMessageBox.question(self, "Appliance", "Qemu on Windows and macOS is not supported by the GNS3 team. Do you want to continue?", QtWidgets.QMessageBox.StandardButton.Yes, QtWidgets.QMessageBox.StandardButton.No)
+                            if reply == QtWidgets.QMessageBox.StandardButton.No:
                                return False
                self._compute_id = "local"

@@ -670,8 +698,8 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
            reply = QtWidgets.QMessageBox.question(self, "Custom files",
                "This option allows files with different MD5 checksums. This feature is only for advanced users and can lead "
                "to unexpected problems. Do you want to proceed?",
-                QtWidgets.QMessageBox.Yes, QtWidgets.QMessageBox.No)
+                QtWidgets.QMessageBox.StandardButton.Yes, QtWidgets.QMessageBox.StandardButton.No)

-            if reply == QtWidgets.QMessageBox.No:
+            if reply == QtWidgets.QMessageBox.StandardButton.No:
                self.allowCustomFiles.setChecked(False)
                return False
--- a/gns3/dialogs/capture_dialog.py
+++ b/gns3/dialogs/capture_dialog.py
@@ -24,15 +24,15 @@ log = logging.getLogger(__name__)

 class CaptureDialog(QtWidgets.QDialog, Ui_CaptureDialog):
    """
-    This dialog allow configure the packet capture
+    This dialog allow to configure the packet capture
    """

    def __init__(self, parent, file_name, auto_start, ethernet_link=True):

        super().__init__(parent)
        self.setupUi(self)
-        self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Ok).clicked.connect(self._okButtonClickedSlot)
-        self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Cancel).clicked.connect(self.reject)
+        self.uiButtonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Ok).clicked.connect(self._okButtonClickedSlot)
+        self.uiButtonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Cancel).clicked.connect(self.reject)

        if ethernet_link:
            self.uiDataLinkTypeComboBox.addItem("Ethernet", "DLT_EN10MB")
@@ -70,6 +70,6 @@ if __name__ == '__main__':
    main = QtWidgets.QMainWindow()
    dialog = CaptureDialog(main, "test.pcap")
    dialog.show()
-    exit_code = app.exec_()
+    exit_code = app.exec()
    print(dialog.dataLink())
    print(dialog.fileName())
--- a/gns3/dialogs/configuration_dialog.py
+++ b/gns3/dialogs/configuration_dialog.py
@@ -59,7 +59,7 @@ class ConfigurationDialog(QtWidgets.QDialog, Ui_configurationDialog):
        :param button: button that was clicked (QAbstractButton)
        """

-        if button == self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Cancel):
+        if button == self.uiButtonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Cancel):
            QtWidgets.QDialog.reject(self)
        else:
            try:
--- a/gns3/dialogs/console_command_dialog.py
+++ b/gns3/dialogs/console_command_dialog.py
@@ -93,7 +93,7 @@ class ConsoleCommandDialog(QtWidgets.QDialog, Ui_uiConsoleCommandDialog):
        """
        Save a custom command to the list
        """
-        name, ok = QtWidgets.QInputDialog.getText(self, "Add a command", "Command name:", QtWidgets.QLineEdit.Normal)
+        name, ok = QtWidgets.QInputDialog.getText(self, "Add a command", "Command name:", QtWidgets.QLineEdit.EchoMode.Normal)
        command = self.uiCommandPlainTextEdit.toPlainText().strip()
        if ok and len(command) > 0:
            if command not in self._consoles.values():
@@ -123,7 +123,7 @@ class ConsoleCommandDialog(QtWidgets.QDialog, Ui_uiConsoleCommandDialog):
    def getCommand(parent, console_type="telnet", current=None):
        dialog = ConsoleCommandDialog(parent, console_type=console_type, current=current)
        dialog.show()
-        if dialog.exec_():
+        if dialog.exec():
            return True, dialog.uiCommandPlainTextEdit.toPlainText().replace("\n", " ")
        return False, None

--- a/gns3/dialogs/custom_adapters_configuration_dialog.py
+++ b/gns3/dialogs/custom_adapters_configuration_dialog.py
@@ -67,7 +67,7 @@ class CustomAdaptersConfigurationDialog(QtWidgets.QDialog, Ui_CustomAdaptersConf
        self._custom_adapters = custom_adapters
        self._base_mac_address = base_mac_address

-        self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Reset).clicked.connect(self._resetSlot)
+        self.uiButtonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Reset).clicked.connect(self._resetSlot)

        if self._default_adapter_type and self._adapter_types:
            self.uiAdaptersTreeWidget.setColumnCount(3)
@@ -115,10 +115,10 @@ class CustomAdaptersConfigurationDialog(QtWidgets.QDialog, Ui_CustomAdaptersConf
        adapter_number = 0
        for port_name in self._ports:
            item = TreeWidgetItem(self.uiAdaptersTreeWidget)
-            item.setFlags(item.flags() | QtCore.Qt.ItemIsEditable)
+            item.setFlags(item.flags() | QtCore.Qt.ItemFlag.ItemIsEditable)
            item.setText(0, "Adapter {}".format(adapter_number))
-            item.setData(0, QtCore.Qt.UserRole, adapter_number)
-            item.setData(1, QtCore.Qt.UserRole, port_name)
+            item.setData(0, QtCore.Qt.ItemDataRole.UserRole, adapter_number)
+            item.setData(1, QtCore.Qt.ItemDataRole.UserRole, port_name)
            custom_adapter = self._getCustomAdapterSettings(adapter_number)
            item.setText(1, custom_adapter.get("port_name", port_name))

@@ -131,7 +131,7 @@ class CustomAdaptersConfigurationDialog(QtWidgets.QDialog, Ui_CustomAdaptersConf
                    index = 0
                    for adapter_type, adapter_description in self._adapter_types.items():
                        combobox.addItem("{}".format(adapter_type))
-                        combobox.setItemData(index, adapter_description, QtCore.Qt.ToolTipRole)
+                        combobox.setItemData(index, adapter_description, QtCore.Qt.ItemDataRole.ToolTipRole)
                        index += 1
                adapter_type_index = combobox.findText(custom_adapter.get("adapter_type", self._default_adapter_type))
                combobox.setCurrentIndex(adapter_type_index)
@@ -147,7 +147,7 @@ class CustomAdaptersConfigurationDialog(QtWidgets.QDialog, Ui_CustomAdaptersConf
            adapter_number += 1

        self.uiAdaptersTreeWidget.setItemDelegateForColumn(0, NoEditDelegate(self))
-        self.uiAdaptersTreeWidget.sortByColumn(0, QtCore.Qt.AscendingOrder)
+        self.uiAdaptersTreeWidget.sortByColumn(0, QtCore.Qt.SortOrder.AscendingOrder)
        self.uiAdaptersTreeWidget.setSortingEnabled(True)

        for column in range(self.uiAdaptersTreeWidget.columnCount()):
@@ -166,9 +166,9 @@ class CustomAdaptersConfigurationDialog(QtWidgets.QDialog, Ui_CustomAdaptersConf
            custom_adapter_settings = {}
            item = self.uiAdaptersTreeWidget.topLevelItem(row)
            port_name = item.text(1)
-            adapter_number = item.data(0, QtCore.Qt.UserRole)
+            adapter_number = item.data(0, QtCore.Qt.ItemDataRole.UserRole)
            custom_adapter_settings["adapter_number"] = adapter_number
-            original_port_name = item.data(1, QtCore.Qt.UserRole)
+            original_port_name = item.data(1, QtCore.Qt.ItemDataRole.UserRole)
            if not port_name:
                QtWidgets.QMessageBox.critical(self, "Port name", "Port name cannot be empty for adapter {}".format(adapter_number))
                return False
--- a/gns3/dialogs/doctor_dialog.py
+++ b/gns3/dialogs/doctor_dialog.py
@@ -180,4 +180,4 @@ if __name__ == '__main__':
    main = QtWidgets.QMainWindow()
    dialog = DoctorDialog(main, console=True)
    # dialog.show()
-    #exit_code = app.exec_()
+    #exit_code = app.exec()
--- a/gns3/dialogs/edit_compute_dialog.py
+++ b/gns3/dialogs/edit_compute_dialog.py
@@ -90,4 +90,4 @@ if __name__ == '__main__':
    main = QtWidgets.QMainWindow()
    dialog = EditComputeDialog(main)
    dialog.show()
-    exit_code = app.exec_()
+    exit_code = app.exec()
--- a/gns3/dialogs/edit_project_dialog.py
+++ b/gns3/dialogs/edit_project_dialog.py
@@ -41,12 +41,12 @@ class EditProjectDialog(QtWidgets.QDialog, Ui_EditProjectDialog):
        self.uiNodeGridSizeSpinBox.setValue(self._project.nodeGridSize())
        self.uiDrawingGridSizeSpinBox.setValue(self._project.drawingGridSize())

-        self.uiGlobalVariablesGrid.setAlignment(QtCore.Qt.AlignTop)
+        self.uiGlobalVariablesGrid.setAlignment(QtCore.Qt.AlignmentFlag.AlignTop)

        self.uiNewVarButton = QtWidgets.QPushButton('Add new variable', self)
-        self.uiNewVarButton.setSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed)
+        self.uiNewVarButton.setSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Fixed)
        self.uiNewVarButton.clicked.connect(self.onAddNewVariable)
-        self.uiGlobalVariablesGrid.addWidget(self.uiNewVarButton, 0, 3, QtCore.Qt.AlignRight)
+        self.uiGlobalVariablesGrid.addWidget(self.uiNewVarButton, 0, 3, QtCore.Qt.AlignmentFlag.AlignRight)

        self._readme_filename = "README.txt"
        self.uiTabWidget.currentChanged.connect(self._previewMarkdownSlot)
--- a/gns3/dialogs/file_editor_dialog.py
+++ b/gns3/dialogs/file_editor_dialog.py
@@ -48,8 +48,8 @@ class FileEditorDialog(QtWidgets.QDialog, Ui_FileEditorDialog):
        self.setWindowTitle(target.name() + " " + os.path.basename(path))

        self.uiRefreshButton.pressed.connect(self._refreshSlot)
-        self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Save).clicked.connect(self._okButtonClickedSlot)
-        self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Cancel).clicked.connect(self.reject)
+        self.uiButtonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Save).clicked.connect(self._okButtonClickedSlot)
+        self.uiButtonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Cancel).clicked.connect(self.reject)

        self._refreshSlot()

--- a/gns3/dialogs/filter_dialog.py
+++ b/gns3/dialogs/filter_dialog.py
@@ -38,9 +38,9 @@ class FilterDialog(QtWidgets.QDialog, Ui_FilterDialog):
        self._link.listAvailableFilters(self._listAvailableFiltersCallback)
        self._initialized = False
        self._filter_items = {}
-        self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Apply).clicked.connect(self._applyPreferencesSlot)
-        self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Help).clicked.connect(self._helpSlot)
-        self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Reset).clicked.connect(self._resetSlot)
+        self.uiButtonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Apply).clicked.connect(self._applyPreferencesSlot)
+        self.uiButtonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Help).clicked.connect(self._helpSlot)
+        self.uiButtonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Reset).clicked.connect(self._resetSlot)

    def _listAvailableFiltersCallback(self, result, error=False, *args, **kwargs):
        if error:
@@ -91,7 +91,7 @@ class FilterDialog(QtWidgets.QDialog, Ui_FilterDialog):
                    spinBox.setMinimum(param["minimum"])
                    spinBox.setMaximum(param["maximum"])

-                    sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed)
+                    sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Fixed)
                    sizePolicy.setHorizontalStretch(0)
                    sizePolicy.setVerticalStretch(0)
                    sizePolicy.setHeightForWidth(spinBox.sizePolicy().hasHeightForWidth())
@@ -112,7 +112,7 @@ class FilterDialog(QtWidgets.QDialog, Ui_FilterDialog):
                    textEdit = QtWidgets.QTextEdit()
                    textEdit.setAcceptRichText(False)
                    filter["textEdits"].append(textEdit)
-                    sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
+                    sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding)
                    sizePolicy.setHorizontalStretch(0)
                    sizePolicy.setVerticalStretch(0)
                    textEdit.setMinimumWidth(300)
@@ -128,7 +128,7 @@ class FilterDialog(QtWidgets.QDialog, Ui_FilterDialog):

                line += 1

-            spacerItem = QtWidgets.QSpacerItem(1, 1, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+            spacerItem = QtWidgets.QSpacerItem(1, 1, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
            gridLayout.addItem(spacerItem, line, 0, 1, 1)
            vlayout.addLayout(gridLayout)
            tab.setLayout(vlayout)
--- a/gns3/dialogs/idlepc_dialog.py
+++ b/gns3/dialogs/idlepc_dialog.py
@@ -33,8 +33,8 @@ class IdlePCDialog(QtWidgets.QDialog, Ui_IdlePCDialog):

        super().__init__(parent)
        self.setupUi(self)
-        self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Apply).clicked.connect(self._applySlot)
-        self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Help).clicked.connect(self._helpSlot)
+        self.uiButtonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Apply).clicked.connect(self._applySlot)
+        self.uiButtonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Help).clicked.connect(self._helpSlot)

        self._router = router
        self._idlepcs = idlepcs
--- a/gns3/dialogs/image_dialog.py
+++ b/gns3/dialogs/image_dialog.py
@@ -18,7 +18,7 @@
 import os
 import pathlib
 from gns3.http_client_error import HttpClientError, HttpClientCancelledRequestError
-from ..qt import QtCore, QtWidgets, qslot, sip_is_deleted
+from ..qt import QtCore, QtGui, QtWidgets, qslot, sip_is_deleted
 from ..ui.image_dialog_ui import Ui_ImageDialog
 from ..utils import human_size
 from ..controller import Controller
@@ -41,6 +41,8 @@ class ImageDialog(QtWidgets.QDialog, Ui_ImageDialog):
        self.setupUi(self)
        self.uiUploadImagePushButton.clicked.connect(self._uploadImageSlot)
        self.uiDeleteImagePushButton.clicked.connect(self._deleteImageSlot)
+        self.uiInstallAllPushButton.clicked.connect(self._installAllSlot)
+        self.uiPruneImagesPushButton.clicked.connect(self._pruneImagesSlot)
        self.uiRefreshImagesPushButton.clicked.connect(Controller.instance().refreshImageList)
        Controller.instance().image_list_updated_signal.connect(self._updateImageListSlot)
        self._updateImageListSlot()
@@ -52,14 +54,14 @@ class ImageDialog(QtWidgets.QDialog, Ui_ImageDialog):
        files, _ = QtWidgets.QFileDialog.getOpenFileNames(
            self,
            "Select one or more images to upload",
-            QtCore.QStandardPaths.writableLocation(QtCore.QStandardPaths.DownloadLocation),
-            "Images (*.bin *.image *.qcow2 *.vmdk);;All files (*.*)"
+            QtCore.QStandardPaths.writableLocation(QtCore.QStandardPaths.StandardLocation.DownloadLocation),
+            "Images (*.bin *.image *.iol *.qcow2 *.vmdk *.iso x86_64* i86bi*);;All files (*)"
        )
        error_msgs = ""
        for path in files:
-            log.debug("Uploading image '{}' to controller".format(path))
            image_filename = os.path.basename(path)
            install_appliances = self.uiInstallApplianceCheckBox.isChecked()
+            log.info("Uploading image '{}' to controller".format(image_filename))
            try:
                Controller.instance().post(
                    f"/images/upload/{image_filename}",
@@ -77,11 +79,11 @@ class ImageDialog(QtWidgets.QDialog, Ui_ImageDialog):

        if error_msgs:
            error_dialog = QtWidgets.QMessageBox(self)
-            error_dialog.setWindowModality(QtCore.Qt.ApplicationModal)
+            error_dialog.setWindowModality(QtCore.Qt.WindowModality.ApplicationModal)
            error_dialog.setWindowTitle("Image upload")
            error_dialog.setText(f"Error while uploading images to the controller")
            error_dialog.setDetailedText(error_msgs)
-            error_dialog.setIcon(QtWidgets.QMessageBox.Critical)
+            error_dialog.setIcon(QtWidgets.QMessageBox.Icon.Critical)
            error_dialog.show()

        Controller.instance().refreshImageList()
@@ -97,18 +99,18 @@ class ImageDialog(QtWidgets.QDialog, Ui_ImageDialog):
            self,
            "Delete image(s)",
            "Delete the selected images?\nThis cannot be reverted.",
-            QtWidgets.QMessageBox.Yes,
-            QtWidgets.QMessageBox.No
+            QtWidgets.QMessageBox.StandardButton.Yes,
+            QtWidgets.QMessageBox.StandardButton.No
        )

-        if reply == QtWidgets.QMessageBox.No:
+        if reply == QtWidgets.QMessageBox.StandardButton.No:
            return

        images_to_delete = set()
        for image in self.uiImagesTreeWidget.selectedItems():
            if sip_is_deleted(image):
                continue
-            image_filename = image.data(0, QtCore.Qt.UserRole)
+            image_filename = image.data(0, QtCore.Qt.ItemDataRole.UserRole)
            images_to_delete.add(image_filename)

        error_msgs = ""
@@ -127,11 +129,69 @@ class ImageDialog(QtWidgets.QDialog, Ui_ImageDialog):

        if error_msgs:
            error_dialog = QtWidgets.QMessageBox(self)
-            error_dialog.setWindowModality(QtCore.Qt.ApplicationModal)
+            error_dialog.setWindowModality(QtCore.Qt.WindowModality.ApplicationModal)
            error_dialog.setWindowTitle("Image deletion")
            error_dialog.setText(f"Error while deleting images on the controller")
            error_dialog.setDetailedText(error_msgs)
-            error_dialog.setIcon(QtWidgets.QMessageBox.Critical)
+            error_dialog.setIcon(QtWidgets.QMessageBox.Icon.Critical)
+            error_dialog.show()
+
+        Controller.instance().refreshImageList()
+
+    def _installAllSlot(self, *args):
+
+        reply = QtWidgets.QMessageBox.warning(
+            self,
+            "Install appliance(s)",
+            "This will attempt to automatically create templates based on image checksums.\nContinue?",
+            QtWidgets.QMessageBox.StandardButton.Yes,
+            QtWidgets.QMessageBox.StandardButton.No
+        )
+
+        if reply == QtWidgets.QMessageBox.StandardButton.No:
+            return
+
+        Controller.instance().post(
+            f"/images/install",
+            progress_text=f"Installing appliances",
+            timeout=None,
+            wait=True
+        )
+
+    @qslot
+    def _pruneImagesSlot(self, *args):
+
+        reply = QtWidgets.QMessageBox.warning(
+            self,
+            "Prune image(s)",
+            "Delete all images not used by a template?\nThis cannot be reverted.",
+            QtWidgets.QMessageBox.StandardButton.Yes,
+            QtWidgets.QMessageBox.StandardButton.No
+        )
+
+        if reply == QtWidgets.QMessageBox.StandardButton.No:
+            return
+
+        error_msgs = ""
+        try:
+            Controller.instance().delete(
+                f"/images/prune",
+                progress_text=f"Pruning images",
+                timeout=None,
+                wait=True
+            )
+        except HttpClientCancelledRequestError:
+            return
+        except HttpClientError as e:
+            error_msgs += f"{e}\n"
+
+        if error_msgs:
+            error_dialog = QtWidgets.QMessageBox(self)
+            error_dialog.setWindowModality(QtCore.Qt.WindowModality.ApplicationModal)
+            error_dialog.setWindowTitle("Image pruning")
+            error_dialog.setText(f"Error while deleting images on the controller")
+            error_dialog.setDetailedText(error_msgs)
+            error_dialog.setIcon(QtWidgets.QMessageBox.Icon.Critical)
            error_dialog.show()

        Controller.instance().refreshImageList()
@@ -145,7 +205,8 @@ class ImageDialog(QtWidgets.QDialog, Ui_ImageDialog):
        items = []
        for image in Controller.instance().images():
            item = QtWidgets.QTreeWidgetItem([image["filename"], image["image_type"], human_size(image["image_size"])])
-            item.setData(0, QtCore.Qt.UserRole, image["filename"])
+            item.setData(0, QtCore.Qt.ItemDataRole.UserRole, image["filename"])
+            item.setToolTip(0, f'{image["filename"]} {image["checksum"]}')
            items.append(item)

        self.uiImagesTreeWidget.addTopLevelItems(items)
@@ -156,13 +217,40 @@ class ImageDialog(QtWidgets.QDialog, Ui_ImageDialog):
        self.uiImagesTreeWidget.resizeColumnToContents(0)
        self.uiImagesTreeWidget.resizeColumnToContents(1)
        self.uiImagesTreeWidget.resizeColumnToContents(2)
-        self.uiImagesTreeWidget.sortItems(0, QtCore.Qt.AscendingOrder)
+        self.uiImagesTreeWidget.sortItems(0, QtCore.Qt.SortOrder.AscendingOrder)
        self.uiImagesTreeWidget.setUpdatesEnabled(True)

+    def contextMenuEvent(self, event):
+        """
+        Handles all context menu events.
+
+        :param event: QContextMenuEvent instance
+        """
+
+        items = self.uiImagesTreeWidget.selectedItems()
+        if items:
+            menu = QtWidgets.QMenu()
+            copy = QtGui.QAction("&Copy image information to clipboard", menu)
+            copy.triggered.connect(self._copyToClipboardSlot)
+            menu.addAction(copy)
+            menu.exec(event.globalPos())
+
+    def _copyToClipboardSlot(self):
+        """
+        Copies the selected image tooltip to the clipboard.
+        """
+
+        items = self.uiImagesTreeWidget.selectedItems()
+        if items:
+            QtWidgets.QApplication.clipboard().setText(items[0].toolTip(0))
+            log.info(f"'{items[0].toolTip(0)}' copied to clipboard")
+
    def keyPressEvent(self, e):
        """
        Event handler in order to properly handle escape.
        """

-        if e.key() == QtCore.Qt.Key_Escape:
+        if e.key() == QtCore.Qt.Key.Key_Escape:
            self.close()
+        elif e.matches(QtGui.QKeySequence.StandardKey.Copy):
+            self._copyToClipboardSlot()
--- a/gns3/dialogs/new_template_wizard.py
+++ b/gns3/dialogs/new_template_wizard.py
@@ -18,9 +18,9 @@
 import sys
 import tempfile
 import json
-import sip
 import os

+from ..qt import sip
 from gns3.qt import QtCore, QtWidgets, qpartial
 from gns3.controller import Controller
 from gns3.appliance_manager import ApplianceManager
@@ -41,16 +41,16 @@ class NewTemplateWizard(QtWidgets.QWizard, Ui_NewTemplateWizard):
        super().__init__(parent)
        self.setupUi(self)

-        self.setWizardStyle(QtWidgets.QWizard.ModernStyle)
+        self.setWizardStyle(QtWidgets.QWizard.WizardStyle.ModernStyle)
        if sys.platform.startswith("darwin"):
            # we want to see the cancel button on OSX
-            self.setOptions(QtWidgets.QWizard.NoDefaultButton)
+            self.setOptions(QtWidgets.QWizard.WizardOption.NoDefaultButton)

        # add a custom button to show appliance information
-        self.setButtonText(QtWidgets.QWizard.CustomButton1, "&Update from online registry")
-        self.setOption(QtWidgets.QWizard.HaveCustomButton1, True)
+        self.setButtonText(QtWidgets.QWizard.WizardButton.CustomButton1, "&Update from online registry")
+        self.setOption(QtWidgets.QWizard.WizardOption.HaveCustomButton1, True)
        self.customButtonClicked.connect(self._downloadAppliancesSlot)
-        self.button(QtWidgets.QWizard.CustomButton1).hide()
+        self.button(QtWidgets.QWizard.WizardButton.CustomButton1).hide()
        self.uiFilterLineEdit.textChanged.connect(self._filterTextChangedSlot)
        ApplianceManager.instance().appliances_changed_signal.connect(self._appliancesChangedSlot)

@@ -154,16 +154,16 @@ class NewTemplateWizard(QtWidgets.QWizard, Ui_NewTemplateWizard):
        self.uiAppliancesTreeWidget.clear()
        parent_routers = QtWidgets.QTreeWidgetItem(self.uiAppliancesTreeWidget)
        parent_routers.setText(0, "Routers")
-        parent_routers.setFlags(parent_routers.flags() & ~QtCore.Qt.ItemIsSelectable)
+        parent_routers.setFlags(parent_routers.flags() & ~QtCore.Qt.ItemFlag.ItemIsSelectable)
        parent_switches = QtWidgets.QTreeWidgetItem(self.uiAppliancesTreeWidget)
        parent_switches.setText(0, "Switches")
-        parent_switches.setFlags(parent_switches.flags() & ~QtCore.Qt.ItemIsSelectable)
+        parent_switches.setFlags(parent_switches.flags() & ~QtCore.Qt.ItemFlag.ItemIsSelectable)
        parent_guests = QtWidgets.QTreeWidgetItem(self.uiAppliancesTreeWidget)
        parent_guests.setText(0, "Guests")
-        parent_guests.setFlags(parent_guests.flags() & ~QtCore.Qt.ItemIsSelectable)
+        parent_guests.setFlags(parent_guests.flags() & ~QtCore.Qt.ItemFlag.ItemIsSelectable)
        parent_firewalls = QtWidgets.QTreeWidgetItem(self.uiAppliancesTreeWidget)
        parent_firewalls.setText(0, "Firewalls")
-        parent_firewalls.setFlags(parent_firewalls.flags() & ~QtCore.Qt.ItemIsSelectable)
+        parent_firewalls.setFlags(parent_firewalls.flags() & ~QtCore.Qt.ItemFlag.ItemIsSelectable)
        self.uiAppliancesTreeWidget.expandAll()

        for appliance in ApplianceManager.instance().appliances():
@@ -200,14 +200,14 @@ class NewTemplateWizard(QtWidgets.QWizard, Ui_NewTemplateWizard):
                item.setText(1, "N/A")

            item.setText(2, appliance["vendor_name"])
-            item.setData(0, QtCore.Qt.UserRole, appliance)
+            item.setData(0, QtCore.Qt.ItemDataRole.UserRole, appliance)

            #item.setSizeHint(0, QtCore.QSize(32, 32))
            item.setToolTip(0, self._get_tooltip_text(appliance))
            Controller.instance().getSymbolIcon(appliance.get("symbol"), qpartial(self._setItemIcon, item),
                                                fallback=":/symbols/" + appliance["category"] + ".svg")

-        self.uiAppliancesTreeWidget.sortByColumn(0, QtCore.Qt.AscendingOrder)
+        self.uiAppliancesTreeWidget.sortByColumn(0, QtCore.Qt.SortOrder.AscendingOrder)
        self.uiAppliancesTreeWidget.resizeColumnToContents(0)
        if not appliance_filter:
            self.uiAppliancesTreeWidget.collapseAll()
@@ -221,19 +221,19 @@ class NewTemplateWizard(QtWidgets.QWizard, Ui_NewTemplateWizard):

        super().initializePage(page_id)
        if self.page(page_id) == self.uiApplianceFromServerWizardPage:
-            self.button(QtWidgets.QWizard.CustomButton1).show()
-            self.setButtonText(QtWidgets.QWizard.FinishButton, "&Install")
+            self.button(QtWidgets.QWizard.WizardButton.CustomButton1).show()
+            self.setButtonText(QtWidgets.QWizard.WizardButton.FinishButton, "&Install")
            self._get_appliances_from_server()
        else:
-            self.button(QtWidgets.QWizard.CustomButton1).hide()
+            self.button(QtWidgets.QWizard.WizardButton.CustomButton1).hide()

    def cleanupPage(self, page_id):
        """
        Restore button default settings on the first page.
        """

-        self.button(QtWidgets.QWizard.CustomButton1).hide()
-        self.setButtonText(QtWidgets.QWizard.FinishButton, "&Finish")
+        self.button(QtWidgets.QWizard.WizardButton.CustomButton1).hide()
+        self.setButtonText(QtWidgets.QWizard.WizardButton.FinishButton, "&Finish")
        super().cleanupPage(page_id)

    def validateCurrentPage(self):
@@ -274,7 +274,7 @@ class NewTemplateWizard(QtWidgets.QWizard, Ui_NewTemplateWizard):
                items = self.uiAppliancesTreeWidget.selectedItems()
                for item in items:
                    f = tempfile.NamedTemporaryFile(mode="w+", suffix=".builtin.gns3a", delete=False)
-                    json.dump(item.data(0, QtCore.Qt.UserRole), f)
+                    json.dump(item.data(0, QtCore.Qt.ItemDataRole.UserRole), f)
                    f.close()
                    MainWindow.instance().loadPath(f.name)
                    try:
--- a/gns3/dialogs/node_properties_dialog.py
+++ b/gns3/dialogs/node_properties_dialog.py
@@ -40,8 +40,8 @@ class NodePropertiesDialog(QtWidgets.QDialog, Ui_NodePropertiesDialog):
        self._node_items = node_items
        self._parent_items = {}

-        self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Apply).setEnabled(False)
-        self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Reset).setEnabled(False)
+        self.uiButtonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Apply).setEnabled(False)
+        self.uiButtonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Reset).setEnabled(False)

        self.previousItem = None
        self.previousPage = None
@@ -84,7 +84,7 @@ class NodePropertiesDialog(QtWidgets.QDialog, Ui_NodePropertiesDialog):
            ConfigurationPageItem(self._parent_items[parent], node_item)

        # sort the tree
-        self.uiNodesTreeWidget.sortByColumn(0, QtCore.Qt.AscendingOrder)
+        self.uiNodesTreeWidget.sortByColumn(0, QtCore.Qt.SortOrder.AscendingOrder)

        if len(self._node_items) == 1:
            parent = " {} group".format(str(node_item.node()))
@@ -135,19 +135,19 @@ class NodePropertiesDialog(QtWidgets.QDialog, Ui_NodePropertiesDialog):
        self.uiConfigStackedWidget.setCurrentWidget(page)

        if page != self.uiEmptyPageWidget:
-            self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Apply).setEnabled(True)
-            self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Reset).setEnabled(True)
-            self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Help).setEnabled(True)
+            self.uiButtonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Apply).setEnabled(True)
+            self.uiButtonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Reset).setEnabled(True)
+            self.uiButtonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Help).setEnabled(True)
        else:
-            self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Apply).setEnabled(False)
-            self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Reset).setEnabled(False)
-            self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Help).setEnabled(False)
+            self.uiButtonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Apply).setEnabled(False)
+            self.uiButtonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Reset).setEnabled(False)
+            self.uiButtonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Help).setEnabled(False)

        # hide the contextual help button if there is no help text
        if page.whatsThis():
-            self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Help).show()
+            self.uiButtonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Help).show()
        else:
-            self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Help).hide()
+            self.uiButtonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Help).hide()

    def on_uiButtonBox_clicked(self, button):
        """
@@ -157,13 +157,13 @@ class NodePropertiesDialog(QtWidgets.QDialog, Ui_NodePropertiesDialog):
        """

        try:
-            if button == self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Apply):
+            if button == self.uiButtonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Apply):
                self.applySettings()
-            elif button == self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Reset):
+            elif button == self.uiButtonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Reset):
                self.resetSettings()
-            elif button == self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Help):
+            elif button == self.uiButtonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Help):
                self.showHelp()
-            elif button == self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Cancel):
+            elif button == self.uiButtonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Cancel):
                QtWidgets.QDialog.reject(self)
            else:
                self.applySettings()
--- a/gns3/dialogs/notif_dialog.py
+++ b/gns3/dialogs/notif_dialog.py
@@ -54,12 +54,12 @@ class NotifDialog(QtWidgets.QWidget):
        super().__init__(parent)
        self._notifs = []

-        self.setWindowFlags(QtCore.Qt.FramelessWindowHint |
-                            QtCore.Qt.WindowDoesNotAcceptFocus |
-                            QtCore.Qt.SubWindow)
-        # QtCore.Qt.Tool)
-        # QtCore.Qt.WindowStaysOnTopHint)
-        self.setAttribute(QtCore.Qt.WA_ShowWithoutActivating)  # | QtCore.Qt.WA_TranslucentBackground)
+        self.setWindowFlags(QtCore.Qt.WindowType.FramelessWindowHint |
+                            QtCore.Qt.WindowType.WindowDoesNotAcceptFocus |
+                            QtCore.Qt.WindowType.SubWindow)
+        # QtCore.Qt.WindowType.Tool)
+        # QtCore.Qt.WindowType.WindowStaysOnTopHint)
+        self.setAttribute(QtCore.Qt.WidgetAttribute.WA_ShowWithoutActivating)  # | QtCore.Qt.WidgetAttribute.WA_TranslucentBackground)

        self._layout = QtWidgets.QVBoxLayout()

@@ -70,7 +70,7 @@ class NotifDialog(QtWidgets.QWidget):

        for i in range(0, MAX_ELEMENTS):
            l = QtWidgets.QLabel()
-            l.setAlignment(QtCore.Qt.AlignTop)
+            l.setAlignment(QtCore.Qt.AlignmentFlag.AlignTop)
            l.setWordWrap(True)
            l.hide()
            self._layout.addWidget(l)
@@ -187,4 +187,4 @@ if __name__ == '__main__':
    main.setMinimumWidth(600)
    main.setMinimumHeight(600)
    main.show()
-    exit_code = app.exec_()
+    exit_code = app.exec()
--- a/gns3/dialogs/password_dialog.py
+++ b/gns3/dialogs/password_dialog.py
@@ -0,0 +1,85 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2025 GNS3 Technologies Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import re
+from ..qt import QtCore, QtGui, QtWidgets
+from ..ui.password_dialog_ui import Ui_PasswordDialog
+
+
+import logging
+log = logging.getLogger(__name__)
+
+
+class PasswordDialog(QtWidgets.QDialog, Ui_PasswordDialog):
+
+    """
+    Password dialog.
+    """
+
+    def __init__(self, parent):
+        """
+        :param parent: parent widget.
+        """
+
+        super().__init__(parent)
+        self.setupUi(self)
+        self._password = None
+
+        self._eye_on_icon = QtGui.QIcon(':/icons/eye-on.svg')
+        self._eye_off_icon = QtGui.QIcon(':/icons/eye-off.svg')
+        for line_edit in [self.uiPasswordLineEdit, self.uiConfirmPasswordLineEdit]:
+            action = line_edit.addAction(self._eye_on_icon, QtWidgets.QLineEdit.TrailingPosition)
+            button = action.associatedWidgets()[-1]
+            button.setCursor(QtGui.QCursor(QtCore.Qt.PointingHandCursor))
+            button.pressed.connect(self.onPressedSlot)
+            #button.released.connect(self.onReleasedSlot)
+
+    def onPressedSlot(self):
+
+        button = self.sender()
+        line_edit = button.parent()
+        if line_edit.echoMode() == QtWidgets.QLineEdit.Password:
+            button.setIcon(self._eye_off_icon)
+            line_edit.setEchoMode(QtWidgets.QLineEdit.Normal)
+        else:
+            button.setIcon(self._eye_on_icon)
+            line_edit.setEchoMode(QtWidgets.QLineEdit.Password)
+
+    # def onReleasedSlot(self):
+    #
+    #     button = self.sender()
+    #     button.setIcon(self._eye_on_icon)
+    #     button.parent().setEchoMode(QtWidgets.QLineEdit.Password)
+
+    def getPassword(self):
+
+        return self._password
+
+    def done(self, result):
+
+        if result:
+            new_password = self.uiPasswordLineEdit.text()
+            confirm_password = self.uiConfirmPasswordLineEdit.text()
+            if new_password != confirm_password:
+                QtWidgets.QMessageBox.critical(self, "Error", "Passwords do not match.")
+                return
+            pattern = re.compile(r'^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}$')
+            if not pattern.match(new_password):
+                QtWidgets.QMessageBox.critical(self, "Error", "Password must be at least 8 characters long and contain at least one digit, one lowercase letter and one uppercase letter.")
+                return
+            self._password = new_password
+        super().done(result)
--- a/gns3/dialogs/preferences_dialog.py
+++ b/gns3/dialogs/preferences_dialog.py
@@ -19,11 +19,12 @@
 Dialog to load module and built-in preference pages.
 """

-from ..qt import QtCore, QtWidgets
+from ..qt import QtGui, QtCore, QtWidgets
 from ..ui.preferences_dialog_ui import Ui_PreferencesDialog
 from ..pages.controller_preferences_page import ControllerPreferencesPage
 from ..pages.general_preferences_page import GeneralPreferencesPage
 from ..pages.packet_capture_preferences_page import PacketCapturePreferencesPage
+from ..pages.user_preferences_page import UserPreferencesPage
 from ..pages.gns3_vm_preferences_page import GNS3VMPreferencesPage
 from ..modules import MODULES

@@ -49,8 +50,9 @@ class PreferencesDialog(QtWidgets.QDialog, Ui_PreferencesDialog):
        # We adapt the max size to the screen resolution
        # We need to manually do that otherwise on small screen the windows
        # could be bigger than the screen instead of displaying scrollbars
-        height = QtWidgets.QDesktopWidget().screenGeometry().height() - 100
-        width = QtWidgets.QDesktopWidget().screenGeometry().width() - 100
+        geometry = QtGui.QGuiApplication.primaryScreen().geometry()
+        height = geometry.height() - 100
+        width = geometry.width() - 100

        # 980 is the default width
        if self.width() > width:
@@ -60,7 +62,7 @@ class PreferencesDialog(QtWidgets.QDialog, Ui_PreferencesDialog):
            self.resize(self.width(), height)

        self.uiTreeWidget.currentItemChanged.connect(self._showPreferencesPageSlot)
-        self._applyButton = self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Apply)
+        self._applyButton = self.uiButtonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Apply)
        self._applyButton.clicked.connect(self._applyPreferences)
        self._applyButton.setEnabled(False)
        self._applyButton.setStyleSheet("QPushButton:disabled {color: gray}")
@@ -73,7 +75,7 @@ class PreferencesDialog(QtWidgets.QDialog, Ui_PreferencesDialog):
        # set the maximum width based on the content of column 0
        self.uiTreeWidget.setMaximumWidth(self.uiTreeWidget.sizeHintForColumn(0) + 10)

-        # Something has change?
+        # Something has changed?
        self._modified_pages = set()

    def _loadPreferencePages(self):
@@ -85,8 +87,9 @@ class PreferencesDialog(QtWidgets.QDialog, Ui_PreferencesDialog):
        pages = [
            GeneralPreferencesPage,
            ControllerPreferencesPage,
+            UserPreferencesPage,
            #GNS3VMPreferencesPage,
-            PacketCapturePreferencesPage,
+            PacketCapturePreferencesPage
        ]

        for page in pages:
@@ -95,7 +98,7 @@ class PreferencesDialog(QtWidgets.QDialog, Ui_PreferencesDialog):
            name = preferences_page.windowTitle()
            item = QtWidgets.QTreeWidgetItem(self.uiTreeWidget)
            item.setText(0, name)
-            item.setData(0, QtCore.Qt.UserRole, preferences_page)
+            item.setData(0, QtCore.Qt.ItemDataRole.UserRole, preferences_page)
            self.uiStackedWidget.addWidget(preferences_page)
            self._items.append(item)
            self._watchForChanges(preferences_page)
@@ -111,7 +114,7 @@ class PreferencesDialog(QtWidgets.QDialog, Ui_PreferencesDialog):
                name = preferences_page.windowTitle()
                item = QtWidgets.QTreeWidgetItem(parent)
                item.setText(0, name)
-                item.setData(0, QtCore.Qt.UserRole, preferences_page)
+                item.setData(0, QtCore.Qt.ItemDataRole.UserRole, preferences_page)
                self.uiStackedWidget.addWidget(preferences_page)
                self._items.append(item)
                if cls is preference_pages[0]:
@@ -176,7 +179,7 @@ class PreferencesDialog(QtWidgets.QDialog, Ui_PreferencesDialog):
        if current is None:
            current = previous

-        preferences_page = current.data(0, QtCore.Qt.UserRole)
+        preferences_page = current.data(0, QtCore.Qt.ItemDataRole.UserRole)
        accessible_name = preferences_page.accessibleName()
        if accessible_name:
            self.uiTitleLabel.setText(accessible_name)
@@ -192,9 +195,9 @@ class PreferencesDialog(QtWidgets.QDialog, Ui_PreferencesDialog):
        for index in range(0, self.uiStackedWidget.count()):
            page = self.uiStackedWidget.widget(index)
            if self.uiStackedWidget.currentIndex() == index:
-                page.setSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
+                page.setSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding)
            else:
-                page.setSizePolicy(QtWidgets.QSizePolicy.Ignored, QtWidgets.QSizePolicy.Ignored)
+                page.setSizePolicy(QtWidgets.QSizePolicy.Policy.Ignored, QtWidgets.QSizePolicy.Policy.Ignored)

    def _applyPreferences(self):
        """
@@ -223,9 +226,9 @@ class PreferencesDialog(QtWidgets.QDialog, Ui_PreferencesDialog):
            reply = QtWidgets.QMessageBox.warning(self,
                                                  "Preferences",
                                                  "You have unsaved preferences in {}.\n\nContinue without saving?".format(pages_title),
-                                                  QtWidgets.QMessageBox.Yes,
-                                                  QtWidgets.QMessageBox.No)
-            if reply == QtWidgets.QMessageBox.No:
+                                                  QtWidgets.QMessageBox.StandardButton.Yes,
+                                                  QtWidgets.QMessageBox.StandardButton.No)
+            if reply == QtWidgets.QMessageBox.StandardButton.No:
                return
        QtWidgets.QDialog.reject(self)

--- a/gns3/dialogs/profile_select.py
+++ b/gns3/dialogs/profile_select.py
@@ -19,7 +19,7 @@ import os
 import sys
 import shutil

-from gns3.qt import QtWidgets
+from gns3.qt import QtWidgets, QtGui
 from gns3.local_config import LocalConfig
 from gns3.ui.profile_select_dialog_ui import Ui_ProfileSelectDialog
 from gns3.version import __version_info__
@@ -46,7 +46,7 @@ class ProfileSelectDialog(QtWidgets.QDialog, Ui_ProfileSelectDialog):
        self.uiDeletePushButton.clicked.connect(self._deletePushButtonSlot)

        # Center on screen
-        screen = QtWidgets.QApplication.desktop().screenGeometry()
+        screen = QtGui.QGuiApplication.primaryScreen().geometry()
        self.move(screen.center() - self.rect().center())

        version = "{}.{}".format(__version_info__[0], __version_info__[1])
@@ -54,8 +54,14 @@ class ProfileSelectDialog(QtWidgets.QDialog, Ui_ProfileSelectDialog):
            appdata = os.path.expandvars("%APPDATA%")
            path = os.path.join(appdata, "GNS3", version)
        else:
-            home = os.path.expanduser("~")
-            path = os.path.join(home, ".config", "GNS3", version)
+            xgd_config_var = "$XDG_CONFIG_HOME"
+            xdg_config_res = os.path.expandvars(xgd_config_var)
+            if xdg_config_res != xgd_config_var:
+                path = os.path.join(xdg_config_res, "GNS3", version)
+            else:
+                home = os.path.expanduser("~")
+                path = os.path.join(home, ".config", "GNS3", version)
+
        self.profiles_path = os.path.join(path, "profiles")

        self.uiShowAtStartupCheckBox.setChecked(LocalConfig.instance().multiProfiles())
@@ -103,4 +109,4 @@ if __name__ == '__main__':
    app = QtWidgets.QApplication(sys.argv)
    dialog = ProfileSelectDialog()
    dialog.show()
-    exit_code = app.exec_()
+    exit_code = app.exec()
--- a/gns3/dialogs/project_dialog.py
+++ b/gns3/dialogs/project_dialog.py
@@ -93,15 +93,15 @@ class ProjectDialog(QtWidgets.QDialog, Ui_ProjectDialog):
        for project in self.uiProjectsTreeWidget.selectedItems():
            if sip_is_deleted(project):
                continue
-            project_id = project.data(0, QtCore.Qt.UserRole)
-            project_name = project.data(1, QtCore.Qt.UserRole)
+            project_id = project.data(0, QtCore.Qt.ItemDataRole.UserRole)
+            project_name = project.data(1, QtCore.Qt.ItemDataRole.UserRole)

            reply = QtWidgets.QMessageBox.warning(self,
                                                  "Delete project",
                                                  'Delete project "{}"?\nThis cannot be reverted.'.format(project_name),
-                                                  QtWidgets.QMessageBox.Yes,
-                                                  QtWidgets.QMessageBox.No)
-            if reply == QtWidgets.QMessageBox.Yes:
+                                                  QtWidgets.QMessageBox.StandardButton.Yes,
+                                                  QtWidgets.QMessageBox.StandardButton.No)
+            if reply == QtWidgets.QMessageBox.StandardButton.Yes:
                projects_to_delete.add(project_id)

        for project_id in projects_to_delete:
@@ -118,8 +118,8 @@ class ProjectDialog(QtWidgets.QDialog, Ui_ProjectDialog):
            return

        for project in self.uiProjectsTreeWidget.selectedItems():
-            project_id = project.data(0, QtCore.Qt.UserRole)
-            project_name = project.data(1, QtCore.Qt.UserRole)
+            project_id = project.data(0, QtCore.Qt.ItemDataRole.UserRole)
+            project_name = project.data(1, QtCore.Qt.ItemDataRole.UserRole)

            new_project_name = project_name + "-1"
            existing_project_name = [p["name"] for p in Controller.instance().projects()]
@@ -131,7 +131,7 @@ class ProjectDialog(QtWidgets.QDialog, Ui_ProjectDialog):
            name, reply = QtWidgets.QInputDialog.getText(self,
                                                         "Duplicate project",
                                                         'Duplicate project "{}"?.'.format(project_name),
-                                                         QtWidgets.QLineEdit.Normal,
+                                                         QtWidgets.QLineEdit.EchoMode.Normal,
                                                         new_project_name)
            name = name.strip()
            if reply and len(name) > 0:
@@ -173,9 +173,9 @@ class ProjectDialog(QtWidgets.QDialog, Ui_ProjectDialog):
        for project in Controller.instance().projects():
            path = os.path.join(project["path"], project["filename"])
            item = QtWidgets.QTreeWidgetItem([project["name"], project["status"], path])
-            item.setData(0, QtCore.Qt.UserRole, project["project_id"])
-            item.setData(1, QtCore.Qt.UserRole, project["name"])
-            item.setData(2, QtCore.Qt.UserRole, path)
+            item.setData(0, QtCore.Qt.ItemDataRole.UserRole, project["project_id"])
+            item.setData(1, QtCore.Qt.ItemDataRole.UserRole, project["name"])
+            item.setData(2, QtCore.Qt.ItemDataRole.UserRole, path)
            items.append(item)
        self.uiProjectsTreeWidget.addTopLevelItems(items)

@@ -186,7 +186,7 @@ class ProjectDialog(QtWidgets.QDialog, Ui_ProjectDialog):
        self.uiProjectsTreeWidget.resizeColumnToContents(0)
        self.uiProjectsTreeWidget.resizeColumnToContents(1)
        self.uiProjectsTreeWidget.resizeColumnToContents(2)
-        self.uiProjectsTreeWidget.sortItems(0, QtCore.Qt.AscendingOrder)
+        self.uiProjectsTreeWidget.sortItems(0, QtCore.Qt.SortOrder.AscendingOrder)
        self.uiProjectsTreeWidget.setUpdatesEnabled(True)

    def keyPressEvent(self, e):
@@ -194,7 +194,7 @@ class ProjectDialog(QtWidgets.QDialog, Ui_ProjectDialog):
        Event handler in order to properly handle escape.
        """

-        if e.key() == QtCore.Qt.Key_Escape:
+        if e.key() == QtCore.Qt.Key.Key_Escape:
            self.close()

    def _projectNameSlot(self, text):
@@ -295,10 +295,10 @@ class ProjectDialog(QtWidgets.QDialog, Ui_ProjectDialog):
                reply = QtWidgets.QMessageBox.warning(self,
                                                      "New project",
                                                      'Project "{}" already exists in location "{}", overwrite it?'.format(existing_project["name"], existing_project["path"]),
-                                                      QtWidgets.QMessageBox.Yes,
-                                                      QtWidgets.QMessageBox.No)
+                                                      QtWidgets.QMessageBox.StandardButton.Yes,
+                                                      QtWidgets.QMessageBox.StandardButton.No)

-                if reply == QtWidgets.QMessageBox.Yes:
+                if reply == QtWidgets.QMessageBox.StandardButton.Yes:
                    Controller.instance().deleteProject(existing_project["project_id"], self._overwriteProjectCallback)

                # In all cases we cancel the new project and if project success to delete
@@ -319,6 +319,6 @@ class ProjectDialog(QtWidgets.QDialog, Ui_ProjectDialog):
                    QtWidgets.QMessageBox.critical(self, "Open project", "No project selected")
                    return

-                self._project_settings["project_id"] = current.data(0, QtCore.Qt.UserRole)
-                self._project_settings["project_name"] = current.data(1, QtCore.Qt.UserRole)
+                self._project_settings["project_id"] = current.data(0, QtCore.Qt.ItemDataRole.UserRole)
+                self._project_settings["project_name"] = current.data(1, QtCore.Qt.ItemDataRole.UserRole)
        super().done(result)
--- a/gns3/dialogs/project_export_wizard.py
+++ b/gns3/dialogs/project_export_wizard.py
@@ -42,10 +42,10 @@ class ExportProjectWizard(QtWidgets.QWizard, Ui_ExportProjectWizard):

        self._project = project
        self._path = None
-        self.setWizardStyle(QtWidgets.QWizard.ModernStyle)
+        self.setWizardStyle(QtWidgets.QWizard.WizardStyle.ModernStyle)
        if sys.platform.startswith("darwin"):
            # we want to see the cancel button on OSX
-            self.setOptions(QtWidgets.QWizard.NoDefaultButton)
+            self.setOptions(QtWidgets.QWizard.WizardOption.NoDefaultButton)

        self.uiCompressionComboBox.addItem("None", "none")
        self.uiCompressionComboBox.addItem("Zip compression (deflate)", "zip")
@@ -88,7 +88,7 @@ class ExportProjectWizard(QtWidgets.QWizard, Ui_ExportProjectWizard):

    def _pathBrowserSlot(self):

-        directory = QtCore.QStandardPaths.writableLocation(QtCore.QStandardPaths.DocumentsLocation)
+        directory = QtCore.QStandardPaths.writableLocation(QtCore.QStandardPaths.StandardLocation.DocumentsLocation)
        if len(directory) == 0:
            directory = LocalServer.instance().localServerSettings()["projects_path"]

@@ -155,7 +155,7 @@ class ExportProjectWizard(QtWidgets.QWizard, Ui_ExportProjectWizard):
        signal.connect(loop.quit)
        if timeout is not None:
            QtCore.QTimer.singleShot(timeout, loop.quit)
-        loop.exec_()
+        loop.exec()

    def _compressionChangedSlot(self, index):
        """
@@ -186,18 +186,16 @@ class ExportProjectWizard(QtWidgets.QWizard, Ui_ExportProjectWizard):
            if content:
                self._project.post("/files/{}".format(self._readme_filename), self._saveReadmeCallback, body=content)

+            include_images = include_snapshots = reset_mac_addresses = keep_compute_ids = "no"
            if self.uiIncludeImagesCheckBox.isChecked():
                include_images = "yes"
-            else:
-                include_images = "no"
            if self.uiIncludeSnapshotsCheckBox.isChecked():
                include_snapshots = "yes"
-            else:
-                include_snapshots = "no"
            if self.uiResetMacAddressesCheckBox.isChecked():
                reset_mac_addresses = "yes"
-            else:
-                reset_mac_addresses = "no"
+            if self.uiKeepComputeIdsCheckBox.isChecked():
+                keep_compute_ids = "yes"
+
            compression = self.uiCompressionComboBox.currentData()
            self.waitForReadme(self.readme_signal)

@@ -205,6 +203,7 @@ class ExportProjectWizard(QtWidgets.QWizard, Ui_ExportProjectWizard):
                "include_images": include_images,
                "include_snapshots": include_snapshots,
                "reset_mac_addresses": reset_mac_addresses,
+                "keep_compute_ids": keep_compute_ids,
                "compression": compression
            }

--- a/gns3/dialogs/project_welcome_dialog.py
+++ b/gns3/dialogs/project_welcome_dialog.py
@@ -35,7 +35,7 @@ class ProjectWelcomeDialog(QtWidgets.QDialog, Ui_ProjectWelcomeDialog):
        self._project = project
        self.setupUi(self)
        self.uiOkButton.clicked.connect(self._okButtonClickedSlot)
-        self.gridLayout.setAlignment(QtCore.Qt.AlignTop)
+        self.gridLayout.setAlignment(QtCore.Qt.AlignmentFlag.AlignTop)
        self.label.setOpenExternalLinks(True)
        self._variables = self._getVariables(project)
        self._loadReadme()
@@ -76,9 +76,9 @@ class ProjectWelcomeDialog(QtWidgets.QDialog, Ui_ProjectWelcomeDialog):
            reply = QtWidgets.QMessageBox.warning(self,
                                                  "Missing values",
                                                  "Are you sure you want to continue without providing missing values?",
-                                                  QtWidgets.QMessageBox.Yes,
-                                                  QtWidgets.QMessageBox.No)
-            if reply == QtWidgets.QMessageBox.No:
+                                                  QtWidgets.QMessageBox.StandardButton.Yes,
+                                                  QtWidgets.QMessageBox.StandardButton.No)
+            if reply == QtWidgets.QMessageBox.StandardButton.No:
                return

        self._project.setVariables(self._variables)
--- a/gns3/dialogs/setup_wizard.py
+++ b/gns3/dialogs/setup_wizard.py
@@ -43,10 +43,10 @@ class SetupWizard(QtWidgets.QWizard, Ui_SetupWizard):
        self.setupUi(self)
        self.adjustSize()

-        self.setWizardStyle(QtWidgets.QWizard.ModernStyle)
+        self.setWizardStyle(QtWidgets.QWizard.WizardStyle.ModernStyle)
        if sys.platform.startswith("darwin"):
            # we want to see the cancel button on OSX
-            self.setOptions(QtWidgets.QWizard.NoDefaultButton)
+            self.setOptions(QtWidgets.QWizard.WizardOption.NoDefaultButton)

        self.uiLocalServerToolButton.clicked.connect(self._localServerBrowserSlot)
        settings = parent.settings()
@@ -57,7 +57,7 @@ class SetupWizard(QtWidgets.QWizard, Ui_SetupWizard):

        # load all available addresses
        for address in QtNetwork.QNetworkInterface.allAddresses():
-            if address.protocol() in [QtNetwork.QAbstractSocket.IPv4Protocol, QtNetwork.QAbstractSocket.IPv6Protocol]:
+            if address.protocol() in [QtNetwork.QAbstractSocket.NetworkLayerProtocol.IPv4Protocol, QtNetwork.QAbstractSocket.NetworkLayerProtocol.IPv6Protocol]:
                address_string = address.toString()
                if address_string.startswith("169.254") or address_string.startswith("fe80"):
                    # ignore link-local addresses, could not use https://doc.qt.io/qt-5/qhostaddress.html#isLinkLocal
@@ -83,7 +83,7 @@ class SetupWizard(QtWidgets.QWizard, Ui_SetupWizard):

        filter = ""
        if sys.platform.startswith("win"):
-            filter = "Executable (*.exe);;All files (*.*)"
+            filter = "Executable (*.exe);;All files (*)"
        server_path = shutil.which("gns3server")
        path, _ = QtWidgets.QFileDialog.getOpenFileName(self, "Select the local server", server_path, filter)
        if not path:
@@ -101,7 +101,7 @@ class SetupWizard(QtWidgets.QWizard, Ui_SetupWizard):
        :returns: current QWidget
        """

-        pane = dialog.uiTreeWidget.findItems(name, QtCore.Qt.MatchFixedString)[0]
+        pane = dialog.uiTreeWidget.findItems(name, QtCore.Qt.MatchFlag.MatchFixedString)[0]
        child_pane = pane.child(0)
        dialog.uiTreeWidget.setCurrentItem(child_pane)
        return dialog.uiStackedWidget.currentWidget()
@@ -204,7 +204,8 @@ class SetupWizard(QtWidgets.QWizard, Ui_SetupWizard):
            remote_controller_settings["remote"] = True
            remote_controller_settings["host"] = self.uiRemoteMainServerHostLineEdit.text()
            remote_controller_settings["port"] = self.uiRemoteMainServerPortSpinBox.value()
-            remote_controller_settings["protocol"] = "http"
+            remote_controller_settings["protocol"] = self.uiRemoteMainServerProtocolComboBox.currentText().lower()
+            remote_controller_settings["accept_insecure_ssl_certificate"] = False
            remote_controller_settings["username"] = self.uiRemoteMainServerUserLineEdit.text()
            remote_controller_settings["password"] = self.uiRemoteMainServerPasswordLineEdit.text()
            Controller.instance().setSettings(remote_controller_settings)
--- a/gns3/dialogs/snapshots_dialog.py
+++ b/gns3/dialogs/snapshots_dialog.py
@@ -68,7 +68,7 @@ class SnapshotsDialog(QtWidgets.QDialog, Ui_SnapshotsDialog):
        for snapshot in result:
            item = QtWidgets.QListWidgetItem(self.uiSnapshotsList)
            item.setText("{} on {}".format(snapshot["name"], datetime.fromtimestamp(snapshot["created_at"]).strftime("%d/%m/%y at %H:%M:%S")))
-            item.setData(QtCore.Qt.UserRole, snapshot["snapshot_id"])
+            item.setData(QtCore.Qt.ItemDataRole.UserRole, snapshot["snapshot_id"])

        if self.uiSnapshotsList.count():
            self.uiSnapshotsList.setCurrentRow(0)
@@ -83,7 +83,7 @@ class SnapshotsDialog(QtWidgets.QDialog, Ui_SnapshotsDialog):
        Slot to create a snapshot.
        """

-        snapshot_name, ok = QtWidgets.QInputDialog.getText(self, "Snapshot", "Snapshot name:", QtWidgets.QLineEdit.Normal, "Unnamed")
+        snapshot_name, ok = QtWidgets.QInputDialog.getText(self, "Snapshot", "Snapshot name:", QtWidgets.QLineEdit.EchoMode.Normal, "Unnamed")
        if ok and snapshot_name and self._project:
            Controller.instance().post(
                "/projects/{}/snapshots".format(self._project.id()),
@@ -110,7 +110,7 @@ class SnapshotsDialog(QtWidgets.QDialog, Ui_SnapshotsDialog):

        item = self.uiSnapshotsList.currentItem()
        if item:
-            snapshot_id = item.data(QtCore.Qt.UserRole)
+            snapshot_id = item.data(QtCore.Qt.ItemDataRole.UserRole)
            Controller.instance().delete("/projects/{}/snapshots/{}".format(self._project.id(), snapshot_id), self._deleteSnapshotsCallback)

    def _deleteSnapshotsCallback(self, result, error=False, server=None, context={}, **kwargs):
@@ -128,7 +128,7 @@ class SnapshotsDialog(QtWidgets.QDialog, Ui_SnapshotsDialog):

        item = self.uiSnapshotsList.currentItem()
        if item:
-            snapshot_id = item.data(QtCore.Qt.UserRole)
+            snapshot_id = item.data(QtCore.Qt.ItemDataRole.UserRole)
            self._restoreSnapshot(snapshot_id)

    def _restoreSnapshot(self, snapshot_id):
@@ -138,8 +138,8 @@ class SnapshotsDialog(QtWidgets.QDialog, Ui_SnapshotsDialog):
        :param snapshot_id: id of the snapshot
        """

-        reply = QtWidgets.QMessageBox.question(self, "Snapshots", "This will discard any changes made to your project since the snapshot was taken, would you like to proceed?", QtWidgets.QMessageBox.Ok, QtWidgets.QMessageBox.Cancel)
-        if reply == QtWidgets.QMessageBox.Cancel:
+        reply = QtWidgets.QMessageBox.question(self, "Snapshots", "This will discard any changes made to your project since the snapshot was taken, would you like to proceed?", QtWidgets.QMessageBox.StandardButton.Ok, QtWidgets.QMessageBox.StandardButton.Cancel)
+        if reply == QtWidgets.QMessageBox.StandardButton.Cancel:
            return

        Controller.instance().post(
@@ -163,5 +163,5 @@ class SnapshotsDialog(QtWidgets.QDialog, Ui_SnapshotsDialog):
        Slot to restore a snapshot when it is double clicked.
        """

-        snapshot_id = item.data(QtCore.Qt.UserRole)
+        snapshot_id = item.data(QtCore.Qt.ItemDataRole.UserRole)
        self._restoreSnapshot(snapshot_id)
--- a/gns3/dialogs/style_editor_dialog.py
+++ b/gns3/dialogs/style_editor_dialog.py
@@ -23,6 +23,7 @@ from ..qt import QtCore, QtWidgets, QtGui
 from ..ui.style_editor_dialog_ui import Ui_StyleEditorDialog
 from ..items.shape_item import ShapeItem
 from ..items.line_item import LineItem
+from ..items.rectangle_item import RectangleItem


 class StyleEditorDialog(QtWidgets.QDialog, Ui_StyleEditorDialog):
@@ -42,15 +43,15 @@ class StyleEditorDialog(QtWidgets.QDialog, Ui_StyleEditorDialog):
        self._items = items
        self.uiColorPushButton.clicked.connect(self._setColorSlot)
        self.uiBorderColorPushButton.clicked.connect(self._setBorderColorSlot)
-        self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Apply).clicked.connect(self._applyPreferencesSlot)
+        self.uiButtonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Apply).clicked.connect(self._applyPreferencesSlot)

-        self.uiBorderStyleComboBox.addItem("Solid", QtCore.Qt.SolidLine)
-        self.uiBorderStyleComboBox.addItem("Dash", QtCore.Qt.DashLine)
-        self.uiBorderStyleComboBox.addItem("Dot", QtCore.Qt.DotLine)
-        self.uiBorderStyleComboBox.addItem("Dash Dot", QtCore.Qt.DashDotLine)
-        self.uiBorderStyleComboBox.addItem("Dash Dot Dot", QtCore.Qt.DashDotDotLine)
+        self.uiBorderStyleComboBox.addItem("Solid", QtCore.Qt.PenStyle.SolidLine)
+        self.uiBorderStyleComboBox.addItem("Dash", QtCore.Qt.PenStyle.DashLine)
+        self.uiBorderStyleComboBox.addItem("Dot", QtCore.Qt.PenStyle.DotLine)
+        self.uiBorderStyleComboBox.addItem("Dash Dot", QtCore.Qt.PenStyle.DashDotLine)
+        self.uiBorderStyleComboBox.addItem("Dash Dot Dot", QtCore.Qt.PenStyle.DashDotDotLine)
        if True not in list(map(lambda item: isinstance(item, LineItem), items)):
-            self.uiBorderStyleComboBox.addItem("No border", QtCore.Qt.NoPen)
+            self.uiBorderStyleComboBox.addItem("No border", QtCore.Qt.PenStyle.NoPen)

        # use the first item in the list as the model
        first_item = items[0]
@@ -72,8 +73,27 @@ class StyleEditorDialog(QtWidgets.QDialog, Ui_StyleEditorDialog):
                                                                                                    self._border_color.green(),
                                                                                                    self._border_color.blue(),
                                                                                                    self._border_color.alpha()))
+        if isinstance(first_item, RectangleItem):
+            # use the horizontal corner radius first and then the vertical one if it's not set
+            # maybe we allow configuring them separately in the future
+            corner_radius = first_item.horizontalCornerRadius()
+            if not corner_radius:
+                corner_radius = first_item.verticalCornerRadius()
+            self.uiCornerRadiusSpinBox.setValue(corner_radius)
+        else:
+            self.uiCornerRadiusLabel.hide()
+            self.uiCornerRadiusSpinBox.hide()
        self.uiRotationSpinBox.setValue(int(first_item.rotation()))
        self.uiBorderWidthSpinBox.setValue(pen.width())
+        if isinstance(first_item, ShapeItem):
+            rect = first_item.rect()
+            self.uiWidthSpinBox.setValue(int(rect.width()))
+            self.uiHeightSpinBox.setValue(int(rect.height()))
+        else:
+            self.uiWidthSpinBox.hide()
+            self.uiWidthLabel.hide()
+            self.uiHeightSpinBox.hide()
+            self.uiHeightLabel.hide()
        index = self.uiBorderStyleComboBox.findData(pen.style())
        if index != -1:
            self.uiBorderStyleComboBox.setCurrentIndex(index)
@@ -83,7 +103,7 @@ class StyleEditorDialog(QtWidgets.QDialog, Ui_StyleEditorDialog):
        Slot to select the filling color.
        """

-        color = QtWidgets.QColorDialog.getColor(self._color, self, "Select Color", QtWidgets.QColorDialog.ShowAlphaChannel)
+        color = QtWidgets.QColorDialog.getColor(self._color, self, "Select Color", QtWidgets.QColorDialog.ColorDialogOption.ShowAlphaChannel)
        if color.isValid():
            self._color = color
            self.uiColorPushButton.setStyleSheet("background-color: rgba({}, {}, {}, {});".format(self._color.red(),
@@ -96,7 +116,7 @@ class StyleEditorDialog(QtWidgets.QDialog, Ui_StyleEditorDialog):
        Slot to select the border color.
        """

-        color = QtWidgets.QColorDialog.getColor(self._border_color, self, "Select Color", QtWidgets.QColorDialog.ShowAlphaChannel)
+        color = QtWidgets.QColorDialog.getColor(self._border_color, self, "Select Color", QtWidgets.QColorDialog.ColorDialogOption.ShowAlphaChannel)
        if color.isValid():
            self._border_color = color
            self.uiBorderColorPushButton.setStyleSheet("background-color: rgba({}, {}, {}, {});".format(self._border_color.red(),
@@ -110,7 +130,7 @@ class StyleEditorDialog(QtWidgets.QDialog, Ui_StyleEditorDialog):
        """

        border_style = QtCore.Qt.PenStyle(self.uiBorderStyleComboBox.itemData(self.uiBorderStyleComboBox.currentIndex()))
-        pen = QtGui.QPen(self._border_color, self.uiBorderWidthSpinBox.value(), border_style, QtCore.Qt.RoundCap, QtCore.Qt.RoundJoin)
+        pen = QtGui.QPen(self._border_color, self.uiBorderWidthSpinBox.value(), border_style, QtCore.Qt.PenCapStyle.RoundCap, QtCore.Qt.PenJoinStyle.RoundJoin)
        if self._color:
            brush = QtGui.QBrush(self._color)
        else:
@@ -118,10 +138,18 @@ class StyleEditorDialog(QtWidgets.QDialog, Ui_StyleEditorDialog):

        for item in self._items:
            item.setPen(pen)
-            # on multiselection it's possible to select many type of items
+            # on multi-selection it's possible to select many type of items
            # but brush can be applied only on ShapeItem,
            if brush and isinstance(item, ShapeItem):
                item.setBrush(brush)
+            if isinstance(item, RectangleItem):
+                corner_radius = self.uiCornerRadiusSpinBox.value()
+                # use the corner radius for both horizontal (rx) and vertical (ry)
+                # maybe we support setting them separately in the future
+                item.setHorizontalCornerRadius(corner_radius)
+                item.setVerticalCornerRadius(corner_radius)
+            if isinstance(item, ShapeItem):
+                item.setWidthAndHeight(self.uiWidthSpinBox.value(), self.uiHeightSpinBox.value())
            item.setRotation(self.uiRotationSpinBox.value())

    def done(self, result):
--- a/gns3/dialogs/style_editor_dialog_link.py
+++ b/gns3/dialogs/style_editor_dialog_link.py
@@ -42,23 +42,27 @@ class StyleEditorDialogLink(QtWidgets.QDialog, Ui_StyleEditorDialog):
        self._link_style = {}

        self.uiBorderColorPushButton.clicked.connect(self._setBorderColorSlot)
-        self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Apply).clicked.connect(self._applyPreferencesSlot)
+        self.uiButtonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Apply).clicked.connect(self._applyPreferencesSlot)

-        self.uiBorderStyleComboBox.addItem("Solid", QtCore.Qt.SolidLine)
-        self.uiBorderStyleComboBox.addItem("Dash", QtCore.Qt.DashLine)
-        self.uiBorderStyleComboBox.addItem("Dot", QtCore.Qt.DotLine)
-        self.uiBorderStyleComboBox.addItem("Dash Dot", QtCore.Qt.DashDotLine)
-        self.uiBorderStyleComboBox.addItem("Dash Dot Dot", QtCore.Qt.DashDotDotLine)
-        self.uiBorderStyleComboBox.addItem("Invisible", QtCore.Qt.NoPen)
+        self.uiBorderStyleComboBox.addItem("Solid", QtCore.Qt.PenStyle.SolidLine)
+        self.uiBorderStyleComboBox.addItem("Dash", QtCore.Qt.PenStyle.DashLine)
+        self.uiBorderStyleComboBox.addItem("Dot", QtCore.Qt.PenStyle.DotLine)
+        self.uiBorderStyleComboBox.addItem("Dash Dot", QtCore.Qt.PenStyle.DashDotLine)
+        self.uiBorderStyleComboBox.addItem("Dash Dot Dot", QtCore.Qt.PenStyle.DashDotDotLine)
+        self.uiBorderStyleComboBox.addItem("Invisible", QtCore.Qt.PenStyle.NoPen)

        self.uiColorLabel.hide()
        self.uiColorPushButton.hide()
        self._color = None
-        
+
+        self.uiCornerRadiusLabel.hide()
+        self.uiCornerRadiusSpinBox.hide()
        self.uiRotationLabel.hide()
        self.uiRotationSpinBox.hide()

+        link.setHovered(False)  # make sure we use the right style
        pen = link.pen()
+        link.setHovered(True)

        self._border_color = pen.color()
        self.uiBorderColorPushButton.setStyleSheet("background-color: rgba({}, {}, {}, {});".format(self._border_color.red(),
@@ -77,7 +81,7 @@ class StyleEditorDialogLink(QtWidgets.QDialog, Ui_StyleEditorDialog):
        Slot to select the border color.
        """

-        color = QtWidgets.QColorDialog.getColor(self._border_color, self, "Select Color", QtWidgets.QColorDialog.ShowAlphaChannel)
+        color = QtWidgets.QColorDialog.getColor(self._border_color, self, "Select Color", QtWidgets.QColorDialog.ColorDialogOption.ShowAlphaChannel)
        if color.isValid():
            self._border_color = color
            self.uiBorderColorPushButton.setStyleSheet("background-color: rgba({}, {}, {}, {});".format(self._border_color.red(),
@@ -91,7 +95,7 @@ class StyleEditorDialogLink(QtWidgets.QDialog, Ui_StyleEditorDialog):
        """

        border_style = QtCore.Qt.PenStyle(self.uiBorderStyleComboBox.itemData(self.uiBorderStyleComboBox.currentIndex()))
-        pen = QtGui.QPen(self._border_color, self.uiBorderWidthSpinBox.value(), border_style, QtCore.Qt.RoundCap, QtCore.Qt.RoundJoin)
+        pen = QtGui.QPen(self._border_color, self.uiBorderWidthSpinBox.value(), border_style, QtCore.Qt.PenCapStyle.RoundCap, QtCore.Qt.PenJoinStyle.RoundJoin)

        self._link.setPen(pen)

@@ -102,6 +106,7 @@ class StyleEditorDialogLink(QtWidgets.QDialog, Ui_StyleEditorDialog):
        
        # Store values
        self._link.setLinkStyle(new_link_style)
+        self._link.setHovered(False)  # allow to see the new style

    def done(self, result):
        """
--- a/gns3/dialogs/symbol_selection_dialog.py
+++ b/gns3/dialogs/symbol_selection_dialog.py
@@ -50,16 +50,16 @@ class SymbolSelectionDialog(QtWidgets.QDialog, Ui_SymbolSelectionDialog):
        self.setupUi(self)

        self._items = items
-        self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Apply).clicked.connect(self._applyPreferencesSlot)
+        self.uiButtonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Apply).clicked.connect(self._applyPreferencesSlot)
        self.uiSymbolToolButton.clicked.connect(self._symbolBrowserSlot)
        self.uiCustomSymbolRadioButton.toggled.connect(self._customSymbolToggledSlot)
        self.uiBuiltInSymbolRadioButton.toggled.connect(self._builtInSymbolToggledSlot)
        self.uiSearchLineEdit.textChanged.connect(self._searchTextChangedSlot)
        if not SymbolSelectionDialog._symbols_dir:
-            SymbolSelectionDialog._symbols_dir = QtCore.QStandardPaths.writableLocation(QtCore.QStandardPaths.PicturesLocation)
+            SymbolSelectionDialog._symbols_dir = QtCore.QStandardPaths.writableLocation(QtCore.QStandardPaths.StandardLocation.PicturesLocation)

        if not self._items:
-            self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Apply).hide()
+            self.uiButtonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Apply).hide()

        self.uiBuiltInSymbolRadioButton.setChecked(True)
        self.uiSymbolTreeWidget.setFocus()
@@ -85,14 +85,14 @@ class SymbolSelectionDialog(QtWidgets.QDialog, Ui_SymbolSelectionDialog):
                font = parent.font(0)
                font.setBold(True)
                parent.setFont(0, font)
-                parent.setFlags(parent.flags() & ~QtCore.Qt.ItemIsSelectable)
+                parent.setFlags(parent.flags() & ~QtCore.Qt.ItemFlag.ItemIsSelectable)
                self._parents[theme] = parent
            else:
                parent = self._parents[theme]

            name = os.path.splitext(symbol.filename())[0]
            item = QtWidgets.QTreeWidgetItem(parent)
-            item.setData(0, QtCore.Qt.UserRole, symbol)
+            item.setData(0, QtCore.Qt.ItemDataRole.UserRole, symbol)
            item.setToolTip(0, symbol.id())
            self._symbol_items.append(item)
            item.setText(0, name)
@@ -101,7 +101,7 @@ class SymbolSelectionDialog(QtWidgets.QDialog, Ui_SymbolSelectionDialog):
                if sip_is_deleted(item):
                    return
                svg_renderer = QImageSvgRenderer(path)
-                image = QtGui.QImage(64, 64, QtGui.QImage.Format_ARGB32)
+                image = QtGui.QImage(64, 64, QtGui.QImage.Format.Format_ARGB32)
                # Set the ARGB to 0 to prevent rendering artifacts
                image.fill(0x00000000)
                svg_renderer.render(QtGui.QPainter(image))
@@ -111,7 +111,7 @@ class SymbolSelectionDialog(QtWidgets.QDialog, Ui_SymbolSelectionDialog):
            Controller.instance().getStatic(symbol.url(), qpartial(render, item))

        for parent in self._parents.values():
-            parent.sortChildren(0, QtCore.Qt.AscendingOrder)
+            parent.sortChildren(0, QtCore.Qt.SortOrder.AscendingOrder)
        self.adjustSize()

    def _searchTextChangedSlot(self, text):
@@ -123,7 +123,7 @@ class SymbolSelectionDialog(QtWidgets.QDialog, Ui_SymbolSelectionDialog):
        """
        text = self.uiSearchLineEdit.text()
        for item in self._symbol_items:
-            # if not item.data(0, QtCore.Qt.UserRole).builtin():
+            # if not item.data(0, QtCore.Qt.ItemDataRole.UserRole).builtin():
            #     item.setHidden(True)
            # else:
            if not text.strip() or text.strip().lower() in item.text(0).lower():
@@ -176,7 +176,7 @@ class SymbolSelectionDialog(QtWidgets.QDialog, Ui_SymbolSelectionDialog):
        if self.uiSymbolTreeWidget.isEnabled():
            current = self.uiSymbolTreeWidget.currentItem()
            if current and current.parent():
-                return current.data(0, QtCore.Qt.UserRole).id()
+                return current.data(0, QtCore.Qt.ItemDataRole.UserRole).id()
        else:
            return os.path.basename(self.uiSymbolLineEdit.text())
        return None
@@ -184,7 +184,7 @@ class SymbolSelectionDialog(QtWidgets.QDialog, Ui_SymbolSelectionDialog):
    def _symbolBrowserSlot(self):

        # supported image file formats
-        file_formats = "Image files (*.svg *.bmp *.jpeg *.jpg *.pbm *.pgm *.png *.ppm *.xbm *.xpm *.gif);;All files (*.*)"
+        file_formats = "Image files (*.svg *.bmp *.jpeg *.jpg *.pbm *.pgm *.png *.ppm *.xbm *.xpm *.gif);;All files (*)"
        path, _ = QtWidgets.QFileDialog.getOpenFileName(self, "Image", SymbolSelectionDialog._symbols_dir, file_formats)
        if not path:
            return
--- a/gns3/dialogs/text_editor_dialog.py
+++ b/gns3/dialogs/text_editor_dialog.py
@@ -39,7 +39,7 @@ class TextEditorDialog(QtWidgets.QDialog, Ui_TextEditorDialog):
        self._items = items
        self.uiFontPushButton.clicked.connect(self._setFontSlot)
        self.uiColorPushButton.clicked.connect(self._setColorSlot)
-        self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Apply).clicked.connect(self._applyPreferencesSlot)
+        self.uiButtonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Apply).clicked.connect(self._applyPreferencesSlot)

        # use the first item in the list as the model
        first_item = items[0]
@@ -49,7 +49,7 @@ class TextEditorDialog(QtWidgets.QDialog, Ui_TextEditorDialog):
        self.uiPlainTextEdit.setFont(first_item.font())

        if not first_item.editable():
-            self.uiPlainTextEdit.setTextInteractionFlags(QtCore.Qt.NoTextInteraction)
+            self.uiPlainTextEdit.setTextInteractionFlags(QtCore.Qt.TextInteractionFlag.NoTextInteraction)

        if len(self._items) == 1:
            self.uiApplyColorToAllItemsCheckBox.setChecked(True)
@@ -77,7 +77,7 @@ class TextEditorDialog(QtWidgets.QDialog, Ui_TextEditorDialog):
        """

        selected_font, ok = QtWidgets.QFontDialog.getFont(self.uiPlainTextEdit.font(), self,
-                                                          options=QtWidgets.QFontDialog.DontUseNativeDialog)
+                                                          options=QtWidgets.QFontDialog.FontDialogOption.DontUseNativeDialog)
        if ok:
            self.uiPlainTextEdit.setFont(selected_font)

@@ -87,7 +87,7 @@ class TextEditorDialog(QtWidgets.QDialog, Ui_TextEditorDialog):
        Slot to select the color.
        """

-        color = QtWidgets.QColorDialog.getColor(self._color, self, None, QtWidgets.QColorDialog.ShowAlphaChannel)
+        color = QtWidgets.QColorDialog.getColor(self._color, self, None, QtWidgets.QColorDialog.ColorDialogOption.ShowAlphaChannel)
        if color.isValid():
            self._setColor(color)

--- a/gns3/dialogs/vm_with_images_wizard.py
+++ b/gns3/dialogs/vm_with_images_wizard.py
@@ -88,9 +88,10 @@ class VMWithImagesWizard(VMWizard):
        self._radio_existing_images_buttons.add(radio_button)

    def _imageCreateSlot(self, line_edit, create_image_wizard, image_suffix):
-        create_dialog = create_image_wizard(self, self.getSettings()["compute_id"], self.uiNameLineEdit.text() + image_suffix)
-        if QtWidgets.QDialog.Accepted == create_dialog.exec_():
-            line_edit.setText(create_dialog.uiLocationLineEdit.text())
+
+        create_dialog = create_image_wizard(self, Controller.instance(), self.uiNameLineEdit.text() + image_suffix)
+        if create_dialog.exec() == QtWidgets.QDialog.DialogCode.Accepted:
+            line_edit.setText(create_dialog.uiDiskFilenameLineEdit.text())

    def _imageBrowserSlot(self, line_edit, image_selector):
        """
--- a/gns3/dialogs/vm_wizard.py
+++ b/gns3/dialogs/vm_wizard.py
@@ -37,12 +37,13 @@ class VMWizard(QtWidgets.QWizard):
        self.setModal(True)

        self._devices = devices
+        self._allow_dynamic_compute_allocation = True
        self._local_server_disable = False

-        self.setWizardStyle(QtWidgets.QWizard.ModernStyle)
+        self.setWizardStyle(QtWidgets.QWizard.WizardStyle.ModernStyle)
        if sys.platform.startswith("darwin"):
            # we want to see the cancel button on OSX
-            self.setOptions(QtWidgets.QWizard.NoDefaultButton)
+            self.setOptions(QtWidgets.QWizard.WizardOption.NoDefaultButton)

        self.uiRemoteRadioButton.toggled.connect(self._remoteServerToggledSlot)
        if hasattr(self, "uiVMRadioButton"):
@@ -102,6 +103,8 @@ class VMWizard(QtWidgets.QWizard):
            if hasattr(self, "uiVMRadioButton"):
                self.uiVMRadioButton.setEnabled(False)
            self.uiLocalRadioButton.setEnabled(False)
+            if self._allow_dynamic_compute_allocation:
+                self.uiRemoteServersComboBox.addItem("Any server", None)
            for compute in ComputeManager.instance().computes():
                if compute.id() == "local":
                    self.uiLocalRadioButton.setEnabled(True)
--- a/gns3/graphics_view.py
+++ b/gns3/graphics_view.py
@@ -74,6 +74,10 @@ class GraphicsView(QtWidgets.QGraphicsView):
    :param parent: parent widget
    """

+    # Class-level constants for default colors
+    DEFAULT_DRAWING_GRID_COLOR = QtGui.QColor(208, 208, 208)  # #D0D0D0
+    DEFAULT_NODE_GRID_COLOR = QtGui.QColor(190, 190, 190)     # #BEBEBE
+
    def __init__(self, parent):

        # Our parent is the central widget which parent is the main window.
@@ -92,6 +96,8 @@ class GraphicsView(QtWidgets.QGraphicsView):
        self._dragging = False
        self._grid_size = 75
        self._drawing_grid_size = 25
+        self._drawing_grid_color = self.DEFAULT_DRAWING_GRID_COLOR
+        self._node_grid_color = self.DEFAULT_NODE_GRID_COLOR
        self._last_mouse_position = None
        self._topology = Topology.instance()

@@ -103,14 +109,14 @@ class GraphicsView(QtWidgets.QGraphicsView):
        self.setSceneSize(width, height)

        # set the custom flags for this view
-        self.setDragMode(QtWidgets.QGraphicsView.RubberBandDrag)
-        self.setRenderHint(QtGui.QPainter.Antialiasing)
-        self.setTransformationAnchor(QtWidgets.QGraphicsView.AnchorUnderMouse)
-        self.setResizeAnchor(QtWidgets.QGraphicsView.AnchorViewCenter)
+        self.setDragMode(QtWidgets.QGraphicsView.DragMode.RubberBandDrag)
+        self.setRenderHint(QtGui.QPainter.RenderHint.Antialiasing)
+        self.setTransformationAnchor(QtWidgets.QGraphicsView.ViewportAnchor.AnchorUnderMouse)
+        self.setResizeAnchor(QtWidgets.QGraphicsView.ViewportAnchor.AnchorViewCenter)

        # default directories for QFileDialog
-        self._import_config_directory = QtCore.QStandardPaths.writableLocation(QtCore.QStandardPaths.DocumentsLocation)
-        self._export_config_directory = QtCore.QStandardPaths.writableLocation(QtCore.QStandardPaths.DocumentsLocation)
+        self._import_config_directory = QtCore.QStandardPaths.writableLocation(QtCore.QStandardPaths.StandardLocation.DocumentsLocation)
+        self._export_config_directory = QtCore.QStandardPaths.writableLocation(QtCore.QStandardPaths.StandardLocation.DocumentsLocation)
        self._local_addresses = ['0.0.0.0', '127.0.0.1', 'localhost', '::1', '0:0:0:0:0:0:0:1', '::', QtNetwork.QHostInfo.localHostName()]

    def setSceneSize(self, width, height):
@@ -119,8 +125,6 @@ class GraphicsView(QtWidgets.QGraphicsView):
    def setZoom(self, zoom):
        """
        Sets zoom of the Graphics View
-        :param zoom:
-        :return:
        """
        if zoom:
            factor = zoom / 100.
@@ -191,6 +195,9 @@ class GraphicsView(QtWidgets.QGraphicsView):
        # clear all objects on the scene
        self.scene().clear()

+        # reset zoom / scale
+        self.resetTransform()
+

    def _loadSettings(self):
        """
@@ -228,12 +235,12 @@ class GraphicsView(QtWidgets.QGraphicsView):
        """

        if enabled:
-            self.setCursor(QtCore.Qt.CrossCursor)
+            self.setCursor(QtCore.Qt.CursorShape.CrossCursor)
        else:
            if self._newlink and self._newlink in self.scene().items():
                self.scene().removeItem(self._newlink)
            self._newlink = None
-            self.setCursor(QtCore.Qt.ArrowCursor)
+            self.setCursor(QtCore.Qt.CursorShape.ArrowCursor)
        self._adding_link = enabled

    def addNote(self, state):
@@ -245,10 +252,10 @@ class GraphicsView(QtWidgets.QGraphicsView):

        if state:
            self._adding_note = True
-            self.setCursor(QtCore.Qt.IBeamCursor)
+            self.setCursor(QtCore.Qt.CursorShape.IBeamCursor)
        else:
            self._adding_note = False
-            self.setCursor(QtCore.Qt.ArrowCursor)
+            self.setCursor(QtCore.Qt.CursorShape.ArrowCursor)

    def addRectangle(self, state):
        """
@@ -259,10 +266,10 @@ class GraphicsView(QtWidgets.QGraphicsView):

        if state:
            self._adding_rectangle = True
-            self.setCursor(QtCore.Qt.PointingHandCursor)
+            self.setCursor(QtCore.Qt.CursorShape.PointingHandCursor)
        else:
            self._adding_rectangle = False
-            self.setCursor(QtCore.Qt.ArrowCursor)
+            self.setCursor(QtCore.Qt.CursorShape.ArrowCursor)

    def addEllipse(self, state):
        """
@@ -273,10 +280,10 @@ class GraphicsView(QtWidgets.QGraphicsView):

        if state:
            self._adding_ellipse = True
-            self.setCursor(QtCore.Qt.PointingHandCursor)
+            self.setCursor(QtCore.Qt.CursorShape.PointingHandCursor)
        else:
            self._adding_ellipse = False
-            self.setCursor(QtCore.Qt.ArrowCursor)
+            self.setCursor(QtCore.Qt.CursorShape.ArrowCursor)

    def addLine(self, state):
        """
@@ -287,10 +294,10 @@ class GraphicsView(QtWidgets.QGraphicsView):

        if state:
            self._adding_line = True
-            self.setCursor(QtCore.Qt.PointingHandCursor)
+            self.setCursor(QtCore.Qt.CursorShape.PointingHandCursor)
        else:
            self._adding_line = False
-            self.setCursor(QtCore.Qt.ArrowCursor)
+            self.setCursor(QtCore.Qt.CursorShape.ArrowCursor)

    def addImage(self, image_path):
        """
@@ -392,7 +399,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
        # link addition code
        if not self._newlink:
            source_item = item
-            source_port = source_item.connectToPort(event.globalPos())
+            source_port = source_item.connectToPort(event.globalPosition().toPoint())
            if not source_port:
                return

@@ -401,15 +408,15 @@ class GraphicsView(QtWidgets.QGraphicsView):
                return

            if source_port.linkType() == "Serial":
-                self._newlink = SerialLinkItem(source_item, source_port, self.mapToScene(event.pos()), None, adding_flag=True)
+                self._newlink = SerialLinkItem(source_item, source_port, self.mapToScene(event.position().toPoint()), None, adding_flag=True)
            else:
-                self._newlink = EthernetLinkItem(source_item, source_port, self.mapToScene(event.pos()), None, adding_flag=True)
+                self._newlink = EthernetLinkItem(source_item, source_port, self.mapToScene(event.position().toPoint()), None, adding_flag=True)
            self.scene().addItem(self._newlink)
        else:
            source_item = self._newlink.sourceItem()
            source_port = self._newlink.sourcePort()
            destination_item = item
-            destination_port = destination_item.connectToPort(event.globalPos())
+            destination_port = destination_item.connectToPort(event.globalPosition().toPoint())
            if not destination_port:
                return

@@ -432,9 +439,11 @@ class GraphicsView(QtWidgets.QGraphicsView):
        is_not_link = True
        is_not_logo = True

-        item = self.itemAt(event.pos())
+        item = self.itemAt(event.position().toPoint())
        if item and sip.isdeleted(item):
            return
+        elif not item:
+            self._main_window.uiStatusBar.clearMessage()  # reset the status bar message when clicking on the scene

        if item and (isinstance(item, LinkItem) or isinstance(item.parentItem(), LinkItem)):
            is_not_link = False
@@ -445,57 +454,57 @@ class GraphicsView(QtWidgets.QGraphicsView):
                if isinstance(it, LinkItem):
                    it.setHovered(False)

-        if (event.buttons() == QtCore.Qt.LeftButton and event.modifiers() == QtCore.Qt.ShiftModifier) or event.buttons() == QtCore.Qt.MidButton:
+        if (event.buttons() == QtCore.Qt.MouseButton.LeftButton and event.modifiers() == QtCore.Qt.KeyboardModifier.ShiftModifier) or event.buttons() == QtCore.Qt.MouseButton.MiddleButton:
            # checks to see if either the middle mouse is pressed
            # or a combination of left mouse button and SHIT key are pressed to start dragging the view
-            self._last_mouse_position = self.mapFromGlobal(event.globalPos())
+            self._last_mouse_position = self.mapFromGlobal(event.globalPosition())
            self._dragging = True
-            self.setCursor(QtCore.Qt.ClosedHandCursor)
+            self.setCursor(QtCore.Qt.CursorShape.ClosedHandCursor)
            return

-        if is_not_link and item and event.modifiers() == QtCore.Qt.ControlModifier and event.button() == QtCore.Qt.LeftButton and item and not self._adding_link:
+        if is_not_link and item and event.modifiers() == QtCore.Qt.KeyboardModifier.ControlModifier and event.button() == QtCore.Qt.MouseButton.LeftButton and item and not self._adding_link:
            # manual selection using CTRL
            if item.isSelected():
                item.setSelected(False)
            else:
                item.setSelected(True)
-        elif is_not_link and is_not_logo and event.button() == QtCore.Qt.RightButton and not self._adding_link:
+        elif is_not_link and is_not_logo and event.button() == QtCore.Qt.MouseButton.RightButton and not self._adding_link:
            pass #TODO: remove this without creating a bug...
-        elif is_not_link and self._adding_link and event.button() == QtCore.Qt.RightButton:
+        elif is_not_link and self._adding_link and event.button() == QtCore.Qt.MouseButton.RightButton:
            # send a escape key to the main window to cancel the link addition
-            key = QtGui.QKeyEvent(QtCore.QEvent.KeyPress, QtCore.Qt.Key_Escape, QtCore.Qt.NoModifier)
+            key = QtGui.QKeyEvent(QtCore.QEvent.Type.KeyPress, QtCore.Qt.Key.Key_Escape, QtCore.Qt.KeyboardModifier.NoModifier)
            QtWidgets.QApplication.sendEvent(self._main_window, key)
-        elif item and isinstance(item, NodeItem) and self._adding_link and event.button() == QtCore.Qt.LeftButton:
+        elif item and isinstance(item, NodeItem) and self._adding_link and event.button() == QtCore.Qt.MouseButton.LeftButton:
            self._userNodeLinking(event, item)
-            #context_event = QtGui.QContextMenuEvent(QtGui.QContextMenuEvent.Mouse, event.pos())
+            #context_event = QtGui.QContextMenuEvent(QtGui.QContextMenuEvent.Reason.Mouse, event.pos())
            #QtWidgets.QApplication.sendEvent(self, context_event)
-        elif event.button() == QtCore.Qt.LeftButton and self._adding_note:
-            pos = self.mapToScene(event.pos())
+        elif event.button() == QtCore.Qt.MouseButton.LeftButton and self._adding_note:
+            pos = self.mapToScene(event.position().toPoint())
            note = self.createDrawingItem("text", int(pos.x()), int(pos.y()), 2)
            pos_x = note.pos().x()
            pos_y = note.pos().y() - (note.boundingRect().height() / 2)
            note.setPos(pos_x, pos_y)
            note.editText()
            self._main_window.uiAddNoteAction.setChecked(False)
-            self.setCursor(QtCore.Qt.ArrowCursor)
+            self.setCursor(QtCore.Qt.CursorShape.ArrowCursor)
            self._adding_note = False
-        elif event.button() == QtCore.Qt.LeftButton and self._adding_rectangle:
-            pos = self.mapToScene(event.pos())
+        elif event.button() == QtCore.Qt.MouseButton.LeftButton and self._adding_rectangle:
+            pos = self.mapToScene(event.position().toPoint())
            self.createDrawingItem("rect", int(pos.x()), int(pos.y()), 1)
            self._main_window.uiDrawRectangleAction.setChecked(False)
-            self.setCursor(QtCore.Qt.ArrowCursor)
+            self.setCursor(QtCore.Qt.CursorShape.ArrowCursor)
            self._adding_rectangle = False
-        elif event.button() == QtCore.Qt.LeftButton and self._adding_ellipse:
-            pos = self.mapToScene(event.pos())
+        elif event.button() == QtCore.Qt.MouseButton.LeftButton and self._adding_ellipse:
+            pos = self.mapToScene(event.position().toPoint())
            self.createDrawingItem("ellipse", int(pos.x()), int(pos.y()), 1)
            self._main_window.uiDrawEllipseAction.setChecked(False)
-            self.setCursor(QtCore.Qt.ArrowCursor)
+            self.setCursor(QtCore.Qt.CursorShape.ArrowCursor)
            self._adding_ellipse = False
-        elif event.button() == QtCore.Qt.LeftButton and self._adding_line:
-            pos = self.mapToScene(event.pos())
+        elif event.button() == QtCore.Qt.MouseButton.LeftButton and self._adding_line:
+            pos = self.mapToScene(event.position().toPoint())
            self.createDrawingItem("line", int(pos.x()), int(pos.y()), 1)
            self._main_window.uiDrawLineAction.setChecked(False)
-            self.setCursor(QtCore.Qt.ArrowCursor)
+            self.setCursor(QtCore.Qt.CursorShape.ArrowCursor)
            self._adding_line = False
        else:
            super().mousePressEvent(event)
@@ -529,7 +538,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
            if item and not sip.isdeleted(item):
                # Prevent right clicking on a selected item from de-selecting all other items
                if not item.isSelected():
-                    if not event.modifiers() & QtCore.Qt.ControlModifier:
+                    if not (event.modifiers() & QtCore.Qt.KeyboardModifier.ControlModifier):
                        for it in self.scene().items():
                            it.setSelected(False)
                    item.setSelected(True)
@@ -555,12 +564,12 @@ class GraphicsView(QtWidgets.QGraphicsView):

        # If the left  mouse button is not still pressed TOGETHER with the SHIFT key and neither is the middle button
        # this means the user is no longer trying to drag the view
-        if self._dragging and not (event.buttons() == QtCore.Qt.LeftButton and event.modifiers() == QtCore.Qt.ShiftModifier) and not event.buttons() & QtCore.Qt.MidButton:
+        if self._dragging and not (event.buttons() == QtCore.Qt.MouseButton.LeftButton and event.modifiers() == QtCore.Qt.KeyboardModifier.ShiftModifier) and not (event.buttons() & QtCore.Qt.MouseButton.MiddleButton):
            self._dragging = False
-            self.setCursor(QtCore.Qt.ArrowCursor)
+            self.setCursor(QtCore.Qt.CursorShape.ArrowCursor)
        else:
-            item = self.itemAt(event.pos())
-            if item is not None and not event.modifiers() & QtCore.Qt.ControlModifier:
+            item = self.itemAt(event.position().toPoint())
+            if item is not None and not (event.modifiers() & QtCore.Qt.KeyboardModifier.ControlModifier):
                item.setSelected(True)
            super().mouseReleaseEvent(event)

@@ -573,7 +582,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
        :param: QWheelEvent instance
        """

-        if event.modifiers() == QtCore.Qt.ControlModifier:
+        if event.modifiers() == QtCore.Qt.KeyboardModifier.ControlModifier:
            delta = event.angleDelta()
            if delta is not None and delta.x() == 0:
                # CTRL is pressed then use the mouse wheel to zoom in or out.
@@ -592,7 +601,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
        if factor < 0.10 or factor > 10:
            return
        self.scale(scale_factor, scale_factor)
-        self._main_window.uiStatusBar.showMessage("Zoom: {}%".format(round(self.transform().m11() * 100)), 2000)
+        self._main_window.uiStatusBar.showMessage("Zoom: {}%".format(round(self.transform().m11() * 100)), 5000)

    def keyPressEvent(self, event):
        """
@@ -601,7 +610,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
        :param event: QKeyEvent
        """

-        if event.key() == QtCore.Qt.Key_Delete:
+        if event.key() == QtCore.Qt.Key.Key_Delete:
            # check if we are editing an LabelItem instance, then send the delete key event to it
            for item in self.scene().selectedItems():
                if (isinstance(item, LabelItem) or isinstance(item, TextItem)) and item.hasFocus():
@@ -621,7 +630,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
            # This if statement event checks to see if the user is dragging the scene
            # if so it sets the value of the scene scroll bars based on the change between
            # the previous and current mouse position
-            mapped_global_pos = self.mapFromGlobal(event.globalPos())
+            mapped_global_pos = self.mapFromGlobal(event.globalPosition())
            hBar = self.horizontalScrollBar()
            vBar = self.verticalScrollBar()
            delta = mapped_global_pos - self._last_mouse_position
@@ -630,14 +639,14 @@ class GraphicsView(QtWidgets.QGraphicsView):
            self._last_mouse_position = mapped_global_pos
        if self._adding_link and self._newlink and self._newlink in self.scene().items():
            # update the mouse position when the user is adding a link.
-            self._newlink.setMousePoint(self.mapToScene(event.pos()))
+            self._newlink.setMousePoint(self.mapToScene(event.position().toPoint()))
            event.ignore()
        else:
-            item = self.itemAt(event.pos())
+            item = self.itemAt(event.position().toPoint())
            if item:
                # show item coords in the status bar
                coords = "X: {} Y: {} Z: {}".format(item.x(), item.y(), item.zValue())
-                self._main_window.uiStatusBar.showMessage(coords, 2000)
+                self._main_window.uiStatusBar.showMessage(coords)

            # force the children to redraw because of a problem with QGraphicsEffect
            for item in self.scene().selectedItems():
@@ -652,7 +661,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
        :param event: QMouseEvent instance
        """

-        item = self.itemAt(event.pos())
+        item = self.itemAt(event.position().toPoint())

        if not self._adding_link:
            if isinstance(item, NodeItem) and item.node().initialized():
@@ -661,7 +670,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
                    self.configureSlot()
                    return
                else:
-                    if sys.platform.startswith("win") and item.node().bringToFront():
+                    if item.node().bringToFront():
                        return
                    self.consoleFromItems(self.scene().selectedItems())
                    return
@@ -686,7 +695,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
            node_properties = NodePropertiesDialog(items, self._main_window)
            node_properties.setModal(True)
            node_properties.show()
-            node_properties.exec_()
+            node_properties.exec()

    def dragMoveEvent(self, event):
        """
@@ -710,24 +719,25 @@ class GraphicsView(QtWidgets.QGraphicsView):
        :param event: QDropEvent instance
        """

+        log.debug("Drop event received with mime data: {}".format(event.mimeData().formats()))
        # check if what has been dropped is handled by this view
        if event.mimeData().hasFormat("application/x-gns3-template"):
            template_id = event.mimeData().data("application/x-gns3-template").data().decode()
-            event.setDropAction(QtCore.Qt.CopyAction)
+            event.setDropAction(QtCore.Qt.DropAction.CopyAction)
            event.accept()
-            if event.keyboardModifiers() == QtCore.Qt.ShiftModifier:
+            if event.modifiers() == QtCore.Qt.KeyboardModifier.ShiftModifier:
                max_nodes_per_line = 10  # max number of nodes on a single line
                offset = 100  # spacing between elements
                integer, ok = QtWidgets.QInputDialog.getInt(self, "Nodes", "Number of nodes:", 2, 1, 100, 1)
                if ok:
                    for node_number in range(integer):
-                        x = event.pos().x() - (150 // 2) + (node_number % max_nodes_per_line) * offset
-                        y = event.pos().y() - (70 // 2) + (node_number // max_nodes_per_line) * offset
+                        x = event.position().x() - (150 // 2) + (node_number % max_nodes_per_line) * offset
+                        y = event.position().y() - (70 // 2) + (node_number // max_nodes_per_line) * offset
                        if self.createNodeFromTemplateId(template_id, QtCore.QPoint(x, y)) is False:
                            event.ignore()
                            break
            else:
-                if self.createNodeFromTemplateId(template_id, event.pos()) is False:
+                if self.createNodeFromTemplateId(template_id, event.position()) is False:
                    event.ignore()
        elif event.mimeData().hasFormat("text/uri-list") and event.mimeData().hasUrls():
            # This should not arrive but we received bug report with it...
@@ -752,7 +762,7 @@ class GraphicsView(QtWidgets.QGraphicsView):

        menu = QtWidgets.QMenu()
        self.populateDeviceContextualMenu(menu)
-        menu.exec_(pos)
+        menu.exec(pos)
        menu.clear()
        # Make sure to deselect all items.
        # This is to prevent a bug on Windows
@@ -773,157 +783,157 @@ class GraphicsView(QtWidgets.QGraphicsView):

        if True in list(map(lambda item: isinstance(item, NodeItem) and hasattr(item.node(), "configPage"), items)):
            # Action: Configure node
-            configure_action = QtWidgets.QAction("Configure", menu)
+            configure_action = QtGui.QAction("Configure", menu)
            configure_action.setIcon(get_icon("configuration.svg"))
            configure_action.triggered.connect(self.configureActionSlot)
            menu.addAction(configure_action)

        if True in list(map(lambda item: isinstance(item, NodeItem) and item.node().console() is not None, items)):
-            console_action = QtWidgets.QAction("Console", menu)
+            console_action = QtGui.QAction("Console", menu)
            console_action.setIcon(get_icon("console.svg"))
            console_action.triggered.connect(self.consoleActionSlot)
            menu.addAction(console_action)

        if True in list(map(lambda item: isinstance(item, NodeItem) and hasattr(item.node(), "auxConsole"), items)):
-            aux_console_action = QtWidgets.QAction("Auxiliary console", menu)
+            aux_console_action = QtGui.QAction("Auxiliary console", menu)
            aux_console_action.setIcon(get_icon("aux-console.svg"))
            aux_console_action.triggered.connect(self.auxConsoleActionSlot)
            menu.addAction(aux_console_action)

        if True in list(map(lambda item: isinstance(item, NodeItem) and not item.node().isAlwaysOn(), items)):
-            start_action = QtWidgets.QAction("Start", menu)
+            start_action = QtGui.QAction("Start", menu)
            start_action.setIcon(get_icon("start.svg"))
            start_action.triggered.connect(self.startActionSlot)
            menu.addAction(start_action)

        if True in list(map(lambda item: isinstance(item, NodeItem) and not item.node().isAlwaysOn(), items)):
-            suspend_action = QtWidgets.QAction("Suspend", menu)
+            suspend_action = QtGui.QAction("Suspend", menu)
            suspend_action.setIcon(get_icon("pause.svg"))
            suspend_action.triggered.connect(self.suspendActionSlot)
            menu.addAction(suspend_action)

        if True in list(map(lambda item: isinstance(item, NodeItem) and not item.node().isAlwaysOn(), items)):
-            stop_action = QtWidgets.QAction("Stop", menu)
+            stop_action = QtGui.QAction("Stop", menu)
            stop_action.setIcon(get_icon("stop.svg"))
            stop_action.triggered.connect(self.stopActionSlot)
            menu.addAction(stop_action)

        if True in list(map(lambda item: isinstance(item, NodeItem) and not item.node().isAlwaysOn(), items)):
-            reload_action = QtWidgets.QAction("Reload", menu)
+            reload_action = QtGui.QAction("Reload", menu)
            reload_action.setIcon(get_icon("reload.svg"))
            reload_action.triggered.connect(self.reloadActionSlot)
            menu.addAction(reload_action)

        if True in list(map(lambda item: isinstance(item, NodeItem) and item.node().console() is not None, items)):
-            console_edit_action = QtWidgets.QAction("Custom console", menu)
+            console_edit_action = QtGui.QAction("Custom console", menu)
            console_edit_action.setIcon(get_icon("console_edit.svg"))
            console_edit_action.triggered.connect(self.customConsoleActionSlot)
            menu.addAction(console_edit_action)

        if True in list(map(lambda item: isinstance(item, NodeItem), items)):
-            isolate_action = QtWidgets.QAction("Isolate", menu)
+            isolate_action = QtGui.QAction("Isolate", menu)
            isolate_action.setIcon(get_icon("link-pause.svg"))
            isolate_action.triggered.connect(self.isolateActionSlot)
            menu.addAction(isolate_action)

        if True in list(map(lambda item: isinstance(item, NodeItem), items)):
-            unisolate_action = QtWidgets.QAction("Un-isolate", menu)
+            unisolate_action = QtGui.QAction("Un-isolate", menu)
            unisolate_action.setIcon(get_icon("link-start.svg"))
            unisolate_action.triggered.connect(self.unisolateActionSlot)
            menu.addAction(unisolate_action)

        if True in list(map(lambda item: isinstance(item, NodeItem), items)):
            # Action: Change hostname
-            change_hostname_action = QtWidgets.QAction("Change hostname", menu)
+            change_hostname_action = QtGui.QAction("Change hostname", menu)
            change_hostname_action.setIcon(get_icon("show-hostname.svg"))
            change_hostname_action.triggered.connect(self.changeHostnameActionSlot)
            menu.addAction(change_hostname_action)

        if True in list(map(lambda item: isinstance(item, NodeItem), items)):
            # Action: Change symbol
-            change_symbol_action = QtWidgets.QAction("Change symbol", menu)
+            change_symbol_action = QtGui.QAction("Change symbol", menu)
            change_symbol_action.setIcon(get_icon("node_conception.svg"))
            change_symbol_action.triggered.connect(self.changeSymbolActionSlot)
            menu.addAction(change_symbol_action)

        if True in list(map(lambda item: isinstance(item, DrawingItem) or isinstance(item, NodeItem), items)):
-            duplicate_action = QtWidgets.QAction("Duplicate", menu)
+            duplicate_action = QtGui.QAction("Duplicate", menu)
            duplicate_action.setIcon(get_icon("duplicate.svg"))
            duplicate_action.triggered.connect(self.duplicateActionSlot)
            menu.addAction(duplicate_action)

        if True in list(map(lambda item: isinstance(item, NodeItem) and hasattr(item.node(), "info"), items)):
            # Action: Show node information
-            show_node_info_action = QtWidgets.QAction("Show node information", menu)
+            show_node_info_action = QtGui.QAction("Show node information", menu)
            show_node_info_action.setIcon(get_icon("help.svg"))
            show_node_info_action.triggered.connect(self.showNodeInfoSlot)
            menu.addAction(show_node_info_action)

        if True in list(map(lambda item: isinstance(item, NodeItem) and hasattr(item.node(), "nodeDir"), items)):
            # Action: Show in file manager
-            show_in_file_manager_action = QtWidgets.QAction("Show in file manager", menu)
+            show_in_file_manager_action = QtGui.QAction("Show in file manager", menu)
            show_in_file_manager_action.setIcon(get_icon("open.svg"))
            show_in_file_manager_action.triggered.connect(self.showInFileManagerSlot)
            menu.addAction(show_in_file_manager_action)

-        if sys.platform.startswith("win") and True in list(map(lambda item: isinstance(item, NodeItem) and hasattr(item.node(), "bringToFront"), items)):
-            # Action: bring console or window to front (Windows only)
-            bring_to_front_action = QtWidgets.QAction("Bring to front", menu)
+        if not sys.platform.startswith("darwin") and True in list(map(lambda item: isinstance(item, NodeItem) and hasattr(item.node(), "bringToFront"), items)):
+            # Action: bring console or window to front (Windows and Linux only)
+            bring_to_front_action = QtGui.QAction("Bring to front", menu)
            bring_to_front_action.setIcon(get_icon("front.svg"))
            bring_to_front_action.triggered.connect(self.bringToFrontSlot)
            menu.addAction(bring_to_front_action)

        if True in list(map(lambda item: isinstance(item, NodeItem) and bool(item.node().configFiles()), items)):
-            import_config_action = QtWidgets.QAction("Import config", menu)
+            import_config_action = QtGui.QAction("Import config", menu)
            import_config_action.setIcon(get_icon("import.svg"))
            import_config_action.triggered.connect(self.importConfigActionSlot)
            menu.addAction(import_config_action)

        if True in list(map(lambda item: isinstance(item, NodeItem) and bool(item.node().configFiles()), items)):
-            export_config_action = QtWidgets.QAction("Export config", menu)
+            export_config_action = QtGui.QAction("Export config", menu)
            export_config_action.setIcon(get_icon("export.svg"))
            export_config_action.triggered.connect(self.exportConfigActionSlot)
            menu.addAction(export_config_action)

        if True in list(map(lambda item: isinstance(item, NodeItem) and bool(item.node().configTextFiles()), items)):
-            export_config_action = QtWidgets.QAction("Edit config", menu)
+            export_config_action = QtGui.QAction("Edit config", menu)
            export_config_action.setIcon(get_icon("edit.svg"))
            export_config_action.triggered.connect(self.editConfigActionSlot)
            menu.addAction(export_config_action)

        if True in list(map(lambda item: isinstance(item, NodeItem) and hasattr(item.node(), "idlepc"), items)):
-            idlepc_action = QtWidgets.QAction("Idle-PC", menu)
+            idlepc_action = QtGui.QAction("Idle-PC", menu)
            idlepc_action.setIcon(get_icon("calculate.svg"))
            idlepc_action.triggered.connect(self.idlepcActionSlot)
            menu.addAction(idlepc_action)

        if True in list(map(lambda item: isinstance(item, NodeItem) and hasattr(item.node(), "idlepc"), items)):
-            auto_idlepc_action = QtWidgets.QAction("Auto Idle-PC", menu)
+            auto_idlepc_action = QtGui.QAction("Auto Idle-PC", menu)
            auto_idlepc_action.setIcon(get_icon("calculate.svg"))
            auto_idlepc_action.triggered.connect(self.autoIdlepcActionSlot)
            menu.addAction(auto_idlepc_action)

        if True in list(map(lambda item: isinstance(item, LabelItem), items)):
-            text_edit_action = QtWidgets.QAction("Text edit", menu)
+            text_edit_action = QtGui.QAction("Text edit", menu)
            text_edit_action.setIcon(get_icon("show-hostname.svg"))
            text_edit_action.triggered.connect(self.textEditActionSlot)
            menu.addAction(text_edit_action)

        if True in list(map(lambda item: isinstance(item, TextItem), items)):
-            text_edit_action = QtWidgets.QAction("Text edit", menu)
+            text_edit_action = QtGui.QAction("Text edit", menu)
            text_edit_action.setIcon(get_icon("edit.svg"))
            text_edit_action.triggered.connect(self.textEditActionSlot)
            menu.addAction(text_edit_action)

        if True in list(map(lambda item: isinstance(item, ShapeItem) or isinstance(item, LineItem), items)):
-            style_action = QtWidgets.QAction("Style", menu)
+            style_action = QtGui.QAction("Style", menu)
            style_action.setIcon(get_icon("node_conception.svg"))
            style_action.triggered.connect(self.styleActionSlot)
            menu.addAction(style_action)

        if True in list(map(lambda item: isinstance(item, LabelItem), items)) and False in list(map(lambda item: item.parentItem() is None, items)):
            # action only for port labels
-            reset_label_position_action = QtWidgets.QAction("Reset position", menu)
+            reset_label_position_action = QtGui.QAction("Reset position", menu)
            reset_label_position_action.setIcon(get_icon("reset.svg"))
            reset_label_position_action.triggered.connect(self.resetLabelPositionActionSlot)
            menu.addAction(reset_label_position_action)
@@ -932,41 +942,41 @@ class GraphicsView(QtWidgets.QGraphicsView):
        if True in list(map(lambda item: item.parentItem() is None, items)):

            if len(items) > 1:
-                horizontal_align_action = QtWidgets.QAction("Align horizontally", menu)
+                horizontal_align_action = QtGui.QAction("Align horizontally", menu)
                horizontal_align_action.setIcon(get_icon("horizontally.svg"))
                horizontal_align_action.triggered.connect(self.horizontalAlignmentSlot)
                menu.addAction(horizontal_align_action)

-                vertical_align_action = QtWidgets.QAction("Align vertically", menu)
+                vertical_align_action = QtGui.QAction("Align vertically", menu)
                vertical_align_action.setIcon(get_icon("vertically.svg"))
                vertical_align_action.triggered.connect(self.verticalAlignmentSlot)
                menu.addAction(vertical_align_action)

-            raise_layer_action = QtWidgets.QAction("Raise one layer", menu)
+            raise_layer_action = QtGui.QAction("Raise one layer", menu)
            raise_layer_action.setIcon(get_icon("raise_z_value.svg"))
            raise_layer_action.triggered.connect(self.raiseLayerActionSlot)
            menu.addAction(raise_layer_action)

-            lower_layer_action = QtWidgets.QAction("Lower one layer", menu)
+            lower_layer_action = QtGui.QAction("Lower one layer", menu)
            lower_layer_action.setIcon(get_icon("lower_z_value.svg"))
            lower_layer_action.triggered.connect(self.lowerLayerActionSlot)
            menu.addAction(lower_layer_action)

            if len(items) > 1:
-                lock_action = QtWidgets.QAction("Lock or unlock items", menu)
+                lock_action = QtGui.QAction("Lock or unlock items", menu)
                lock_action.setIcon(get_icon("lock.svg"))
            else:
                item = items[0]
-                if item.flags() & QtWidgets.QGraphicsItem.ItemIsMovable:
-                    lock_action = QtWidgets.QAction("Lock item", menu)
+                if item.flags() & QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsMovable:
+                    lock_action = QtGui.QAction("Lock item", menu)
                    lock_action.setIcon(get_icon("lock.svg"))
                else:
-                    lock_action = QtWidgets.QAction("Unlock item", menu)
+                    lock_action = QtGui.QAction("Unlock item", menu)
                    lock_action.setIcon(get_icon("unlock.svg"))
            lock_action.triggered.connect(self.lockActionSlot)
            menu.addAction(lock_action)

-            delete_action = QtWidgets.QAction("Delete", menu)
+            delete_action = QtGui.QAction("Delete", menu)
            delete_action.setIcon(get_icon("delete.svg"))
            delete_action.triggered.connect(self.deleteActionSlot)
            menu.addAction(delete_action)
@@ -1053,7 +1063,7 @@ class GraphicsView(QtWidgets.QGraphicsView):

        for item in self.scene().selectedItems():
            if isinstance(item, NodeItem) and item.node().initialized():
-                new_hostname, ok = QtWidgets.QInputDialog.getText(self, "Change hostname", "Hostname:", QtWidgets.QLineEdit.Normal, item.node().name())
+                new_hostname, ok = QtWidgets.QInputDialog.getText(self, "Change hostname", "Hostname:", QtWidgets.QLineEdit.EchoMode.Normal, item.node().name())
                if ok:
                    if not new_hostname.strip():
                        QtWidgets.QMessageBox.critical(self, "Change hostname", "Hostname cannot be blank")
@@ -1073,7 +1083,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
        if items:
            dialog = SymbolSelectionDialog(self, items)
            dialog.show()
-            dialog.exec_()
+            dialog.exec()

    def showInFileManagerSlot(self):
        """
@@ -1095,8 +1105,8 @@ class GraphicsView(QtWidgets.QGraphicsView):
                        QtWidgets.QMessageBox.critical(self, "Show in file manager", "Failed to open {}".format(node_dir))
                        break
                else:
-                    reply = QtWidgets.QMessageBox.information(self, "Show in file manager", "The device directory is located in {} on {}\n\nCopy path to clipboard?".format(node_dir, node.compute().name()), QtWidgets.QMessageBox.Yes | QtWidgets.QMessageBox.No)
-                    if reply == QtWidgets.QMessageBox.Yes:
+                    reply = QtWidgets.QMessageBox.information(self, "Show in file manager", "The device directory is located in {} on {}\n\nCopy path to clipboard?".format(node_dir, node.compute().name()), QtWidgets.QMessageBox.StandardButton.Yes | QtWidgets.QMessageBox.StandardButton.No)
+                    if reply == QtWidgets.QMessageBox.StandardButton.Yes:
                        QtWidgets.QApplication.clipboard().setText(node_dir)
                    break

@@ -1153,7 +1163,7 @@ class GraphicsView(QtWidgets.QGraphicsView):

        delay = self._main_window.settings()["delay_console_all"]
        counter = 0
-        for name in sorted(nodes.keys()):
+        for name in sorted(nodes.keys(), key=str.casefold):
            node = nodes[name]
            callback = qpartial(self.consoleToNode, node)
            self._main_window.run_later(counter, callback)
@@ -1171,10 +1181,10 @@ class GraphicsView(QtWidgets.QGraphicsView):
            proceed = QtWidgets.QMessageBox.question(self,
                                                     "Console to all nodes",
                                                     "You are about to open console windows to {} nodes. Are you sure?".format(nb_items),
-                                                     QtWidgets.QMessageBox.Yes,
-                                                     QtWidgets.QMessageBox.No)
+                                                     QtWidgets.QMessageBox.StandardButton.Yes,
+                                                     QtWidgets.QMessageBox.StandardButton.No)

-            if proceed == QtWidgets.QMessageBox.No:
+            if proceed == QtWidgets.QMessageBox.StandardButton.No:
                return
        self.consoleFromItems(items)

@@ -1232,7 +1242,7 @@ class GraphicsView(QtWidgets.QGraphicsView):

        delay = self._main_window.settings()["delay_console_all"]
        counter = 0
-        for name in sorted(nodes.keys()):
+        for name in sorted(nodes.keys(), key=str.casefold):
            node = nodes[name]
            callback = qpartial(self.consoleToNode, node, aux=True)
            self._main_window.run_later(counter, callback)
@@ -1271,7 +1281,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
            path, _ = QtWidgets.QFileDialog.getOpenFileName(self,
                                                            "Import {}".format(os.path.basename(config_file)),
                                                            self._import_config_directory,
-                                                            "All files (*.*);;Config files (*.cfg)",
+                                                            "All files (*);;Config files (*.cfg)",
                                                            "Config files (*.cfg)")
            if not path:
                continue
@@ -1300,7 +1310,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
                    continue
            dialog = FileEditorDialog(item.node(), config_file, parent=self)
            dialog.show()
-            dialog.exec_()
+            dialog.exec()

    def exportConfigActionSlot(self):
        """
@@ -1318,7 +1328,7 @@ class GraphicsView(QtWidgets.QGraphicsView):

        for item in items:
            for config_file in item.node().configFiles():
-                path, ok = QtWidgets.QFileDialog.getSaveFileName(self, "Export file", os.path.join(self._export_config_directory, item.node().name() + "_" + os.path.basename(config_file)), "All files (*.*);;Config files (*.cfg)")
+                path, ok = QtWidgets.QFileDialog.getSaveFileName(self, "Export file", os.path.join(self._export_config_directory, item.node().name() + "_" + os.path.basename(config_file)), "All files (*);;Config files (*.cfg)")
                if not path:
                    continue
                self._export_config_directory = os.path.dirname(path)
@@ -1338,7 +1348,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
        if isinstance(item, NodeItem):
            dialog = NodeInfoDialog(item.node(), parent=self)
            dialog.show()
-            dialog.exec_()
+            dialog.exec()

    def bringToFrontSlot(self):
        """
@@ -1379,7 +1389,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
            if idlepcs and idlepcs[0] != "0x0":
                dialog = IdlePCDialog(router, idlepcs, parent=self)
                dialog.show()
-                dialog.exec_()
+                dialog.exec()
            else:
                QtWidgets.QMessageBox.critical(self, "Idle-PC", "Sorry no Idle-PC values could be computed, please check again with Cisco IOS in a different state")

@@ -1462,7 +1472,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
        if items:
            style_dialog = StyleEditorDialog(self._main_window, items)
            style_dialog.show()
-            style_dialog.exec_()
+            style_dialog.exec()

    def textEditActionSlot(self):
        """
@@ -1477,7 +1487,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
        if items:
            text_edit_dialog = TextEditorDialog(self._main_window, items)
            text_edit_dialog.show()
-            text_edit_dialog.exec_()
+            text_edit_dialog.exec()

    def resetLabelPositionActionSlot(self):
        """
@@ -1535,7 +1545,7 @@ class GraphicsView(QtWidgets.QGraphicsView):

        for item in self.scene().selectedItems():
            if item.parentItem() is None:
-                if not (item.flags() & QtWidgets.QGraphicsItem.ItemIsMovable):
+                if not (item.flags() & QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsMovable):
                    log.error("Cannot move object to a upper layer because it is locked")
                    continue
                item.setZValue(item.zValue() + 1)
@@ -1550,7 +1560,7 @@ class GraphicsView(QtWidgets.QGraphicsView):

        for item in self.scene().selectedItems():
            if item.parentItem() is None:
-                if not (item.flags() & QtWidgets.QGraphicsItem.ItemIsMovable):
+                if not (item.flags() & QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsMovable):
                    log.error("Cannot move object to a lower layer because it is locked")
                    continue
                item.setZValue(item.zValue() - 1)
@@ -1596,8 +1606,8 @@ class GraphicsView(QtWidgets.QGraphicsView):
            else:
                question = "Do you want to permanently delete {}?".format(selected_nodes[0].name())
            reply = QtWidgets.QMessageBox.question(self, "Delete", question,
-                                                   QtWidgets.QMessageBox.Yes, QtWidgets.QMessageBox.No)
-            if reply == QtWidgets.QMessageBox.No:
+                                                   QtWidgets.QMessageBox.StandardButton.Yes, QtWidgets.QMessageBox.StandardButton.No)
+            if reply == QtWidgets.QMessageBox.StandardButton.No:
                return
        for item in self.scene().selectedItems():
            if isinstance(item, NodeItem):
@@ -1633,7 +1643,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
        """
        Ask the server to create a node using this template
        """
-        pos = self.mapToScene(pos)
+        pos = self.mapToScene(pos.toPoint())
        return TemplateManager().instance().createNodeFromTemplateId(self._topology.project(), template_id, pos.x(), pos.y())

    def createNodeItem(self, node, symbol, x, y):
@@ -1664,15 +1674,15 @@ class GraphicsView(QtWidgets.QGraphicsView):
    def createDrawingItem(self, type, x, y, z, locked=False, rotation=0, svg=None, drawing_id=None):

        if type == "ellipse":
-            item = EllipseItem(pos=QtCore.QPoint(x, y), z=z, locked=locked, rotation=rotation, project=self._topology.project(), drawing_id=drawing_id, svg=svg)
+            item = EllipseItem(pos=QtCore.QPointF(x, y), z=z, locked=locked, rotation=rotation, project=self._topology.project(), drawing_id=drawing_id, svg=svg)
        elif type == "rect":
-            item = RectangleItem(pos=QtCore.QPoint(x, y), z=z, locked=locked, rotation=rotation, project=self._topology.project(), drawing_id=drawing_id, svg=svg)
+            item = RectangleItem(pos=QtCore.QPointF(x, y), z=z, locked=locked, rotation=rotation, project=self._topology.project(), drawing_id=drawing_id, svg=svg)
        elif type == "line":
-            item = LineItem(pos=QtCore.QPoint(x, y), dst=QtCore.QPoint(200, 0), z=z, locked=locked, rotation=rotation, project=self._topology.project(), drawing_id=drawing_id, svg=svg)
+            item = LineItem(pos=QtCore.QPointF(x, y), dst=QtCore.QPoint(200, 0), z=z, locked=locked, rotation=rotation, project=self._topology.project(), drawing_id=drawing_id, svg=svg)
        elif type == "image":
-            item = ImageItem(pos=QtCore.QPoint(x, y), z=z, rotation=rotation, locked=locked, project=self._topology.project(), drawing_id=drawing_id, svg=svg)
+            item = ImageItem(pos=QtCore.QPointF(x, y), z=z, rotation=rotation, locked=locked, project=self._topology.project(), drawing_id=drawing_id, svg=svg)
        elif type == "text":
-            item = TextItem(pos=QtCore.QPoint(x, y), z=z, rotation=rotation, locked=locked, project=self._topology.project(), drawing_id=drawing_id, svg=svg)
+            item = TextItem(pos=QtCore.QPointF(x, y), z=z, rotation=rotation, locked=locked, project=self._topology.project(), drawing_id=drawing_id, svg=svg)

        if drawing_id is None:
            item.create()
@@ -1681,11 +1691,39 @@ class GraphicsView(QtWidgets.QGraphicsView):
        self._topology.addDrawing(item)
        return item

+    @QtCore.Property(QtGui.QColor)
+    def drawingGridColor(self):
+        """Returns the drawing grid color"""
+        return self._drawing_grid_color
+
+    @drawingGridColor.setter
+    def drawingGridColor(self, color):
+        """Sets the drawing grid color"""
+        self._drawing_grid_color = color
+        self.viewport().update()
+
+    @QtCore.Property(QtGui.QColor)
+    def nodeGridColor(self):
+        """Returns the node grid color"""
+        return self._node_grid_color
+
+    @nodeGridColor.setter
+    def nodeGridColor(self, color):
+        """Sets the node grid color"""
+        self._node_grid_color = color
+        self.viewport().update()
+
+    def resetGridColors(self):
+        """Reset grid colors to defaults"""
+        self._drawing_grid_color = self.DEFAULT_DRAWING_GRID_COLOR
+        self._node_grid_color = self.DEFAULT_NODE_GRID_COLOR
+        self.viewport().update()
+
    def drawBackground(self, painter, rect):
        super().drawBackground(painter, rect)
        if self._main_window.uiShowGridAction.isChecked():
-            grids = [(self.drawingGridSize(), QtGui.QColor(208, 208, 208)),
-                     (self.nodeGridSize(), QtGui.QColor(190, 190, 190))]
+            grids = [(self.drawingGridSize(), self._drawing_grid_color),
+                     (self.nodeGridSize(), self._node_grid_color)]
            painter.save()
            for (grid, colour) in grids:
                if not grid:
--- a/gns3/http_client.py
+++ b/gns3/http_client.py
@@ -65,8 +65,9 @@ class QNetworkReplyWatcher(QtCore.QObject):
            if not progress_text:
                progress_text = "Waiting for controller..."
            self._progress = QtWidgets.QProgressDialog(progress_text, "Cancel", 0, 0, parent)
-            self._progress.setAttribute(QtCore.Qt.WA_DeleteOnClose, True)
-            self._progress.setWindowModality(QtCore.Qt.ApplicationModal)
+            self._progress.setAttribute(QtCore.Qt.WidgetAttribute.WA_DeleteOnClose, True)
+            self._progress.setWindowModality(QtCore.Qt.WindowModality.ApplicationModal)
+            self._progress.setMinimumDuration(0)
        else:
            self._progress = None

@@ -76,9 +77,11 @@ class QNetworkReplyWatcher(QtCore.QObject):
        """

        if bytes_total > 0:
-            if not self._progress.maximum():
-                self._progress.setMaximum(100)
-            self._progress.setValue(int(100 * bytes_sent / bytes_total))
+            pass
+            # FIXME the code below makes the progress bar to be stuck sometimes
+            # if not self._progress.maximum():
+            #     self._progress.setMaximum(100)
+            # self._progress.setValue(int(100 * bytes_sent / bytes_total))

    def waitForReply(self, reply: QtNetwork.QNetworkReply, uploading: bool = False, timeout=60) -> None:
        """
@@ -100,15 +103,16 @@ class QNetworkReplyWatcher(QtCore.QObject):
        reply.finished.connect(loop.quit)

        if self._progress:
-            reply.finished.connect(self._progress.close)
            if uploading:
                reply.uploadProgress.connect(self._updateProgress)
-            reply.downloadProgress.connect(self._updateProgress)
+            else:
+                reply.downloadProgress.connect(self._updateProgress)
+            reply.finished.connect(self._progress.close)
            self._progress.canceled.connect(reply.abort)
            self._progress.show()

        if not loop.isRunning():
-            if loop.exec_() == 1:
+            if loop.exec() == 1:
                raise HttpClientTimeoutError(
                    f"Request to '{reply.url().toString()}' timed out after {timeout} seconds")

@@ -155,7 +159,7 @@ class HTTPClient(QtCore.QObject):
        self._retry_connection = False
        self._connected = False
        self._shutdown = False  # shutdown in progress
-        self._accept_insecure_certificate = settings.get("accept_insecure_certificate", False)
+        self._accept_insecure_ssl_certificate = settings.get("accept_insecure_ssl_certificate", False)

        # Add custom CA
        # ssl_config = QtNetwork.QSslConfiguration.defaultConfiguration()
@@ -221,12 +225,12 @@ class HTTPClient(QtCore.QObject):

        return self._protocol

-    def setAcceptInsecureCertificate(self, certificate: bool) -> None:
+    def setAcceptInsecureCertificate(self, accept_insecure_ssl_certificate: bool) -> None:
        """
        Does the server accept this insecure SSL certificate digest
        """

-        self._accept_insecure_certificate = certificate
+        self._accept_insecure_ssl_certificate = accept_insecure_ssl_certificate

    def url(self) -> str:
        """
@@ -248,6 +252,13 @@ class HTTPClient(QtCore.QObject):

        return "{}://{}:{}".format(self.protocol(), host, self.port())

+    def getToken(self):
+        """
+        Return the JWT token
+        """
+
+        return self._jwt_token
+
    def shutdown(self) -> None:
        """
        Stop the server and stop to accept queries
@@ -295,7 +306,8 @@ class HTTPClient(QtCore.QObject):
            timeout: int = 120,
            params: dict = None,
            raw: bool = False,
-            wait: bool = False
+            wait: bool = False,
+            network_manager: QtNetwork.QNetworkAccessManager = None
    ) -> Optional[Union[str, bytes]]:
        """
        Send a request to the server
@@ -313,6 +325,7 @@ class HTTPClient(QtCore.QObject):
        :param params: Query parameters
        :param raw: Return the raw server reply body (bytes)
        :param wait: Wait for server reply asynchronously
+        :param network_manager: custom QtNetwork.QNetworkAccessManager instance
        """

        # Shutdown in progress do not execute the request
@@ -333,7 +346,8 @@ class HTTPClient(QtCore.QObject):
            timeout=timeout,
            params=params,
            raw=raw,
-            wait=wait
+            wait=wait,
+            network_manager=network_manager
        )

        if self._connected:
@@ -365,24 +379,24 @@ class HTTPClient(QtCore.QObject):
            data = QtCore.QByteArray(body.encode())
            body = QtCore.QBuffer(self)
            body.setData(data)
-            body.open(QtCore.QIODevice.ReadOnly)
-            request.setHeader(QtNetwork.QNetworkRequest.ContentTypeHeader, "application/json")
-            request.setHeader(QtNetwork.QNetworkRequest.ContentLengthHeader, str(data.size()))
+            body.open(QtCore.QIODeviceBase.OpenModeFlag.ReadOnly)
+            request.setHeader(QtNetwork.QNetworkRequest.KnownHeaders.ContentTypeHeader, "application/json")
+            request.setHeader(QtNetwork.QNetworkRequest.KnownHeaders.ContentLengthHeader, str(data.size()))
            #request.setRawHeader(b"Content-Length", str(data.size()).encode())
            return body
        elif isinstance(body, pathlib.Path):
            body = QtCore.QFile(str(body), self)
-            body.open(QtCore.QFile.ReadOnly)
-            request.setHeader(QtNetwork.QNetworkRequest.ContentTypeHeader, "application/octet-stream")
-            request.setHeader(QtNetwork.QNetworkRequest.ContentLengthHeader, str(body.size()))
+            body.open(QtCore.QIODeviceBase.OpenModeFlag.ReadOnly)
+            request.setHeader(QtNetwork.QNetworkRequest.KnownHeaders.ContentTypeHeader, "application/octet-stream")
+            request.setHeader(QtNetwork.QNetworkRequest.KnownHeaders.ContentLengthHeader, str(body.size()))
            #request.setRawHeader(b"Content-Length", str(body.size()).encode())
            return body
        elif isinstance(body, str):
            data = QtCore.QByteArray(body.encode())
            body = QtCore.QBuffer(self)
            body.setData(data)
-            body.open(QtCore.QIODevice.ReadOnly)
-            request.setHeader(QtNetwork.QNetworkRequest.ContentTypeHeader, "application/octet-stream")
+            body.open(QtCore.QIODeviceBase.OpenModeFlag.ReadOnly)
+            request.setHeader(QtNetwork.QNetworkRequest.KnownHeaders.ContentTypeHeader, "application/octet-stream")
            #request.setRawHeader(b"Content-Length", str(data.size()).encode())
            return body
        else:
@@ -454,18 +468,18 @@ class HTTPClient(QtCore.QObject):
        JSON, we keep it for the next packet
        """

-        if reply.error() != QtNetwork.QNetworkReply.NoError:
+        if reply.error() != QtNetwork.QNetworkReply.NetworkError.NoError:
            return

        # HTTP error
-        status = reply.attribute(QtNetwork.QNetworkRequest.HttpStatusCodeAttribute)
+        status = reply.attribute(QtNetwork.QNetworkRequest.Attribute.HttpStatusCodeAttribute)
        if status >= 300:
            return

        content = bytes(reply.readAll())
        if not content:
            return
-        content_type = reply.header(QtNetwork.QNetworkRequest.ContentTypeHeader)
+        content_type = reply.header(QtNetwork.QNetworkRequest.KnownHeaders.ContentTypeHeader)
        if content_type == "application/json":
            content = content.decode("utf-8")
            if context["query_id"] in self._buffer:
@@ -488,7 +502,7 @@ class HTTPClient(QtCore.QObject):

        # We check if we received HTTP headers
        if not sip.isdeleted(reply) and reply.isRunning() and not len(reply.rawHeaderList()) > 0:
-            if not reply.error() != QtNetwork.QNetworkReply.NoError:
+            if not reply.error() != QtNetwork.QNetworkReply.NetworkError.NoError:
                log.warning(f"Timeout after {timeout} seconds for request {reply.url().toString()}. \
                Please check the connection is not blocked by a firewall or an anti-virus.")
                reply.abort()
@@ -515,7 +529,7 @@ class HTTPClient(QtCore.QObject):
            login_dialog.setUsername(self._username)
        login_dialog.show()
        login_dialog.raise_()
-        if login_dialog.exec_():
+        if login_dialog.exec():
            username = login_dialog.getUsername()
            password = login_dialog.getPassword()
        return username, password
@@ -537,9 +551,14 @@ class HTTPClient(QtCore.QObject):
                "password": password
            }
            self._auth_attempted = True
-            content = self._executeHTTPQuery("POST", "/users/authenticate", body=body, wait=True)
+            content = self._executeHTTPQuery("POST", "/access/users/authenticate", body=body, wait=True)
            if content:
-                log.info(f"Authenticated with controller {self._host} on port {self._port}")
+                additional_ssl_info = ""
+                if self._protocol == "https":
+                    additional_ssl_info = "using SSL"
+                    if self._accept_insecure_ssl_certificate:
+                        additional_ssl_info += " with insecure certificate"
+                log.info(f"Authenticated with controller {self._host} on port {self._port} {additional_ssl_info}")
                token = content.get("access_token")
                if token:
                    self._auth_attempted = False
@@ -581,15 +600,15 @@ class HTTPClient(QtCore.QObject):
            0,
            self._main_window
        )
-        progress.setAttribute(QtCore.Qt.WA_DeleteOnClose, True)
-        progress.setWindowModality(QtCore.Qt.ApplicationModal)
+        progress.setAttribute(QtCore.Qt.WidgetAttribute.WA_DeleteOnClose, True)
+        progress.setWindowModality(QtCore.Qt.WindowModality.ApplicationModal)
        progress.canceled.connect(loop.quit)
        progress.show()
        timer = QtCore.QTimer(self)
        timer.setSingleShot(True)
        timer.timeout.connect(loop.quit)
        timer.start(wait_time * 1000)
-        loop.exec_()
+        loop.exec()
        if progress.wasCanceled():
            return False
        progress.close()
@@ -617,7 +636,7 @@ class HTTPClient(QtCore.QObject):
            content = self._executeHTTPQuery("GET", "/version", wait=True)
            self._validateServerVersion(content)
            self._retry_connection = False
-            self._executeHTTPQuery("GET", "/users/me", wait=True)
+            self._executeHTTPQuery("GET", "/access/users/me", wait=True)
        except HttpClientCancelledRequestError:
            return False  # operation cancelled by user
        except HttpClientError as e:
@@ -629,11 +648,11 @@ class HTTPClient(QtCore.QObject):
            self._query_waiting_connections = []
            self.disconnect()
            error_dialog = QtWidgets.QMessageBox(self._main_window)
-            error_dialog.setWindowModality(QtCore.Qt.ApplicationModal)
+            error_dialog.setWindowModality(QtCore.Qt.WindowModality.ApplicationModal)
            error_dialog.setWindowTitle("Connecting to server")
            error_dialog.setText(f"Error while connecting to the server")
            error_dialog.setDetailedText(f"{e}")
-            error_dialog.setIcon(QtWidgets.QMessageBox.Critical)
+            error_dialog.setIcon(QtWidgets.QMessageBox.Icon.Critical)
            error_dialog.show()
        else:
            self._connected = True
@@ -662,7 +681,7 @@ class HTTPClient(QtCore.QObject):

        request = self._request(url)
        request = self._addAuth(request)
-        request.setHeader(QtNetwork.QNetworkRequest.UserAgentHeader, f"GNS3 QT Client v{__version__}")
+        request.setHeader(QtNetwork.QNetworkRequest.KnownHeaders.UserAgentHeader, f"GNS3 QT Client v{__version__}")
        return request

    def _executeHTTPQuery(
@@ -680,6 +699,7 @@ class HTTPClient(QtCore.QObject):
            params: dict = None,
            raw: bool = False,
            wait: bool = False,
+            network_manager: QtNetwork.QNetworkAccessManager = None

    ) -> Optional[Union[str, bytes]]:
        """
@@ -698,6 +718,7 @@ class HTTPClient(QtCore.QObject):
        :param params: Query parameters
        :param raw: Return the raw server reply body (bytes)
        :param wait: Wait for server reply asynchronously
+        :param network_manager: custom QtNetwork.QNetworkAccessManager instance
        """

        request = self._prepareRequest(method, endpoint, params)
@@ -706,22 +727,27 @@ class HTTPClient(QtCore.QObject):
        # even if it's in the RFC that's why we need to use sendCustomRequest
        body = self._addBodyToRequest(body, request)

+        if not network_manager:
+            network_manager = self._network_manager
+
        try:
-            reply = self._network_manager.sendCustomRequest(request, method.encode(), body)
+            reply = network_manager.sendCustomRequest(request, method.encode(), body)
        except SystemError as e:
            log.error("Can't send query: {}".format(str(e)))
            return

        if context:
            context = copy.copy(context)
-            context["query_id"] = str(uuid.uuid4())
+        else:
+            context = dict()
+        context["query_id"] = str(uuid.uuid4())

        if download_progress_callback is not None:
            reply.readyRead.connect(qpartial(self._dataReadySlot, reply, download_progress_callback, context))

        if wait:
            uploading = False
-            if request.header(QtNetwork.QNetworkRequest.ContentTypeHeader) == "application/octet-stream":
+            if request.header(QtNetwork.QNetworkRequest.KnownHeaders.ContentTypeHeader) == "application/octet-stream":
                uploading = True

            QNetworkReplyWatcher(show_progress, progress_text).waitForReply(reply, uploading, timeout)
@@ -785,9 +811,9 @@ class HTTPClient(QtCore.QObject):
        Process the information returned by QtNetwork.QNetworkReply
        """

-        status = reply.attribute(QtNetwork.QNetworkRequest.HttpStatusCodeAttribute)
-        content_type = reply.header(QtNetwork.QNetworkRequest.ContentTypeHeader)
-        if reply.error() == QtNetwork.QNetworkReply.NoError:
+        status = reply.attribute(QtNetwork.QNetworkRequest.Attribute.HttpStatusCodeAttribute)
+        content_type = reply.header(QtNetwork.QNetworkRequest.KnownHeaders.ContentTypeHeader)
+        if reply.error() == QtNetwork.QNetworkReply.NetworkError.NoError:
            try:
                content = bytes(reply.readAll())
                if raw is False:
@@ -800,9 +826,9 @@ class HTTPClient(QtCore.QObject):
            if status >= 400:
                raise HttpClientError(f"Request to '{reply.url().toString()}' has returned HTTP code {status}")
            return content
-        elif reply.error() == QtNetwork.QNetworkReply.NetworkSessionFailedError:
+        elif reply.error() == QtNetwork.QNetworkReply.NetworkError.NetworkSessionFailedError:
            return  # ignore the network session failed error to let the network manager recover from it
-        elif reply.error() == QtNetwork.QNetworkReply.OperationCanceledError:
+        elif reply.error() == QtNetwork.QNetworkReply.NetworkError.OperationCanceledError:
            raise HttpClientCancelledRequestError("Request cancelled")
        else:
            error_message = f"{reply.errorString()} (HTTP code {status})"
@@ -826,7 +852,7 @@ class HTTPClient(QtCore.QObject):
        Handle SSL errors
        """

-        if self._accept_insecure_certificate:
+        if self._accept_insecure_ssl_certificate:
            reply.ignoreSslErrors()
            return

@@ -839,7 +865,6 @@ class HTTPClient(QtCore.QObject):
        digest = peer_cert.digest()

        if host_port_key in self._ssl_exceptions:
-
            if self._ssl_exceptions[host_port_key] == digest:
                reply.ignoreSslErrors()
                return
@@ -849,17 +874,25 @@ class HTTPClient(QtCore.QObject):
        msgbox.setText(f"This server could not prove that it is {url.host()}:{url.port()}. Please carefully examine the certificate to make sure the server can be trusted.")
        msgbox.setInformativeText(f"{ssl_errors[0].errorString()}")
        msgbox.setDetailedText(peer_cert.toText())
-        msgbox.setSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
+        msgbox.setSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding)
        connect_button = QtWidgets.QPushButton(f"&Connect to {url.host()}:{url.port()}", msgbox)
-        msgbox.addButton(connect_button, QtWidgets.QMessageBox.YesRole)
+        msgbox.addButton(connect_button, QtWidgets.QMessageBox.ButtonRole.YesRole)
+        checkbox = QtWidgets.QCheckBox("Accept insecure certificate for future connections", parent=msgbox)
+        msgbox.setCheckBox(checkbox)
        abort_button = QtWidgets.QPushButton("&Abort", msgbox)
-        msgbox.addButton(abort_button, QtWidgets.QMessageBox.RejectRole)
+        msgbox.addButton(abort_button, QtWidgets.QMessageBox.ButtonRole.RejectRole)
        msgbox.setDefaultButton(abort_button)
-        msgbox.setIcon(QtWidgets.QMessageBox.Critical)
-        msgbox.exec_()
+        msgbox.setIcon(QtWidgets.QMessageBox.Icon.Critical)
+        msgbox.exec()

        if msgbox.clickedButton() == connect_button:
            self._ssl_exceptions[host_port_key] = digest
+            if checkbox.isChecked():
+                log.warning(f"Accepting insecure SSL certificate for future connections to {host_port_key}")
+                from gns3.controller import Controller
+                self._accept_insecure_ssl_certificate = True
+                controller_settings = {"accept_insecure_ssl_certificate": True}
+                Controller.instance().setSettings(controller_settings)
            reply.ignoreSslErrors()
        else:
            for error in ssl_errors:
--- a/gns3/image_manager.py
+++ b/gns3/image_manager.py
@@ -93,9 +93,9 @@ class ImageManager:
                reply = QtWidgets.QMessageBox.question(parent,
                                                       'Image',
                                                       'Would you like to copy {} to the default images directory'.format(source_filename),
-                                                       QtWidgets.QMessageBox.Yes,
-                                                       QtWidgets.QMessageBox.No)
-                if reply == QtWidgets.QMessageBox.Yes:
+                                                       QtWidgets.QMessageBox.StandardButton.Yes,
+                                                       QtWidgets.QMessageBox.StandardButton.No)
+                if reply == QtWidgets.QMessageBox.StandardButton.Yes:
                    try:
                        os.makedirs(destination_directory, exist_ok=True)
                    except OSError as e:
@@ -105,7 +105,7 @@ class ImageManager:
                    worker = FileCopyWorker(source_path, destination_path)
                    progress_dialog = ProgressDialog(worker, 'Image', 'Copying {}'.format(source_filename), 'Cancel', busy=True, parent=parent)
                    progress_dialog.show()
-                    progress_dialog.exec_()
+                    progress_dialog.exec()
                    errors = progress_dialog.errors()
                    if errors:
                        QtWidgets.QMessageBox.critical(parent, 'Image', '{}'.format(''.join(errors)))
--- a/gns3/image_upload_manager.py
+++ b/gns3/image_upload_manager.py
@@ -47,7 +47,7 @@ class ImageUploadManager(object):

    def _fileUploadToController(self) -> bool:

-        log.debug("Uploading image '{}' to controller".format(self._image.path))
+        log.info("Uploading image '{}' to controller".format(self._image.filename))
        try:
            self._controller.post(
                f"/images/upload/{self._image.filename}",
@@ -63,7 +63,7 @@ class ImageUploadManager(object):
        except HttpClientError as e:
            QtWidgets.QMessageBox.critical(
                self._parent,
-                "Image upload",
+                "Image upload to controller",
                f"Could not upload image {self._image.filename}: {e}"
            )
            return False
--- a/gns3/items/drawing_item.py
+++ b/gns3/items/drawing_item.py
@@ -27,12 +27,12 @@ log = logging.getLogger(__name__)
 class DrawingItem:
    # Map QT stroke to SVG style
    QT_DASH_TO_SVG = {
-        QtCore.Qt.SolidLine: "none",
-        QtCore.Qt.NoPen: None,
-        QtCore.Qt.DashLine: "25, 25",
-        QtCore.Qt.DotLine: "5, 25",
-        QtCore.Qt.DashDotLine: "5, 25, 25",
-        QtCore.Qt.DashDotDotLine: "25, 25, 5, 25, 5"
+        QtCore.Qt.PenStyle.SolidLine: "none",
+        QtCore.Qt.PenStyle.NoPen: None,
+        QtCore.Qt.PenStyle.DashLine: "25, 25",
+        QtCore.Qt.PenStyle.DotLine: "5, 25",
+        QtCore.Qt.PenStyle.DashDotLine: "5, 25, 25",
+        QtCore.Qt.PenStyle.DashDotDotLine: "25, 25, 5, 25, 5"
    }

    show_layer = False
@@ -44,10 +44,11 @@ class DrawingItem:
    def __init__(self, project=None, pos=None, drawing_id=None, svg=None, z=0, locked=False, rotation=0, **kws):
        self._id = drawing_id
        self._deleting = False
+        self._allow_snap_to_grid = True
        self._locked = locked
        if self._id is None:
            self._id = str(uuid.uuid4())
-        self.setFlags(QtWidgets.QGraphicsItem.ItemIsMovable | QtWidgets.QGraphicsItem.ItemIsFocusable | QtWidgets.QGraphicsItem.ItemIsSelectable | QtWidgets.QGraphicsItem.ItemSendsGeometryChanges)
+        self.setFlags(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsMovable | QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsFocusable | QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsSelectable | QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemSendsGeometryChanges)

        from ..main_window import MainWindow
        self._graphics_view = MainWindow.instance().uiGraphicsView
@@ -56,7 +57,7 @@ class DrawingItem:
        self._project = project

        # Store a hash of the SVG to avoid him
-        # to be send if he doesn't change
+        # to be sent if he doesn't change
        self._hash_svg = None

        if pos:
@@ -107,7 +108,7 @@ class DrawingItem:
        if error:
            log.error("Error while updating drawing: {}".format(result["message"]))
            return False
-        self.setPos(QtCore.QPoint(result["x"], result["y"]))
+        self.setPos(QtCore.QPointF(result["x"], result["y"]))
        self.setZValue(result["z"])
        self.setLocked(result["locked"])
        self.setRotation(result["rotation"])
@@ -123,18 +124,21 @@ class DrawingItem:
        """
        key = event.key()
        modifiers = event.modifiers()
-        if key in (QtCore.Qt.Key_P, QtCore.Qt.Key_Plus, QtCore.Qt.Key_Equal) and modifiers & QtCore.Qt.AltModifier \
-                or key == QtCore.Qt.Key_Plus and modifiers & QtCore.Qt.AltModifier and modifiers & QtCore.Qt.KeypadModifier:
+        if key in (QtCore.Qt.Key.Key_P, QtCore.Qt.Key.Key_Plus, QtCore.Qt.Key.Key_Equal) and modifiers & QtCore.Qt.KeyboardModifier.AltModifier \
+                or key == QtCore.Qt.Key.Key_Plus and modifiers & QtCore.Qt.KeyboardModifier.AltModifier and modifiers & QtCore.Qt.KeyboardModifier.KeypadModifier:
            if self.rotation() == 0:
                self.setRotation(359)
            else:
                self.setRotation(self.rotation() - 1)
            return True
-        elif key in (QtCore.Qt.Key_M, QtCore.Qt.Key_Minus) and modifiers & QtCore.Qt.AltModifier \
-                or key == QtCore.Qt.Key_Minus and modifiers & QtCore.Qt.AltModifier and modifiers & QtCore.Qt.KeypadModifier:
+        elif key in (QtCore.Qt.Key.Key_M, QtCore.Qt.Key.Key_Minus) and modifiers & QtCore.Qt.KeyboardModifier.AltModifier \
+                or key == QtCore.Qt.Key.Key_Minus and modifiers & QtCore.Qt.KeyboardModifier.AltModifier and modifiers & QtCore.Qt.KeyboardModifier.KeypadModifier:
            if self.rotation() < 360.0:
                self.setRotation(self.rotation() + 1)
                return True
+        elif modifiers & QtCore.Qt.KeyboardModifier.AltModifier:
+            self._allow_snap_to_grid = False
+            return True
        return False

    def keyPressEvent(self, event):
@@ -147,6 +151,15 @@ class DrawingItem:
        if not self.handleKeyPressEvent(event):
            QtWidgets.QGraphicsItem.keyPressEvent(self, event)

+    def keyReleaseEvent(self, event):
+        """
+        Handles all key release events
+
+        :param event: QKeyEvent
+        """
+
+        self._allow_snap_to_grid = True
+
    def __json__(self):
        data = {
            "drawing_id": self._id,
@@ -178,9 +191,9 @@ class DrawingItem:
        """

        if locked is True:
-            self.setFlag(self.ItemIsMovable, False)
+            self.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsMovable, False)
        else:
-            self.setFlag(self.ItemIsMovable, True)
+            self.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsMovable, True)
        self._locked = locked

    def deleting(self):
@@ -213,14 +226,13 @@ class DrawingItem:

    def itemChange(self, change, value):

-        if change == QtWidgets.QGraphicsItem.ItemPositionChange and self.isActive() and self._main_window.uiSnapToGridAction.isChecked():
+        if change == QtWidgets.QGraphicsItem.GraphicsItemChange.ItemPositionChange and self._main_window.uiSnapToGridAction.isChecked() \
+                and self._allow_snap_to_grid:
            grid_size = self._graphics_view.drawingGridSize()
-            mid_x = self.boundingRect().width() / 2
-            value.setX((grid_size * round((value.x() + mid_x) / grid_size)) - mid_x)
-            mid_y = self.boundingRect().height() / 2
-            value.setY((grid_size * round((value.y()+mid_y)/grid_size)) - mid_y)
+            value.setX(grid_size * round(value.x() / grid_size))
+            value.setY(grid_size * round(value.y() / grid_size))

-        if change == QtWidgets.QGraphicsItem.ItemSelectedChange:
+        if change == QtWidgets.QGraphicsItem.GraphicsItemChange.ItemSelectedChange:
            if not value:
                self.updateDrawing()
        return QtWidgets.QGraphicsItem.itemChange(self, change, value)
@@ -244,10 +256,10 @@ class DrawingItem:
            return

        center = self.mapFromItem(self, brect.width() / 2.0, brect.height() / 2.0)
-        painter.setBrush(QtCore.Qt.red)
-        painter.setPen(QtCore.Qt.red)
+        painter.setBrush(QtCore.Qt.GlobalColor.red)
+        painter.setPen(QtCore.Qt.GlobalColor.red)
        painter.drawRect(QtCore.QRectF((brect.width() / 2.0) - 10, (brect.height() / 2.0) - 10, 20, 20))
-        painter.setPen(QtCore.Qt.black)
+        painter.setPen(QtCore.Qt.GlobalColor.black)
        zval = str(int(self.zValue()))
        painter.drawText(QtCore.QPointF(center.x() - 4, center.y() + 4), zval)

@@ -286,9 +298,9 @@ class DrawingItem:
            pen.setColor(colorFromSvg(svg.get("stroke")))
        # Map SVG stroke style (border of the element to the Qt version)
        if not svg.get("stroke"):
-            pen.setStyle(QtCore.Qt.NoPen)
+            pen.setStyle(QtCore.Qt.PenStyle.NoPen)
        else:
-            pen.setStyle(QtCore.Qt.SolidLine)
+            pen.setStyle(QtCore.Qt.PenStyle.SolidLine)
            stroke = svg.get("stroke-dasharray")
            if stroke:
                for (qt_stroke, svg_stroke) in self.QT_DASH_TO_SVG.items():
--- a/gns3/items/ethernet_link_item.py
+++ b/gns3/items/ethernet_link_item.py
@@ -54,14 +54,14 @@ class EthernetLinkItem(LinkItem):

        try:
            if self._hovered:
-                self.setPen(QtGui.QPen(QtCore.Qt.red, self._link._link_style["width"] + 1, QtCore.Qt.SolidLine, QtCore.Qt.RoundCap, QtCore.Qt.RoundJoin))
+                self.setPen(QtGui.QPen(QtCore.Qt.GlobalColor.red, self._link._link_style["width"] + 1, QtCore.Qt.PenStyle.SolidLine, QtCore.Qt.PenCapStyle.RoundCap, QtCore.Qt.PenJoinStyle.RoundJoin))
            else:
-                self.setPen(QtGui.QPen(QtGui.QColor(self._link._link_style["color"]), self._link._link_style["width"], self._link._link_style["type"], QtCore.Qt.RoundCap, QtCore.Qt.RoundJoin))
+                self.setPen(QtGui.QPen(QtGui.QColor(self._link._link_style["color"]), self._link._link_style["width"], self._link._link_style["type"], QtCore.Qt.PenCapStyle.RoundCap, QtCore.Qt.PenJoinStyle.RoundJoin))
        except:
            if self._hovered:
-                self.setPen(QtGui.QPen(QtCore.Qt.red, self._pen_width + 1, QtCore.Qt.SolidLine, QtCore.Qt.RoundCap, QtCore.Qt.RoundJoin))
+                self.setPen(QtGui.QPen(QtCore.Qt.GlobalColor.red, self._pen_width + 1, QtCore.Qt.PenStyle.SolidLine, QtCore.Qt.PenCapStyle.RoundCap, QtCore.Qt.PenJoinStyle.RoundJoin))
            else:
-                self.setPen(QtGui.QPen(QtGui.QColor("#000000"), self._pen_width, QtCore.Qt.SolidLine, QtCore.Qt.RoundCap, QtCore.Qt.RoundJoin))
+                self.setPen(QtGui.QPen(QtGui.QColor("#000000"), self._pen_width, QtCore.Qt.PenStyle.SolidLine, QtCore.Qt.PenCapStyle.RoundCap, QtCore.Qt.PenJoinStyle.RoundJoin))

        # draw a line between nodes
        path = QtGui.QPainterPath(self.source)
@@ -121,17 +121,17 @@ class EthernetLinkItem(LinkItem):

            if self._link.suspended() or self._source_port.status() == Port.suspended:
                # link or port is suspended
-                color = QtCore.Qt.yellow
-                shape = QtCore.Qt.RoundCap
+                color = QtCore.Qt.GlobalColor.yellow
+                shape = QtCore.Qt.PenCapStyle.RoundCap
            elif self._source_port.status() == Port.started:
                # port is active
-                color = QtCore.Qt.green
-                shape = QtCore.Qt.RoundCap
+                color = QtCore.Qt.GlobalColor.green
+                shape = QtCore.Qt.PenCapStyle.RoundCap
            else:
-                color = QtCore.Qt.red
-                shape = QtCore.Qt.SquareCap
+                color = QtCore.Qt.GlobalColor.red
+                shape = QtCore.Qt.PenCapStyle.SquareCap

-            painter.setPen(QtGui.QPen(color, self._point_size, QtCore.Qt.SolidLine, shape, QtCore.Qt.MiterJoin))
+            painter.setPen(QtGui.QPen(color, self._point_size, QtCore.Qt.PenStyle.SolidLine, shape, QtCore.Qt.PenJoinStyle.MiterJoin))
            point1 = QtCore.QPointF(self.source + self.edge_offset) + QtCore.QPointF((self.dx * self._source_collision_offset) / self.length, (self.dy * self._source_collision_offset) / self.length)

            # avoid any collision of the status point with the source node
@@ -154,27 +154,27 @@ class EthernetLinkItem(LinkItem):
                self._source_port.setLabel(source_port_label)

            if self._draw_port_labels:
-                source_port_label.setFlag(source_port_label.ItemIsMovable, not self._source_item.locked())
+                source_port_label.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsMovable, not self._source_item.locked())
                source_port_label.show()
            else:
                source_port_label.hide()

-            if self._settings["draw_link_status_points"] and self.pen().style() != QtCore.Qt.NoPen:
+            if self._settings["draw_link_status_points"] and self.pen().style() != QtCore.Qt.PenStyle.NoPen:
                painter.drawPoint(point1)

            if self._link.suspended() or self._destination_port.status() == Port.suspended:
                # link or port is suspended
-                color = QtCore.Qt.yellow
-                shape = QtCore.Qt.RoundCap
+                color = QtCore.Qt.GlobalColor.yellow
+                shape = QtCore.Qt.PenCapStyle.RoundCap
            elif self._destination_port.status() == Port.started:
                # port is active
-                color = QtCore.Qt.green
-                shape = QtCore.Qt.RoundCap
+                color = QtCore.Qt.GlobalColor.green
+                shape = QtCore.Qt.PenCapStyle.RoundCap
            else:
-                color = QtCore.Qt.red
-                shape = QtCore.Qt.SquareCap
+                color = QtCore.Qt.GlobalColor.red
+                shape = QtCore.Qt.PenCapStyle.SquareCap

-            painter.setPen(QtGui.QPen(color, self._point_size, QtCore.Qt.SolidLine, shape, QtCore.Qt.MiterJoin))
+            painter.setPen(QtGui.QPen(color, self._point_size, QtCore.Qt.PenStyle.SolidLine, shape, QtCore.Qt.PenJoinStyle.MiterJoin))
            point2 = QtCore.QPointF(self.destination - self.edge_offset) - QtCore.QPointF((self.dx * self._destination_collision_offset) / self.length, (self.dy * self._destination_collision_offset) / self.length)

            # avoid any collision of the status point with the destination node
@@ -197,12 +197,12 @@ class EthernetLinkItem(LinkItem):
                self._destination_port.setLabel(destination_port_label)

            if self._draw_port_labels:
-                destination_port_label.setFlag(destination_port_label.ItemIsMovable, not self._destination_item.locked())
+                destination_port_label.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsMovable, not self._destination_item.locked())
                destination_port_label.show()
            else:
                destination_port_label.hide()

-            if self._settings["draw_link_status_points"] and self.pen().style() != QtCore.Qt.NoPen:
+            if self._settings["draw_link_status_points"] and self.pen().style() != QtCore.Qt.PenStyle.NoPen:
                painter.drawPoint(point2)

        self._drawSymbol()
--- a/gns3/items/image_item.py
+++ b/gns3/items/image_item.py
@@ -19,12 +19,12 @@
 Graphical representation of an image on the QGraphicsScene.
 """

-from ..qt import QtSvg
+from ..qt import QtSvgWidgets
 from ..qt.qimage_svg_renderer import QImageSvgRenderer
 from .drawing_item import DrawingItem


-class ImageItem(QtSvg.QGraphicsSvgItem, DrawingItem):
+class ImageItem(QtSvgWidgets.QGraphicsSvgItem, DrawingItem):

    """
    Class to insert an image on the scene.
--- a/gns3/items/label_item.py
+++ b/gns3/items/label_item.py
@@ -42,7 +42,7 @@ class LabelItem(QtWidgets.QGraphicsTextItem):
        qt_font.fromString(view_settings["default_label_font"])
        self.setDefaultTextColor(QtGui.QColor(view_settings["default_label_color"]))
        self.setFont(qt_font)
-        self.setFlags(QtWidgets.QGraphicsItem.ItemIsMovable | QtWidgets.QGraphicsItem.ItemIsSelectable)
+        self.setFlags(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsMovable | QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsSelectable)
        self.setZValue(2)
        self._editable = True

@@ -91,12 +91,12 @@ class LabelItem(QtWidgets.QGraphicsTextItem):

        key = event.key()
        modifiers = event.modifiers()
-        if key in (QtCore.Qt.Key_P, QtCore.Qt.Key_Plus, QtCore.Qt.Key_Equal) and modifiers & QtCore.Qt.AltModifier \
-                or key == QtCore.Qt.Key_Plus and modifiers & QtCore.Qt.AltModifier and modifiers & QtCore.Qt.KeypadModifier:
+        if key in (QtCore.Qt.Key.Key_P, QtCore.Qt.Key.Key_Plus, QtCore.Qt.Key.Key_Equal) and modifiers & QtCore.Qt.KeyboardModifier.AltModifier \
+                or key == QtCore.Qt.Key.Key_Plus and modifiers & QtCore.Qt.KeyboardModifier.AltModifier and modifiers & QtCore.Qt.KeyboardModifier.KeypadModifier:
            if self.rotation() > -360.0:
                self.setRotation(self.rotation() - 1)
-        elif key in (QtCore.Qt.Key_M, QtCore.Qt.Key_Minus) and modifiers & QtCore.Qt.AltModifier \
-                or key == QtCore.Qt.Key_Minus and modifiers & QtCore.Qt.AltModifier and modifiers & QtCore.Qt.KeypadModifier:
+        elif key in (QtCore.Qt.Key.Key_M, QtCore.Qt.Key.Key_Minus) and modifiers & QtCore.Qt.KeyboardModifier.AltModifier \
+                or key == QtCore.Qt.Key.Key_Minus and modifiers & QtCore.Qt.KeyboardModifier.AltModifier and modifiers & QtCore.Qt.KeyboardModifier.KeypadModifier:
            if self.rotation() < 360.0:
                self.setRotation(self.rotation() + 1)
        else:
@@ -107,11 +107,11 @@ class LabelItem(QtWidgets.QGraphicsTextItem):
        Edit mode for this note.
        """

-        self.setTextInteractionFlags(QtCore.Qt.TextEditorInteraction)
+        self.setTextInteractionFlags(QtCore.Qt.TextInteractionFlag.TextEditorInteraction)
        self.setSelected(True)
        self.setFocus()
        cursor = self.textCursor()
-        cursor.select(QtGui.QTextCursor.Document)
+        cursor.select(QtGui.QTextCursor.SelectionType.Document)
        self.setTextCursor(cursor)

    def mouseDoubleClickEvent(self, event):
@@ -131,12 +131,12 @@ class LabelItem(QtWidgets.QGraphicsTextItem):
        :param event: QFocusEvent instance
        """

-        self.setFlag(QtWidgets.QGraphicsItem.ItemIsFocusable, False)
+        self.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsFocusable, False)
        cursor = self.textCursor()
        if cursor.hasSelection():
            cursor.clearSelection()
            self.setTextCursor(cursor)
-        self.setTextInteractionFlags(QtCore.Qt.NoTextInteraction)
+        self.setTextInteractionFlags(QtCore.Qt.TextInteractionFlag.NoTextInteraction)
        if not self.toPlainText():
            # delete the note if empty
            self.delete()
@@ -163,10 +163,10 @@ class LabelItem(QtWidgets.QGraphicsTextItem):
            return

        center = self.mapFromItem(self, brect.width() / 2.0, brect.height() / 2.0)
-        painter.setBrush(QtCore.Qt.red)
-        painter.setPen(QtCore.Qt.red)
+        painter.setBrush(QtCore.Qt.GlobalColor.red)
+        painter.setPen(QtCore.Qt.GlobalColor.red)
        painter.drawRect(QtCore.QRectF((brect.width() / 2.0) - 10, (brect.height() / 2.0) - 10, 20, 20))
-        painter.setPen(QtCore.Qt.black)
+        painter.setPen(QtCore.Qt.GlobalColor.black)
        zval = str(int(self.zValue()))
        painter.drawText(QtCore.QPointF(center.x(), center.y()), zval)

@@ -213,7 +213,7 @@ class LabelItem(QtWidgets.QGraphicsTextItem):
        :param change: GraphicsItemChange type
        :param value: value of the change
        """
-        if change == QtWidgets.QGraphicsItem.ItemSelectedChange:
+        if change == QtWidgets.QGraphicsItem.GraphicsItemChange.ItemSelectedChange:
            if value == 0:
                self.item_unselected_signal.emit()
        return super().itemChange(change, value)
--- a/gns3/items/line_item.py
+++ b/gns3/items/line_item.py
@@ -44,7 +44,7 @@ class LineItem(QtWidgets.QGraphicsLineItem, DrawingItem):
                             0,
                             dst.x(),
                             dst.y())
-                pen = QtGui.QPen(QtCore.Qt.black, 2, QtCore.Qt.SolidLine, QtCore.Qt.RoundCap, QtCore.Qt.RoundJoin)
+                pen = QtGui.QPen(QtCore.Qt.GlobalColor.black, 2, QtCore.Qt.PenStyle.SolidLine, QtCore.Qt.PenCapStyle.RoundCap, QtCore.Qt.PenJoinStyle.RoundJoin)
                self.setPen(pen)
        else:
            self.fromSvg(svg)
@@ -124,19 +124,19 @@ class LineItem(QtWidgets.QGraphicsLineItem, DrawingItem):

            if self._isHorizontalLine():
                if event.pos().x() > (self.line().x2() - self._border):
-                    self._graphics_view.setCursor(QtCore.Qt.SizeHorCursor)
+                    self._graphics_view.setCursor(QtCore.Qt.CursorShape.SizeHorCursor)
                elif event.pos().x() < self._border:
-                    self._graphics_view.setCursor(QtCore.Qt.SizeHorCursor)
+                    self._graphics_view.setCursor(QtCore.Qt.CursorShape.SizeHorCursor)
                else:
-                    self._graphics_view.setCursor(QtCore.Qt.SizeAllCursor)
+                    self._graphics_view.setCursor(QtCore.Qt.CursorShape.SizeAllCursor)
            # Vertical line
            else:
                if event.pos().y() > (self.line().y2() - self._border):
-                    self._graphics_view.setCursor(QtCore.Qt.SizeVerCursor)
+                    self._graphics_view.setCursor(QtCore.Qt.CursorShape.SizeVerCursor)
                elif event.pos().y() < self._border:
-                    self._graphics_view.setCursor(QtCore.Qt.SizeVerCursor)
+                    self._graphics_view.setCursor(QtCore.Qt.CursorShape.SizeVerCursor)
                else:
-                    self._graphics_view.setCursor(QtCore.Qt.SizeAllCursor)
+                    self._graphics_view.setCursor(QtCore.Qt.CursorShape.SizeAllCursor)

    def mouseMoveEvent(self, event):
        """
@@ -177,17 +177,17 @@ class LineItem(QtWidgets.QGraphicsLineItem, DrawingItem):
        self.update()
        if self._isHorizontalLine():
            if event.pos().x() > (self.line().x2() - self._border):
-                self.setFlag(QtWidgets.QGraphicsItem.ItemIsMovable, False)
+                self.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsMovable, False)
                self._edge = "right"
            elif event.pos().x() < (self.line().x1() + self._border):
-                self.setFlag(QtWidgets.QGraphicsItem.ItemIsMovable, False)
+                self.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsMovable, False)
                self._edge = "left"
        else:
            if event.pos().y() > (self.line().y2() - self._border):
-                self.setFlag(QtWidgets.QGraphicsItem.ItemIsMovable, False)
+                self.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsMovable, False)
                self._edge = "top"
            elif event.pos().y() < (self.line().y1() + self._border):
-                self.setFlag(QtWidgets.QGraphicsItem.ItemIsMovable, False)
+                self.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsMovable, False)
                self._edge = "bottom"
        super().mousePressEvent(event)

@@ -199,7 +199,7 @@ class LineItem(QtWidgets.QGraphicsLineItem, DrawingItem):
        """

        self.update()
-        self.setFlag(QtWidgets.QGraphicsItem.ItemIsMovable)
+        self.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsMovable)

        self._edge = None
        super().mouseReleaseEvent(event)
@@ -213,4 +213,4 @@ class LineItem(QtWidgets.QGraphicsLineItem, DrawingItem):

        # locked objects don't need cursors
        if not self.locked():
-            self._graphics_view.setCursor(QtCore.Qt.ArrowCursor)
+            self._graphics_view.setCursor(QtCore.Qt.CursorShape.ArrowCursor)
--- a/gns3/items/link_item.py
+++ b/gns3/items/link_item.py
@@ -21,7 +21,7 @@ Link items are graphical representation of a link on the QGraphicsScene
 """

 import math
-from ..qt import QtCore, QtGui, QtWidgets, QtSvg, qslot, sip_is_deleted
+from ..qt import QtCore, QtGui, QtWidgets, QtSvgWidgets, qslot, sip_is_deleted

 from ..packet_capture import PacketCapture
 from ..dialogs.filter_dialog import FilterDialog
@@ -29,11 +29,11 @@ from ..dialogs.style_editor_dialog_link import StyleEditorDialogLink
 from ..utils.get_icon import get_icon


-class SvgIconItem(QtSvg.QGraphicsSvgItem):
+class SvgIconItem(QtSvgWidgets.QGraphicsSvgItem):

    def __init__(self, symbol, parent):

-        QtSvg.QGraphicsSvgItem.__init__(self, symbol, parent)
+        QtSvgWidgets.QGraphicsSvgItem.__init__(self, symbol, parent)

    def mousePressEvent(self, event):

@@ -56,7 +56,7 @@ class LinkItem(QtWidgets.QGraphicsPathItem):
    """

    _draw_port_labels = False
-    delete_link_item_signal = QtCore.pyqtSignal(str)
+    delete_link_item_signal = QtCore.Signal(str)

    def __init__(self, source_item, source_port, destination_item, destination_port, link=None, adding_flag=False):

@@ -102,7 +102,7 @@ class LinkItem(QtWidgets.QGraphicsPathItem):
            self._link = link
            self._link.updated_link_signal.connect(self._drawSymbol)
            self._link.delete_link_signal.connect(self._linkDeletedSlot)
-            self.setFlag(self.ItemIsFocusable)
+            self.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsFocusable)
            source_item.addLink(self)
            destination_item.addLink(self)
            self.setCustomToolTip()
@@ -132,7 +132,7 @@ class LinkItem(QtWidgets.QGraphicsPathItem):
    def _filterActionSlot(self, *args):
        dialog = FilterDialog(self._main_window, self._link)
        dialog.show()
-        dialog.exec_()
+        dialog.exec()

    @qslot
    def _suspendActionSlot(self, *args):
@@ -142,7 +142,7 @@ class LinkItem(QtWidgets.QGraphicsPathItem):
    def _styleActionSlot(self, *args):
        style_dialog = StyleEditorDialogLink(self, self._main_window)
        style_dialog.show()
-        style_dialog.exec_()
+        style_dialog.exec()

    def setLinkStyle(self, link_style):
        self._link._link_style["color"] = link_style["color"]
@@ -245,63 +245,63 @@ class LinkItem(QtWidgets.QGraphicsPathItem):

        if not self._link.capturing():
            # start capture
-            start_capture_action = QtWidgets.QAction("Start capture", menu)
+            start_capture_action = QtGui.QAction("Start capture", menu)
            start_capture_action.setIcon(get_icon('capture-start.svg'))
            start_capture_action.triggered.connect(self._startCaptureActionSlot)
            menu.addAction(start_capture_action)

        if self._link.capturing():
            # stop capture
-            stop_capture_action = QtWidgets.QAction("Stop capture", menu)
+            stop_capture_action = QtGui.QAction("Stop capture", menu)
            stop_capture_action.setIcon(get_icon('capture-stop.svg'))
            stop_capture_action.triggered.connect(self._stopCaptureActionSlot)
            menu.addAction(stop_capture_action)

            # start wireshark
-            start_wireshark_action = QtWidgets.QAction("Start Wireshark", menu)
+            start_wireshark_action = QtGui.QAction("Start Wireshark", menu)
            start_wireshark_action.setIcon(QtGui.QIcon(":/icons/wireshark.png"))
            start_wireshark_action.triggered.connect(self._startWiresharkActionSlot)
            menu.addAction(start_wireshark_action)

            if PacketCapture.instance().packetAnalyzerAvailable():
-                analyze_action = QtWidgets.QAction("Analyze capture", menu)
+                analyze_action = QtGui.QAction("Analyze capture", menu)
                analyze_action.setIcon(QtGui.QIcon(':/icons/rtv.png'))
                analyze_action.triggered.connect(self._analyzeCaptureActionSlot)
                menu.addAction(analyze_action)

        if self._link.suspended() is False:
            # Edit filters
-            filter_action = QtWidgets.QAction("Packet filters", menu)
+            filter_action = QtGui.QAction("Packet filters", menu)
            filter_action.setIcon(get_icon('filter.svg'))
            filter_action.triggered.connect(self._filterActionSlot)
            menu.addAction(filter_action)

            # Suspend link
-            suspend_action = QtWidgets.QAction("Suspend", menu)
+            suspend_action = QtGui.QAction("Suspend", menu)
            suspend_action.setIcon(get_icon('pause.svg'))
            suspend_action.triggered.connect(self._suspendActionSlot)
            menu.addAction(suspend_action)
        else:
            # Resume link
-            resume_action = QtWidgets.QAction("Resume", menu)
+            resume_action = QtGui.QAction("Resume", menu)
            resume_action.setIcon(get_icon('start.svg'))
            resume_action.triggered.connect(self._suspendActionSlot)
            menu.addAction(resume_action)

        # reset
-        reset_action = QtWidgets.QAction("Reset", menu)
+        reset_action = QtGui.QAction("Reset", menu)
        reset_action.setIcon(get_icon('reload.svg'))
        reset_action.triggered.connect(self._resetActionSlot)
        menu.addAction(reset_action)

        # style
-        style_action = QtWidgets.QAction("Style", menu)
+        style_action = QtGui.QAction("Style", menu)
        style_action.setIcon(get_icon("node_conception.svg"))
        style_action.triggered.connect(self._styleActionSlot)
        menu.addAction(style_action)

        # delete
-        delete_action = QtWidgets.QAction("Delete", menu)
+        delete_action = QtGui.QAction("Delete", menu)
        delete_action.setIcon(get_icon('delete.svg'))
        delete_action.triggered.connect(self._deleteActionSlot)
        menu.addAction(delete_action)
@@ -314,10 +314,10 @@ class LinkItem(QtWidgets.QGraphicsPathItem):
        :param: QGraphicsSceneMouseEvent instance
        """

-        if event.button() == QtCore.Qt.RightButton and self._adding_flag:
+        if event.button() == QtCore.Qt.MouseButton.RightButton and self._adding_flag:
            # send a escape key to the main window to cancel the link addition
            from ..main_window import MainWindow
-            key = QtGui.QKeyEvent(QtCore.QEvent.KeyPress, QtCore.Qt.Key_Escape, QtCore.Qt.NoModifier)
+            key = QtGui.QKeyEvent(QtCore.QEvent.Type.KeyPress, QtCore.Qt.Key.Key_Escape, QtCore.Qt.KeyboardModifier.NoModifier)
            QtWidgets.QApplication.sendEvent(MainWindow.instance(), key)
            return
        else:
@@ -332,13 +332,13 @@ class LinkItem(QtWidgets.QGraphicsPathItem):

        if not sip_is_deleted(self):
            # create the contextual menu
+            self.setHovered(True)
            self.setAcceptHoverEvents(False)
            menu = QtWidgets.QMenu()
            self.populateLinkContextualMenu(menu)
-            menu.exec_(QtGui.QCursor.pos())
+            menu.exec(QtGui.QCursor.pos())
            self.setAcceptHoverEvents(True)
-            self._hovered = False
-            self.adjust()
+            self.setHovered(False)

    def keyPressEvent(self, event):
        """
@@ -348,7 +348,7 @@ class LinkItem(QtWidgets.QGraphicsPathItem):
        """

        # On pressing backspace or delete key, the selected link gets deleted
-        if event.key() == QtCore.Qt.Key_Delete or event.key() == QtCore.Qt.Key_Backspace:
+        if event.key() == QtCore.Qt.Key.Key_Delete or event.key() == QtCore.Qt.Key.Key_Backspace:
            self._deleteActionSlot()
            return

--- a/gns3/items/logo_item.py
+++ b/gns3/items/logo_item.py
@@ -18,7 +18,7 @@

 import urllib.parse

-from ..qt import QtCore, QtGui, QtWidgets, QtSvg
+from ..qt import QtCore, QtGui, QtWidgets, QtSvgWidgets
 from ..qt.qimage_svg_renderer import QImageSvgRenderer
 from ..controller import Controller

@@ -27,7 +27,7 @@ import logging
 log = logging.getLogger(__name__)


-class LogoItem(QtSvg.QGraphicsSvgItem):
+class LogoItem(QtSvgWidgets.QGraphicsSvgItem):
    """
    Margin for the logo
    """
@@ -60,8 +60,8 @@ class LogoItem(QtSvg.QGraphicsSvgItem):
        self.graphicsEffect().setEnabled(False)

        # set graphical settings for this item
-        self.setFlag(QtWidgets.QGraphicsItem.ItemIsFocusable)
-        self.setFlag(QtWidgets.QGraphicsItem.ItemSendsGeometryChanges)
+        self.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsFocusable)
+        self.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemSendsGeometryChanges)
        self.setAcceptHoverEvents(True)

        from ..main_window import MainWindow
@@ -83,7 +83,7 @@ class LogoItem(QtSvg.QGraphicsSvgItem):
        self.setZValue(-2)

    def eventFilter(self, source, event):
-        if event.type() == QtCore.QEvent.Paint:
+        if event.type() == QtCore.QEvent.Type.Paint:
            self.updatePosition()
        return QtWidgets.QWidget.eventFilter(self, source, event)

--- a/gns3/items/node_item.py
+++ b/gns3/items/node_item.py
@@ -21,7 +21,7 @@ Graphical representation of a node on the QGraphicsScene.

 from ..qt import sip

-from ..qt import QtCore, QtGui, QtWidgets, QtSvg, qslot
+from ..qt import QtCore, QtGui, QtWidgets, QtSvgWidgets, qslot
 from ..qt.qimage_svg_renderer import QImageSvgRenderer
 from .label_item import LabelItem
 from ..symbol import Symbol
@@ -32,7 +32,7 @@ import logging
 log = logging.getLogger(__name__)


-class NodeItem(QtSvg.QGraphicsSvgItem):
+class NodeItem(QtSvgWidgets.QGraphicsSvgItem):

    """
    Node for the scene.
@@ -51,6 +51,7 @@ class NodeItem(QtSvg.QGraphicsSvgItem):
        self._links = []
        self._symbol = None
        self._locked = False
+        self._allow_snap_to_grid = True

        # says if the attached node has been initialized
        # by the server.
@@ -59,7 +60,7 @@ class NodeItem(QtSvg.QGraphicsSvgItem):
        # node label
        self._node_label = None

-        self.setPos(QtCore.QPoint(self._node.x(), self._node.y()))
+        self.setPos(QtCore.QPointF(self._node.x(), self._node.y()))

        # Temporary symbol during loading
        renderer = QImageSvgRenderer(":/icons/reload.svg")
@@ -73,10 +74,10 @@ class NodeItem(QtSvg.QGraphicsSvgItem):
        self.graphicsEffect().setEnabled(False)

        # set graphical settings for this node
-        self.setFlag(QtWidgets.QGraphicsItem.ItemIsMovable)
-        self.setFlag(QtWidgets.QGraphicsItem.ItemIsSelectable)
-        self.setFlag(QtWidgets.QGraphicsItem.ItemIsFocusable)
-        self.setFlag(QtWidgets.QGraphicsItem.ItemSendsGeometryChanges)
+        self.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsMovable)
+        self.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsSelectable)
+        self.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsFocusable)
+        self.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemSendsGeometryChanges)
        self.setAcceptHoverEvents(True)

        # update z value and locked state
@@ -108,6 +109,9 @@ class NodeItem(QtSvg.QGraphicsSvgItem):
        if node.initialized():
            self.createdSlot(node.id())

+        if self._main_window.uiSnapToGridAction.isChecked():
+            self.setPos(QtCore.QPointF(self._node.x() + 0.1, self._node.y()))
+
    def updateNode(self):
        """
        Sync change to the node
@@ -219,7 +223,7 @@ class NodeItem(QtSvg.QGraphicsSvgItem):
        :param base_node_id: base node identifier (integer)
        """

-        self.setPos(QtCore.QPoint(self._node.x(), self._node.y()))
+        self.setPos(QtCore.QPointF(self._node.x(), self._node.y()))
        self.setSymbol(self._node.symbol())
        self.update()

@@ -380,7 +384,7 @@ class NodeItem(QtSvg.QGraphicsSvgItem):
        self._node_label.setRotation(label_data.get("rotation", 0))

        if self._node.locked():
-            self._node_label.setFlag(self.ItemIsMovable, False)
+            self._node_label.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsMovable, False)

        if label_data["x"] is None:
            self._centerLabel()
@@ -439,7 +443,7 @@ class NodeItem(QtSvg.QGraphicsSvgItem):
        # add some delay before showing the menu
        # https://github.com/GNS3/gns3-gui/issues/3169
        QtCore.QThread.msleep(100)
-        menu.exec_(pos)
+        menu.exec(pos)
        return self._selected_port

    def selectedPortSlot(self, action):
@@ -466,7 +470,8 @@ class NodeItem(QtSvg.QGraphicsSvgItem):
        :param value: value of the change
        """

-        if change == QtWidgets.QGraphicsItem.ItemPositionChange and self.isActive() and self._main_window.uiSnapToGridAction.isChecked():
+        if change == QtWidgets.QGraphicsItem.GraphicsItemChange.ItemPositionChange and self._main_window.uiSnapToGridAction.isChecked() \
+                and self._allow_snap_to_grid:
            grid_size = self._main_window.uiGraphicsView.nodeGridSize()
            mid_x = self.boundingRect().width() / 2
            value.setX((grid_size * round((value.x() + mid_x) / grid_size)) - mid_x)
@@ -474,7 +479,7 @@ class NodeItem(QtSvg.QGraphicsSvgItem):
            value.setY((grid_size * round((value.y() + mid_y) / grid_size)) - mid_y)

        # dynamically change the renderer when this node item is selected/unselected.
-        if change == QtWidgets.QGraphicsItem.ItemSelectedChange:
+        if change == QtWidgets.QGraphicsItem.GraphicsItemChange.ItemSelectedChange:
            if value:
                self.graphicsEffect().setEnabled(True)
            else:
@@ -482,7 +487,7 @@ class NodeItem(QtSvg.QGraphicsSvgItem):
                self.updateNode()

        # adjust link item positions when this node is moving or has changed.
-        if change == QtWidgets.QGraphicsItem.ItemPositionChange or change == QtWidgets.QGraphicsItem.ItemPositionHasChanged:
+        if change == QtWidgets.QGraphicsItem.GraphicsItemChange.ItemPositionChange or change == QtWidgets.QGraphicsItem.GraphicsItemChange.ItemPositionHasChanged:
            for link in self._links:
                link.adjust()

@@ -499,16 +504,16 @@ class NodeItem(QtSvg.QGraphicsSvgItem):

        # don't show the selection rectangle
        if not self._settings["draw_rectangle_selected_item"]:
-            option.state = QtWidgets.QStyle.State_None
+            option.state = QtWidgets.QStyle.StateFlag.State_None
        super().paint(painter, option, widget)

        if not self._initialized or self.show_layer:
            brect = self.boundingRect()
            center = self.mapFromItem(self, brect.width() / 2.0, brect.height() / 2.0)
-            painter.setBrush(QtCore.Qt.red)
-            painter.setPen(QtCore.Qt.red)
+            painter.setBrush(QtCore.Qt.GlobalColor.red)
+            painter.setPen(QtCore.Qt.GlobalColor.red)
            painter.drawRect(QtCore.QRectF((brect.width() / 2.0) - 10, (brect.height() / 2.0) - 10, 20, 20))
-            painter.setPen(QtCore.Qt.black)
+            painter.setPen(QtCore.Qt.GlobalColor.black)
            if self.show_layer:
                text = str(int(self.zValue()))  # Z value
            elif self._last_error:
@@ -528,6 +533,27 @@ class NodeItem(QtSvg.QGraphicsSvgItem):
        for link in self._links:
            link.adjust()

+    def keyPressEvent(self, event):
+        """
+        Handles all key press events
+
+        :param event: QKeyEvent
+        """
+
+        if event.modifiers() & QtCore.Qt.KeyboardModifier.AltModifier:
+            self._allow_snap_to_grid = False
+        else:
+            super().keyPressEvent(event)
+
+    def keyReleaseEvent(self, event):
+        """
+        Handles all key release events
+
+        :param event: QKeyEvent
+        """
+
+        self._allow_snap_to_grid = True
+
    def locked(self):

        return self._locked
@@ -540,13 +566,13 @@ class NodeItem(QtSvg.QGraphicsSvgItem):
        """

        if locked is True:
-            self.setFlag(self.ItemIsMovable, False)
+            self.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsMovable, False)
            if self._node_label:
-                self._node_label.setFlag(self.ItemIsMovable, False)
+                self._node_label.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsMovable, False)
        else:
-            self.setFlag(self.ItemIsMovable, True)
+            self.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsMovable, True)
            if self._node_label:
-                self._node_label.setFlag(self.ItemIsMovable, True)
+                self._node_label.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsMovable, True)
        for link in self._links:
            link.adjust()
        self._locked = locked
--- a/gns3/items/rectangle_item.py
+++ b/gns3/items/rectangle_item.py
@@ -32,8 +32,22 @@ class RectangleItem(QtWidgets.QGraphicsRectItem, ShapeItem):
    """

    def __init__(self, width=200, height=100, **kws):
+        self._rx = 0
+        self._ry = 0
        super().__init__(width=width, height=height, **kws)

+    def setHorizontalCornerRadius(self, radius: int):
+        self._rx = radius
+
+    def horizontalCornerRadius(self):
+        return self._rx
+
+    def setVerticalCornerRadius(self, radius: int):
+        self._ry = radius
+
+    def verticalCornerRadius(self):
+        return self._ry
+
    def paint(self, painter, option, widget=None):
        """
        Paints the contents of an item in local coordinates.
@@ -43,7 +57,9 @@ class RectangleItem(QtWidgets.QGraphicsRectItem, ShapeItem):
        :param widget: QWidget instance
        """

-        super().paint(painter, option, widget)
+        painter.setPen(self.pen())
+        painter.setBrush(self.brush())
+        painter.drawRoundedRect(self.rect(), self._rx, self._ry)
        self.drawLayerInfo(painter)

    def toSvg(self):
@@ -57,7 +73,27 @@ class RectangleItem(QtWidgets.QGraphicsRectItem, ShapeItem):
        rect = ET.SubElement(svg, "rect")
        rect.set("width", str(int(self.rect().width())))
        rect.set("height", str(int(self.rect().height())))
+        if self._rx:
+            rect.set("rx", str(self._rx))
+        if self._ry:
+            rect.set("ry", str(self._ry))

        rect = self._styleSvg(rect)

        return ET.tostring(svg, encoding="utf-8").decode("utf-8")
+
+    def fromSvg(self, svg):
+        svg_elem = ET.fromstring(svg)
+        if len(svg_elem):
+            # handle horizontal corner radius and vertical corner radius (specific to rectangles)
+            rx = svg_elem[0].get("rx")
+            ry = svg_elem[0].get("ry")
+            if rx:
+                self._rx = int(rx)
+            elif ry:
+                self._rx = int(ry)  # defaults to ry if it is specified
+            if ry:
+                self._ry = int(ry)
+            elif rx:
+                self._ry = int(rx)  # defaults to rx if it is specified
+        super().fromSvg(svg)
--- a/gns3/items/serial_link_item.py
+++ b/gns3/items/serial_link_item.py
@@ -52,14 +52,14 @@ class SerialLinkItem(LinkItem):

        try:
            if self._hovered:
-                self.setPen(QtGui.QPen(QtCore.Qt.red, self._link._link_style["width"] + 1, QtCore.Qt.SolidLine, QtCore.Qt.RoundCap, QtCore.Qt.RoundJoin))
+                self.setPen(QtGui.QPen(QtCore.Qt.GlobalColor.red, self._link._link_style["width"] + 1, QtCore.Qt.PenStyle.SolidLine, QtCore.Qt.PenCapStyle.RoundCap, QtCore.Qt.PenJoinStyle.RoundJoin))
            else:
-                self.setPen(QtGui.QPen(QtGui.QColor(self._link._link_style["color"]), self._link._link_style["width"], self._link._link_style["type"], QtCore.Qt.RoundCap, QtCore.Qt.RoundJoin))
+                self.setPen(QtGui.QPen(QtGui.QColor(self._link._link_style["color"]), self._link._link_style["width"], self._link._link_style["type"], QtCore.Qt.PenCapStyle.RoundCap, QtCore.Qt.PenJoinStyle.RoundJoin))
        except:
            if self._hovered:
-                self.setPen(QtGui.QPen(QtCore.Qt.red, self._pen_width + 1, QtCore.Qt.SolidLine, QtCore.Qt.RoundCap, QtCore.Qt.RoundJoin))
+                self.setPen(QtGui.QPen(QtCore.Qt.GlobalColor.red, self._pen_width + 1, QtCore.Qt.PenStyle.SolidLine, QtCore.Qt.PenCapStyle.RoundCap, QtCore.Qt.PenJoinStyle.RoundJoin))
            else:
-                self.setPen(QtGui.QPen(QtCore.Qt.darkRed, self._pen_width, QtCore.Qt.SolidLine, QtCore.Qt.RoundCap, QtCore.Qt.RoundJoin))
+                self.setPen(QtGui.QPen(QtCore.Qt.GlobalColor.darkRed, self._pen_width, QtCore.Qt.PenStyle.SolidLine, QtCore.Qt.PenCapStyle.RoundCap, QtCore.Qt.PenJoinStyle.RoundJoin))

        # get source to destination angle
        vector_angle = math.atan2(self.dy, self.dx)
@@ -122,17 +122,17 @@ class SerialLinkItem(LinkItem):
            # source point color
            if self._link.suspended() or self._source_port.status() == Port.suspended:
                # link or port is suspended
-                shape = QtCore.Qt.RoundCap
-                color = QtCore.Qt.yellow
+                shape = QtCore.Qt.PenCapStyle.RoundCap
+                color = QtCore.Qt.GlobalColor.yellow
            elif self._source_port.status() == Port.started:
                # port is active
-                shape = QtCore.Qt.RoundCap
-                color = QtCore.Qt.green
+                shape = QtCore.Qt.PenCapStyle.RoundCap
+                color = QtCore.Qt.GlobalColor.green
            else:
-                shape = QtCore.Qt.SquareCap
-                color = QtCore.Qt.red
+                shape = QtCore.Qt.PenCapStyle.SquareCap
+                color = QtCore.Qt.GlobalColor.red

-            painter.setPen(QtGui.QPen(color, self._point_size, QtCore.Qt.SolidLine, shape, QtCore.Qt.MiterJoin))
+            painter.setPen(QtGui.QPen(color, self._point_size, QtCore.Qt.PenStyle.SolidLine, shape, QtCore.Qt.PenJoinStyle.MiterJoin))

            source_port_label = self._source_port.label()
            if source_port_label is None:
@@ -142,28 +142,28 @@ class SerialLinkItem(LinkItem):
                self._source_port.setLabel(source_port_label)

            if self._draw_port_labels:
-                source_port_label.setFlag(source_port_label.ItemIsMovable, not self._source_item.locked())
+                source_port_label.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsMovable, not self._source_item.locked())
                source_port_label.show()
            else:
                source_port_label.hide()

-            if self._settings["draw_link_status_points"] and self.pen().style() != QtCore.Qt.NoPen:
+            if self._settings["draw_link_status_points"] and self.pen().style() != QtCore.Qt.PenStyle.NoPen:
                painter.drawPoint(self.source_point)

            # destination point color
            if self._link.suspended() or self._destination_port.status() == Port.suspended:
                # link or port is suspended
-                color = QtCore.Qt.yellow
-                shape = QtCore.Qt.RoundCap
+                color = QtCore.Qt.GlobalColor.yellow
+                shape = QtCore.Qt.PenCapStyle.RoundCap
            elif self._destination_port.status() == Port.started:
                # port is active
-                color = QtCore.Qt.green
-                shape = QtCore.Qt.RoundCap
+                color = QtCore.Qt.GlobalColor.green
+                shape = QtCore.Qt.PenCapStyle.RoundCap
            else:
-                color = QtCore.Qt.red
-                shape = QtCore.Qt.SquareCap
+                color = QtCore.Qt.GlobalColor.red
+                shape = QtCore.Qt.PenCapStyle.SquareCap

-            painter.setPen(QtGui.QPen(color, self._point_size, QtCore.Qt.SolidLine, shape, QtCore.Qt.MiterJoin))
+            painter.setPen(QtGui.QPen(color, self._point_size, QtCore.Qt.PenStyle.SolidLine, shape, QtCore.Qt.PenJoinStyle.MiterJoin))

            destination_port_label = self._destination_port.label()

@@ -174,12 +174,12 @@ class SerialLinkItem(LinkItem):
                self._destination_port.setLabel(destination_port_label)

            if self._draw_port_labels:
-                destination_port_label.setFlag(destination_port_label.ItemIsMovable, not self._destination_item.locked())
+                destination_port_label.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsMovable, not self._destination_item.locked())
                destination_port_label.show()
            else:
                destination_port_label.hide()

-            if self._settings["draw_link_status_points"] and self.pen().style() != QtCore.Qt.NoPen:
+            if self._settings["draw_link_status_points"] and self.pen().style() != QtCore.Qt.PenStyle.NoPen:
                painter.drawPoint(self.destination_point)

        self._drawSymbol()
--- a/gns3/items/shape_item.py
+++ b/gns3/items/shape_item.py
@@ -44,7 +44,7 @@ class ShapeItem(DrawingItem):

        if svg is None:
            self.setRect(0, 0, width, height)
-            pen = QtGui.QPen(QtCore.Qt.black, 2, QtCore.Qt.SolidLine, QtCore.Qt.RoundCap, QtCore.Qt.RoundJoin)
+            pen = QtGui.QPen(QtCore.Qt.GlobalColor.black, 2, QtCore.Qt.PenStyle.SolidLine, QtCore.Qt.PenCapStyle.RoundCap, QtCore.Qt.PenJoinStyle.RoundJoin)
            self.setPen(pen)
            brush = QtGui.QBrush(QtGui.QColor(255, 255, 255, 255))  # default color is white and not transparent
            self.setBrush(brush)
@@ -61,21 +61,21 @@ class ShapeItem(DrawingItem):
        """

        self.update()
-        self._originally_movable = self.flags() & QtWidgets.QGraphicsItem.ItemIsMovable
+        self._originally_movable = bool(self.flags() & QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsMovable)
        if event.pos().x() > (self.rect().right() - self._border):
-            self.setFlag(QtWidgets.QGraphicsItem.ItemIsMovable, False)
+            self.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsMovable, False)
            self._edge = "right"

        elif event.pos().x() < (self.rect().left() + self._border):
-            self.setFlag(QtWidgets.QGraphicsItem.ItemIsMovable, False)
+            self.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsMovable, False)
            self._edge = "left"

        elif event.pos().y() < (self.rect().top() + self._border):
-            self.setFlag(QtWidgets.QGraphicsItem.ItemIsMovable, False)
+            self.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsMovable, False)
            self._edge = "top"

        elif event.pos().y() > (self.rect().bottom() - self._border):
-            self.setFlag(QtWidgets.QGraphicsItem.ItemIsMovable, False)
+            self.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsMovable, False)
            self._edge = "bottom"
        QtWidgets.QGraphicsItem.mousePressEvent(self, event)

@@ -87,7 +87,7 @@ class ShapeItem(DrawingItem):
        """

        self.update()
-        self.setFlag(QtWidgets.QGraphicsItem.ItemIsMovable, self._originally_movable)
+        self.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsMovable, self._originally_movable)
        self._edge = None
        QtWidgets.QGraphicsItem.mouseReleaseEvent(self, event)

@@ -150,15 +150,15 @@ class ShapeItem(DrawingItem):
        # locked objects don't need cursors
        if not self.locked():
            if event.pos().x() > (self.rect().right() - self._border):
-                self._graphics_view.setCursor(QtCore.Qt.SizeHorCursor)
+                self._graphics_view.setCursor(QtCore.Qt.CursorShape.SizeHorCursor)
            elif event.pos().x() < (self.rect().left() + self._border):
-                self._graphics_view.setCursor(QtCore.Qt.SizeHorCursor)
+                self._graphics_view.setCursor(QtCore.Qt.CursorShape.SizeHorCursor)
            elif event.pos().y() < (self.rect().top() + self._border):
-                self._graphics_view.setCursor(QtCore.Qt.SizeVerCursor)
+                self._graphics_view.setCursor(QtCore.Qt.CursorShape.SizeVerCursor)
            elif event.pos().y() > (self.rect().bottom() - self._border):
-                self._graphics_view.setCursor(QtCore.Qt.SizeVerCursor)
+                self._graphics_view.setCursor(QtCore.Qt.CursorShape.SizeVerCursor)
            else:
-                self._graphics_view.setCursor(QtCore.Qt.SizeAllCursor)
+                self._graphics_view.setCursor(QtCore.Qt.CursorShape.SizeAllCursor)

    def hoverLeaveEvent(self, event):
        """
@@ -169,11 +169,14 @@ class ShapeItem(DrawingItem):

        # locked objects don't need cursors
        if not self.locked():
-            self._graphics_view.setCursor(QtCore.Qt.ArrowCursor)
+            self._graphics_view.setCursor(QtCore.Qt.CursorShape.ArrowCursor)
+
+    def setWidthAndHeight(self, width, height):
+        self.setRect(0, 0, width, height)

    def fromSvg(self, svg):
        """
-        Import element informations from an SVG
+        Import element information from SVG
        """
        svg = ET.fromstring(svg)
        width = float(svg.get("width", self.rect().width()))
@@ -181,7 +184,7 @@ class ShapeItem(DrawingItem):
        self.setRect(0, 0, width, height)

        pen = QtGui.QPen()
-        brush = QtGui.QBrush(QtCore.Qt.SolidPattern)
+        brush = QtGui.QBrush(QtCore.Qt.BrushStyle.SolidPattern)

        if len(svg):
            pen = self._penFromSVGElement(svg[0])
--- a/gns3/items/text_item.py
+++ b/gns3/items/text_item.py
@@ -62,11 +62,11 @@ class TextItem(QtWidgets.QGraphicsTextItem, DrawingItem):
        Edit mode for this note.
        """

-        self.setTextInteractionFlags(QtCore.Qt.TextEditorInteraction)
+        self.setTextInteractionFlags(QtCore.Qt.TextInteractionFlag.TextEditorInteraction)
        self.setSelected(True)
        self.setFocus()
        cursor = self.textCursor()
-        cursor.select(QtGui.QTextCursor.Document)
+        cursor.select(QtGui.QTextCursor.SelectionType.Document)
        self.setTextCursor(cursor)

    def mouseDoubleClickEvent(self, event):
@@ -85,12 +85,12 @@ class TextItem(QtWidgets.QGraphicsTextItem, DrawingItem):
        :param event: QFocusEvent instance
        """

-        self.setFlag(QtWidgets.QGraphicsItem.ItemIsFocusable, False)
+        self.setFlag(QtWidgets.QGraphicsItem.GraphicsItemFlag.ItemIsFocusable, False)
        cursor = self.textCursor()
        if cursor.hasSelection():
            cursor.clearSelection()
            self.setTextCursor(cursor)
-        self.setTextInteractionFlags(QtCore.Qt.NoTextInteraction)
+        self.setTextInteractionFlags(QtCore.Qt.TextInteractionFlag.NoTextInteraction)
        if not self.toPlainText():
            # delete the note if empty
            self.delete()
--- a/gns3/link.py
+++ b/gns3/link.py
@@ -23,7 +23,7 @@ import re
 from .qt import sip
 import uuid

-from .qt import QtCore
+from .qt import QtCore, QtNetwork
 from .controller import Controller


@@ -78,6 +78,7 @@ class Link(QtCore.QObject):
        self._deleting = False
        self._capture_file_path = None
        self._capture_file = None
+        self._network_manager = None
        self._response_stream = None
        self._capture_compute_id = None
        self._initialized = False
@@ -111,18 +112,24 @@ class Link(QtCore.QObject):
                # We need to stream the pcap file content if the controller or compute is remote
                if Controller.instance().isRemote() or self._capture_file_path is None:
                    self._capture_file = QtCore.QTemporaryFile()
-                    self._capture_file.open(QtCore.QFile.WriteOnly)
+                    self._capture_file.open(QtCore.QIODeviceBase.OpenModeFlag.WriteOnly)
                    self._capture_file.setAutoRemove(True)
                    self._capture_file_path = self._capture_file.fileName()
                else:
                    self._capture_file = QtCore.QFile(self._capture_file_path)
-                    self._capture_file.open(QtCore.QFile.WriteOnly)
+                    self._capture_file.open(QtCore.QIODeviceBase.OpenModeFlag.WriteOnly)
+
+                if self._network_manager is None:
+                    self._network_manager = QtNetwork.QNetworkAccessManager(self)
+                    self._network_manager.sslErrors.connect(Controller.instance().httpClient().handleSslError)
+
                self._response_stream = Controller.instance().get(
                    "/projects/{project_id}/links/{link_id}/capture/stream".format(project_id=self.project().id(), link_id=self._link_id),
                    callback=None,
                    show_progress=False,
                    download_progress_callback=self._downloadPcapProgress,
-                    timeout=None
+                    timeout=None,
+                    network_manager=self._network_manager
                )
            log.debug("Has successfully started capturing packets on link {} to '{}'".format(self._link_id, self._capture_file_path))
        else:
--- a/resources/linux/applications/gns3.desktop
+++ b/resources/linux/applications/gns3.desktop
--- a/resources/linux/gns3-gui.xml
+++ b/resources/linux/gns3-gui.xml
--- a/resources/linux/icons/hicolor/16x16/apps/gns3.png
+++ b/resources/linux/icons/hicolor/16x16/apps/gns3.png
--- a/resources/linux/icons/hicolor/32x32/apps/gns3.png
+++ b/resources/linux/icons/hicolor/32x32/apps/gns3.png
--- a/resources/linux/icons/hicolor/48x48/apps/gns3.png
+++ b/resources/linux/icons/hicolor/48x48/apps/gns3.png
--- a/resources/linux/icons/hicolor/48x48/mimetypes/application-x-gns3.png
+++ b/resources/linux/icons/hicolor/48x48/mimetypes/application-x-gns3.png
--- a/resources/linux/icons/hicolor/48x48/mimetypes/application-x-gns3appliance.png
+++ b/resources/linux/icons/hicolor/48x48/mimetypes/application-x-gns3appliance.png
--- a/resources/linux/icons/hicolor/48x48/mimetypes/application-x-gns3project.png
+++ b/resources/linux/icons/hicolor/48x48/mimetypes/application-x-gns3project.png
--- a/resources/linux/icons/hicolor/scalable/apps/gns3.svg
+++ b/resources/linux/icons/hicolor/scalable/apps/gns3.svg
--- a/resources/linux/icons/hicolor/scalable/mimetypes/application-x-gns3.svg
+++ b/resources/linux/icons/hicolor/scalable/mimetypes/application-x-gns3.svg
--- a/resources/linux/icons/hicolor/scalable/mimetypes/application-x-gns3appliance.svg
+++ b/resources/linux/icons/hicolor/scalable/mimetypes/application-x-gns3appliance.svg
--- a/resources/linux/icons/hicolor/scalable/mimetypes/application-x-gns3project.svg
+++ b/resources/linux/icons/hicolor/scalable/mimetypes/application-x-gns3project.svg
--- a/gns3/local_config.py
+++ b/gns3/local_config.py
@@ -91,7 +91,12 @@ class LocalConfig(QtCore.QObject):
                if sys.platform.startswith("win"):
                    old_config_path = os.path.join(os.path.expandvars("%APPDATA%"), "GNS3", filename)
                else:
-                    old_config_path = os.path.join(os.path.expanduser("~"), ".config", "GNS3", filename)
+                    xgd_config_var = "$XDG_CONFIG_HOME"
+                    xdg_config_res = os.path.expandvars(xgd_config_var)
+                    if xdg_config_res  != xgd_config_var:
+                        old_config_path = os.path.join(xdg_config_res, "GNS3", filename)
+                    else:
+                        old_config_path = os.path.join(os.path.expanduser("~"), ".config", "GNS3", filename)

                # TODO: migrate versioned config file from a previous version of GNS3 (for instance 2.2 -> 2.3) + support profiles
                if os.path.exists(old_config_path):
@@ -141,8 +146,13 @@ class LocalConfig(QtCore.QObject):
            appdata = os.path.expandvars("%APPDATA%")
            path = os.path.join(appdata, "GNS3", version)
        else:
-            home = os.path.expanduser("~")
-            path = os.path.join(home, ".config", "GNS3", version)
+            xgd_config_var = "$XDG_CONFIG_HOME"
+            xdg_config_res = os.path.expandvars(xgd_config_var)
+            if xdg_config_res != xgd_config_var:
+                path = os.path.join(xdg_config_res, "GNS3", version)
+            else:
+                home = os.path.expanduser("~")
+                path = os.path.join(home, ".config", "GNS3", version)

        if self._profile is not None:
            path = os.path.join(path, "profiles", self._profile)
@@ -188,7 +198,7 @@ class LocalConfig(QtCore.QObject):
                QtWidgets.QMessageBox.critical(False, "Version error", error_message)
                # Exit immediately not clean but we want to avoid any side effect that could corrupt the file
                QtCore.QTimer.singleShot(0, app.quit)
-                app.exec_()
+                app.exec()
                sys.exit(1)

        if "version" not in self._settings or parse_version(self._settings["version"]) < parse_version("1.4.0alpha1"):
@@ -392,14 +402,6 @@ class LocalConfig(QtCore.QObject):
        from gns3.settings import GENERAL_SETTINGS
        return self.loadSectionSettings("MainWindow", GENERAL_SETTINGS)["experimental_features"]

-    def hdpi(self):
-        """
-        :returns: Boolean. True if hdpi is allowed
-        """
-
-        from gns3.settings import GENERAL_SETTINGS
-        return self.loadSectionSettings("MainWindow", GENERAL_SETTINGS)["hdpi"]
-
    def multiProfiles(self):
        """
        :returns: Boolean. True if multi_profiles is enabled
@@ -467,7 +469,7 @@ class LocalConfig(QtCore.QObject):

        if os.path.exists(pid_path):
            try:
-                with open(pid_path) as f:
+                with open(pid_path, encoding="utf-8") as f:
                    pid = int(f.read())
                    if pid != my_pid:
                        try:
@@ -482,9 +484,17 @@ class LocalConfig(QtCore.QObject):
                                    return False
                    else:
                        return True
-            except (OSError, ValueError) as e:
+            except OSError as e:
                log.critical("Can't read pid file %s: %s", pid_path, str(e))
                return False
+            except ValueError as e:
+                log.warning("Invalid data in pid file %s: %s", pid_path, str(e))
+                try:
+                    # try removing the file since it contains invalid data
+                    os.remove(pid_path)
+                except OSError:
+                    log.critical("Can't remove pid file %s", pid_path)
+                    return False

        try:
            with open(pid_path, 'w+') as f:
--- a/gns3/local_server.py
+++ b/gns3/local_server.py
@@ -48,9 +48,9 @@ class StopLocalServerWorker(QtCore.QObject):
    the server
    """
    # signals to update the progress dialog.
-    error = QtCore.pyqtSignal(str, bool)
-    finished = QtCore.pyqtSignal()
-    updated = QtCore.pyqtSignal(int)
+    error = QtCore.Signal(str, bool)
+    finished = QtCore.Signal()
+    updated = QtCore.Signal(int)

    def __init__(self, local_server_process):
        super().__init__()
@@ -140,9 +140,9 @@ class LocalServer(QtCore.QObject):
                        self.parent(),
                        "uBridge",
                        "uBridge requires CAP_NET_RAW capability to interact with network interfaces. Set the capability to uBridge? All users on the system will be able to read packet from the network interfaces.",
-                        QtWidgets.QMessageBox.Yes,
-                        QtWidgets.QMessageBox.No)
-                    if proceed == QtWidgets.QMessageBox.Yes:
+                        QtWidgets.QMessageBox.StandardButton.Yes,
+                        QtWidgets.QMessageBox.StandardButton.No)
+                    if proceed == QtWidgets.QMessageBox.StandardButton.Yes:
                        sudo(["setcap", "cap_net_admin,cap_net_raw=ep", path])
            except AttributeError:
                # Due to a Python bug, os.listxattr could be missing: https://github.com/GNS3/gns3-gui/issues/2010
@@ -159,10 +159,14 @@ class LocalServer(QtCore.QObject):
                        self.parent(),
                        "uBridge",
                        "uBridge requires root permissions to interact with network interfaces. Set root permissions to uBridge? All admin users on the system will be able to read packet from the network interfaces.",
-                        QtWidgets.QMessageBox.Yes,
-                        QtWidgets.QMessageBox.No)
-                    if proceed == QtWidgets.QMessageBox.Yes:
-                        sudo(["chown", "root:admin", path], ["chmod", "4750", path])
+                        QtWidgets.QMessageBox.StandardButton.Yes,
+                        QtWidgets.QMessageBox.StandardButton.No)
+                    if proceed == QtWidgets.QMessageBox.StandardButton.Yes:
+                        from gns3.utils.macos_ubridge_setuid import macos_ubridge_setuid
+                        if sys.platform.startswith("darwin") and hasattr(sys, "frozen"):
+                            macos_ubridge_setuid()
+                        else:
+                            sudo(["chown", "root:admin", path], ["chmod", "4750", path])
            except OSError as e:
                QtWidgets.QMessageBox.critical(self.parent(), "uBridge", "Can't set root permissions to uBridge {}: {}".format(path, str(e)))
                return False
@@ -216,7 +220,7 @@ class LocalServer(QtCore.QObject):
        Controller.instance().setSettings(self._settings)

        # Settings have changed we need to restart the server
-        if old_settings != self._settings:
+        if not Controller.instance().connected() or old_settings != self._settings:
            if self._settings["auto_start"]:
                # We restart the local server only if we really need. Auth can be hot change
                settings_require_restart = ('host', 'port', 'path')
@@ -232,6 +236,8 @@ class LocalServer(QtCore.QObject):
            # If the controller is remote:
            else:
                self.stopLocalServer(wait=True)
+                if Controller.instance().isRemote() and not Controller.instance().connected():
+                    Controller.instance().connect()

    def shouldLocalServerAutoStart(self):
        """
@@ -305,7 +311,7 @@ class LocalServer(QtCore.QObject):
                                             "Starting local controller {} on port {}...".format(self._settings["host"], self._port),
                                             "Cancel", busy=True, parent=self.parent())
            progress_dialog.show()
-            if not progress_dialog.exec_():
+            if not progress_dialog.exec():
                return False
        self._server_started_by_me = True
        Controller.instance().connect()
@@ -415,11 +421,15 @@ class LocalServer(QtCore.QObject):
        try:
            if sys.platform.startswith("win"):
                # use the string on Windows
-                self._local_server_process = subprocess.Popen(command, creationflags=subprocess.CREATE_NEW_PROCESS_GROUP, stderr=subprocess.PIPE)
+                self._local_server_process = subprocess.Popen(
+                    command,
+                    creationflags=subprocess.CREATE_NEW_PROCESS_GROUP,
+                    stderr=subprocess.PIPE,
+                    env=os.environ)
            else:
                # use arguments on other platforms
                args = shlex.split(command)
-                self._local_server_process = subprocess.Popen(args, stderr=subprocess.PIPE)
+                self._local_server_process = subprocess.Popen(args, stderr=subprocess.PIPE, env=os.environ)
        except (OSError, subprocess.SubprocessError) as e:
            log.warning('Could not start local server "{}": {}'.format(command, e))
            return False
@@ -479,7 +489,7 @@ class LocalServer(QtCore.QObject):
                worker = StopLocalServerWorker(self._local_server_process)
                progress_dialog = ProgressDialog(worker, "Local server", "Waiting for the local controller to stop...", None, busy=True, parent=self.parent())
                progress_dialog.show()
-                progress_dialog.exec_()
+                progress_dialog.exec()
                if self._local_server_process.returncode is None:
                    self._killLocalServer()
            self._server_started_by_me = False
@@ -502,10 +512,10 @@ class LocalServer(QtCore.QObject):
            proceed = QtWidgets.QMessageBox.question(self.parent(),
                                                     "Local controller",
                                                     "The local controller cannot be stopped, would you like to kill it?",
-                                                     QtWidgets.QMessageBox.Yes,
-                                                     QtWidgets.QMessageBox.No)
+                                                     QtWidgets.QMessageBox.StandardButton.Yes,
+                                                     QtWidgets.QMessageBox.StandardButton.No)

-            if proceed == QtWidgets.QMessageBox.Yes:
+            if proceed == QtWidgets.QMessageBox.StandardButton.Yes:
                self._local_server_process.kill()

    @staticmethod
--- a/gns3/main.py
+++ b/gns3/main.py
@@ -30,16 +30,6 @@ try:
 except Exception as e:
    print("Fail update installation: {}".format(str(e)))

-
-# WARNING
-# Due to buggy user machines we choose to put this as the first loading modules
-# otherwise the egg cache is initialized in his standard location and
-# if is not writetable the application crash. It's the user fault
-# because one day the user as used sudo to run an egg and break his
-# filesystem permissions, but it's a common mistake.
-from gns3.utils.get_resource import get_resource
-
-
 import datetime
 import traceback
 import time
@@ -59,13 +49,14 @@ from gns3.crash_report import CrashReport
 from gns3.local_config import LocalConfig
 from gns3.application import Application
 from gns3.utils import parse_version
+from gns3.utils.install_mime_types import install_mime_types
 from gns3.dialogs.profile_select import ProfileSelectDialog
+from gns3.version import __version__
+

 import logging
 log = logging.getLogger(__name__)

-from gns3.version import __version__
-

 def locale_check():
    """
@@ -129,12 +120,24 @@ def main():
    parser.add_argument("-q", "--quiet", action="store_true", help="do not show logs on stdout")
    parser.add_argument("--config", help="Configuration file")
    parser.add_argument("--profile", help="Settings profile (blank will use default settings files)")
+    parser.add_argument("--install-mime-types", help="Install mime types (Linux only)", action="store_true", default=False)
    options = parser.parse_args()
    exception_file_path = "exceptions.log"

+    if options.install_mime_types:
+        install_mime_types()
+        return
+
    if options.project:
        options.project = os.path.abspath(options.project)

+    try:
+        import truststore
+        truststore.inject_into_ssl()
+        log.info("Using system certificate store for SSL connections")
+    except ImportError:
+        pass
+
    if hasattr(sys, "frozen"):
        # We add to the path where the OS search executable our binary location starting by GNS3
        # packaged binary
@@ -145,6 +148,7 @@ def main():
            frozen_dirs = [
                frozen_dir,
                os.path.normpath(os.path.join(frozen_dir, 'dynamips')),
+                os.path.normpath(os.path.join(frozen_dir, 'ubridge')),
                os.path.normpath(os.path.join(frozen_dir, 'vpcs')),
            ]

@@ -153,6 +157,7 @@ def main():
        if options.project:
            os.chdir(frozen_dir)

+
    def exceptionHook(exception, value, tb):

        if exception == KeyboardInterrupt:
@@ -184,12 +189,12 @@ def main():
    # catch exceptions to write them in a file
    sys.excepthook = exceptionHook

-    # we only support Python 3 version >= 3.7
-    if sys.version_info < (3, 7):
-        raise SystemExit("Python 3.7 or higher is required")
+    # we only support Python 3 version >= 3.9
+    if sys.version_info < (3, 9):
+        raise SystemExit("Python 3.9 or higher is required")

-    if parse_version(QtCore.QT_VERSION_STR) < parse_version("5.5.0"):
-        raise SystemExit("Requirement is PyQt5 version 5.5.0 or higher, got version {}".format(QtCore.QT_VERSION_STR))
+    if parse_version(QtCore.QT_VERSION_STR) < parse_version("6.3.1"):
+        raise SystemExit("Requirement is PyQt6 version 6.3.1 or higher, got version {}".format(QtCore.QT_VERSION_STR))

    if parse_version(psutil.__version__) < parse_version("2.2.1"):
        raise SystemExit("Requirement is psutil version 2.2.1 or higher, got version {}".format(psutil.__version__))
@@ -206,7 +211,7 @@ def main():

    # always use the INI format on Windows and OSX (because we don't like the registry and plist files)
    if sys.platform.startswith('win') or sys.platform.startswith('darwin'):
-        QtCore.QSettings.setDefaultFormat(QtCore.QSettings.IniFormat)
+        QtCore.QSettings.setDefaultFormat(QtCore.QSettings.Format.IniFormat)

    if sys.platform.startswith('win') and hasattr(sys, "frozen"):
        try:
@@ -219,20 +224,27 @@ def main():
        if not options.debug:
            try:
                # hide the console
+                # win32console.AllocConsole()
                console_window = win32console.GetConsoleWindow()
-                win32gui.ShowWindow(console_window, win32con.SW_HIDE)
+                parent_window = win32gui.GetParent(console_window)
+                if not parent_window and console_window:
+                    win32gui.ShowWindow(console_window, win32con.SW_HIDE)
+                elif parent_window:
+                    win32gui.ShowWindow(parent_window, win32con.SW_HIDE)
+                else:
+                    log.warning("Could not get the console window")
            except win32console.error as e:
-                print("warning: could not allocate console: {}".format(e))
+                log.warning("Could not allocate console: {}".format(e))

    local_config = LocalConfig.instance()

    global app
-    app = Application(sys.argv, hdpi=local_config.hdpi())
+    app = Application(sys.argv)

    if local_config.multiProfiles() and not options.profile:
        profile_select = ProfileSelectDialog()
        profile_select.show()
-        if profile_select.exec_():
+        if profile_select.exec():
            options.profile = profile_select.profile()
        else:
            sys.exit(0)
@@ -258,6 +270,7 @@ def main():
    log.info("GNS3 GUI version {}".format(__version__))
    log.info("Copyright (c) 2007-{} GNS3 Technologies Inc.".format(current_year))
    log.info("Application started with {}".format(" ".join(sys.argv)))
+    log.debug("PATH={}".format(os.environ["PATH"]))

    # update the exception file path to have it in the same directory as the settings file.
    exception_file_path = os.path.join(LocalConfig.instance().configDirectory(), exception_file_path)
@@ -269,7 +282,7 @@ def main():
            error_message = "GNS3.app must be moved to the '/Applications' folder before it can be used"
            QtWidgets.QMessageBox.critical(False, "Loading error", error_message)
            QtCore.QTimer.singleShot(0, app.quit)
-            app.exec_()
+            app.exec()
            sys.exit(1)

    global mainwindow
@@ -292,7 +305,7 @@ def main():

    mainwindow.show()

-    exit_code = app.exec_()
+    exit_code = app.exec()
    signal.signal(signal.SIGINT, orig_sigint)
    signal.signal(signal.SIGTERM, orig_sigterm)

--- a/gns3/main_window.py
+++ b/gns3/main_window.py
@@ -50,7 +50,6 @@ from .topology import Topology
 from .http_client import HTTPClient
 from .progress import Progress
 from .update_manager import UpdateManager
-from .utils.analytics import AnalyticsClient
 from .dialogs.appliance_wizard import ApplianceWizard
 from .dialogs.new_template_wizard import NewTemplateWizard
 from .dialogs.notif_dialog import NotifDialog, NotifDialogHandler
@@ -71,7 +70,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
    """

    # signal to tell the view if the user is adding a link or not
-    adding_link_signal = QtCore.pyqtSignal(bool)
+    adding_link_signal = QtCore.Signal(bool)

    # Signal of settings updates
    settings_updated_signal = QtCore.Signal()
@@ -87,7 +86,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
        self.setupUi(self)
        self.setUnifiedTitleAndToolBarOnMac(True)

-        # This widgets will be disable when you have no project loaded
+        # This widgets will be disabled when you have no project loaded
        self.disableWhenNoProjectWidgets = [
            self.uiGraphicsView,
            self.uiAnnotateMenu,
@@ -150,11 +149,11 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
        self._local_config_timer = QtCore.QTimer(self)
        self._local_config_timer.timeout.connect(local_config.checkConfigChanged)
        self._local_config_timer.start(1000)  # milliseconds
-        self._analytics_client = AnalyticsClient()
        self._template_manager = TemplateManager().instance()
        self._appliance_manager = ApplianceManager().instance()

        # restore the geometry and state of the main window.
+        self._save_gui_state_geometry = True
        self.restoreGeometry(QtCore.QByteArray().fromBase64(self._settings["geometry"].encode()))
        self.restoreState(QtCore.QByteArray().fromBase64(self._settings["state"].encode()))

@@ -172,17 +171,17 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
        self.uiNodesDockWidget.setVisible(False)

        # default directories for QFileDialog
-        self._import_configs_from_dir = QtCore.QStandardPaths.writableLocation(QtCore.QStandardPaths.DocumentsLocation)
-        self._export_configs_to_dir = QtCore.QStandardPaths.writableLocation(QtCore.QStandardPaths.DocumentsLocation)
-        self._screenshots_dir = QtCore.QStandardPaths.writableLocation(QtCore.QStandardPaths.PicturesLocation)
-        self._pictures_dir = QtCore.QStandardPaths.writableLocation(QtCore.QStandardPaths.PicturesLocation)
-        self._appliance_dir = QtCore.QStandardPaths.writableLocation(QtCore.QStandardPaths.DownloadLocation)
-        self._portable_project_dir = QtCore.QStandardPaths.writableLocation(QtCore.QStandardPaths.DownloadLocation)
+        self._import_configs_from_dir = QtCore.QStandardPaths.writableLocation(QtCore.QStandardPaths.StandardLocation.DocumentsLocation)
+        self._export_configs_to_dir = QtCore.QStandardPaths.writableLocation(QtCore.QStandardPaths.StandardLocation.DocumentsLocation)
+        self._screenshots_dir = QtCore.QStandardPaths.writableLocation(QtCore.QStandardPaths.StandardLocation.PicturesLocation)
+        self._pictures_dir = QtCore.QStandardPaths.writableLocation(QtCore.QStandardPaths.StandardLocation.PicturesLocation)
+        self._appliance_dir = QtCore.QStandardPaths.writableLocation(QtCore.QStandardPaths.StandardLocation.DownloadLocation)
+        self._portable_project_dir = QtCore.QStandardPaths.writableLocation(QtCore.QStandardPaths.StandardLocation.DownloadLocation)
        self._project_dir = None

        # add recent file actions to the File menu
        for i in range(0, self._maxrecent_files):
-            action = QtWidgets.QAction(self.uiFileMenu)
+            action = QtGui.QAction(self.uiFileMenu)
            action.setVisible(False)
            action.triggered.connect(self.openRecentFileSlot)
            self.recent_file_actions.append(action)
@@ -193,7 +192,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):

        # add recent projects to the File menu
        for i in range(0, self._maxrecent_files):
-            action = QtWidgets.QAction(self.uiFileMenu)
+            action = QtGui.QAction(self.uiFileMenu)
            action.setVisible(False)
            action.triggered.connect(self.openRecentProjectSlot)
            self.recent_project_actions.append(action)
@@ -212,6 +211,12 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):

        self.setWindowTitle("[*] GNS3")

+        # detect if the SVG module is correctly installed
+        supported_image_formats = [fmt.data().decode('utf-8') for fmt in QtGui.QImageReader().supportedImageFormats()]
+        log.debug("Supported image formats: %s", ", ".join(supported_image_formats))
+        if "svg" not in supported_image_formats:
+            log.warning("SVG image format is not supported, is the Qt SVG module installed? (qt6-svg-plugins)")
+
        # load initial stuff once the event loop isn't busy
        self.run_later(0, self.startupLoading)

@@ -253,6 +258,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
        self.uiShowReadmeAction.triggered.connect(self._showReadmeActionSlot)
        self.uiSnapToGridAction.triggered.connect(self._snapToGridActionSlot)
        self.uiLockAllAction.triggered.connect(self._lockActionSlot)
+        self.uiResetGUIStateAction.triggered.connect(self._resetGUIState)
        self.uiResetDocksAction.triggered.connect(self._resetDocksSlot)

        # tool menu connections
@@ -287,6 +293,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
        self.uiExportDebugInformationAction.triggered.connect(self._exportDebugInformationSlot)
        self.uiDoctorAction.triggered.connect(self._doctorSlot)
        self.uiAcademyAction.triggered.connect(self._academyActionSlot)
+        self.uiShortcutsAction.triggered.connect(self._shortcutsActionSlot)

        # browsers tool bar connections
        self.uiBrowseRoutersAction.triggered.connect(self._browseRoutersActionSlot)
@@ -387,6 +394,18 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
                        item.updateNode()
                    item.update()

+    def _resetGUIState(self):
+        """
+        Reset the GUI state.
+        """
+
+        self._save_gui_state_geometry = False
+        self.close()
+        if hasattr(sys, "frozen"):
+            QtCore.QProcess.startDetached(os.path.abspath(sys.executable), sys.argv)
+        else:
+            QtWidgets.QMessageBox.information(self, "GUI state","The GUI state has been reset, please restart the application")
+
    def _resetDocksSlot(self):
        """
        Reset the dock widgets.
@@ -397,13 +416,6 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
        self.uiConsoleDockWidget.setFloating(False)
        self.uiNodesDockWidget.setFloating(False)

-    def analyticsClient(self):
-        """
-        Return the analytics client
-        """
-
-        return self._analytics_client
-
    def _newProjectActionSlot(self):
        """
        Slot called to create a new project.
@@ -415,7 +427,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):

        self._project_dialog = ProjectDialog(self)
        self._project_dialog.show()
-        create_new_project = self._project_dialog.exec_()
+        create_new_project = self._project_dialog.exec()

        if create_new_project:
            Topology.instance().createLoadProject(self._project_dialog.getProjectSettings())
@@ -429,7 +441,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):

        dialog = NewTemplateWizard(self)
        dialog.show()
-        dialog.exec_()
+        dialog.exec()

    def _imageManagementActionSlot(self):
        """
@@ -438,7 +450,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):

        dialog = ImageDialog(self)
        dialog.show()
-        dialog.exec_()
+        dialog.exec()

    @qslot
    def openApplianceActionSlot(self, *args):
@@ -450,7 +462,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
        if not os.path.exists(self._appliance_dir):
            directory = Topology.instance().projectsDirPath()
        path, _ = QtWidgets.QFileDialog.getOpenFileName(self, "Import appliance", directory,
-                                                        "All files (*.*);;GNS3 Appliance (*.gns3appliance *.gns3a)",
+                                                        "All files (*);;GNS3 Appliance (*.gns3appliance *.gns3a)",
                                                        "GNS3 Appliance (*.gns3appliance *.gns3a)")
        if path:
            self.loadPath(path)
@@ -469,7 +481,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
            if self._project_dir is None or not os.path.exists(self._project_dir):
                directory = Topology.instance().projectsDirPath()
            path, _ = QtWidgets.QFileDialog.getOpenFileName(self, "Open project", directory,
-                                                            "All files (*.*);;GNS3 Project (*.gns3);;GNS3 Portable Project (*.gns3project *.gns3p);;NET files (*.net)",
+                                                            "All files (*);;GNS3 Project (*.gns3);;GNS3 Portable Project (*.gns3project *.gns3p);;NET files (*.net)",
                                                            "GNS3 Project (*.gns3)")
            if path:
                self.loadPath(path)
@@ -533,7 +545,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
                QtWidgets.QMessageBox.critical(self, "Appliance", "Error while importing appliance {}: {}".format(path, str(e)))
                return
            self._appliance_wizard.show()
-            self._appliance_wizard.exec_()
+            self._appliance_wizard.exec()
        elif path.endswith(".gns3"):
            if Controller.instance().isRemote():
                QtWidgets.QMessageBox.critical(self, "Open project", "Cannot open a .gns3 file on a remote server, please use a project (.gns3p) instead")
@@ -613,7 +625,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
        Exports all configs to a directory.
        """

-        path = QtWidgets.QFileDialog.getExistingDirectory(self, "Export directory", self._export_configs_to_dir, QtWidgets.QFileDialog.ShowDirsOnly)
+        path = QtWidgets.QFileDialog.getExistingDirectory(self, "Export directory", self._export_configs_to_dir, QtWidgets.QFileDialog.Option.ShowDirsOnly)
        if path:
            self._export_configs_to_dir = os.path.dirname(path)
            for module in MODULES:
@@ -626,7 +638,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
        Imports all configs from a directory.
        """

-        path = QtWidgets.QFileDialog.getExistingDirectory(self, "Import directory", self._import_configs_from_dir, QtWidgets.QFileDialog.ShowDirsOnly)
+        path = QtWidgets.QFileDialog.getExistingDirectory(self, "Import directory", self._import_configs_from_dir, QtWidgets.QFileDialog.Option.ShowDirsOnly)
        if path:
            self._import_configs_from_dir = os.path.dirname(path)
            for module in MODULES:
@@ -644,12 +656,12 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
        scene = self.uiGraphicsView.scene()
        scene.clearSelection()
        source = scene.itemsBoundingRect().adjusted(-20.0, -20.0, 20.0, 20.0)
-        image = QtGui.QImage(source.size().toSize(), QtGui.QImage.Format_RGB32)
-        image.fill(QtCore.Qt.white)
+        image = QtGui.QImage(source.size().toSize(), QtGui.QImage.Format.Format_RGB32)
+        image.fill(QtCore.Qt.GlobalColor.white)
        painter = QtGui.QPainter(image)
-        painter.setRenderHint(QtGui.QPainter.Antialiasing, True)
-        painter.setRenderHint(QtGui.QPainter.TextAntialiasing, True)
-        painter.setRenderHint(QtGui.QPainter.SmoothPixmapTransform, True)
+        painter.setRenderHint(QtGui.QPainter.RenderHint.Antialiasing, True)
+        painter.setRenderHint(QtGui.QPainter.RenderHint.TextAntialiasing, True)
+        painter.setRenderHint(QtGui.QPainter.RenderHint.SmoothPixmapTransform, True)
        scene.render(painter, source=source)
        painter.end()
        # TODO: quality option
@@ -739,7 +751,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):

        dialog = SnapshotsDialog(self, project)
        dialog.show()
-        dialog.exec_()
+        dialog.exec()

    def _selectAllActionSlot(self):
        """
@@ -764,12 +776,12 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
        Slot to switch to full screen.
        """

-        if not self.windowState() & QtCore.Qt.WindowFullScreen:
+        if not self.windowState() & QtCore.Qt.WindowState.WindowFullScreen:
            # switch to full screen
-            self.setWindowState(self.windowState() | QtCore.Qt.WindowFullScreen)
+            self.setWindowState(self.windowState() | QtCore.Qt.WindowState.WindowFullScreen)
        else:
            # switch back to normal
-            self.setWindowState(self.windowState() & ~QtCore.Qt.WindowFullScreen)
+            self.setWindowState(self.windowState() & ~QtCore.Qt.WindowState.WindowFullScreen)

    def _zoomInActionSlot(self):
        """
@@ -805,7 +817,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
        view = self.uiGraphicsView
        bounding_rect = view.scene().itemsBoundingRect().adjusted(-20.0, -20.0, 20.0, 20.0)
        view.ensureVisible(bounding_rect)
-        view.fitInView(bounding_rect, QtCore.Qt.KeepAspectRatio)
+        view.fitInView(bounding_rect, QtCore.Qt.AspectRatioMode.KeepAspectRatio)

    def _showLayersActionSlot(self):
        """
@@ -848,9 +860,9 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
        """

        reply = QtWidgets.QMessageBox.question(self, "Confirm Start All", "Are you sure you want to start all devices?",
-                                                   QtWidgets.QMessageBox.Yes | QtWidgets.QMessageBox.No)
+                                                   QtWidgets.QMessageBox.StandardButton.Yes | QtWidgets.QMessageBox.StandardButton.No)
                                                   
-        if reply == QtWidgets.QMessageBox.No:
+        if reply == QtWidgets.QMessageBox.StandardButton.No:
            return

        project = Topology.instance().project()
@@ -863,9 +875,9 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
        """

        reply = QtWidgets.QMessageBox.question(self, "Confirm Suspend All", "Are you sure you want to suspend all devices?",
-                                                   QtWidgets.QMessageBox.Yes | QtWidgets.QMessageBox.No)
+                                                   QtWidgets.QMessageBox.StandardButton.Yes | QtWidgets.QMessageBox.StandardButton.No)

-        if reply == QtWidgets.QMessageBox.No:
+        if reply == QtWidgets.QMessageBox.StandardButton.No:
            return

        project = Topology.instance().project()
@@ -878,9 +890,9 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
        """

        reply = QtWidgets.QMessageBox.question(self, "Confirm Stop All", "Are you sure you want to stop all devices?",
-                                                   QtWidgets.QMessageBox.Yes | QtWidgets.QMessageBox.No)
+                                                   QtWidgets.QMessageBox.StandardButton.Yes | QtWidgets.QMessageBox.StandardButton.No)

-        if reply == QtWidgets.QMessageBox.No:
+        if reply == QtWidgets.QMessageBox.StandardButton.No:
            return

        project = Topology.instance().project()
@@ -893,9 +905,9 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
        """

        reply = QtWidgets.QMessageBox.question(self, "Confirm Reload All", "Are you sure you want to reload all devices?",
-                                                   QtWidgets.QMessageBox.Yes | QtWidgets.QMessageBox.No)
+                                                   QtWidgets.QMessageBox.StandardButton.Yes | QtWidgets.QMessageBox.StandardButton.No)

-        if reply == QtWidgets.QMessageBox.No:
+        if reply == QtWidgets.QMessageBox.StandardButton.No:
            return

        project = Topology.instance().project()
@@ -945,7 +957,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
        Slot called when inserting an image on the scene.
        """
        # supported image file formats
-        file_formats = "Image files (*.svg *.bmp *.jpeg *.jpg *.gif *.pbm *.pgm *.png *.ppm *.xbm *.xpm);;All files (*.*)"
+        file_formats = "Image files (*.svg *.bmp *.jpeg *.jpg *.gif *.pbm *.pgm *.png *.ppm *.xbm *.xpm);;All files (*)"

        path, _ = QtWidgets.QFileDialog.getOpenFileName(self, "Image", self._pictures_dir, file_formats)
        if not path:
@@ -1000,7 +1012,16 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):

        setup_wizard = SetupWizard(self)
        setup_wizard.show()
-        setup_wizard.exec_()
+        setup_wizard.exec()
+
+    def _shortcutsActionSlot(self):
+
+        shortcuts_text = ""
+        for action in self.findChildren(QtGui.QAction):
+            shortcut = action.shortcut().toString()
+            if shortcut:
+                shortcuts_text += f"{action.toolTip()}: {shortcut}\n"
+        QtWidgets.QMessageBox.information(self, "Shortcuts", shortcuts_text)

    def _aboutQtActionSlot(self):
        """
@@ -1016,7 +1037,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):

        dialog = AboutDialog(self)
        dialog.show()
-        dialog.exec_()
+        dialog.exec()

    def _exportDebugInformationSlot(self):
        """
@@ -1025,7 +1046,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):

        dialog = ExportDebugDialog(self, Topology.instance().project())
        dialog.show()
-        dialog.exec_()
+        dialog.exec()

    def _doctorSlot(self):
        """
@@ -1034,7 +1055,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):

        dialog = DoctorDialog(self)
        dialog.show()
-        dialog.exec_()
+        dialog.exec()

    def _academyActionSlot(self):
        """
@@ -1124,7 +1145,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
            dialog = PreferencesDialog(self)
            #dialog.restoreGeometry(QtCore.QByteArray().fromBase64(self._settings["preferences_dialog_geometry"].encode()))
            dialog.show()
-            dialog.exec_()
+            dialog.exec()
            #self._settings["preferences_dialog_geometry"] = bytes(dialog.saveGeometry().toBase64()).decode()
            #self.setSettings(self._settings)

@@ -1153,9 +1174,13 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):

        key = event.key()
        # if the user is adding a link and press Escape, then cancel the link addition.
-        if self.uiAddLinkAction.isChecked() and key == QtCore.Qt.Key_Escape:
+        if self.uiAddLinkAction.isChecked() and key == QtCore.Qt.Key.Key_Escape:
            self.uiAddLinkAction.setChecked(False)
            self._addLinkActionSlot()
+        elif key == QtCore.Qt.Key.Key_C and (event.modifiers() & QtCore.Qt.KeyboardModifier.ControlModifier):
+            status_bar_message = self.uiStatusBar.currentMessage()
+            if status_bar_message:
+                QtWidgets.QApplication.clipboard().setText(status_bar_message)
        else:
            super().keyPressEvent(event)

@@ -1168,8 +1193,8 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):

        if Topology.instance().project():
            reply = QtWidgets.QMessageBox.question(self, "Confirm Exit", "Are you sure you want to exit GNS3?",
-                                                   QtWidgets.QMessageBox.Yes | QtWidgets.QMessageBox.No)
-            if reply == QtWidgets.QMessageBox.No:
+                                                   QtWidgets.QMessageBox.StandardButton.Yes | QtWidgets.QMessageBox.StandardButton.No)
+            if reply == QtWidgets.QMessageBox.StandardButton.No:
                event.ignore()
                return

@@ -1178,8 +1203,6 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
        progress.setCancelButtonText("Force quit")

        log.debug("Close the Main Window")
-        self._analytics_client.sendScreenView("Main Window", session_start=False)
-
        self._finish_application_closing(close_windows=False)
        event.accept()
        self.uiConsoleTextEdit.closeIO()
@@ -1194,8 +1217,12 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):

        log.debug("_finish_application_closing")

-        self._settings["geometry"] = bytes(self.saveGeometry().toBase64()).decode()
-        self._settings["state"] = bytes(self.saveState().toBase64()).decode()
+        if self._save_gui_state_geometry:
+            self._settings["geometry"] = bytes(self.saveGeometry().toBase64()).decode()
+            self._settings["state"] = bytes(self.saveState().toBase64()).decode()
+        else:
+            self._settings["geometry"] = ""
+            self._settings["state"] = ""
        self.setSettings(self._settings)

        Controller.instance().stopListenNotifications()
@@ -1229,8 +1256,8 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):

        if not LocalConfig.instance().isMainGui():
            reply = QtWidgets.QMessageBox.warning(self, "GNS3", "Another GNS3 GUI is already running. Continue?",
-                                                  QtWidgets.QMessageBox.Yes | QtWidgets.QMessageBox.No)
-            if reply == QtWidgets.QMessageBox.No:
+                                                  QtWidgets.QMessageBox.StandardButton.Yes | QtWidgets.QMessageBox.StandardButton.No)
+            if reply == QtWidgets.QMessageBox.StandardButton.No:
                sys.exit(1)
                return

@@ -1268,7 +1295,6 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
        Controller.instance().connected_signal.connect(self._controllerConnectedSlot)
        Controller.instance().project_list_updated_signal.connect(self.updateRecentProjectActions)

-        self._analytics_client.sendScreenView("Main Window")
        self.uiGraphicsView.setEnabled(False)

        # show the setup wizard
@@ -1440,7 +1466,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
            if self._open_file_at_startup:
                self.loadPath(self._open_file_at_startup)
                self._open_file_at_startup = None
-            elif Topology.instance().project() is None:
+            elif Topology.instance().project() is None and QtWidgets.QApplication.activeModalWidget() is None:
                self._newProjectActionSlot()

    def run_later(self, counter, callback):
@@ -1469,7 +1495,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
        if not os.path.exists(directory):
            directory = Topology.instance().projectsDirPath()
        path, _ = QtWidgets.QFileDialog.getOpenFileName(self, "Open project", directory,
-                                                        "All files (*.*);;GNS3 Portable Project (*.gns3project *.gns3p)",
+                                                        "All files (*);;GNS3 Portable Project (*.gns3project *.gns3p)",
                                                        "GNS3 Portable Project (*.gns3project *.gns3p)")
        if path:
            Topology.instance().importProject(path)
@@ -1480,7 +1506,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
            return
        dialog = EditProjectDialog(self)
        dialog.show()
-        dialog.exec_()
+        dialog.exec()

    def _deleteProjectActionSlot(self):
        if Topology.instance().project() is None:
@@ -1489,8 +1515,8 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
            self,
            "GNS3",
            "The project will be deleted from disk. All files will be removed including the project subdirectories. Continue?",
-            QtWidgets.QMessageBox.Yes | QtWidgets.QMessageBox.No)
-        if reply == QtWidgets.QMessageBox.Yes:
+            QtWidgets.QMessageBox.StandardButton.Yes | QtWidgets.QMessageBox.StandardButton.No)
+        if reply == QtWidgets.QMessageBox.StandardButton.Yes:
            Topology.instance().deleteProject()

    def _setStyle(self, style_name):
--- a/gns3/modules/builtin/atm_switch.py
+++ b/gns3/modules/builtin/atm_switch.py
@@ -53,7 +53,7 @@ class ATMSwitch(Node):

        info = """ATM switch {name} is always-on
  Running on server {host} with port {port}
-  Local ID is {id} and server ID is {node_id}
+  Local ID is {id} and node ID is {node_id}
  Hardware is Dynamips emulated simple ATM switch
 """.format(name=self.name(),
           id=self.id(),
--- a/gns3/modules/builtin/dialogs/cloud_wizard.py
+++ b/gns3/modules/builtin/dialogs/cloud_wizard.py
@@ -37,7 +37,7 @@ class CloudWizard(VMWizard, Ui_CloudNodeWizard):

        super().__init__(cloud_nodes, parent)

-        self.setPixmap(QtWidgets.QWizard.LogoPixmap, QtGui.QPixmap(":/symbols/cloud.svg"))
+        self.setPixmap(QtWidgets.QWizard.WizardPixmap.LogoPixmap, QtGui.QPixmap(":/symbols/cloud.svg"))
        self.uiNameWizardPage.registerField("name*", self.uiNameLineEdit)

    def getSettings(self):
--- a/gns3/modules/builtin/dialogs/ethernet_hub_wizard.py
+++ b/gns3/modules/builtin/dialogs/ethernet_hub_wizard.py
@@ -38,7 +38,7 @@ class EthernetHubWizard(VMWizard, Ui_EthernetHubWizard):

        super().__init__(ethernet_hubs, parent)

-        self.setPixmap(QtWidgets.QWizard.LogoPixmap, QtGui.QPixmap(":/symbols/hub.svg"))
+        self.setPixmap(QtWidgets.QWizard.WizardPixmap.LogoPixmap, QtGui.QPixmap(":/symbols/hub.svg"))
        self.uiNameWizardPage.registerField("name*", self.uiNameLineEdit)

    def getSettings(self):
--- a/gns3/modules/builtin/dialogs/ethernet_switch_wizard.py
+++ b/gns3/modules/builtin/dialogs/ethernet_switch_wizard.py
@@ -38,7 +38,7 @@ class EthernetSwitchWizard(VMWizard, Ui_EthernetSwitchWizard):

        super().__init__(ethernet_switches, parent)

-        self.setPixmap(QtWidgets.QWizard.LogoPixmap, QtGui.QPixmap(":/symbols/ethernet_switch.svg"))
+        self.setPixmap(QtWidgets.QWizard.WizardPixmap.LogoPixmap, QtGui.QPixmap(":/symbols/ethernet_switch.svg"))
        self.uiNameWizardPage.registerField("name*", self.uiNameLineEdit)

    def getSettings(self):
--- a/gns3/modules/builtin/ethernet_hub.py
+++ b/gns3/modules/builtin/ethernet_hub.py
@@ -49,7 +49,7 @@ class EthernetHub(Node):

        info = """Ethernet hub {name} is always-on
  Running on server {host} with port {port}
-  Local ID is {id} and server ID is {node_id}
+  Local ID is {id} and node ID is {node_id}
 """.format(name=self.name(),
           id=self.id(),
           node_id=self._node_id,
--- a/gns3/modules/builtin/ethernet_switch.py
+++ b/gns3/modules/builtin/ethernet_switch.py
@@ -49,7 +49,7 @@ class EthernetSwitch(Node):

        info = """Ethernet switch {name} is always-on
  Running on server {host} with port {port}
-  Local ID is {id} and server ID is {node_id}
+  Local ID is {id} and node ID is {node_id}
  Console is on port {console} and type is {console_type}
 """.format(name=self.name(),
           id=self.id(),
--- a/gns3/modules/builtin/frame_relay_switch.py
+++ b/gns3/modules/builtin/frame_relay_switch.py
@@ -50,7 +50,7 @@ class FrameRelaySwitch(Node):

        info = """Frame relay switch {name} is always-on
  Running on server {host} with port {port}
-  Local ID is {id} and server ID is {node_id}
+  Local ID is {id} and node ID is {node_id}
  Hardware is Dynamips emulated simple Frame relay switch
 """.format(name=self.name(),
           id=self.id(),
--- a/gns3/modules/builtin/nat.py
+++ b/gns3/modules/builtin/nat.py
@@ -73,7 +73,7 @@ class Nat(Node):
        :returns: symbol path (or resource).
        """

-        return ":/symbols/cloud.svg"
+        return ":/symbols/nat.svg"

    @staticmethod
    def categories():
--- a/gns3/modules/builtin/pages/atm_switch_configuration_page.py
+++ b/gns3/modules/builtin/pages/atm_switch_configuration_page.py
@@ -43,7 +43,7 @@ class ATMSwitchConfigurationPage(QtWidgets.QWidget, Ui_atmSwitchConfigPageWidget
        self.uiMappingTreeWidget.itemSelectionChanged.connect(self._mappingSelectionChangedSlot)

        # enable sorting
-        self.uiMappingTreeWidget.sortByColumn(0, QtCore.Qt.AscendingOrder)
+        self.uiMappingTreeWidget.sortByColumn(0, QtCore.Qt.SortOrder.AscendingOrder)
        self.uiMappingTreeWidget.setSortingEnabled(True)

    def _mappingSelectedSlot(self, item, column):
@@ -61,11 +61,11 @@ class ATMSwitchConfigurationPage(QtWidgets.QWidget, Ui_atmSwitchConfigPageWidget
        match_destination_mapping = mapping.search(destination)

        if match_source_mapping and match_destination_mapping:
-            self.uiVPICheckBox.setCheckState(QtCore.Qt.Unchecked)
+            self.uiVPICheckBox.setCheckState(QtCore.Qt.CheckState.Unchecked)
            (source_port, source_vpi, source_vci) = match_source_mapping.group(1, 2, 3)
            (destination_port, destination_vpi, destination_vci) = match_destination_mapping.group(1, 2, 3)
        else:
-            self.uiVPICheckBox.setCheckState(QtCore.Qt.Checked)
+            self.uiVPICheckBox.setCheckState(QtCore.Qt.CheckState.Checked)
            (source_port, source_vpi) = source.split(':')
            (destination_port, destination_vpi) = destination.split(':')
            source_vci = destination_vci = 0
@@ -103,7 +103,7 @@ class ATMSwitchConfigurationPage(QtWidgets.QWidget, Ui_atmSwitchConfigPageWidget
        destination_vpi = self.uiDestinationVPISpinBox.value()
        destination_vci = self.uiDestinationVCISpinBox.value()

-        if self.uiVPICheckBox.checkState() == QtCore.Qt.Unchecked:
+        if self.uiVPICheckBox.checkState() == QtCore.Qt.CheckState.Unchecked:
            source = "{port}:{vpi}:{vci}".format(port=source_port,
                                                 vpi=source_vpi,
                                                 vci=source_vci)
--- a/gns3/modules/builtin/pages/cloud_configuration_page.py
+++ b/gns3/modules/builtin/pages/cloud_configuration_page.py
@@ -364,7 +364,7 @@ class CloudConfigurationPage(QtWidgets.QWidget, Ui_cloudConfigPageWidget):
            if interface["type"] == "ethernet":
                if not state and interface["special"]:
                    continue
-                if self.uiEthernetListWidget.findItems(interface["name"], QtCore.Qt.MatchFixedString):
+                if self.uiEthernetListWidget.findItems(interface["name"], QtCore.Qt.MatchFlag.MatchFixedString):
                    continue
                self.uiEthernetComboBox.addItem(interface["name"])
                index += 1
@@ -377,7 +377,7 @@ class CloudConfigurationPage(QtWidgets.QWidget, Ui_cloudConfigPageWidget):
        symbol_path = self.uiSymbolLineEdit.text()
        dialog = SymbolSelectionDialog(self, symbol=symbol_path)
        dialog.show()
-        if dialog.exec_():
+        if dialog.exec():
            new_symbol_path = dialog.getSymbol()
            self.uiSymbolLineEdit.setText(new_symbol_path)
            self.uiSymbolLineEdit.setToolTip('<img src="{}"/>'.format(new_symbol_path))
--- a/gns3/modules/builtin/pages/cloud_preferences_page.py
+++ b/gns3/modules/builtin/pages/cloud_preferences_page.py
@@ -89,9 +89,13 @@ class CloudPreferencesPage(QtWidgets.QWidget, Ui_CloudPreferencesPageWidget):
        try:
            compute_id = cloud_node.get("compute_id")
            if compute_id:
-                QtWidgets.QTreeWidgetItem(section_item, ["Server:", ComputeManager.instance().getCompute(compute_id).name()])
+                QtWidgets.QTreeWidgetItem(section_item, ["Compute:", ComputeManager.instance().getCompute(compute_id).name()])
            else:
-                QtWidgets.QTreeWidgetItem(section_item, ["Server:", "Dynamically allocated by the controller"])
+                if Controller.instance().settings()["dynamic_compute_allocation"]:
+                    msg = "Dynamically allocated by the controller"
+                else:
+                    msg = "Manually chosen"
+                QtWidgets.QTreeWidgetItem(section_item, ["Compute:", msg])
        except KeyError:
            pass

@@ -111,7 +115,7 @@ class CloudPreferencesPage(QtWidgets.QWidget, Ui_CloudPreferencesPageWidget):
        self.uiEditCloudNodePushButton.setEnabled(single_selected)

        if single_selected:
-            key = selection[0].data(0, QtCore.Qt.UserRole)
+            key = selection[0].data(0, QtCore.Qt.ItemDataRole.UserRole)
            cloud_node = self._cloud_nodes[key]
            self._refreshInfo(cloud_node)
        else:
@@ -124,7 +128,7 @@ class CloudPreferencesPage(QtWidgets.QWidget, Ui_CloudPreferencesPageWidget):

        wizard = CloudWizard(self._cloud_nodes, parent=self)
        wizard.show()
-        if wizard.exec_():
+        if wizard.exec():
            new_cloud_settings = wizard.getSettings()
            key = "{server}:{name}".format(server=new_cloud_settings["compute_id"], name=new_cloud_settings["name"])
            self._cloud_nodes[key] = CLOUD_SETTINGS.copy()
@@ -134,7 +138,7 @@ class CloudPreferencesPage(QtWidgets.QWidget, Ui_CloudPreferencesPageWidget):
            item.setText(0, self._cloud_nodes[key]["name"])
            Controller.instance().getSymbolIcon(self._cloud_nodes[key]["symbol"], qpartial(self._setItemIcon, item))

-            item.setData(0, QtCore.Qt.UserRole, key)
+            item.setData(0, QtCore.Qt.ItemDataRole.UserRole, key)
            self._items.append(item)
            self.uiCloudNodesTreeWidget.setCurrentItem(item)

@@ -145,11 +149,11 @@ class CloudPreferencesPage(QtWidgets.QWidget, Ui_CloudPreferencesPageWidget):

        item = self.uiCloudNodesTreeWidget.currentItem()
        if item:
-            key = item.data(0, QtCore.Qt.UserRole)
+            key = item.data(0, QtCore.Qt.ItemDataRole.UserRole)
            cloud_node = self._cloud_nodes[key]
            dialog = ConfigurationDialog(cloud_node["name"], cloud_node, CloudConfigurationPage(), parent=self)
            dialog.show()
-            if dialog.exec_():
+            if dialog.exec():
                # update the icon
                Controller.instance().getSymbolIcon(cloud_node["symbol"], qpartial(self._setItemIcon, item))
                if cloud_node["name"] != item.text(0):
@@ -162,7 +166,7 @@ class CloudPreferencesPage(QtWidgets.QWidget, Ui_CloudPreferencesPageWidget):
                    self._cloud_nodes[new_key] = self._cloud_nodes[key]
                    del self._cloud_nodes[key]
                    item.setText(0, cloud_node["name"])
-                    item.setData(0, QtCore.Qt.UserRole, new_key)
+                    item.setData(0, QtCore.Qt.ItemDataRole.UserRole, new_key)
                self._refreshInfo(cloud_node)

    def _deleteCloudNodeSlot(self):
@@ -172,7 +176,7 @@ class CloudPreferencesPage(QtWidgets.QWidget, Ui_CloudPreferencesPageWidget):

        for item in self.uiCloudNodesTreeWidget.selectedItems():
            if item:
-                key = item.data(0, QtCore.Qt.UserRole)
+                key = item.data(0, QtCore.Qt.ItemDataRole.UserRole)
                del self._cloud_nodes[key]
                self.uiCloudNodesTreeWidget.takeTopLevelItem(self.uiCloudNodesTreeWidget.indexOfTopLevelItem(item))

@@ -196,12 +200,12 @@ class CloudPreferencesPage(QtWidgets.QWidget, Ui_CloudPreferencesPageWidget):
            item = QtWidgets.QTreeWidgetItem(self.uiCloudNodesTreeWidget)
            item.setText(0, cloud_node["name"])
            Controller.instance().getSymbolIcon(cloud_node["symbol"], qpartial(self._setItemIcon, item))
-            item.setData(0, QtCore.Qt.UserRole, key)
+            item.setData(0, QtCore.Qt.ItemDataRole.UserRole, key)
            self._items.append(item)

        if self._items:
            self.uiCloudNodesTreeWidget.setCurrentItem(self._items[0])
-            self.uiCloudNodesTreeWidget.sortByColumn(0, QtCore.Qt.AscendingOrder)
+            self.uiCloudNodesTreeWidget.sortByColumn(0, QtCore.Qt.SortOrder.AscendingOrder)
            self.uiCloudNodesTreeWidget.setMaximumWidth(self.uiCloudNodesTreeWidget.sizeHintForColumn(0) + 20)

    def _setItemIcon(self, item, icon):
--- a/gns3/modules/builtin/pages/ethernet_hub_configuration_page.py
+++ b/gns3/modules/builtin/pages/ethernet_hub_configuration_page.py
@@ -52,7 +52,7 @@ class EthernetHubConfigurationPage(QtWidgets.QWidget, Ui_ethernetHubConfigPageWi
        symbol_path = self.uiSymbolLineEdit.text()
        dialog = SymbolSelectionDialog(self, symbol=symbol_path)
        dialog.show()
-        if dialog.exec_():
+        if dialog.exec():
            new_symbol_path = dialog.getSymbol()
            self.uiSymbolLineEdit.setText(new_symbol_path)
            self.uiSymbolLineEdit.setToolTip('<img src="{}"/>'.format(new_symbol_path))
--- a/gns3/modules/builtin/pages/ethernet_hub_preferences_page.py
+++ b/gns3/modules/builtin/pages/ethernet_hub_preferences_page.py
@@ -85,9 +85,13 @@ class EthernetHubPreferencesPage(QtWidgets.QWidget, Ui_EthernetHubPreferencesPag
        try:
            compute_id = ethernet_hub.get("compute_id")
            if compute_id:
-                QtWidgets.QTreeWidgetItem(section_item, ["Server:", ComputeManager.instance().getCompute(compute_id).name()])
+                QtWidgets.QTreeWidgetItem(section_item, ["Compute:", ComputeManager.instance().getCompute(compute_id).name()])
            else:
-                QtWidgets.QTreeWidgetItem(section_item, ["Server:", "Dynamically allocated by the controller"])
+                if Controller.instance().settings()["dynamic_compute_allocation"]:
+                    msg = "Dynamically allocated by the controller"
+                else:
+                    msg = "Manually chosen"
+                QtWidgets.QTreeWidgetItem(section_item, ["Compute:", msg])
        except KeyError:
            pass
        QtWidgets.QTreeWidgetItem(section_item, ["Number of ports:", str(len(ethernet_hub["ports_mapping"]))])
@@ -108,7 +112,7 @@ class EthernetHubPreferencesPage(QtWidgets.QWidget, Ui_EthernetHubPreferencesPag
        self.uiEditEthernetHubPushButton.setEnabled(single_selected)

        if single_selected:
-            key = selection[0].data(0, QtCore.Qt.UserRole)
+            key = selection[0].data(0, QtCore.Qt.ItemDataRole.UserRole)
            ethernet_hub = self._ethernet_hubs[key]
            self._refreshInfo(ethernet_hub)
        else:
@@ -121,7 +125,7 @@ class EthernetHubPreferencesPage(QtWidgets.QWidget, Ui_EthernetHubPreferencesPag

        wizard = EthernetHubWizard(self._ethernet_hubs, parent=self)
        wizard.show()
-        if wizard.exec_():
+        if wizard.exec():
            new_ethernet_hub_settings = wizard.getSettings()
            key = "{server}:{name}".format(server=new_ethernet_hub_settings["compute_id"], name=new_ethernet_hub_settings["name"])
            self._ethernet_hubs[key] = ETHERNET_HUB_SETTINGS.copy()
@@ -130,7 +134,7 @@ class EthernetHubPreferencesPage(QtWidgets.QWidget, Ui_EthernetHubPreferencesPag
            item = QtWidgets.QTreeWidgetItem(self.uiEthernetHubsTreeWidget)
            item.setText(0, self._ethernet_hubs[key]["name"])
            Controller.instance().getSymbolIcon(self._ethernet_hubs[key]["symbol"], qpartial(self._setItemIcon, item))
-            item.setData(0, QtCore.Qt.UserRole, key)
+            item.setData(0, QtCore.Qt.ItemDataRole.UserRole, key)
            self._items.append(item)
            self.uiEthernetHubsTreeWidget.setCurrentItem(item)

@@ -141,11 +145,11 @@ class EthernetHubPreferencesPage(QtWidgets.QWidget, Ui_EthernetHubPreferencesPag

        item = self.uiEthernetHubsTreeWidget.currentItem()
        if item:
-            key = item.data(0, QtCore.Qt.UserRole)
+            key = item.data(0, QtCore.Qt.ItemDataRole.UserRole)
            ethernet_hub = self._ethernet_hubs[key]
            dialog = ConfigurationDialog(ethernet_hub["name"], ethernet_hub, EthernetHubConfigurationPage(), parent=self)
            dialog.show()
-            if dialog.exec_():
+            if dialog.exec():
                # update the icon
                Controller.instance().getSymbolIcon(ethernet_hub["symbol"], qpartial(self._setItemIcon, item))
                if ethernet_hub["name"] != item.text(0):
@@ -158,7 +162,7 @@ class EthernetHubPreferencesPage(QtWidgets.QWidget, Ui_EthernetHubPreferencesPag
                    self._ethernet_hubs[new_key] = self._ethernet_hubs[key]
                    del self._ethernet_hubs[key]
                    item.setText(0, ethernet_hub["name"])
-                    item.setData(0, QtCore.Qt.UserRole, new_key)
+                    item.setData(0, QtCore.Qt.ItemDataRole.UserRole, new_key)
                self._refreshInfo(ethernet_hub)

    def _deleteEthernetHubSlot(self):
@@ -168,7 +172,7 @@ class EthernetHubPreferencesPage(QtWidgets.QWidget, Ui_EthernetHubPreferencesPag

        for item in self.uiEthernetHubsTreeWidget.selectedItems():
            if item:
-                key = item.data(0, QtCore.Qt.UserRole)
+                key = item.data(0, QtCore.Qt.ItemDataRole.UserRole)
                del self._ethernet_hubs[key]
                self.uiEthernetHubsTreeWidget.takeTopLevelItem(self.uiEthernetHubsTreeWidget.indexOfTopLevelItem(item))

@@ -192,12 +196,12 @@ class EthernetHubPreferencesPage(QtWidgets.QWidget, Ui_EthernetHubPreferencesPag
            item = QtWidgets.QTreeWidgetItem(self.uiEthernetHubsTreeWidget)
            item.setText(0, ethernet_hub["name"])
            Controller.instance().getSymbolIcon(ethernet_hub["symbol"], qpartial(self._setItemIcon, item))
-            item.setData(0, QtCore.Qt.UserRole, key)
+            item.setData(0, QtCore.Qt.ItemDataRole.UserRole, key)
            self._items.append(item)

        if self._items:
            self.uiEthernetHubsTreeWidget.setCurrentItem(self._items[0])
-            self.uiEthernetHubsTreeWidget.sortByColumn(0, QtCore.Qt.AscendingOrder)
+            self.uiEthernetHubsTreeWidget.sortByColumn(0, QtCore.Qt.SortOrder.AscendingOrder)
            self.uiEthernetHubsTreeWidget.setMaximumWidth(self.uiEthernetHubsTreeWidget.sizeHintForColumn(0) + 20)

    def _setItemIcon(self, item, icon):
--- a/gns3/modules/builtin/pages/ethernet_switch_configuration_page.py
+++ b/gns3/modules/builtin/pages/ethernet_switch_configuration_page.py
@@ -51,7 +51,7 @@ class EthernetSwitchConfigurationPage(QtWidgets.QWidget, Ui_ethernetSwitchConfig
        self.uiPortTypeComboBox.currentIndexChanged.connect(self._typeSelectionChangedSlot)

        # enable sorting
-        self.uiPortsTreeWidget.sortByColumn(0, QtCore.Qt.AscendingOrder)
+        self.uiPortsTreeWidget.sortByColumn(0, QtCore.Qt.SortOrder.AscendingOrder)
        self.uiPortsTreeWidget.setSortingEnabled(True)

        self.uiSymbolToolButton.clicked.connect(self._symbolBrowserSlot)
@@ -64,7 +64,7 @@ class EthernetSwitchConfigurationPage(QtWidgets.QWidget, Ui_ethernetSwitchConfig
        symbol_path = self.uiSymbolLineEdit.text()
        dialog = SymbolSelectionDialog(self, symbol=symbol_path)
        dialog.show()
-        if dialog.exec_():
+        if dialog.exec():
            new_symbol_path = dialog.getSymbol()
            self.uiSymbolLineEdit.setText(new_symbol_path)
            self.uiSymbolLineEdit.setToolTip('<img src="{}"/>'.format(new_symbol_path))
@@ -127,11 +127,11 @@ class EthernetSwitchConfigurationPage(QtWidgets.QWidget, Ui_ethernetSwitchConfig
        if port_type == "qinq":
            port_ethertype = self.uiPortEtherTypeComboBox.currentText()
        else:
-            port_ethertype = None
+            port_ethertype = "0x8100"

        if port in self._ports:
            # update a given entry in the tree widget
-            item = self.uiPortsTreeWidget.findItems(str(port), QtCore.Qt.MatchFixedString)[0]
+            item = self.uiPortsTreeWidget.findItems(str(port), QtCore.Qt.MatchFlag.MatchFixedString)[0]
            item.setText(1, str(vlan))
            item.setText(2, port_type)
            if port_ethertype:
--- a/gns3/modules/builtin/pages/ethernet_switch_preferences_page.py
+++ b/gns3/modules/builtin/pages/ethernet_switch_preferences_page.py
@@ -84,9 +84,13 @@ class EthernetSwitchPreferencesPage(QtWidgets.QWidget, Ui_EthernetSwitchPreferen
        try:
            compute_id = ethernet_switch.get("compute_id")
            if compute_id:
-                QtWidgets.QTreeWidgetItem(section_item, ["Server:", ComputeManager.instance().getCompute(compute_id).name()])
+                QtWidgets.QTreeWidgetItem(section_item, ["Compute:", ComputeManager.instance().getCompute(compute_id).name()])
            else:
-                QtWidgets.QTreeWidgetItem(section_item, ["Server:", "Dynamically allocated by the controller"])
+                if Controller.instance().settings()["dynamic_compute_allocation"]:
+                    msg = "Dynamically allocated by the controller"
+                else:
+                    msg = "Manually chosen"
+                QtWidgets.QTreeWidgetItem(section_item, ["Compute:", msg])
        except KeyError:
            pass

@@ -113,7 +117,7 @@ class EthernetSwitchPreferencesPage(QtWidgets.QWidget, Ui_EthernetSwitchPreferen
        self.uiEditEthernetSwitchPushButton.setEnabled(single_selected)

        if single_selected:
-            key = selection[0].data(0, QtCore.Qt.UserRole)
+            key = selection[0].data(0, QtCore.Qt.ItemDataRole.UserRole)
            ethernet_switch = self._ethernet_switches[key]
            self._refreshInfo(ethernet_switch)
        else:
@@ -126,7 +130,7 @@ class EthernetSwitchPreferencesPage(QtWidgets.QWidget, Ui_EthernetSwitchPreferen

        wizard = EthernetSwitchWizard(self._ethernet_switches, parent=self)
        wizard.show()
-        if wizard.exec_():
+        if wizard.exec():
            new_ethernet_switch_settings = wizard.getSettings()
            key = "{server}:{name}".format(server=new_ethernet_switch_settings["compute_id"], name=new_ethernet_switch_settings["name"])
            self._ethernet_switches[key] = ETHERNET_SWITCH_SETTINGS.copy()
@@ -136,7 +140,7 @@ class EthernetSwitchPreferencesPage(QtWidgets.QWidget, Ui_EthernetSwitchPreferen
            item.setText(0, self._ethernet_switches[key]["name"])
            Controller.instance().getSymbolIcon(self._ethernet_switches[key]["symbol"], qpartial(self._setItemIcon, item))

-            item.setData(0, QtCore.Qt.UserRole, key)
+            item.setData(0, QtCore.Qt.ItemDataRole.UserRole, key)
            self._items.append(item)
            self.uiEthernetSwitchesTreeWidget.setCurrentItem(item)

@@ -147,11 +151,11 @@ class EthernetSwitchPreferencesPage(QtWidgets.QWidget, Ui_EthernetSwitchPreferen

        item = self.uiEthernetSwitchesTreeWidget.currentItem()
        if item:
-            key = item.data(0, QtCore.Qt.UserRole)
+            key = item.data(0, QtCore.Qt.ItemDataRole.UserRole)
            ethernet_switch = self._ethernet_switches[key]
            dialog = ConfigurationDialog(ethernet_switch["name"], ethernet_switch, EthernetSwitchConfigurationPage(), parent=self)
            dialog.show()
-            if dialog.exec_():
+            if dialog.exec():
                # update the icon
                Controller.instance().getSymbolIcon(ethernet_switch["symbol"], qpartial(self._setItemIcon, item))
                if ethernet_switch["name"] != item.text(0):
@@ -164,7 +168,7 @@ class EthernetSwitchPreferencesPage(QtWidgets.QWidget, Ui_EthernetSwitchPreferen
                    self._ethernet_switches[new_key] = self._ethernet_switches[key]
                    del self._ethernet_switches[key]
                    item.setText(0, ethernet_switch["name"])
-                    item.setData(0, QtCore.Qt.UserRole, new_key)
+                    item.setData(0, QtCore.Qt.ItemDataRole.UserRole, new_key)
                self._refreshInfo(ethernet_switch)

    def _deleteEthernetSwitchSlot(self):
@@ -173,7 +177,7 @@ class EthernetSwitchPreferencesPage(QtWidgets.QWidget, Ui_EthernetSwitchPreferen
        """
        for item in self.uiEthernetSwitchesTreeWidget.selectedItems():
            if item:
-                key = item.data(0, QtCore.Qt.UserRole)
+                key = item.data(0, QtCore.Qt.ItemDataRole.UserRole)
                del self._ethernet_switches[key]
                self.uiEthernetSwitchesTreeWidget.takeTopLevelItem(self.uiEthernetSwitchesTreeWidget.indexOfTopLevelItem(item))

@@ -197,12 +201,12 @@ class EthernetSwitchPreferencesPage(QtWidgets.QWidget, Ui_EthernetSwitchPreferen
            item = QtWidgets.QTreeWidgetItem(self.uiEthernetSwitchesTreeWidget)
            item.setText(0, ethernet_switch["name"])
            Controller.instance().getSymbolIcon(ethernet_switch["symbol"], qpartial(self._setItemIcon, item))
-            item.setData(0, QtCore.Qt.UserRole, key)
+            item.setData(0, QtCore.Qt.ItemDataRole.UserRole, key)
            self._items.append(item)

        if self._items:
            self.uiEthernetSwitchesTreeWidget.setCurrentItem(self._items[0])
-            self.uiEthernetSwitchesTreeWidget.sortByColumn(0, QtCore.Qt.AscendingOrder)
+            self.uiEthernetSwitchesTreeWidget.sortByColumn(0, QtCore.Qt.SortOrder.AscendingOrder)
            self.uiEthernetSwitchesTreeWidget.setMaximumWidth(self.uiEthernetSwitchesTreeWidget.sizeHintForColumn(0) + 20)

    def _setItemIcon(self, item, icon):
--- a/gns3/modules/builtin/pages/frame_relay_switch_configuration_page.py
+++ b/gns3/modules/builtin/pages/frame_relay_switch_configuration_page.py
@@ -42,7 +42,7 @@ class FrameRelaySwitchConfigurationPage(QtWidgets.QWidget, Ui_frameRelaySwitchCo
        self.uiMappingTreeWidget.itemSelectionChanged.connect(self._mappingSelectionChangedSlot)

        # enable sorting
-        self.uiMappingTreeWidget.sortByColumn(0, QtCore.Qt.AscendingOrder)
+        self.uiMappingTreeWidget.sortByColumn(0, QtCore.Qt.SortOrder.AscendingOrder)
        self.uiMappingTreeWidget.setSortingEnabled(True)

    def _mappingSelectedSlot(self, item, column):
--- a/gns3/modules/builtin/ui/atm_switch_configuration_page_ui.py
+++ b/gns3/modules/builtin/ui/atm_switch_configuration_page_ui.py
@@ -1,39 +1,40 @@
-# -*- coding: utf-8 -*-
-
 # Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/modules/builtin/ui/atm_switch_configuration_page.ui'
 #
-# Created by: PyQt5 UI code generator 5.5.1
+# Created by: PyQt6 UI code generator 6.10.1
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
+
+
+from PyQt6 import QtCore, QtGui, QtWidgets

-from PyQt5 import QtCore, QtGui, QtWidgets

 class Ui_atmSwitchConfigPageWidget(object):
    def setupUi(self, atmSwitchConfigPageWidget):
        atmSwitchConfigPageWidget.setObjectName("atmSwitchConfigPageWidget")
-        atmSwitchConfigPageWidget.resize(459, 430)
+        atmSwitchConfigPageWidget.resize(540, 553)
        self.gridLayout_2 = QtWidgets.QGridLayout(atmSwitchConfigPageWidget)
        self.gridLayout_2.setObjectName("gridLayout_2")
-        self.uiGeneralGroupBox = QtWidgets.QGroupBox(atmSwitchConfigPageWidget)
+        self.uiGeneralGroupBox = QtWidgets.QGroupBox(parent=atmSwitchConfigPageWidget)
        self.uiGeneralGroupBox.setObjectName("uiGeneralGroupBox")
        self.gridLayout = QtWidgets.QGridLayout(self.uiGeneralGroupBox)
        self.gridLayout.setObjectName("gridLayout")
-        self.uiNameLabel = QtWidgets.QLabel(self.uiGeneralGroupBox)
+        self.uiNameLabel = QtWidgets.QLabel(parent=self.uiGeneralGroupBox)
        self.uiNameLabel.setObjectName("uiNameLabel")
        self.gridLayout.addWidget(self.uiNameLabel, 0, 0, 1, 1)
-        self.uiNameLineEdit = QtWidgets.QLineEdit(self.uiGeneralGroupBox)
+        self.uiNameLineEdit = QtWidgets.QLineEdit(parent=self.uiGeneralGroupBox)
        self.uiNameLineEdit.setObjectName("uiNameLineEdit")
        self.gridLayout.addWidget(self.uiNameLineEdit, 0, 1, 1, 1)
-        self.uiVPICheckBox = QtWidgets.QCheckBox(self.uiGeneralGroupBox)
+        self.uiVPICheckBox = QtWidgets.QCheckBox(parent=self.uiGeneralGroupBox)
        self.uiVPICheckBox.setObjectName("uiVPICheckBox")
        self.gridLayout.addWidget(self.uiVPICheckBox, 1, 0, 1, 2)
        self.gridLayout_2.addWidget(self.uiGeneralGroupBox, 0, 0, 1, 3)
-        self.uiMappingGroupBox = QtWidgets.QGroupBox(atmSwitchConfigPageWidget)
+        self.uiMappingGroupBox = QtWidgets.QGroupBox(parent=atmSwitchConfigPageWidget)
        self.uiMappingGroupBox.setObjectName("uiMappingGroupBox")
        self.vboxlayout = QtWidgets.QVBoxLayout(self.uiMappingGroupBox)
        self.vboxlayout.setObjectName("vboxlayout")
-        self.uiMappingTreeWidget = QtWidgets.QTreeWidget(self.uiMappingGroupBox)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
+        self.uiMappingTreeWidget = QtWidgets.QTreeWidget(parent=self.uiMappingGroupBox)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding)
        sizePolicy.setHorizontalStretch(0)
        sizePolicy.setVerticalStretch(0)
        sizePolicy.setHeightForWidth(self.uiMappingTreeWidget.sizePolicy().hasHeightForWidth())
@@ -42,17 +43,17 @@ class Ui_atmSwitchConfigPageWidget(object):
        self.uiMappingTreeWidget.setObjectName("uiMappingTreeWidget")
        self.vboxlayout.addWidget(self.uiMappingTreeWidget)
        self.gridLayout_2.addWidget(self.uiMappingGroupBox, 0, 3, 3, 1)
-        self.uiAddPushButton = QtWidgets.QPushButton(atmSwitchConfigPageWidget)
+        self.uiAddPushButton = QtWidgets.QPushButton(parent=atmSwitchConfigPageWidget)
        self.uiAddPushButton.setObjectName("uiAddPushButton")
        self.gridLayout_2.addWidget(self.uiAddPushButton, 3, 0, 1, 1)
-        self.uiDeletePushButton = QtWidgets.QPushButton(atmSwitchConfigPageWidget)
+        self.uiDeletePushButton = QtWidgets.QPushButton(parent=atmSwitchConfigPageWidget)
        self.uiDeletePushButton.setEnabled(False)
        self.uiDeletePushButton.setObjectName("uiDeletePushButton")
        self.gridLayout_2.addWidget(self.uiDeletePushButton, 3, 1, 1, 1)
-        spacerItem = QtWidgets.QSpacerItem(213, 31, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        spacerItem = QtWidgets.QSpacerItem(213, 31, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
        self.gridLayout_2.addItem(spacerItem, 4, 2, 1, 2)
-        self.uiSourceGroupBox = QtWidgets.QGroupBox(atmSwitchConfigPageWidget)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred)
+        self.uiSourceGroupBox = QtWidgets.QGroupBox(parent=atmSwitchConfigPageWidget)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Preferred)
        sizePolicy.setHorizontalStretch(0)
        sizePolicy.setVerticalStretch(0)
        sizePolicy.setHeightForWidth(self.uiSourceGroupBox.sizePolicy().hasHeightForWidth())
@@ -60,11 +61,11 @@ class Ui_atmSwitchConfigPageWidget(object):
        self.uiSourceGroupBox.setObjectName("uiSourceGroupBox")
        self.gridlayout = QtWidgets.QGridLayout(self.uiSourceGroupBox)
        self.gridlayout.setObjectName("gridlayout")
-        self.uiSourcePortLabel = QtWidgets.QLabel(self.uiSourceGroupBox)
+        self.uiSourcePortLabel = QtWidgets.QLabel(parent=self.uiSourceGroupBox)
        self.uiSourcePortLabel.setObjectName("uiSourcePortLabel")
        self.gridlayout.addWidget(self.uiSourcePortLabel, 0, 0, 1, 1)
-        self.uiSourcePortSpinBox = QtWidgets.QSpinBox(self.uiSourceGroupBox)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed)
+        self.uiSourcePortSpinBox = QtWidgets.QSpinBox(parent=self.uiSourceGroupBox)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Fixed)
        sizePolicy.setHorizontalStretch(0)
        sizePolicy.setVerticalStretch(0)
        sizePolicy.setHeightForWidth(self.uiSourcePortSpinBox.sizePolicy().hasHeightForWidth())
@@ -74,12 +75,12 @@ class Ui_atmSwitchConfigPageWidget(object):
        self.uiSourcePortSpinBox.setProperty("value", 1)
        self.uiSourcePortSpinBox.setObjectName("uiSourcePortSpinBox")
        self.gridlayout.addWidget(self.uiSourcePortSpinBox, 0, 1, 1, 1)
-        self.uiSourceVPILabel = QtWidgets.QLabel(self.uiSourceGroupBox)
+        self.uiSourceVPILabel = QtWidgets.QLabel(parent=self.uiSourceGroupBox)
        self.uiSourceVPILabel.setObjectName("uiSourceVPILabel")
        self.gridlayout.addWidget(self.uiSourceVPILabel, 1, 0, 1, 1)
-        self.uiSourceVPISpinBox = QtWidgets.QSpinBox(self.uiSourceGroupBox)
+        self.uiSourceVPISpinBox = QtWidgets.QSpinBox(parent=self.uiSourceGroupBox)
        self.uiSourceVPISpinBox.setEnabled(True)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Fixed)
        sizePolicy.setHorizontalStretch(0)
        sizePolicy.setVerticalStretch(0)
        sizePolicy.setHeightForWidth(self.uiSourceVPISpinBox.sizePolicy().hasHeightForWidth())
@@ -88,11 +89,11 @@ class Ui_atmSwitchConfigPageWidget(object):
        self.uiSourceVPISpinBox.setProperty("value", 0)
        self.uiSourceVPISpinBox.setObjectName("uiSourceVPISpinBox")
        self.gridlayout.addWidget(self.uiSourceVPISpinBox, 1, 1, 1, 1)
-        self.uiSourceVCILabel = QtWidgets.QLabel(self.uiSourceGroupBox)
+        self.uiSourceVCILabel = QtWidgets.QLabel(parent=self.uiSourceGroupBox)
        self.uiSourceVCILabel.setObjectName("uiSourceVCILabel")
        self.gridlayout.addWidget(self.uiSourceVCILabel, 2, 0, 1, 1)
-        self.uiSourceVCISpinBox = QtWidgets.QSpinBox(self.uiSourceGroupBox)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed)
+        self.uiSourceVCISpinBox = QtWidgets.QSpinBox(parent=self.uiSourceGroupBox)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Fixed)
        sizePolicy.setHorizontalStretch(0)
        sizePolicy.setVerticalStretch(0)
        sizePolicy.setHeightForWidth(self.uiSourceVCISpinBox.sizePolicy().hasHeightForWidth())
@@ -102,8 +103,8 @@ class Ui_atmSwitchConfigPageWidget(object):
        self.uiSourceVCISpinBox.setObjectName("uiSourceVCISpinBox")
        self.gridlayout.addWidget(self.uiSourceVCISpinBox, 2, 1, 1, 1)
        self.gridLayout_2.addWidget(self.uiSourceGroupBox, 1, 0, 1, 3)
-        self.uiDestinationGroupBox = QtWidgets.QGroupBox(atmSwitchConfigPageWidget)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred)
+        self.uiDestinationGroupBox = QtWidgets.QGroupBox(parent=atmSwitchConfigPageWidget)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Preferred)
        sizePolicy.setHorizontalStretch(0)
        sizePolicy.setVerticalStretch(0)
        sizePolicy.setHeightForWidth(self.uiDestinationGroupBox.sizePolicy().hasHeightForWidth())
@@ -111,11 +112,11 @@ class Ui_atmSwitchConfigPageWidget(object):
        self.uiDestinationGroupBox.setObjectName("uiDestinationGroupBox")
        self.gridlayout1 = QtWidgets.QGridLayout(self.uiDestinationGroupBox)
        self.gridlayout1.setObjectName("gridlayout1")
-        self.uiDestinationPortLabel = QtWidgets.QLabel(self.uiDestinationGroupBox)
+        self.uiDestinationPortLabel = QtWidgets.QLabel(parent=self.uiDestinationGroupBox)
        self.uiDestinationPortLabel.setObjectName("uiDestinationPortLabel")
        self.gridlayout1.addWidget(self.uiDestinationPortLabel, 0, 0, 1, 1)
-        self.uiDestinationPortSpinBox = QtWidgets.QSpinBox(self.uiDestinationGroupBox)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed)
+        self.uiDestinationPortSpinBox = QtWidgets.QSpinBox(parent=self.uiDestinationGroupBox)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Fixed)
        sizePolicy.setHorizontalStretch(0)
        sizePolicy.setVerticalStretch(0)
        sizePolicy.setHeightForWidth(self.uiDestinationPortSpinBox.sizePolicy().hasHeightForWidth())
@@ -125,12 +126,12 @@ class Ui_atmSwitchConfigPageWidget(object):
        self.uiDestinationPortSpinBox.setProperty("value", 10)
        self.uiDestinationPortSpinBox.setObjectName("uiDestinationPortSpinBox")
        self.gridlayout1.addWidget(self.uiDestinationPortSpinBox, 0, 1, 1, 1)
-        self.uiDestinationVPILabel = QtWidgets.QLabel(self.uiDestinationGroupBox)
+        self.uiDestinationVPILabel = QtWidgets.QLabel(parent=self.uiDestinationGroupBox)
        self.uiDestinationVPILabel.setObjectName("uiDestinationVPILabel")
        self.gridlayout1.addWidget(self.uiDestinationVPILabel, 1, 0, 1, 1)
-        self.uiDestinationVPISpinBox = QtWidgets.QSpinBox(self.uiDestinationGroupBox)
+        self.uiDestinationVPISpinBox = QtWidgets.QSpinBox(parent=self.uiDestinationGroupBox)
        self.uiDestinationVPISpinBox.setEnabled(True)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Fixed)
        sizePolicy.setHorizontalStretch(0)
        sizePolicy.setVerticalStretch(0)
        sizePolicy.setHeightForWidth(self.uiDestinationVPISpinBox.sizePolicy().hasHeightForWidth())
@@ -139,11 +140,11 @@ class Ui_atmSwitchConfigPageWidget(object):
        self.uiDestinationVPISpinBox.setProperty("value", 0)
        self.uiDestinationVPISpinBox.setObjectName("uiDestinationVPISpinBox")
        self.gridlayout1.addWidget(self.uiDestinationVPISpinBox, 1, 1, 1, 1)
-        self.uiDestinationVCILabel = QtWidgets.QLabel(self.uiDestinationGroupBox)
+        self.uiDestinationVCILabel = QtWidgets.QLabel(parent=self.uiDestinationGroupBox)
        self.uiDestinationVCILabel.setObjectName("uiDestinationVCILabel")
        self.gridlayout1.addWidget(self.uiDestinationVCILabel, 2, 0, 1, 1)
-        self.uiDestinationVCISpinBox = QtWidgets.QSpinBox(self.uiDestinationGroupBox)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed)
+        self.uiDestinationVCISpinBox = QtWidgets.QSpinBox(parent=self.uiDestinationGroupBox)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Fixed)
        sizePolicy.setHorizontalStretch(0)
        sizePolicy.setVerticalStretch(0)
        sizePolicy.setHeightForWidth(self.uiDestinationVCISpinBox.sizePolicy().hasHeightForWidth())
@@ -185,4 +186,3 @@ class Ui_atmSwitchConfigPageWidget(object):
        self.uiDestinationPortLabel.setText(_translate("atmSwitchConfigPageWidget", "Port:"))
        self.uiDestinationVPILabel.setText(_translate("atmSwitchConfigPageWidget", "VPI:"))
        self.uiDestinationVCILabel.setText(_translate("atmSwitchConfigPageWidget", "VCI:"))
-
--- a/gns3/modules/builtin/ui/builtin_preferences_page_ui.py
+++ b/gns3/modules/builtin/ui/builtin_preferences_page_ui.py
@@ -1,12 +1,13 @@
-# -*- coding: utf-8 -*-
-
 # Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/modules/builtin/ui/builtin_preferences_page.ui'
 #
-# Created by: PyQt5 UI code generator 5.9.1
+# Created by: PyQt6 UI code generator 6.10.1
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic6 is
+# run again.  Do not edit this file unless you know what you are doing.
+
+
+from PyQt6 import QtCore, QtGui, QtWidgets

-from PyQt5 import QtCore, QtGui, QtWidgets

 class Ui_BuiltinPreferencesPageWidget(object):
    def setupUi(self, BuiltinPreferencesPageWidget):
@@ -14,28 +15,28 @@ class Ui_BuiltinPreferencesPageWidget(object):
        BuiltinPreferencesPageWidget.resize(456, 385)
        self.verticalLayout = QtWidgets.QVBoxLayout(BuiltinPreferencesPageWidget)
        self.verticalLayout.setObjectName("verticalLayout")
-        self.uiTabWidget = QtWidgets.QTabWidget(BuiltinPreferencesPageWidget)
-        self.uiTabWidget.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
+        self.uiTabWidget = QtWidgets.QTabWidget(parent=BuiltinPreferencesPageWidget)
+        self.uiTabWidget.setContextMenuPolicy(QtCore.Qt.ContextMenuPolicy.CustomContextMenu)
        self.uiTabWidget.setObjectName("uiTabWidget")
        self.uiServerSettingsTabWidget = QtWidgets.QWidget()
        self.uiServerSettingsTabWidget.setObjectName("uiServerSettingsTabWidget")
        self.gridLayout = QtWidgets.QGridLayout(self.uiServerSettingsTabWidget)
        self.gridLayout.setObjectName("gridLayout")
-        self.label = QtWidgets.QLabel(self.uiServerSettingsTabWidget)
+        self.label = QtWidgets.QLabel(parent=self.uiServerSettingsTabWidget)
        self.label.setObjectName("label")
        self.gridLayout.addWidget(self.label, 0, 0, 1, 1)
-        self.uiNATInterfaceComboBox = QtWidgets.QComboBox(self.uiServerSettingsTabWidget)
+        self.uiNATInterfaceComboBox = QtWidgets.QComboBox(parent=self.uiServerSettingsTabWidget)
        self.uiNATInterfaceComboBox.setObjectName("uiNATInterfaceComboBox")
        self.gridLayout.addWidget(self.uiNATInterfaceComboBox, 1, 0, 1, 1)
-        spacerItem = QtWidgets.QSpacerItem(20, 5, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        spacerItem = QtWidgets.QSpacerItem(20, 5, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
        self.gridLayout.addItem(spacerItem, 2, 0, 1, 1)
        self.uiTabWidget.addTab(self.uiServerSettingsTabWidget, "")
        self.verticalLayout.addWidget(self.uiTabWidget)
        self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
-        spacerItem1 = QtWidgets.QSpacerItem(254, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        spacerItem1 = QtWidgets.QSpacerItem(254, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
        self.horizontalLayout_2.addItem(spacerItem1)
-        self.uiRestoreDefaultsPushButton = QtWidgets.QPushButton(BuiltinPreferencesPageWidget)
+        self.uiRestoreDefaultsPushButton = QtWidgets.QPushButton(parent=BuiltinPreferencesPageWidget)
        self.uiRestoreDefaultsPushButton.setObjectName("uiRestoreDefaultsPushButton")
        self.horizontalLayout_2.addWidget(self.uiRestoreDefaultsPushButton)
        self.verticalLayout.addLayout(self.horizontalLayout_2)
@@ -50,4 +51,3 @@ class Ui_BuiltinPreferencesPageWidget(object):
        self.label.setText(_translate("BuiltinPreferencesPageWidget", "Default NAT interface:"))
        self.uiTabWidget.setTabText(self.uiTabWidget.indexOf(self.uiServerSettingsTabWidget), _translate("BuiltinPreferencesPageWidget", "Local settings"))
        self.uiRestoreDefaultsPushButton.setText(_translate("BuiltinPreferencesPageWidget", "Restore defaults"))
-
--- a/Show More
+++ b/Show More