.ci/Ubuntu22.04/Dockerfile

@@ -9,18 +9,20 @@ RUN apt-get update && \
         file \
         g++ \
         git \
+        libgl-dev \
         liblzma-dev \
         libmariadb-dev-compat \
         libprotobuf-dev \
-        libqt5multimedia5-plugins \
-        libqt5sql5-mysql \
-        libqt5svg5-dev \
-        libqt5websockets5-dev \
+        libqt6multimedia6 \
+        libqt6sql6-mysql \
+        libqt6svg6-dev \
+        libqt6websockets6-dev \
         ninja-build \
         protobuf-compiler \
-        qt5-image-formats-plugins \
-        qtmultimedia5-dev \
-        qttools5-dev \
-        qttools5-dev-tools \
+        qt6-image-formats-plugins \
+        qt6-l10n-tools \
+        qt6-multimedia-dev \
+        qt6-tools-dev \
+        qt6-tools-dev-tools \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*

.ci/Ubuntu26.04/Dockerfile

@@ -1,29 +0,0 @@
-FROM ubuntu:26.04
-
-RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-        build-essential \
-        ca-certificates \
-        ccache \
-        clang-format \
-        cmake \
-        file \
-        g++ \
-        git \
-        libgl-dev \
-        liblzma-dev \
-        libmariadb-dev-compat \
-        libprotobuf-dev \
-        libqt6multimedia6 \
-        libqt6sql6-mysql \
-        ninja-build \
-        protobuf-compiler \
-        qt6-image-formats-plugins \
-        qt6-l10n-tools \
-        qt6-multimedia-dev \
-        qt6-svg-dev \
-        qt6-tools-dev \
-        qt6-tools-dev-tools \
-        qt6-websockets-dev \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*

.ci/compile.sh

@@ -10,11 +10,9 @@
 # --test runs tests
 # --debug or --release sets the build type ie CMAKE_BUILD_TYPE
 # --ccache [<size>] uses ccache and shows stats, optionally provide size
-# --evict-ccache <age> runs ccache eviction based on given age after build
 # --dir <dir> sets the name of the build dir, default is "build"
-# --cmake-generator <generator> sets CMAKE_GENERATOR as used by cmake
 # --target-macos-version <version> sets the min os version - only used for macOS builds
-# uses env: BUILDTYPE MAKE_INSTALL MAKE_PACKAGE PACKAGE_TYPE PACKAGE_SUFFIX MAKE_SERVER MAKE_NO_CLIENT MAKE_TEST USE_CCACHE CCACHE_SIZE CCACHE_EVICTION_AGE BUILD_DIR CMAKE_GENERATOR TARGET_MACOS_VERSION
+# uses env: BUILDTYPE MAKE_INSTALL MAKE_PACKAGE PACKAGE_TYPE PACKAGE_SUFFIX MAKE_SERVER MAKE_NO_CLIENT MAKE_TEST USE_CCACHE CCACHE_SIZE BUILD_DIR CMAKE_GENERATOR TARGET_MACOS_VERSION
 # (correspond to args: --debug/--release --install --package <package type> --suffix <suffix> --server --test --ccache <ccache_size> --dir <dir>)
 # exitcode: 1 for failure, 3 for invalid arguments
 
@@ -73,15 +71,6 @@ while [[ $# != 0 ]]; do
         shift
       fi
       ;;
-    '--evict-ccache')
-      shift
-      if [[ $# == 0 ]]; then
-        echo "::error file=$0::--evict-ccache expects an argument"
-        exit 3
-      fi
-      CCACHE_EVICTION_AGE=$1
-      shift
-      ;;
     '--vcpkg')
       USE_VCPKG=1
       shift
@@ -95,15 +84,6 @@ while [[ $# != 0 ]]; do
       BUILD_DIR="$1"
       shift
       ;;
-    '--cmake-generator')
-      shift
-      if [[ $# == 0 ]]; then
-        echo "::error file=$0::--cmake-generator expects an argument"
-        exit 3
-      fi
-      export CMAKE_GENERATOR=$1
-      shift
-      ;;
     '--target-macos-version')
       shift
       if [[ $# == 0 ]]; then
@@ -142,7 +122,7 @@ if [[ $MAKE_SERVER ]]; then
   flags+=("-DWITH_SERVER=1")
 fi
 if [[ $MAKE_NO_CLIENT ]]; then
-  flags+=("-DWITH_CLIENT=0" "-DWITH_ORACLE=0")
+  flags+=("-DWITH_CLIENT=0" "-DWITH_ORACLE=0" "-DWITH_DBCONVERTER=0")
 fi
 if [[ $MAKE_TEST ]]; then
   flags+=("-DTEST=1")
@@ -176,19 +156,6 @@ function ccachestatsverbose() {
 
 # Compile
 if [[ $RUNNER_OS == macOS ]]; then
-  # QTDIR is needed for macOS since we actually only use the cached thin Qt binaries instead of the install-qt-action,
-  # which sets a few environment variables
-  if QTDIR=$(find "$GITHUB_WORKSPACE/Qt" -depth -maxdepth 2 -name macos -type d -print -quit); then
-    echo "found QTDIR at $QTDIR"
-  else
-    echo "could not find QTDIR!"
-    exit 2
-  fi
-  # the qtdir is located at Qt/[qtversion]/macos
-  # we use find to get the first subfolder with the name "macos"
-  # this works independent of the qt version as there should be only one version installed on the runner at a time
-  export QTDIR
-
   if [[ $TARGET_MACOS_VERSION ]]; then
     # CMAKE_OSX_DEPLOYMENT_TARGET is a vanilla cmake flag needed to compile to target macOS version
     flags+=("-DCMAKE_OSX_DEPLOYMENT_TARGET=$TARGET_MACOS_VERSION")
@@ -235,18 +202,17 @@ if [[ $RUNNER_OS == macOS ]]; then
     hdiutil_script="/tmp/hdiutil.sh"
     # shellcheck disable=SC2016
     echo '#!/bin/bash
-    i=0
-    while ! hdiutil "$@"; do
-      if (( ++i >= 10 )); then
-        echo "Error: hdiutil failed $i times!" >&2
-        break
-      fi
-      sleep 1
-    done' >"$hdiutil_script"
+i=0
+while ! hdiutil "$@"; do
+  if (( ++i >= 10 )); then
+    echo "Error: hdiutil failed $i times!" >&2
+    break
+  fi
+  sleep 1
+done' >"$hdiutil_script"
     chmod +x "$hdiutil_script"
     flags+=(-DCPACK_COMMAND_HDIUTIL="$hdiutil_script")
   fi
-
 elif [[ $RUNNER_OS == Windows ]]; then
   # Enable MTT, see https://devblogs.microsoft.com/cppblog/improved-parallelism-in-msbuild/
   # and https://devblogs.microsoft.com/cppblog/cpp-build-throughput-investigation-and-tune-up/#multitooltask-mtt
@@ -271,29 +237,9 @@ cmake --build . "${buildflags[@]}"
 echo "::endgroup::"
 
 if [[ $USE_CCACHE ]]; then
-  if [[ $CCACHE_EVICTION_AGE ]]; then
-    echo "::group::evict ccache files older than $CCACHE_EVICTION_AGE"
-    ccache --evict-older-than "$CCACHE_EVICTION_AGE"
-    echo "::endgroup::"
-  fi
   echo "::group::Show ccache stats again"
   ccachestatsverbose
   echo "::endgroup::"
-elif [[ $CCACHE_EVICTION_AGE ]]; then
-  echo "::error file=$0::ccache eviction is enabled while ccache is disabled!"
-fi
-
-if [[ $RUNNER_OS == macOS ]]; then
-  echo "::group::Inspect Mach-O binaries"
-  for app in cockatrice oracle servatrice; do
-    binary="$GITHUB_WORKSPACE/build/$app/$app.app/Contents/MacOS/$app"
-    echo "Inspecting $app..."
-    vtool -show-build "$binary"
-    file "$binary"
-    lipo -info "$binary"
-    echo ""
-  done
-  echo "::endgroup::"
 fi
 
 if [[ $MAKE_TEST ]]; then
@@ -310,6 +256,7 @@ fi
 
 if [[ $MAKE_PACKAGE ]]; then
   echo "::group::Create package"
+  
   cmake --build . --target package --config "$BUILDTYPE"
   echo "::endgroup::"
 

.ci/docker.sh

@@ -3,28 +3,17 @@
 # This script is to be used by the ci environment from the project root directory, do not use it from somewhere else.
 
 # Creates or loads docker images to use in compilation, creates RUN function to start compilation on the docker image.
-#
-# usage: source <script> <name> [--get] [--build] [--save] [--interactive] [--set-cache <location>]
-# <name> sets the name of the docker image, these correspond to directories in .ci
+# <arg> sets the name of the docker image, these correspond to directories in .ci
 # --get loads the image from a previously saved image cache, will build if no image is found
 # --build builds the image from the Dockerfile in .ci/$NAME
 # --save stores the image, if an image was loaded it will not be stored
 # --interactive immediately starts the image interactively for debugging
 # --set-cache <location> sets the location to cache the image or for ccache
-#
 # requires: docker
 # uses env: NAME CACHE BUILD GET SAVE INTERACTIVE
 # (correspond to args: <name> --set-cache <cache> --build --get --save --interactive)
 # sets env: RUN CCACHE_DIR IMAGE_NAME RUN_ARGS RUN_OPTS BUILD_SCRIPT
 # exitcode: 1 for failure, 2 for missing dockerfile, 3 for invalid arguments
-#
-# exported RUN function will run the BUILD_SCRIPT inside of the docker container.
-# note that the docker container will not inherit any environment variables!
-#
-# usage: RUN [arguments for build script]
-# roughly equivalent to `docker run $IMAGE_NAME bash $BUILD_SCRIPT $@`
-# uses env: CCACHE_DIR IMAGE_NAME RUN_ARGS RUN_OPTS BUILD_SCRIPT
-# exitcode: 3 for invalid arguments, returns the returncode of docker run
 export BUILD_SCRIPT=".ci/compile.sh"
 
 project_name="cockatrice"
@@ -52,17 +41,12 @@ while [[ $# != 0 ]]; do
       shift
       ;;
     '--set-cache')
-      shift
-      if [[ $# == 0 ]]; then
-        echo "--set-cache expects an argument" >&2
-        exit 3
-      fi
-      CACHE=$1
-      shift
+      CACHE=$2
       if ! [[ -d $CACHE ]]; then
         echo "could not find cache path: $CACHE" >&2
         return 3
       fi
+      shift 2
       ;;
     *)
       if [[ ${1:0:1} == - ]]; then
@@ -165,11 +149,10 @@ function RUN ()
       args+=(--mount "type=bind,source=$CCACHE_DIR,target=/.ccache")
       args+=(--env "CCACHE_DIR=/.ccache")
     fi
-    if [[ $GITHUB_OUTPUT ]]; then
-      args+=(--mount "type=bind,source=$GITHUB_OUTPUT,target=/gh_output")
-      args+=(--env "GITHUB_OUTPUT=/gh_output")
+    if [[ -n "$CMAKE_GENERATOR" ]]; then
+      args+=(--env "CMAKE_GENERATOR=$CMAKE_GENERATOR")
     fi
-    # shellcheck disable=2086
+  # shellcheck disable=2086
     docker run "${args[@]}" $RUN_ARGS "$IMAGE_NAME" bash "$BUILD_SCRIPT" $RUN_OPTS "$@"
     return $?
   else

.ci/name_build.sh

@@ -2,6 +2,7 @@
 # used by the ci to rename build artifacts
 # renames the file to [original name][SUFFIX].[original extension]
 # where SUFFIX is either available in the environment or as the first arg
+# if MAKE_ZIP is set instead a zip is made
 # expected to be run in the build directory unless BUILD_DIR is set
 # adds output to GITHUB_OUTPUT
 builddir="${BUILD_DIR:=.}"
@@ -21,8 +22,8 @@ set -e
 
 # find file
 found="$(find "$builddir" -maxdepth 1 -type f -name "$findrx" -print -quit)"
-path="${found%/*}"    # remove all including first "/" from right side
-file="${found##*/}"    # remove all including last "/" from left side
+path="${found%/*}" # remove all after last /
+file="${found##*/}" # remove all before last /
 if [[ ! $file ]]; then
   echo "::error file=$0::could not find package"
   exit 1
@@ -34,16 +35,21 @@ if ! cd "$path"; then
 fi
 
 # set filename
-name="${file%.*}"    # remove all including first "." from right side
-new_name="$name$SUFFIX"
-extension="${file##*.}"    # remove all including last "." from left side
-filename="$new_name.$extension"
-echo "renaming '$file' to '$filename'"
-mv "$file" "$filename"
+name="${file%.*}" # remove all after last .
+new_name="$name$SUFFIX."
+if [[ $MAKE_ZIP ]]; then
+  filename="${new_name}zip"
+  echo "creating zip '$filename' from '$file'"
+  zip "$filename" "$file"
+else
+  extension="${file##*.}" # remove all before last .
+  filename="$new_name$extension"
+  echo "renaming '$file' to '$filename'"
+  mv "$file" "$filename"
+fi
 
 cd "$oldpwd"
 relative_path="$path/$filename"
 ls -l "$relative_path"
 echo "path=$relative_path" >>"$GITHUB_OUTPUT"
-echo "name=$new_name" >>"$GITHUB_OUTPUT"
-echo "fullname=$filename" >>"$GITHUB_OUTPUT"
+echo "name=$filename" >>"$GITHUB_OUTPUT"

.ci/release_template.md

@@ -10,6 +10,7 @@ Available pre-compiled binaries for installation:
 
   <b>Windows</b>
    • <kbd>Windows 10+</kbd>
+   • <kbd>Windows 7+</kbd>
 
   <b>macOS</b>
    • <kbd>macOS 15+</kbd> <sub><i>Sequoia</i></sub> <sub>Apple M</sub>
@@ -17,7 +18,6 @@ Available pre-compiled binaries for installation:
    • <kbd>macOS 13+</kbd> <sub><i>Ventura</i></sub> <sub>Intel</sub>
 
   <b>Linux</b>
-   • <kbd>Ubuntu 26.04 LTS</kbd> <sub><i>Resolute Racoon</i></sub>
    • <kbd>Ubuntu 24.04 LTS</kbd> <sub><i>Noble Numbat</i></sub>
    • <kbd>Ubuntu 22.04 LTS</kbd> <sub><i>Jammy Jellyfish</i></sub>
    • <kbd>Debian 13</kbd> <sub><i>Trixie</i></sub>
@@ -28,8 +28,6 @@ Available pre-compiled binaries for installation:
 
 <sub>We are also packaged in <kbd>Arch Linux</kbd>'s <a href="https://archlinux.org/packages/extra/x86_64/cockatrice">official extra repository</a>, courtesy of @FFY00.</sub>
 <sub>General Linux support is available via a <kbd>flatpak</kbd> package at <a href="https://flathub.org/apps/io.github.Cockatrice.cockatrice">Flathub</a>!</sub>
-
-<sub>We provide a <kbd>Docker</kbd> image for "Servatrice" in <a href="https://github.com/Cockatrice/Cockatrice/pkgs/container/servatrice">GHCR</a>. You can docker pull it or use our Docker Compose files!</sub>
 </pre>
 
 

.ci/resolve_latest_aqt_qt_version.sh

@@ -1,49 +0,0 @@
-#!/bin/bash
-
-# This script is used to resolve the latest patch version of Qt using aqtinstall.
-# It interprets wildcards to get the latest patch version. E.g. "6.6.*" -> "6.6.3".
-
-# This script is meant to be used by the ci enironment.
-# It uses the runner's GITHUB_OUTPUT env variable.
-
-# Usage example: .ci/resolve_latest_aqt_qt_version.sh "6.6.*"
-
-qt_spec=$1
-if [[ ! $qt_spec ]]; then
-  echo "usage: $0 [version]"
-  exit 2
-fi
-
-# If version is already specific (no wildcard), use it as-is
-if [[ $qt_spec != *"*" ]]; then
-  echo "version $qt_spec is already resolved"
-  echo "version=$qt_spec" >> "$GITHUB_OUTPUT"
-  exit 0
-fi
-
-if ! hash aqt; then
-  echo "aqt could not be found, has aqtinstall been installed?"
-  exit 2
-fi
-
-# Resolve latest patch
-if [[ $RUNNER_OS == macOS ]]; then
-  if ! qt_resolved=$(aqt list-qt mac desktop --spec "$qt_spec" --latest-version); then
-    exit 1
-  fi
-elif [[ $RUNNER_OS == Windows ]]; then
-  if ! qt_resolved=$(aqt list-qt windows desktop --spec "$qt_spec" --latest-version); then
-    exit 1
-  fi
-else
-  echo "aqt command for $RUNNER_OS not defined."
-  exit 1
-fi
-
-echo "resolved $qt_spec to $qt_resolved"
-if [[ ! $qt_resolved ]]; then
-  echo "Error: Could not resolve Qt version for $qt_spec"
-  exit 1
-fi
-
-echo "version=$qt_resolved" >> "$GITHUB_OUTPUT"

.ci/thin_macos_qtlib.sh

@@ -1,25 +0,0 @@
-#!/bin/bash
-
-# The macos binaries from aqt are fat (universal), so we thin them to the target architecture to reduce the size of
-# the packages and caches using lipo.
-
-# This script is meant to be used by the ci enironment on macos runners only.
-# It uses the runner's GITHUB_WORKSPACE env variable.
-arch=$(uname -m)
-nproc=$(sysctl -n hw.ncpu)
-
-function thin() {
-  local libfile=$1
-  if [[ $(file -b --mime-type "$libfile") == application/x-mach-binary* ]]; then
-    echo "Processing $libfile"
-    lipo "$libfile" -thin "$arch" -output "$libfile"
-  fi
-  return 0
-}
-export -f thin  # export to allow use in xargs
-export arch
-set -eo pipefail
-
-echo "::group::Thinning Qt libraries to $arch using $nproc cores"
-find "$GITHUB_WORKSPACE/Qt" -type f -print0 | xargs -0 -n1 -P"$nproc" -I{} bash -c "thin '{}'"
-echo "::endgroup::"

.github/CONTRIBUTING.md

@@ -461,11 +461,7 @@ revoke the tag by doing the following:
 git push --delete upstream $TAG_NAME
 git tag -d $TAG_NAME
 ```
-You can also do this on GitHub.
-
-> [!NOTE]
-> If you want to push a new release to replace it immediately with the same
-> name you have to delete the automatically created release first!
+You can also do this on GitHub, you'll also want to delete the false release.
 
 In the first lines of [CMakeLists.txt](
 https://github.com/Cockatrice/Cockatrice/blob/master/CMakeLists.txt)

.github/ISSUE_TEMPLATE/config.yml

@@ -1,12 +1,9 @@
 blank_issues_enabled: false
 contact_links:
   - name: 💬 Discord Community (Get help with server issues, e.g. Login)
-    url: https://discord.com/invite/3Z9yzmA
+    url: https://discord.gg/3Z9yzmA
     about: Need help with using the client? Want to find some games? Try the Discord server!
   - name: 🌐 Translations (Help improve the localization of the app)
     url: https://explore.transifex.com/cockatrice/cockatrice/
     # it is not possible to add a link to the wiki to this description
     about: For more information and guidance check our Translation FAQ on our wiki!
-  - name: 📖 Code Documentation
-    url: https://cockatrice.github.io/docs/
-    about: Helpful source focusing on developers, but there are also references for users!

.github/dependabot.yml

@@ -2,21 +2,19 @@
 
 version: 2
 updates:
- # Enable version updates for git submodules
- # If SemVer is used, updates will happen to new releases only (not HEAD)
+ # # Enable version updates for git submodules
+ # Not yet possible to bump only on tags or releases, see:
  # https://github.com/dependabot/dependabot-core/issues/1639
  # https://github.com/dependabot/dependabot-core/issues/2192
-  - package-ecosystem: "gitsubmodule"
-    # Look for `.gitmodules` in the `root` directory
-    directory: "/"
-    ignore:
-      # Ignore updates for vcpkg (Bump to latest tag not working (no SemVer used) & macOS Intel triplet broken with newer releases)
-      - dependency-name: "vcpkg"
-    # Check for updates once a month
-    schedule:
-      interval: "monthly"
-    # Limit the amout of open PR's (default = 5, disabled = 0, security updates are not impacted)
-    open-pull-requests-limit: 2
+ # Alternative: Action that updates submodule and can be manually run on demand (workflow_dispatch)
+ # - package-ecosystem: "gitsubmodule"
+ #   # Look for `.gitmodules` in the `root` directory
+ #   directory: "/"
+ #   # Check for updates once a month
+ #   schedule:
+ #     interval: "monthly"
+ #   # Limit the amout of open PR's (default = 5, disabled = 0, security updates are not impacted)
+ #   open-pull-requests-limit: 1
 
  # # Enable version updates for Docker
  # Not yet possible to bump from one LTS version to the next and skip others, see:

.github/workflows/desktop-build.yml

@@ -38,15 +38,15 @@ on:
       - 'vcpkg.json'
       - 'vcpkg'
 
-# Cancel earlier, unfinished runs of this workflow on the same branch (unless on release)
+# Cancel earlier, unfinished runs of this workflow on the same branch (unless on master)
 concurrency:
   group: "${{ github.workflow }} @ ${{ github.ref_name }}"
-  cancel-in-progress: ${{ github.ref_type != 'tag' }}
+  cancel-in-progress: ${{ github.ref_name != 'master' }}
 
 jobs:
   configure:
     name: Configure
-    runs-on: ubuntu-slim
+    runs-on: ubuntu-latest
     outputs:
       tag: ${{steps.configure.outputs.tag}}
       sha: ${{steps.configure.outputs.sha}}
@@ -70,7 +70,7 @@ jobs:
 
       - name: Checkout
         if: steps.configure.outputs.tag != null
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
@@ -148,31 +148,25 @@ jobs:
             version: 24.04
             package: DEB
 
-          - distro: Ubuntu
-            version: 26.04
-            package: DEB
-
     name: ${{matrix.distro}} ${{matrix.version}}
     needs: configure
     runs-on: ubuntu-latest
     continue-on-error: ${{matrix.allow-failure == 'yes'}}
-    timeout-minutes: 70
     env:
       NAME: ${{matrix.distro}}${{matrix.version}}
       CACHE: ${{github.workspace}}/.cache/${{matrix.distro}}${{matrix.version}}   # directory for caching docker image and ccache
       # Cache size over the entire repo is 10Gi:
       # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
-      CCACHE_SIZE: 550M
-      CCACHE_EVICTION_AGE: 7d
+      CCACHE_SIZE: 500M
       CMAKE_GENERATOR: 'Ninja'
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Restore compiler cache (ccache)
         id: ccache_restore
-        uses: actions/cache/restore@v5
+        uses: actions/cache/restore@v4
         env:
           BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
         with:
@@ -187,47 +181,31 @@ jobs:
       - name: Build debug and test
         if: matrix.test != 'skip'
         shell: bash
+        env:
+          CMAKE_GENERATOR: '${{env.CMAKE_GENERATOR}}'
         run: |
           source .ci/docker.sh
-          RUN --server --debug --test --ccache "$CCACHE_SIZE" \
-                  --cmake-generator "$CMAKE_GENERATOR"
+          RUN --server --debug --test --ccache "$CCACHE_SIZE"
 
       - name: Build release package
         id: build
         if: matrix.package != 'skip'
         shell: bash
         env:
+          BUILD_DIR: build
           SUFFIX: '-${{matrix.distro}}${{matrix.version}}'
           package: '${{matrix.package}}'
-          server_only: '${{matrix.server_only}}'
+          CMAKE_GENERATOR: '${{env.CMAKE_GENERATOR}}'
+          NO_CLIENT: ${{matrix.server_only == 'yes' && '--no-client' || '' }}
         run: |
           source .ci/docker.sh
-          args=()
-          if [[ $server_only == yes ]]; then
-            args+=(--no-client)
-          fi
-          if [[ $GITHUB_REF == "refs/heads/master" ]]; then
-            args+=(--evict-ccache "$CCACHE_EVICTION_AGE")
-          fi
-          args+=(--ccache "$CCACHE_SIZE")
-          args+=(--cmake-generator "$CMAKE_GENERATOR")
-          args+=(--suffix "$SUFFIX")
-          RUN --server --release --package "$package" "${args[@]}"
+          RUN --server --release --package "$package" --dir "$BUILD_DIR" \
+                  --ccache "$CCACHE_SIZE" $NO_CLIENT
+          .ci/name_build.sh
 
-      # Delete used cache to emulate a ccache update. See https://github.com/actions/cache/issues/342
-      - name: Delete remote compiler cache (ccache)
-        if: github.ref == 'refs/heads/master' && steps.ccache_restore.outputs.cache-hit
-        continue-on-error: true
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          if gh cache delete --repo ${{ github.repository }} ${{ steps.ccache_restore.outputs.cache-primary-key }}; then
-            echo "Cache deleted successfully"
-          fi
-
-      - name: Save updated compiler cache (ccache)
+      - name: Save compiler cache (ccache)
         if: github.ref == 'refs/heads/master'
-        uses: actions/cache/save@v5
+        uses: actions/cache/save@v4
         with:
           path: ${{env.CACHE}}
           key: ${{ steps.ccache_restore.outputs.cache-primary-key }}
@@ -235,10 +213,10 @@ jobs:
       - name: Upload artifact
         id: upload_artifact
         if: matrix.package != 'skip'
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v5
         with:
+          name: ${{matrix.distro}}${{matrix.version}}-package
           path: ${{steps.build.outputs.path}}
-          archive: false
           if-no-files-found: error
 
       - name: Upload to release
@@ -248,24 +226,24 @@ jobs:
         env:
           GH_TOKEN: ${{github.token}}
           tag_name: ${{needs.configure.outputs.tag}}
-          asset_name: ${{steps.build.outputs.fullname}}
           asset_path: ${{steps.build.outputs.path}}
+          asset_name: ${{steps.build.outputs.name}}
         run: gh release upload "$tag_name" "$asset_path#$asset_name"
 
       - name: Attest binary provenance
         id: attestation
         if: steps.upload_release.outcome == 'success'
-        uses: actions/attest@v4
+        uses: actions/attest-build-provenance@v3
         with:
-          subject-path: ${{steps.build.outputs.path}}
-          show-summary: false
+          subject-name: ${{steps.build.outputs.name}}
+          subject-digest: sha256:${{ steps.upload_artifact.outputs.artifact-digest }}
 
       - name: Verify binary attestation
         if: steps.attestation.outcome == 'success'
         shell: bash
         env:
           GH_TOKEN: ${{github.token}}
-        run: gh attestation verify ${{steps.build.outputs.path}} --repo Cockatrice/Cockatrice
+        run: gh attestation verify ${{steps.build.outputs.path}} -R Cockatrice/Cockatrice
 
   build-vcpkg:
     strategy:
@@ -281,12 +259,13 @@ jobs:
             override_target: 13
             make_package: 1
             package_suffix: "-macOS13_Intel"
-            qt_version: 6.11.*
+            artifact_name: macOS13_Intel-package
+            qt_version: 6.6.*
             qt_arch: clang_64
             qt_modules: qtimageformats qtmultimedia qtwebsockets
+            cache_qt: false # qt caches take too much space for macOS (1.1Gi)
             cmake_generator: Ninja
             use_ccache: 1
-            ccache_eviction_age: 7d
 
           - os: macOS
             target: 14
@@ -296,12 +275,13 @@ jobs:
             type: Release
             make_package: 1
             package_suffix: "-macOS14"
-            qt_version: 6.11.*
+            artifact_name: macOS14-package
+            qt_version: 6.6.*
             qt_arch: clang_64
             qt_modules: qtimageformats qtmultimedia qtwebsockets
+            cache_qt: false
             cmake_generator: Ninja
             use_ccache: 1
-            ccache_eviction_age: 7d
 
           - os: macOS
             target: 15
@@ -311,12 +291,13 @@ jobs:
             type: Release
             make_package: 1
             package_suffix: "-macOS15"
-            qt_version: 6.11.*
+            artifact_name: macOS15-package
+            qt_version: 6.6.*
             qt_arch: clang_64
             qt_modules: qtimageformats qtmultimedia qtwebsockets
+            cache_qt: false
             cmake_generator: Ninja
             use_ccache: 1
-            ccache_eviction_age: 7d
 
           - os: macOS
             target: 15
@@ -324,118 +305,75 @@ jobs:
             soc: Apple
             xcode: "16.4"
             type: Debug
-            qt_version: 6.11.*
+            qt_version: 6.6.*
             qt_arch: clang_64
             qt_modules: qtimageformats qtmultimedia qtwebsockets
+            cache_qt: false
             cmake_generator: Ninja
             use_ccache: 1
-            ccache_eviction_age: 7d
+
+          - os: Windows
+            target: 7
+            runner: windows-2022
+            type: Release
+            make_package: 1
+            package_suffix: "-Win7"
+            artifact_name: Windows7-installer
+            qt_version: 5.15.*
+            qt_arch: win64_msvc2019_64
+            cache_qt: true
+            cmake_generator: "Visual Studio 17 2022"
+            cmake_generator_platform: x64
 
           - os: Windows
             target: 10
-            runner: windows-2025
+            runner: windows-2022
             type: Release
             make_package: 1
             package_suffix: "-Win10"
-            qt_version: 6.11.*
-            qt_arch: win64_msvc2022_64
+            artifact_name: Windows10-installer
+            qt_version: 6.6.*
+            qt_arch: win64_msvc2019_64
             qt_modules: qtimageformats qtmultimedia qtwebsockets
+            cache_qt: true
             cmake_generator: "Visual Studio 17 2022"
             cmake_generator_platform: x64
 
     name: ${{matrix.os}} ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }}
     needs: configure
     runs-on: ${{matrix.runner}}
-    timeout-minutes: 100
-    env:
-      CCACHE_DIR: ${{github.workspace}}/.cache/
-      # Cache size over the entire repo is 10Gi:
-      # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
-      CCACHE_SIZE: 550M
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
         with:
           submodules: recursive
 
       - name: Add msbuild to PATH
         if: matrix.os == 'Windows'
         id: add-msbuild
-        uses: microsoft/setup-msbuild@v3
+        uses: microsoft/setup-msbuild@v2
         with:
           msbuild-architecture: x64
 
+      # Using jianmingyong/ccache-action to setup ccache without using brew
+      # It tries to download a binary of ccache from GitHub Release and falls back to building from source if it fails
       - name: Setup ccache
-        if: matrix.use_ccache == 1 && matrix.os == 'macOS'
-        run: brew install ccache
-
-      - name: Restore compiler cache (ccache)
         if: matrix.use_ccache == 1
-        id: ccache_restore
-        uses: actions/cache/restore@v5
-        env:
-          BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
+        uses: jianmingyong/ccache-action@v1
         with:
-          path: ${{env.CCACHE_DIR}}
-          key: ccache-${{matrix.runner}}-${{matrix.soc}}-${{matrix.type}}-${{env.BRANCH_NAME}}
-          restore-keys: ccache-${{matrix.runner}}-${{matrix.soc}}-${{matrix.type}}-
+          install-type: "binary"
+          ccache-key-prefix: ccache-${{matrix.runner}}-${{matrix.soc}}-${{matrix.type}}
+          max-size: 500M
+          gh-token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Install aqtinstall
-        run: pipx install aqtinstall
-
-      # Resolve given wildcard versions (e.g. Qt 6.6.*) to latest version via aqtinstall to avoid stale caches on new releases
-      - name: Resolve latest Qt patch version
-        id: resolve_qt_version
-        shell: bash
-        run: .ci/resolve_latest_aqt_qt_version.sh "${{matrix.qt_version}}"
-
-      - name: Restore thin Qt ${{ steps.resolve_qt_version.outputs.version }} libraries (${{ matrix.soc }} macOS)
-        if: matrix.os == 'macOS'
-        id: restore_qt
-        uses: actions/cache/restore@v5
-        with:
-          path: ${{ github.workspace }}/Qt
-          key: thin-qt-macos-${{ matrix.soc }}-${{ steps.resolve_qt_version.outputs.version }}
-
-      # Using jurplel/install-qt-action to install Qt without using brew
-      # qt build using vcpkg either just fails or takes too long to build
-      - name: Install fat Qt ${{ steps.resolve_qt_version.outputs.version }} (${{ matrix.soc }} macOS)
-        if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true'
+      - name: Install Qt ${{matrix.qt_version}}
         uses: jurplel/install-qt-action@v4
         with:
-          version: ${{ steps.resolve_qt_version.outputs.version }}
+          version: ${{matrix.qt_version}}
           arch: ${{matrix.qt_arch}}
           modules: ${{matrix.qt_modules}}
-          cache: false
-          dir: ${{github.workspace}}
-
-      - name: Thin Qt libraries (${{ matrix.soc }} macOS)
-        if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true'
-        run: .ci/thin_macos_qtlib.sh
-
-      - name: Cache thin Qt libraries (${{ matrix.soc }} macOS)
-        if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true'
-        uses: actions/cache/save@v5
-        with:
-          path: ${{ github.workspace }}/Qt
-          key: thin-qt-macos-${{ matrix.soc }}-${{ steps.resolve_qt_version.outputs.version }}
-
-      - name: Install Qt ${{matrix.qt_version}} (Windows)
-        if: matrix.os == 'Windows'
-        uses: jurplel/install-qt-action@v4
-        with:
-          # qt 6.11.0 only works with aqtinstall directly from git until aqtinstall 3.4 is released
-          aqtsource: git+https://github.com/miurahr/aqtinstall.git
-          version: ${{ steps.resolve_qt_version.outputs.version }}
-          arch: ${{matrix.qt_arch}}
-          modules: ${{matrix.qt_modules}}
-          cache: true
-
-      - name: Install NSIS
-        if: matrix.os == 'Windows'
-        shell: bash
-        run: choco install nsis
+          cache: ${{matrix.cache_qt}}
 
       - name: Setup vcpkg cache
         id: vcpkg-cache
@@ -463,30 +401,10 @@ jobs:
           MACOS_CI_KEYCHAIN_PWD: ${{ secrets.PROD_MACOS_CI_KEYCHAIN_PWD }}
           DEVELOPER_DIR: '/Applications/Xcode_${{matrix.xcode}}.app/Contents/Developer'
           TARGET_MACOS_VERSION: ${{ matrix.override_target }}
-          CCACHE_EVICTION_AGE: ${{ matrix.ccache_eviction_age }}
         run: .ci/compile.sh --server --test --vcpkg
 
-      # Delete used cache to emulate a ccache update. See https://github.com/actions/cache/issues/342
-      - name: Delete remote compiler cache (ccache)
-        if: github.ref == 'refs/heads/master' && matrix.use_ccache == 1 && steps.ccache_restore.outputs.cache-hit
-        continue-on-error: true
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          if gh cache delete --repo ${{ github.repository }} ${{ steps.ccache_restore.outputs.cache-primary-key }}; then
-            echo "Cache deleted successfully"
-          fi
-
-      - name: Save updated compiler cache (ccache)
-        if: github.ref == 'refs/heads/master' && matrix.use_ccache == 1
-        uses: actions/cache/save@v5
-        with:
-          path: ${{env.CCACHE_DIR}}
-          key: ${{ steps.ccache_restore.outputs.cache-primary-key }}
-
       - name: Sign app bundle
-        if: matrix.os == 'macOS' && matrix.make_package && needs.configure.outputs.tag != null
-        id: sign_macos
+        if: matrix.os == 'macOS' && matrix.make_package && (github.ref == 'refs/heads/master' || needs.configure.outputs.tag != null)
         env:
           MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }}
           MACOS_CI_KEYCHAIN_PWD: ${{ secrets.PROD_MACOS_CI_KEYCHAIN_PWD }}
@@ -498,7 +416,7 @@ jobs:
           fi
 
       - name: Notarize app bundle
-        if: steps.sign_macos.outcome == 'success'
+        if: matrix.os == 'macOS' && matrix.make_package && (github.ref == 'refs/heads/master' || needs.configure.outputs.tag != null)
         env:
           MACOS_NOTARIZATION_APPLE_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_APPLE_ID }}
           MACOS_NOTARIZATION_TEAM_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_TEAM_ID }}
@@ -530,47 +448,46 @@ jobs:
           fi
 
       - name: Upload artifact
-        if: matrix.make_package
         id: upload_artifact
-        uses: actions/upload-artifact@v7
+        if: matrix.make_package
+        uses: actions/upload-artifact@v5
         with:
+          name: ${{matrix.artifact_name}}
           path: ${{steps.build.outputs.path}}
-          archive: false
           if-no-files-found: error
 
-      - name: Upload PDBs (Program Databases)
-        if: matrix.os == 'Windows' && github.ref_type != 'tag'
-        uses: actions/upload-artifact@v7
+      - name: Upload pdb database
+        if: matrix.os == 'Windows'
+        uses: actions/upload-artifact@v5
         with:
-          name: ${{steps.build.outputs.name}}-PDBs
+          name: Windows${{matrix.target}}-debug-pdbs
           path: |
             build/cockatrice/Release/*.pdb
-            build/oracle/Release/*.pdb
             build/servatrice/Release/*.pdb
           if-no-files-found: error
 
       - name: Upload to release
-        if: needs.configure.outputs.tag != null && matrix.make_package == '1'
         id: upload_release
+        if: needs.configure.outputs.tag != null
         shell: bash
         env:
           GH_TOKEN: ${{github.token}}
           tag_name: ${{needs.configure.outputs.tag}}
-          asset_name: ${{steps.build.outputs.fullname}}
           asset_path: ${{steps.build.outputs.path}}
+          asset_name: ${{steps.build.outputs.name}}
         run: gh release upload "$tag_name" "$asset_path#$asset_name"
 
       - name: Attest binary provenance
-        if: steps.upload_release.outcome == 'success'
         id: attestation
-        uses: actions/attest@v4
+        if: steps.upload_release.outcome == 'success'
+        uses: actions/attest-build-provenance@v3
         with:
-          subject-path: ${{steps.build.outputs.path}}
-          show-summary: false
+          subject-name: ${{steps.build.outputs.name}}
+          subject-digest: sha256:${{ steps.upload_artifact.outputs.artifact-digest }}
 
       - name: Verify binary attestation
         if: steps.attestation.outcome == 'success'
         shell: bash
         env:
           GH_TOKEN: ${{github.token}}
-        run: gh attestation verify ${{steps.build.outputs.path}} --repo Cockatrice/Cockatrice
+        run: gh attestation verify ${{steps.build.outputs.path}} -R Cockatrice/Cockatrice

.github/workflows/desktop-lint.yml

@@ -20,13 +20,13 @@ on:
 
 jobs:
   format:
-    runs-on: ubuntu-slim
+    runs-on: ubuntu-22.04
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v6
+      uses: actions/checkout@v5
       with:
-        fetch-depth: 20    # should be enough to find merge base
+        fetch-depth: 20 # should be enough to find merge base
 
     - name: Install dependencies
       shell: bash

.github/workflows/docker-release.yml

@@ -13,11 +13,6 @@ on:
       - '.github/workflows/docker-release.yml'
       - 'Dockerfile'
 
-# Cancel earlier, unfinished runs of this workflow on the same branch (unless on release)
-concurrency:
-  group: "${{ github.workflow }} @ ${{ github.ref_name }}"
-  cancel-in-progress: ${{ github.ref_type != 'tag' }}
-
 jobs:
   docker:
     name: amd64 & arm64
@@ -28,11 +23,11 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Docker metadata
         id: metadata
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
           images: |
             ghcr.io/cockatrice/servatrice
@@ -46,27 +41,26 @@ jobs:
             org.opencontainers.image.description=Server for Cockatrice, a cross-platform virtual tabletop for multiplayer card games  
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v4
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker buildx
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to GitHub Container Registry
         if: github.ref_type == 'tag'
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ github.token }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
         with:
           context: .
           platforms: linux/amd64,linux/arm64
           push: ${{ github.ref_type == 'tag' }}
           tags: ${{ steps.metadata.outputs.tags }}
           labels: ${{ steps.metadata.outputs.labels }}
-          annotations: ${{ steps.metadata.outputs.annotations }}
-          cache-from: type=gha,scope=servatrice
-          cache-to: type=gha,mode=max,scope=servatrice
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/documentation-build.yml

@@ -6,14 +6,11 @@ on:
       - '*'   # Only re-generate docs when a new tagged version is pushed
   pull_request:
     paths:
-      - 'doc/doxygen/**'
       - '.github/workflows/documentation-build.yml'
       - 'Doxyfile'
+      - 'doxygen_style.css'
   workflow_dispatch:
 
-env:
-  COCKATRICE_REF: ${{ github.ref_name }}    # Tag name if the commit is tagged, otherwise branch name
-
 jobs:
   docs:
     name: Doxygen
@@ -21,35 +18,12 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v6
-        with:
-          submodules: recursive
+        uses: actions/checkout@v5
 
-      - name: Install Graphviz
-        run: |
-          sudo apt-get install -y graphviz
-          dot -V
-
-      - name: Install Doxygen
-        uses: ssciwr/doxygen-install@v2
-        with:
-          version: "1.14.0"
-
-      - name: Update Doxygen Configuration
-        run: |
-          git diff Doxyfile
-          doxygen -u Doxyfile
-          if git diff --quiet Doxyfile; then
-            echo "::notice::No config changes in Doxyfile detected."
-          else
-            echo "::error::Config changes in Doxyfile detected! Please update the file by running 'doxygen -u Doxyfile'."
-            echo ""
-            git diff --color=always Doxyfile
-            exit 1
-          fi
+      - name: Install Doxygen and Graphviz
+        run: sudo apt-get install -y doxygen graphviz
 
       - name: Generate Documentation
-        if: always()
         run: doxygen Doxyfile
 
       - name: Deploy to cockatrice.github.io

.github/workflows/translations-pull.yml

@@ -16,11 +16,11 @@ jobs:
     if: github.event_name != 'schedule' || github.repository_owner == 'Cockatrice'
 
     name: Pull languages
-    runs-on: ubuntu-slim
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Pull translated strings from Transifex
         uses: transifex/cli-action@v2
@@ -33,7 +33,7 @@ jobs:
       - name: Create pull request
         if: github.event_name != 'pull_request'
         id: create_pr
-        uses: peter-evans/create-pull-request@v8
+        uses: peter-evans/create-pull-request@v7
         with:
           add-paths: |
             cockatrice/translations/*.ts

.github/workflows/translations-push.yml

@@ -16,11 +16,11 @@ jobs:
     if: github.event_name != 'schedule' || github.repository_owner == 'Cockatrice'
 
     name: Push strings
-    runs-on: ubuntu-slim
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Install lupdate
         shell: bash
@@ -46,7 +46,7 @@ jobs:
 
       - name: Render template
         id: template
-        uses: chuhlomin/render-template/binary@v1
+        uses: chuhlomin/render-template@v1
         with:
           template: .ci/update_translation_source_strings_template.md
           vars: |
@@ -57,7 +57,7 @@ jobs:
       - name: Create pull request
         if: github.event_name != 'pull_request'
         id: create_pr
-        uses: peter-evans/create-pull-request@v8
+        uses: peter-evans/create-pull-request@v7
         with:
           add-paths: |
             cockatrice/cockatrice_en@source.ts

.github/workflows/web-build.yml

@@ -35,7 +35,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
 
       - name: Setup Node.js
         uses: actions/setup-node@v6

.github/workflows/web-lint.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   ESLint:
-    runs-on: ubuntu-slim
+    runs-on: ubuntu-latest
     
     defaults:
       run:
@@ -18,7 +18,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v6
+      uses: actions/checkout@v5
 
     - name: Setup Node.js
       uses: actions/setup-node@v6

.gitignore

@@ -14,4 +14,3 @@ compile_commands.json
 .cache
 .gdb_history
 cockatrice/resources/config/qtlogging.ini
-docs/

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "vcpkg"]
 	path = vcpkg
 	url = https://github.com/microsoft/vcpkg.git
-[submodule "doxygen-awesome-css"]
-	path = doc/doxygen/theme
-	url = https://github.com/jothepro/doxygen-awesome-css.git

CMakeLists.txt

@@ -20,6 +20,8 @@ option(WITH_SERVER "build servatrice" OFF)
 option(WITH_CLIENT "build cockatrice" ON)
 # Compile oracle
 option(WITH_ORACLE "build oracle" ON)
+# Compile dbconverter
+option(WITH_DBCONVERTER "build dbconverter" ON)
 # Compile tests
 option(TEST "build tests" OFF)
 # Use vcpkg regardless of OS
@@ -74,11 +76,11 @@ endif()
 
 # A project name is needed for CPack
 # Version can be overriden by git tags, see cmake/getversion.cmake
-project("Cockatrice" VERSION 3.0.0)
+project("Cockatrice" VERSION 2.11.0)
 
 # Set release name if not provided via env/cmake var
 if(NOT DEFINED GIT_TAG_RELEASENAME)
-  set(GIT_TAG_RELEASENAME "Graduation Day")
+  set(GIT_TAG_RELEASENAME "Omenpath")
 endif()
 
 # Use c++20 for all targets
@@ -254,9 +256,7 @@ endif()
 set(CPACK_PACKAGE_CONTACT "Zach Halpern <zach@cockatrice.us>")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_NAME}")
 set(CPACK_PACKAGE_VENDOR "Cockatrice Development Team")
-set(CPACK_PACKAGE_DESCRIPTION
-    "Cockatrice is an open-source, multiplatform application for playing tabletop card games over a network. The program's server design prevents users from manipulating the game for unfair advantage. The client also provides a single-player mode, which allows users to brew while offline."
-)
+set(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/README.md")
 set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
 set(CPACK_PACKAGE_VERSION_MAJOR "${PROJECT_VERSION_MAJOR}")
 set(CPACK_PACKAGE_VERSION_MINOR "${PROJECT_VERSION_MINOR}")
@@ -330,12 +330,7 @@ include(CPack)
 
 add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_interfaces ${CMAKE_BINARY_DIR}/libcockatrice_interfaces)
 add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_protocol ${CMAKE_BINARY_DIR}/libcockatrice_protocol)
-if(WITH_CLIENT
-   OR WITH_SERVER
-   OR WITH_ORACLE
-)
-  add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_network ${CMAKE_BINARY_DIR}/libcockatrice_network)
-endif()
+add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_network ${CMAKE_BINARY_DIR}/libcockatrice_network)
 add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_deck_list ${CMAKE_BINARY_DIR}/libcockatrice_deck_list)
 add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_rng ${CMAKE_BINARY_DIR}/libcockatrice_rng)
 add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_card ${CMAKE_BINARY_DIR}/libcockatrice_card)
@@ -361,6 +356,11 @@ if(WITH_ORACLE)
   set(CPACK_INSTALL_CMAKE_PROJECTS "Oracle;Oracle;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS})
 endif()
 
+if(WITH_DBCONVERTER)
+  add_subdirectory(dbconverter)
+  set(CPACK_INSTALL_CMAKE_PROJECTS "Dbconverter;Dbconverter;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS})
+endif()
+
 if(TEST)
   include(CTest)
   add_subdirectory(tests)

Dockerfile

@@ -20,7 +20,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 WORKDIR /src
 COPY . .
 RUN mkdir build && cd build && \
-    cmake .. -DWITH_SERVER=1 -DWITH_CLIENT=0 -DWITH_ORACLE=0 && \
+    cmake .. -DWITH_SERVER=1 -DWITH_CLIENT=0 -DWITH_ORACLE=0 -DWITH_DBCONVERTER=0 && \
     make -j$(nproc) && \
     make install
 

Doxyfile

@@ -42,19 +42,19 @@ DOXYFILE_ENCODING      = UTF-8
 # title of most generated pages and in a few other places.
 # The default value is: My Project.
 
-PROJECT_NAME           = Cockatrice
+PROJECT_NAME           = "Cockatrice"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = $(COCKATRICE_REF)
+PROJECT_NUMBER         = 2.11
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewers a
 # quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          = "A virtual tabletop for multiplayer card games"
+PROJECT_BRIEF          =
 
 # With the PROJECT_LOGO tag one can specify a logo or an icon that is included
 # in the documentation. The maximum height of the logo should not exceed 55
@@ -379,7 +379,7 @@ TOC_INCLUDE_HEADINGS   = 6
 # The default value is: DOXYGEN.
 # This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
 
-MARKDOWN_ID_STYLE      = GITHUB
+MARKDOWN_ID_STYLE      = DOXYGEN
 
 # When enabled Doxygen tries to link words that correspond to documented
 # classes, or namespaces to their corresponding documentation. Such a link can
@@ -839,7 +839,7 @@ FILE_VERSION_FILTER    =
 # DoxygenLayout.xml, Doxygen will parse it automatically even if the LAYOUT_FILE
 # tag is left empty.
 
-LAYOUT_FILE            = doc/doxygen/DoxygenLayout.xml
+LAYOUT_FILE            = DoxygenLayout.xml
 
 # The CITE_BIB_FILES tag can be used to specify one or more bib files containing
 # the reference definitions. This must be a list of .bib files. The .bib
@@ -991,7 +991,7 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = .
+INPUT                  = cockatrice doc/doxygen-extra-pages doc/doxygen-groups libcockatrice_card libcockatrice_deck_list libcockatrice_filters libcockatrice_interfaces libcockatrice_models libcockatrice_network libcockatrice_protocol libcockatrice_rng libcockatrice_settings libcockatrice_utility
 
 # This tag can be used to specify the character encoding of the source files
 # that Doxygen parses. Internally Doxygen uses the UTF-8 encoding. Doxygen uses
@@ -1031,7 +1031,8 @@ INPUT_FILE_ENCODING    =
 # provided as Doxygen C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
 # *.f18, *.f, *.for, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
 
-FILE_PATTERNS          = *.cc \
+FILE_PATTERNS          = *.c \
+                         *.cc \
                          *.cxx \
                          *.cxxm \
                          *.cpp \
@@ -1039,19 +1040,47 @@ FILE_PATTERNS          = *.cc \
                          *.ccm \
                          *.c++ \
                          *.c++m \
+                         *.java \
                          *.ii \
                          *.ixx \
                          *.ipp \
                          *.i++ \
                          *.inl \
+                         *.idl \
+                         *.ddl \
+                         *.odl \
                          *.h \
                          *.hh \
                          *.hxx \
                          *.hpp \
                          *.h++ \
+                         *.l \
+                         *.cs \
+                         *.d \
+                         *.php \
+                         *.php4 \
+                         *.php5 \
+                         *.phtml \
+                         *.inc \
+                         *.m \
                          *.markdown \
                          *.md \
-                         *.dox
+                         *.mm \
+                         *.dox \
+                         *.py \
+                         *.pyw \
+                         *.f90 \
+                         *.f95 \
+                         *.f03 \
+                         *.f08 \
+                         *.f18 \
+                         *.f \
+                         *.for \
+                         *.vhd \
+                         *.vhdl \
+                         *.ucf \
+                         *.qsf \
+                         *.ice
 
 # The RECURSIVE tag can be used to specify whether or not subdirectories should
 # be searched for input files as well.
@@ -1066,12 +1095,7 @@ RECURSIVE              = YES
 # Note that relative paths are relative to the directory from which Doxygen is
 # run.
 
-EXCLUDE                = build/ \
-                         cmake/ \
-                         doc/doxygen/theme/docs/ \
-                         doc/doxygen/theme/include/ \
-                         vcpkg/ \
-                         webclient/
+EXCLUDE                = common/lib
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
@@ -1087,8 +1111,7 @@ EXCLUDE_SYMLINKS       = NO
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       = .* \
-                         .*/
+EXCLUDE_PATTERNS       =
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the
@@ -1122,7 +1145,7 @@ EXAMPLE_RECURSIVE      = NO
 # that contain images that are to be included in the documentation (see the
 # \image command).
 
-IMAGE_PATH             = doc/doxygen/images
+IMAGE_PATH             = doc/doxygen-images
 
 # The INPUT_FILTER tag can be used to specify a program that Doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program
@@ -1290,46 +1313,6 @@ USE_HTAGS              = NO
 
 VERBATIM_HEADERS       = YES
 
-# If the CLANG_ASSISTED_PARSING tag is set to YES then Doxygen will use the
-# clang parser (see:
-# http://clang.llvm.org/) for more accurate parsing at the cost of reduced
-# performance. This can be particularly helpful with template rich C++ code for
-# which Doxygen's built-in parser lacks the necessary type information.
-# Note: The availability of this option depends on whether or not Doxygen was
-# generated with the -Duse_libclang=ON option for CMake.
-# The default value is: NO.
-
-CLANG_ASSISTED_PARSING = NO
-
-# If the CLANG_ASSISTED_PARSING tag is set to YES and the CLANG_ADD_INC_PATHS
-# tag is set to YES then Doxygen will add the directory of each input to the
-# include path.
-# The default value is: YES.
-# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
-
-CLANG_ADD_INC_PATHS    = YES
-
-# If clang assisted parsing is enabled you can provide the compiler with command
-# line options that you would normally use when invoking the compiler. Note that
-# the include paths will already be set by Doxygen for the files and directories
-# specified with INPUT and INCLUDE_PATH.
-# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
-
-CLANG_OPTIONS          =
-
-# If clang assisted parsing is enabled you can provide the clang parser with the
-# path to the directory containing a file called compile_commands.json. This
-# file is the compilation database (see:
-# http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html) containing the
-# options used when the source files were built. This is equivalent to
-# specifying the -p option to a clang tool, such as clang-check. These options
-# will then be passed to the parser. Any options specified with CLANG_OPTIONS
-# will be added as well.
-# Note: The availability of this option depends on whether or not Doxygen was
-# generated with the -Duse_libclang=ON option for CMake.
-
-CLANG_DATABASE_PATH    =
-
 #---------------------------------------------------------------------------
 # Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
@@ -1432,9 +1415,7 @@ HTML_STYLESHEET        =
 # documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_EXTRA_STYLESHEET  = doc/doxygen/theme/doxygen-awesome.css \
-                         doc/doxygen/css/hide_nav_sync.css \
-                         doc/doxygen/css/cockatrice_docs_style.css
+HTML_EXTRA_STYLESHEET  = doc/doxygen/css/doxygen_style.css
 
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note
@@ -1457,7 +1438,7 @@ HTML_EXTRA_FILES       = doc/doxygen/js/graph_toggle.js
 # The default value is: AUTO_LIGHT.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_COLORSTYLE        = LIGHT
+HTML_COLORSTYLE        = DARK
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
@@ -1768,7 +1749,7 @@ ECLIPSE_DOC_ID         = org.doxygen.Project
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-DISABLE_INDEX          = NO
+DISABLE_INDEX          = YES
 
 # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
 # structure should be generated to display hierarchical information. If the tag
@@ -2040,7 +2021,7 @@ EXTRA_SEARCH_MAPPINGS  =
 # If the GENERATE_LATEX tag is set to YES, Doxygen will generate LaTeX output.
 # The default value is: YES.
 
-GENERATE_LATEX         = NO
+GENERATE_LATEX         = YES
 
 # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
 # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
@@ -2626,7 +2607,7 @@ DOT_COMMON_ATTR        = "fontname=Helvetica,fontsize=10"
 # The default value is: labelfontname=Helvetica,labelfontsize=10.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_EDGE_ATTR          = "labelfontname=Helvetica,labelfontsize=10,arrowhead=open, arrowtail=open, arrowsize=0.5"
+DOT_EDGE_ATTR  = "labelfontname=Helvetica,labelfontsize=10,arrowhead=open, arrowtail=open, arrowsize=0.5"
 
 # DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes
 # around nodes set 'shape=plain' or 'shape=plaintext' <a
@@ -2634,7 +2615,7 @@ DOT_EDGE_ATTR          = "labelfontname=Helvetica,labelfontsize=10,arrowhead=ope
 # The default value is: shape=box,height=0.2,width=0.4.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_NODE_ATTR          = "shape=box,height=0.2,width=0.4"
+DOT_NODE_ATTR  = "shape=box,height=0.2,width=0.4"
 
 # You can set the path where dot can find font specified with fontname in
 # DOT_COMMON_ATTR and others dot attributes.

DoxygenLayout.xml

@@ -7,7 +7,7 @@
         <tab type="pages" visible="yes" title="" intro=""/>
         <tab type="topics" visible="yes" title="" intro=""/>
         <tab type="usergroup" title="Code Reference">
-            <tab type="modules" visible="no" title="" intro="">
+            <tab type="modules" visible="yes" title="" intro="">
                 <tab type="modulelist" visible="yes" title="" intro=""/>
                 <tab type="modulemembers" visible="yes" title="" intro=""/>
             </tab>
@@ -15,8 +15,9 @@
                 <tab type="namespacelist" visible="yes" title="" intro=""/>
                 <tab type="namespacemembers" visible="yes" title="" intro=""/>
             </tab>
-            <tab type="concepts" visible="no" title=""/>
-            <tab type="interfaces" visible="no" title="">
+            <tab type="concepts" visible="yes" title="">
+            </tab>
+            <tab type="interfaces" visible="yes" title="">
                 <tab type="interfacelist" visible="yes" title="" intro=""/>
                 <tab type="interfaceindex" visible="$ALPHABETICAL_INDEX" title=""/>
                 <tab type="interfacehierarchy" visible="yes" title="" intro=""/>
@@ -27,11 +28,11 @@
                 <tab type="hierarchy" visible="yes" title="" intro=""/>
                 <tab type="classmembers" visible="yes" title="" intro=""/>
             </tab>
-            <tab type="structs" visible="no" title="">
+            <tab type="structs" visible="yes" title="">
                 <tab type="structlist" visible="yes" title="" intro=""/>
                 <tab type="structindex" visible="$ALPHABETICAL_INDEX" title=""/>
             </tab>
-            <tab type="exceptions" visible="no" title="">
+            <tab type="exceptions" visible="yes" title="">
                 <tab type="exceptionlist" visible="yes" title="" intro=""/>
                 <tab type="exceptionindex" visible="$ALPHABETICAL_INDEX" title=""/>
                 <tab type="exceptionhierarchy" visible="yes" title="" intro=""/>
@@ -40,7 +41,7 @@
                 <tab type="filelist" visible="yes" title="" intro=""/>
                 <tab type="globals" visible="yes" title="" intro=""/>
             </tab>
-            <tab type="examples" visible="no" title="" intro=""/>
+            <tab type="examples" visible="yes" title="" intro=""/>
         </tab>
     </navindex>
 

README.md

@@ -44,42 +44,24 @@ Latest <kbd>beta</kbd> version:
 
 # Related Repositories
 
-- [Magic-Token](https://github.com/Cockatrice/Magic-Token): File with MtG token data for use in Cockatrice
-- [Magic-Spoiler](https://github.com/Cockatrice/Magic-Spoiler): Code to generate MtG spoiler data from [MTGJSON](https://github.com/mtgjson/mtgjson) for use in Cockatrice
-- [cockatrice.github.io](https://github.com/Cockatrice/cockatrice.github.io): Code of the official Cockatrice webpage
-- [io.github.Cockatrice.cockatrice](https://github.com/flathub/io.github.Cockatrice.cockatrice): Configuration of our Linux `flatpak` package hosted at [Flathub](https://flathub.org/en/apps/io.github.Cockatrice.cockatrice)
+- [Magic-Token](https://github.com/Cockatrice/Magic-Token): MtG token data to use in Cockatrice
+- [Magic-Spoiler](https://github.com/Cockatrice/Magic-Spoiler): Script to generate MtG spoiler data from [MTGJSON](https://github.com/mtgjson/mtgjson) to use in Cockatrice
+- [cockatrice.github.io](https://github.com/Cockatrice/cockatrice.github.io): Code of the official webpage of the Cockatrice project
 
 
 # Community Resources [![Discord](https://img.shields.io/discord/314987288398659595?label=Discord&logo=discord&logoColor=white)](https://discord.gg/3Z9yzmA)
 
-Join our [Discord community](https://discord.gg/3Z9yzmA) to connect with other project contributors (`#dev` channel) or fellow users of the app. Come here to talk about the application, features, or just to hang out.
+Join our [Discord community](https://discord.gg/3Z9yzmA) to connect with other projet contributors (`#dev` channel) or fellow users of the app. Come here to talk about the application, features, or just to hang out.
 - [Official Website](https://cockatrice.github.io)
 - [Official Wiki](https://github.com/Cockatrice/Cockatrice/wiki)
 - [Official Discord](https://discord.gg/3Z9yzmA)
 - [reddit r/Cockatrice](https://reddit.com/r/cockatrice)
 
-> [!IMPORTANT]
-> For support regarding specific servers, please contact that server's admin/mods and use their dedicated communication channels rather than contacting the team building the software.
+>[!IMPORTANT]
+>For support regarding specific servers, please contact that server's admin/mods and use their dedicated communication channels rather than contacting the team building the software.
 
 
 # Contribute
-<p>
-   <a href="#code">Code</a> <b>|</b>
-   <a href="#documentation-">Documentation</a> <b>|</b>
-   <a href="#translation-">Translation</a>
-</p>
-
-#### Repository Activity
-![Cockatrice Repo Analytics](https://repobeats.axiom.co/api/embed/c7cec938789a5bbaeb4182a028b4dbb96db8f181.svg "Cockatrice Repo Analytics by Repobeats")
-
-<details>
-<summary><b>Kudos to all our amazing contributors ❤️</b></summary>
-<br>
-   <a href="https://github.com/Cockatrice/Cockatrice/graphs/contributors">
-      <img src="https://contrib.rocks/image?repo=Cockatrice/Cockatrice" />
-   </a><br>
-   <sub><i>Made with <a href="https://contrib.rocks">contrib.rocks</a></i></sub>
-</details>
 
 ### Code
 
@@ -93,23 +75,22 @@ This tag is used for issues that we are looking for somebody to pick up. Often t
 For both tags, we're willing to provide help to contributors in showing them where and how they can make changes, as well as code reviews for submitted changes.<br>
 We'll happily advice on how best to implement a feature, or we can show you where the codebase is doing something similar before you get too far along - put a note on an issue you want to discuss more on!
 
-You can also have a look at our `Todo List` in our [Code Documentation](https://cockatrice.github.io/docs) or search the repo for [`\todo` comments](https://github.com/search?q=repo%3ACockatrice%2FCockatrice%20%5Ctodo&type=code).
-
-### Documentation [![CI Docs](https://github.com/Cockatrice/Cockatrice/actions/workflows/documentation-build.yml/badge.svg?event=push)](https://github.com/Cockatrice/Cockatrice/actions/workflows/documentation-build.yml?query=event%3Apush)
-
-There are various places where useful information for different needs are maintained:
-- [Official Code Documentation](https://cockatrice.github.io/docs/) 
-- [Official Wiki](https://github.com/Cockatrice/Cockatrice/wiki) `Community supported`
-- [Official Webpage](https://cockatrice.github.io/)
-- [Official README](https://github.com/Cockatrice/Cockatrice/blob/master/README.md) `This file`
-
 Cockatrice tries to use the [Google Developer Documentation Style Guide](https://developers.google.com/style/) to ensure consistent documentation. We encourage you to improve the documentation by suggesting edits based on this guide.
 
-### Translation [![Transifex Project](https://img.shields.io/badge/translate-on%20transifex-brightgreen)](https://explore.transifex.com/cockatrice/cockatrice/)
+<details>
+<summary><b>Kudos to our amazing contributors ❤️</b></summary>
+<br>
+   <a href="https://github.com/Cockatrice/Cockatrice/graphs/contributors">
+      <img src="https://contrib.rocks/image?repo=Cockatrice/Cockatrice" />
+   </a><br>
+   <sub><i>Made with <a href="https://contrib.rocks">contrib.rocks</a></i></sub>
+</details>
+
+### Translations [![Transifex Project](https://img.shields.io/badge/translate-on%20transifex-brightgreen)](https://explore.transifex.com/cockatrice/cockatrice/)
 
 Cockatrice uses Transifex to manage translations. You can help us bring <kbd>Cockatrice</kbd>, <kbd>Oracle</kbd> and <kbd>Webatrice</kbd> to your language and just adjust single wordings right from within your browser by visiting our [Transifex project page](https://explore.transifex.com/cockatrice/cockatrice/).<br>
 
-Check out our [Translator FAQ](https://github.com/Cockatrice/Cockatrice/wiki/Translation-FAQ) for more information about getting involved, and join a group of hundreds of others!<br>
+Check out our [Translator FAQ](https://github.com/Cockatrice/Cockatrice/wiki/Translation-FAQ) for more information about getting invovled, and join a group of hundreds of others!<br>
 
 
 # Build [![CI Desktop](https://github.com/Cockatrice/Cockatrice/actions/workflows/desktop-build.yml/badge.svg?branch=master&event=push)](https://github.com/Cockatrice/Cockatrice/actions/workflows/desktop-build.yml?query=branch%3Amaster+event%3Apush) [![CI Docker](https://github.com/Cockatrice/Cockatrice/actions/workflows/docker-release.yml/badge.svg?branch=master&event=push)](https://github.com/Cockatrice/Cockatrice/actions/workflows/docker-release.yml?query=branch%3Amaster+event%3Apush) [![CI Web](https://github.com/Cockatrice/Cockatrice/actions/workflows/web-build.yml/badge.svg?branch=master&event=push)](https://github.com/Cockatrice/Cockatrice/actions/workflows/web-build.yml?query=branch%3Amaster+event%3Apush)
@@ -143,8 +124,8 @@ You can then
     make package
     ```
 
-> [!NOTE]
-> Detailed compiling instructions can be found in the Cockatrice wiki at [Compiling Cockatrice](https://github.com/Cockatrice/Cockatrice/wiki/Compiling-Cockatrice)
+>[!NOTE]
+>Detailed compiling instructions can be found in the Cockatrice wiki at [Compiling Cockatrice](https://github.com/Cockatrice/Cockatrice/wiki/Compiling-Cockatrice)
 
 <br>
 

cmake/CMakeDMGSetup.script

@@ -42,6 +42,7 @@ tell disk image_name
       set position of item "Cockatrice.app" to { 139, 214 }
       set position of item "Oracle.app" to { 139, 414 }
       set position of item "Servatrice.app" to { 139, 614 }
+      set position of item "dbconverter.app" to { 1400, 1400 }
       set position of item "Applications" to { 861, 414 }
     end tell
     update without registering applications

cmake/FindQtRuntime.cmake

@@ -1,11 +1,12 @@
 # Find a compatible Qt version
-# Inputs: WITH_SERVER, WITH_CLIENT, WITH_ORACLE, FORCE_USE_QT5
+# Inputs: WITH_SERVER, WITH_CLIENT, WITH_ORACLE, WITH_DBCONVERTER, FORCE_USE_QT5
 # Optional Input: QT6_DIR -- Hint as to where Qt6 lives on the system
 # Optional Input: QT5_DIR -- Hint as to where Qt5 lives on the system
 # Output: COCKATRICE_QT_VERSION_NAME -- Example values: Qt5, Qt6
 # Output: SERVATRICE_QT_MODULES
 # Output: COCKATRICE_QT_MODULES
 # Output: ORACLE_QT_MODULES
+# Output: DBCONVERTER_QT_MODULES
 # Output: TEST_QT_MODULES
 
 set(REQUIRED_QT_COMPONENTS Core)
@@ -28,21 +29,22 @@ endif()
 if(WITH_ORACLE)
   set(_ORACLE_NEEDED Concurrent Network Svg Widgets)
 endif()
+if(WITH_DBCONVERTER)
+  set(_DBCONVERTER_NEEDED Network Widgets)
+endif()
 if(TEST)
-  # Union of Qt modules required across all test targets (independent of application targets).
-  # When adding a new test that needs additional Qt modules, add them here rather than in the test's CMakeLists.txt.
-  set(_TEST_NEEDED Concurrent Network Svg Widgets)
+  set(_TEST_NEEDED Widgets)
 endif()
 
 set(REQUIRED_QT_COMPONENTS ${REQUIRED_QT_COMPONENTS} ${_SERVATRICE_NEEDED} ${_COCKATRICE_NEEDED} ${_ORACLE_NEEDED}
-                           ${_TEST_NEEDED}
+                           ${_DBCONVERTER_NEEDED} ${_TEST_NEEDED}
 )
 list(REMOVE_DUPLICATES REQUIRED_QT_COMPONENTS)
 
 if(NOT FORCE_USE_QT5)
   # Linguist is now a component in Qt6 instead of an external package
   find_package(
-    Qt6 6.4.2
+    Qt6 6.2.3
     COMPONENTS ${REQUIRED_QT_COMPONENTS} Linguist
     QUIET HINTS ${Qt6_DIR}
   )
@@ -61,7 +63,7 @@ if(Qt6_FOUND)
   endif()
 else()
   find_package(
-    Qt5 5.15.2
+    Qt5 5.8.0
     COMPONENTS ${REQUIRED_QT_COMPONENTS}
     QUIET HINTS ${Qt5_DIR}
   )
@@ -110,6 +112,7 @@ message(DEBUG "QT_LIBRARY_DIR = ${QT_LIBRARY_DIR}")
 string(REGEX REPLACE "([^;]+)" "${COCKATRICE_QT_VERSION_NAME}::\\1" SERVATRICE_QT_MODULES "${_SERVATRICE_NEEDED}")
 string(REGEX REPLACE "([^;]+)" "${COCKATRICE_QT_VERSION_NAME}::\\1" COCKATRICE_QT_MODULES "${_COCKATRICE_NEEDED}")
 string(REGEX REPLACE "([^;]+)" "${COCKATRICE_QT_VERSION_NAME}::\\1" ORACLE_QT_MODULES "${_ORACLE_NEEDED}")
+string(REGEX REPLACE "([^;]+)" "${COCKATRICE_QT_VERSION_NAME}::\\1" DB_CONVERTER_QT_MODULES "${_DBCONVERTER_NEEDED}")
 string(REGEX REPLACE "([^;]+)" "${COCKATRICE_QT_VERSION_NAME}::\\1" TEST_QT_MODULES "${_TEST_NEEDED}")
 
 # Core-only export (useful for headless libs)

cmake/NSIS.template.in

@@ -11,7 +11,6 @@ SetCompressor LZMA
 Var NormalDestDir
 Var PortableDestDir
 Var PortableMode
-Var ReinstallMode
 
 !include LogicLib.nsh
 !include FileFunc.nsh
@@ -27,25 +26,14 @@ Var ReinstallMode
 !define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of Cockatrice.$\r$\n$\r$\nClick Next to continue."
 !define MUI_FINISHPAGE_RUN "$INSTDIR/cockatrice.exe"
 !define MUI_FINISHPAGE_RUN_TEXT "Run 'Cockatrice' now"
-!define MUI_ICON "${NSIS_SOURCE_PATH}\cockatrice\resources\appicon.ico"
 
-!define MUI_PAGE_CUSTOMFUNCTION_PRE SkipIfReinstall
 !insertmacro MUI_PAGE_WELCOME
-
-!define MUI_PAGE_CUSTOMFUNCTION_PRE SkipIfReinstall
 !insertmacro MUI_PAGE_LICENSE "${NSIS_SOURCE_PATH}\LICENSE"
-
 Page Custom PortableModePageCreate PortableModePageLeave
 !define MUI_PAGE_CUSTOMFUNCTION_PRE componentsPagePre
 !insertmacro MUI_PAGE_COMPONENTS
-
-!define MUI_PAGE_CUSTOMFUNCTION_PRE SkipIfReinstall
 !insertmacro MUI_PAGE_DIRECTORY
-
-!define MUI_PAGE_CUSTOMFUNCTION_PRE SkipIfReinstall
 !insertmacro MUI_PAGE_INSTFILES
-
-!define MUI_PAGE_CUSTOMFUNCTION_PRE SkipIfReinstall
 !insertmacro MUI_PAGE_FINISH
 
 !insertmacro MUI_UNPAGE_CONFIRM
@@ -84,7 +72,6 @@ ${IfNot} ${Errors}
     MessageBox MB_ICONINFORMATION|MB_SETFOREGROUND "\
       /PORTABLE : Install in portable mode$\n\
       /S : Silent install$\n\
-      /R : Silent upgrade$\n\
       /D=%directory% : Specify destination directory$\n"
     Quit
 ${EndIf}
@@ -102,16 +89,6 @@ ${Else}
     ${EndIf}
 ${EndIf}
 
-ClearErrors
-${GetOptions} $9 "/R" $8
-${IfNot} ${Errors}
-    StrCpy $ReinstallMode 1
-    SetSilent silent
-    SetAutoClose true
-${Else}
-    StrCpy $ReinstallMode 0
-${EndIf}
-
 ${If} $InstDir == ""
     ; User did not use /D to specify a directory,
     ; we need to set a default based on the install mode
@@ -119,22 +96,6 @@ ${If} $InstDir == ""
 ${EndIf}
 Call SetModeDestinationFromInstdir
 
-; --- Detect portable install when using /R ---
-${If} $ReinstallMode = 1
-    IfFileExists "$InstDir\portable.dat" 0 not_portable
-        StrCpy $PortableMode 1
-        Goto portable_done
-
-    not_portable:
-        StrCpy $PortableMode 0
-
-    portable_done:
-${EndIf}
-
-${If} $ReinstallMode = 1
-    Call AutoUninstallIfNeeded
-${EndIf}
-
 FunctionEnd
 
 Function un.onInit
@@ -164,46 +125,8 @@ ${Else}
 ${EndIf}
 FunctionEnd
 
-Function SkipIfReinstall
-${If} $ReinstallMode = 1
-    Abort
-${EndIf}
-FunctionEnd
-
-Function AutoUninstallIfNeeded
-
-SetShellVarContext all
-
-; --- 32-bit uninstall ---
-SetRegView 32
-ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "QuietUninstallString"
-
-StrCmp $R0 "" done32
-DetailPrint "Removing previous version (32-bit)..."
-ExecWait '$R0'
-
-done32:
-
-; --- 64-bit uninstall ---
-${If} ${RunningX64}
-    SetRegView 64
-    ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "QuietUninstallString"
-
-    StrCmp $R0 "" done64
-    DetailPrint "Removing previous version (64-bit)..."
-    ExecWait '$R0'
-
-    done64:
-${EndIf}
-
-FunctionEnd
 
 Function PortableModePageCreate
-
-${If} $ReinstallMode = 1
-    Abort
-${EndIf}
-
 Call SetModeDestinationFromInstdir ; If the user clicks BACK on the directory page we will remember their mode specific directory
 !insertmacro MUI_HEADER_TEXT "Install Mode" "Choose how you want to install Cockatrice."
 nsDialogs::Create 1018
@@ -235,11 +158,6 @@ ${EndIf}
 FunctionEnd
 
 Function componentsPagePre
-
-${If} $ReinstallMode = 1
-    Return
-${EndIf}
-
 ${If} $PortableMode = 0
     SetShellVarContext all
 
@@ -249,12 +167,8 @@ ${If} $PortableMode = 0
     ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "UninstallString"
     StrCmp $R0 "" done32
 
-    ${If} $ReinstallMode = 0
-        MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "A previous version of Cockatrice must be uninstalled before installing the new one." IDOK uninst32
-        Abort
-    ${Else}
-        Goto uninst32
-    ${EndIf}
+    MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "A previous version of Cockatrice must be uninstalled before installing the new one." IDOK uninst32
+    Abort
 
     uninst32:
     ClearErrors
@@ -269,12 +183,8 @@ ${If} $PortableMode = 0
 	    ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "UninstallString"
 	    StrCmp $R0 "" done64
 
-	    ${If} $ReinstallMode = 0
-            MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "A previous version of Cockatrice must be uninstalled before installing the new one." IDOK uninst64
-            Abort
-        ${Else}
-            Goto uninst64
-        ${EndIf}
+	    MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "A previous version of Cockatrice must be uninstalled before installing the new one." IDOK uninst64
+	    Abort
 
 	    uninst64:
 	    ClearErrors
@@ -303,6 +213,7 @@ ${AndIf} ${FileExists} "$INSTDIR\portable.dat"
 	Delete "$INSTDIR\uninstall.exe"
 	Delete "$INSTDIR\cockatrice.exe"
 	Delete "$INSTDIR\oracle.exe"
+	Delete "$INSTDIR\dbconverter.exe"
 	Delete "$INSTDIR\servatrice.exe"
 	Delete "$INSTDIR\Qt*.dll"
 	Delete "$INSTDIR\libmysql.dll"
@@ -366,12 +277,6 @@ ${Else}
     FileWrite $0 "PORTABLE"
     FileClose $0
 ${EndIf}
-
-${If} $ReinstallMode = 1
-    IfFileExists "$INSTDIR\cockatrice.exe" 0 +2
-        Exec '"$INSTDIR\cockatrice.exe"'
-${EndIf}
-
 SectionEnd
 
 Section "Start menu item" SecStartMenu

cmake/SignMacApplications.cmake

@@ -3,7 +3,7 @@
 string(LENGTH "$ENV{MACOS_CERTIFICATE_NAME}" MACOS_CERTIFICATE_NAME_LEN)
 
 if(APPLE AND MACOS_CERTIFICATE_NAME_LEN GREATER 0)
-  set(APPLICATIONS "cockatrice" "servatrice" "oracle")
+  set(APPLICATIONS "cockatrice" "servatrice" "oracle" "dbconverter")
   foreach(app_name IN LISTS APPLICATIONS)
     set(FULL_APP_PATH "${CPACK_TEMPORARY_INSTALL_DIRECTORY}/${app_name}.app")
 

cockatrice/CMakeLists.txt

@@ -19,10 +19,7 @@ set(cockatrice_SOURCES
     src/client/settings/card_counter_settings.cpp
     src/client/settings/shortcut_treeview.cpp
     src/client/settings/shortcuts_settings.cpp
-    src/interface/deck_loader/card_node_function.cpp
-    src/interface/deck_loader/deck_file_format.cpp
     src/interface/deck_loader/deck_loader.cpp
-    src/interface/deck_loader/loaded_deck.cpp
     src/interface/widgets/dialogs/dlg_connect.cpp
     src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp
     src/interface/widgets/dialogs/dlg_create_game.cpp
@@ -39,7 +36,6 @@ set(cockatrice_SOURCES
     src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp
     src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp
     src/interface/widgets/dialogs/dlg_load_remote_deck.cpp
-    src/interface/widgets/dialogs/dlg_local_game_options.cpp
     src/interface/widgets/dialogs/dlg_manage_sets.cpp
     src/interface/widgets/dialogs/dlg_register.cpp
     src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp
@@ -48,7 +44,6 @@ set(cockatrice_SOURCES
     src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp
     src/interface/widgets/dialogs/dlg_update.cpp
     src/interface/widgets/dialogs/dlg_view_log.cpp
-    src/interface/widgets/dialogs/override_printing_warning.cpp
     src/interface/widgets/dialogs/tip_of_the_day.cpp
     src/filters/deck_filter_string.cpp
     src/filters/filter_builder.cpp
@@ -58,6 +53,7 @@ set(cockatrice_SOURCES
     src/game/board/abstract_card_drag_item.cpp
     src/game/board/abstract_card_item.cpp
     src/game/board/abstract_counter.cpp
+    src/game/board/abstract_graphics_item.cpp
     src/game/board/arrow_item.cpp
     src/game/board/arrow_target.cpp
     src/game/board/card_drag_item.cpp
@@ -117,7 +113,6 @@ set(cockatrice_SOURCES
     src/game/zones/table_zone.cpp
     src/game/zones/view_zone.cpp
     src/game/zones/view_zone_widget.cpp
-    src/game_graphics/board/abstract_graphics_item.cpp
     src/interface/card_picture_loader/card_picture_loader.cpp
     src/interface/card_picture_loader/card_picture_loader_local.cpp
     src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.cpp
@@ -146,55 +141,24 @@ set(cockatrice_SOURCES
     src/interface/widgets/cards/card_size_widget.cpp
     src/interface/widgets/cards/deck_card_zone_display_widget.cpp
     src/interface/widgets/cards/deck_preview_card_picture_widget.cpp
-    src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.cpp
-    src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp
-    src/interface/widgets/deck_analytics/analytics_panel_widget_factory.cpp
-    src/interface/widgets/deck_analytics/analytics_panel_widget_registrar.cpp
     src/interface/widgets/deck_analytics/deck_analytics_widget.cpp
-    src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.cpp
-    src/interface/widgets/deck_analytics/resizable_panel.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.cpp
-    src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_category_widget.cpp
-    src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp
-    src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp
+    src/interface/widgets/deck_analytics/mana_base_widget.cpp
+    src/interface/widgets/deck_analytics/mana_curve_widget.cpp
+    src/interface/widgets/deck_analytics/mana_devotion_widget.cpp
     src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp
     src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp
     src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
     src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp
     src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp
     src/interface/widgets/deck_editor/deck_list_style_proxy.cpp
-    src/interface/widgets/deck_editor/deck_state_manager.cpp
-    src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp
     src/interface/widgets/general/background_sources.cpp
-    src/interface/widgets/general/display/background_plate_widget.cpp
     src/interface/widgets/general/display/banner_widget.cpp
+    src/interface/widgets/general/display/bar_widget.cpp
     src/interface/widgets/general/display/dynamic_font_size_label.cpp
     src/interface/widgets/general/display/dynamic_font_size_push_button.cpp
     src/interface/widgets/general/display/labeled_input.cpp
+    src/interface/widgets/general/display/percent_bar_widget.cpp
     src/interface/widgets/general/display/shadow_background_label.cpp
-    src/interface/widgets/general/display/charts/bars/bar_widget.cpp
-    src/interface/widgets/general/display/charts/bars/color_bar.cpp
-    src/interface/widgets/general/display/charts/bars/percent_bar_widget.cpp
-    src/interface/widgets/general/display/charts/bars/bar_chart_widget.cpp
-    src/interface/widgets/general/display/charts/bars/bar_chart_background_widget.cpp
-    src/interface/widgets/general/display/charts/bars/segmented_bar_widget.cpp
-    src/interface/widgets/general/display/charts/pies/color_pie.cpp
     src/interface/widgets/general/home_styled_button.cpp
     src/interface/widgets/general/home_widget.cpp
     src/interface/widgets/general/layout_containers/flow_widget.cpp
@@ -206,7 +170,6 @@ set(cockatrice_SOURCES
     src/interface/widgets/printing_selector/printing_selector.cpp
     src/interface/widgets/printing_selector/printing_selector_card_display_widget.cpp
     src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp
-    src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp
     src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp
     src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp
     src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp
@@ -217,7 +180,6 @@ set(cockatrice_SOURCES
     src/interface/widgets/replay/replay_timeline_widget.cpp
     src/interface/widgets/server/chat_view/chat_view.cpp
     src/interface/widgets/server/game_selector.cpp
-    src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp
     src/interface/widgets/server/games_model.cpp
     src/interface/widgets/server/handle_public_servers.cpp
     src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp
@@ -230,20 +192,14 @@ set(cockatrice_SOURCES
     src/interface/widgets/utility/custom_line_edit.cpp
     src/interface/widgets/utility/get_text_with_max.cpp
     src/interface/widgets/utility/sequence_edit.cpp
-    src/interface/widgets/utility/visibility_change_listener.cpp
-    src/interface/widgets/utility/visibility_change_listener.h
     src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp
-    src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp
-    src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_display_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp
-    src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp
-    src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp
     src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp
     src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp
     src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp
@@ -262,20 +218,6 @@ set(cockatrice_SOURCES
     src/interface/window_main.cpp
     src/main.cpp
     src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
-    src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp
-    src/interface/widgets/tabs/api/archidekt/api_response/archidekt_deck_listing_api_response.cpp
-    src/interface/widgets/tabs/api/archidekt/api_response/archidekt_formats.h
-    src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.cpp
-    src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card_entry.cpp
-    src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_edition.cpp
-    src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck.cpp
-    src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck_category.cpp
-    src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_listing_container.cpp
-    src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.cpp
-    src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp
-    src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.cpp
-    src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_listings_display_widget.cpp
-    src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.cpp
     src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp
     src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp
     src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp
@@ -321,10 +263,6 @@ set(cockatrice_SOURCES
     src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
     src/interface/key_signals.cpp
     src/interface/logger.cpp
-    src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp
-    src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.h
-    src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp
-    src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.h
 )
 
 add_subdirectory(sounds)
@@ -564,9 +502,6 @@ if(WIN32)
     PATTERN "styles/qopensslbackend.dll"
     PATTERN "styles/qschannelbackend.dll"
     PATTERN "styles/qwindowsvistastyle.dll"
-    PATTERN "styles/qwindows11style.dll"
-    PATTERN "styles/qmodernwindowsstyle.dll"
-    PATTERN "styles/qmodernwindowsstyled.dll"
     PATTERN "tls/qcertonlybackend.dll"
     PATTERN "tls/qopensslbackend.dll"
     PATTERN "tls/qschannelbackend.dll"

cockatrice/cockatrice.qrc

@@ -7,32 +7,23 @@
 
         <file>resources/icons/arrow_bottom_green.svg</file>
         <file>resources/icons/arrow_down_green.svg</file>
-        <file>resources/icons/arrow_history.svg</file>
         <file>resources/icons/arrow_left_green.svg</file>
-        <file>resources/icons/arrow_redo.svg</file>
         <file>resources/icons/arrow_right_blue.svg</file>
         <file>resources/icons/arrow_right_green.svg</file>
         <file>resources/icons/arrow_top_green.svg</file>
         <file>resources/icons/arrow_up_green.svg</file>
-        <file>resources/icons/arrow_undo.svg</file>
-        <file>resources/icons/circle_half_stroke.svg</file>
         <file>resources/icons/clearsearch.svg</file>
         <file>resources/icons/cogwheel.svg</file>
         <file>resources/icons/conceded.svg</file>
         <file>resources/icons/decrement.svg</file>
         <file>resources/icons/delete.svg</file>
-        <file>resources/icons/dragon.svg</file>
         <file>resources/icons/dropdown_collapsed.svg</file>
         <file>resources/icons/dropdown_expanded.svg</file>
-        <file>resources/icons/filter.svg</file>
-        <file>resources/icons/floppy_disk.svg</file>
         <file>resources/icons/forgot_password.svg</file>
-        <file>resources/icons/gear.svg</file>
         <file>resources/icons/increment.svg</file>
         <file>resources/icons/info.svg</file>
         <file>resources/icons/lock.svg</file>
         <file>resources/icons/not_ready_start.svg</file>
-        <file>resources/icons/pen_to_square.svg</file>
         <file>resources/icons/pencil.svg</file>
         <file>resources/icons/pin.svg</file>
         <file>resources/icons/player.svg</file>
@@ -40,13 +31,10 @@
         <file>resources/icons/reload.svg</file>
         <file>resources/icons/remove_row.svg</file>
         <file>resources/icons/rename.svg</file>
-        <file>resources/icons/scale_balanced.svg</file>
         <file>resources/icons/scales.svg</file>
-        <file>resources/icons/scroll.svg</file>
         <file>resources/icons/search.svg</file>
         <file>resources/icons/settings.svg</file>
         <file>resources/icons/share.svg</file>
-        <file>resources/icons/sort_arrow_down.svg</file>
         <file>resources/icons/spectator.svg</file>
         <file>resources/icons/swap.svg</file>
         <file>resources/icons/sync.svg</file>
@@ -61,8 +49,6 @@
         <file>resources/icons/mana/W.svg</file>
 
         <file>resources/backgrounds/home.png</file>
-        <file>resources/backgrounds/card_triplet.svg</file>
-        <file>resources/backgrounds/placeholder_printing_selector.svg</file>
 
         <file>resources/config/general.svg</file>
         <file>resources/config/appearance.svg</file>

cockatrice/resources/backgrounds/card_triplet.svg

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   version="1.1"
-   width="250"
-   id="svg13"
-   height="231.66667"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg">
-  <defs
-     id="defs13" />
-  <g
-     transform="matrix(1.705559,0,0,1.705559,-18.310328,-4.2419088)"
-     id="g13">
-    <path
-       d="M 90.069854,3.479957 C 89.356513,1.2235709 86.980392,-0.01102897 84.723451,0.70218215 L 3.4767601,26.377781 C 1.2199188,27.090982 -0.01486587,29.46663 0.69839437,31.723116 L 33.512365,135.52112 c 0.713341,2.25639 3.089462,3.49099 5.346403,2.77777 l 81.246672,-25.6756 c 2.25684,-0.71319 3.49163,-3.08884 2.77837,-5.34533 L 90.074852,3.479957 Z"
-       style="display:none;fill:#c0c0c0;fill-opacity:1;stroke:#989898;stroke-width:1;stroke-opacity:1"
-       id="path1" />
-    <path
-       d="m 110.61293,7.4983294 c -0.36657,-2.337853 -2.53055,-3.9150142 -4.86886,-3.5484627 L 21.563382,17.14452 c -2.338314,0.366502 -3.915784,2.529976 -3.549207,4.867929 L 34.876507,129.55893 c 0.366577,2.33786 2.530549,3.91502 4.868863,3.54847 l 84.18069,-13.19466 c 2.33831,-0.3665 3.91578,-2.52997 3.5492,-4.86793 L 110.61093,7.4983294 Z"
-       style="fill:#c0c0c0;fill-opacity:1;stroke:#989898;stroke-width:1;stroke-opacity:1"
-       id="path4" />
-    <path
-       d="m 130.53623,15.555064 c 0,-2.366441 -1.89356,-4.259575 -4.26046,-4.259575 H 41.067426 c -2.366905,0 -4.260468,1.893134 -4.260468,4.259575 V 124.41102 c 0,2.36644 1.893563,4.25957 4.260468,4.25957 h 85.208344 c 2.3669,0 4.26046,-1.89313 4.26046,-4.25957 z"
-       style="fill:#c0c0c0;fill-opacity:1;stroke:#989898;stroke-width:1;stroke-opacity:1"
-       id="path7" />
-    <path
-       d="m 149.43988,26.480639 c 0.38018,-2.335754 -1.1846,-4.508374 -3.52082,-4.88852 L 61.817351,7.9076636 C 59.481136,7.5275576 57.308066,9.0920839 56.927894,11.427736 L 39.439773,118.87426 c -0.380182,2.33576 1.184602,4.50838 3.520816,4.88852 l 84.102711,13.68346 c 2.33622,0.38011 4.50929,-1.18442 4.88946,-3.52007 L 149.43688,26.479639 Z"
-       style="display:inline;fill:#c0c0c0;fill-opacity:1;stroke:#989898;stroke-width:1;stroke-opacity:1"
-       id="path10" />
-  </g>
-</svg>

cockatrice/resources/backgrounds/placeholder_printing_selector.svg

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com        License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.-->
-
-<svg
-   version="1.1"
-   width="172.65051"
-   id="svg13"
-   height="213.30714"
-   xml:space="preserve"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"><defs
-     id="defs13" /><g
-     transform="matrix(1.705559,0,0,1.705559,-97.653345,-68.741256)"
-     id="g13"><path
-       d="m 151.48519,45.063813 c 0,-2.366441 -1.89356,-4.259575 -4.26046,-4.259575 H 62.016385 c -2.366905,0 -4.260468,1.893134 -4.260468,4.259575 V 153.91977 c 0,2.36644 1.893563,4.25957 4.260468,4.25957 h 85.208345 c 2.3669,0 4.26046,-1.89313 4.26046,-4.25957 z"
-       style="fill:#c0c0c0;fill-opacity:1;stroke:#989898;stroke-width:1;stroke-opacity:1"
-       id="path7" /><path
-       d="m 154.70135,48.441704 c 0,-2.366441 -1.89356,-4.259575 -4.26046,-4.259575 H 65.232545 c -2.366905,0 -4.260468,1.893134 -4.260468,4.259575 V 157.29767 c 0,2.36644 1.893563,4.25957 4.260468,4.25957 h 85.208345 c 2.3669,0 4.26046,-1.89313 4.26046,-4.25957 z"
-       style="fill:#c0c0c0;fill-opacity:1;stroke:#989898;stroke-width:1;stroke-opacity:1"
-       id="path7-5" /><path
-       d="m 157.98403,51.75453 c 0,-2.366441 -1.89356,-4.259575 -4.26046,-4.259575 H 68.515228 c -2.366905,0 -4.260468,1.893134 -4.260468,4.259575 v 108.85596 c 0,2.36644 1.893563,4.25957 4.260468,4.25957 h 85.208342 c 2.3669,0 4.26046,-1.89313 4.26046,-4.25957 z"
-       style="fill:#c0c0c0;fill-opacity:1;stroke:#989898;stroke-width:1;stroke-opacity:1"
-       id="path7-6" /></g><path
-     d="m 196.24576,207.42361 c 0,0.11213 0,0.22413 0,0.33621 -0.0498,4.54511 -4.18399,7.63329 -8.72909,7.63329 h -12.19086 c -3.29988,0 -5.97713,2.67727 -5.97713,5.97712 0,0.4234 0.0498,0.83433 0.12449,1.23279 0.26149,1.27014 0.80939,2.49046 1.34485,3.72325 0.75959,1.71843 1.50674,3.4244 1.50674,5.22998 0,3.95986 -2.68971,7.55859 -6.64956,7.72046 -0.43583,0.0128 -0.87166,0.025 -1.31995,0.025 -17.60761,0 -31.878,-14.27038 -31.878,-31.878 0,-17.60761 14.28284,-31.878 31.89046,-31.878 17.60762,0 31.87801,14.27039 31.87801,31.878 z m -47.81703,3.98475 c 0,-2.20407 -1.78067,-3.98475 -3.98473,-3.98475 -2.20407,0 -3.98477,1.78068 -3.98477,3.98475 0,2.20406 1.7807,3.98475 3.98477,3.98475 2.20406,0 3.98473,-1.78069 3.98473,-3.98475 z m 0,-11.95426 c 2.20407,0 3.98477,-1.78068 3.98477,-3.98475 0,-2.20407 -1.7807,-3.98475 -3.98477,-3.98475 -2.20405,0 -3.98473,1.78068 -3.98473,3.98475 0,2.20407 1.78068,3.98475 3.98473,3.98475 z m 19.92376,-11.95424 c 0,-2.20408 -1.78068,-3.98477 -3.98473,-3.98477 -2.20407,0 -3.98477,1.78069 -3.98477,3.98477 0,2.20405 1.7807,3.98474 3.98477,3.98474 2.20405,0 3.98473,-1.78069 3.98473,-3.98474 z m 11.95426,11.95424 c 2.20407,0 3.98475,-1.78068 3.98475,-3.98475 0,-2.20407 -1.78068,-3.98475 -3.98475,-3.98475 -2.20406,0 -3.98475,1.78068 -3.98475,3.98475 0,2.20407 1.78069,3.98475 3.98475,3.98475 z"
-     id="path1"
-     style="display:none;fill:#3b3b3b;fill-opacity:1;stroke:#000000;stroke-width:2.53798;stroke-dasharray:none;stroke-opacity:1" /><path
-     d="M 126.20915,54.574783 82.324247,83.8512 c -5.76807,3.845383 -9.435059,10.089163 -10.029703,16.90777 12.348823,2.53716 22.081191,12.26955 24.638191,24.63819 6.838435,-0.59465 13.062395,-4.26163 16.907775,-10.0297 l 29.2566,-43.904722 c 1.32804,-2.001984 2.04162,-4.340923 2.04162,-6.75915 0,-6.719506 -5.45092,-12.170428 -12.17043,-12.170428 -2.3984,0 -4.75718,0.713573 -6.75915,2.041623 z M 88.052677,131.81933 c 0,-12.26953 -9.930593,-22.20012 -22.200138,-22.20012 -12.269532,0 -22.200126,9.93059 -22.200126,22.20012 0,0.77305 0.03966,1.54609 0.118929,2.2993 0.356787,3.46877 -2.021792,7.21505 -5.510393,7.21505 h -0.951431 c -3.508409,0 -6.342895,2.83447 -6.342895,6.3429 0,3.5084 2.834486,6.34289 6.342895,6.34289 h 28.543021 c 12.269545,0 22.200138,-9.93059 22.200138,-22.20014 z"
-     id="path1-2"
-     style="fill:#989898;fill-opacity:1;stroke-width:0.198215" /></svg>

cockatrice/resources/config/qtlogging.ini

@@ -1,10 +1,6 @@
 [Rules]
 # The default log level is info
 *.debug = false
-#*.info = true
-#*.warning = true
-#*.critical = true
-#*.fatal = true
 
 # Uncomment a rule to see debug level logs for that category,
 # or set <category> = false to disable logging

cockatrice/resources/help/deck_search.md

@@ -1,13 +1,11 @@
 @page deck_search_syntax_help Deck Search Syntax Help
 
 ## Deck Search Syntax Help
-
+-----
 The search bar recognizes a set of special commands.<br>
 In this list of examples below, each entry has an explanation and can be clicked to test the query. Note that all
 searches are case insensitive.
-
 <dl>
-
 <dt>Display Name (The deck name, or the filename if the deck name isn't set):</dt>
 <dd>[red deck wins](#red deck wins) <small>(Any deck with a display name containing the words red, deck, and wins)</small></dd>
 <dd>["red deck wins"](#%22red deck wins%22) <small>(Any deck with a display name containing the exact phrase "red deck wins")</small></dd>
@@ -17,23 +15,15 @@ searches are case insensitive.
 <dd>[n:red n:deck n:wins](#n:red n:deck n:wins) <small>(Any deck with a name containing the words red, deck, and wins)</small></dd>
 <dd>[n:"red deck wins"](#n:%22red deck wins%22) <small>(Any deck with a name containing the exact phrase "red deck wins")</small></dd>
 
-<dt><u>F</u>ile <u>N</u>ame:</dt>
-<dd>[fn:aggro](#fn:aggro) <small>(Any deck with a filename containing the word aggro)</small></dd>
-<dd>[fn:red fn:deck fn:wins](#fn:red fn:deck fn:wins) <small>(Any deck with a filename containing the words red, deck, and wins)</small></dd>
-<dd>[fn:"red deck wins"](#fn:%22red deck wins%22) <small>(Any deck with a filename containing the exact phrase "red deck wins")</small></dd>
+<dt><u>F</u>ile Name:</dt>
+<dd>[f:aggro](#f:aggro) <small>(Any deck with a filename containing the word aggro)</small></dd>
+<dd>[f:red f:deck f:wins](#f:red f:deck f:wins) <small>(Any deck with a filename containing the words red, deck, and wins)</small></dd>
+<dd>[f:"red deck wins"](#f:%22red deck wins%22) <small>(Any deck with a filename containing the exact phrase "red deck wins")</small></dd>
 
 <dt>Relative <u>P</u>ath (starting from the deck folder):</dt>
 <dd>[p:aggro](#p:aggro) <small>(Any deck that has "aggro" somewhere in its relative path)</small></dd>
 <dd>[p:edh/](#p:edh/) <small>(Any deck with "edh/" in its relative path, A.K.A. decks in the "edh" folder)</small></dd>
 
-<dt><u>F</u>ormat:</dt>
-<dd>[f:standard](#f:standard) <small>(Any deck with format set to standard)</small></dd>
-
-<dt><u>C</u>omments:</dt>
-<dd>[c:good](#c:good) <small>(Any deck with comments containing the word good)</small></dd>
-<dd>[c:good c:deck](#c:good c:deck) <small>(Any deck with comments containing the words good and deck)</small></dd>
-<dd>[c:"good deck"](#c:%22good deck%22) <small>(Any deck with comments containing the exact phrase "good deck")</small></dd>
-
 <dt>Deck Contents (Uses [card search expressions](#cardSearchSyntaxHelp)):</dt>
 <dd><a href="#[[plains]]">[[plains]]</a> <small>(Any deck that contains at least one card with "plains" in its name)</small></dd>
 <dd><a href="#[[t:legendary]]">[[t:legendary]]</a> <small>(Any deck that contains at least one legendary)</small></dd>
@@ -47,6 +37,6 @@ searches are case insensitive.
 <dd>[t:aggro OR o:control](#t:aggro OR o:control) <small>(Any deck filename that contains either aggro or control)</small></dd>
 
 <dt>Grouping:</dt>
-<dd><a href="#red -([[]]:100 OR aggro)">red -([[]]:100 OR aggro)</a> <small>(Any deck that has red in its filename but is not 100 cards or has aggro in its filename)</small></dd>
+<dd><a href="#red -([[]]:100 or aggro)">red -([[]]:100 or aggro)</a> <small>(Any deck that has red in its filename but is not 100 cards or has aggro in its filename)</small></dd>
 
-</dl>
+</dl>

cockatrice/resources/help/search.md

@@ -1,12 +1,10 @@
 @page search_syntax_help Search Syntax Help
 
 ## Search Syntax Help
-
+-----
 The search bar recognizes a set of special commands similar to some other card databases.<br>
 In this list of examples below, each entry has an explanation and can be clicked to test the query. Note that all searches are case insensitive.
-
 <dl>
-
 <dt>Name:</dt>
 <dd>[birds of paradise](#birds of paradise) <small>(Any card name containing the words birds, of, and paradise)</small></dd>
 <dd>["birds of paradise"](#%22birds of paradise%22) <small>(Any card name containing the exact phrase "birds of paradise")</small></dd>
@@ -51,20 +49,20 @@ In this list of examples below, each entry has an explanation and can be clicked
 
 <dt><u>E</u>dition:</dt>
 <dd>[set:lea](#set:lea) <small>(Cards that appear in Alpha, which has the set code LEA)</small></dd>
-<dd>[e:lea OR e:leb](#e:lea OR e:leb) <small>(Cards that appear in Alpha or Beta)</small></dd>
+<dd>[e:lea or e:leb](#e:lea or e:leb) <small>(Cards that appear in Alpha or Beta)</small></dd>
 
 <dt>Negate:</dt>
 <dd>[c:wu -c:m](#c:wu -c:m) <small>(Any card that is white or blue, but not multicolored)</small></dd>
 
 <dt>Branching:</dt>
-<dd>[t:sliver OR o:changeling](#t:sliver OR o:changeling) <small>(Any card that is either a sliver or has changeling)</small></dd>
+<dd>[t:sliver or o:changeling](#t:sliver or o:changeling) <small>(Any card that is either a sliver or has changeling)</small></dd>
 
 <dt>Grouping:</dt>
-<dd><a href="#t:angel -(angel OR c:w)">t:angel -(angel OR c:w)</a> <small>(Any angel that doesn't have angel in its name and isn't white)</small></dd>
+<dd><a href="#t:angel -(angel or c:w)">t:angel -(angel or c:w)</a> <small>(Any angel that doesn't have angel in its name and isn't white)</small></dd>
 
 <dt>Regular Expression:</dt>
 <dd>[/^fell/](#/^fell/) <small>(Any card name that begins with "fell")</small></dd>
 <dd>[o:/counter target .* spell/](#o:/counter target .* spell/) <small>(Any card text with "counter target *something* spell")</small></dd>
 <dd>[o:/for each .* and\/or .*/](#o:/for each .* and\/or .*/) <small>(/'s can be escaped with a \)</small></dd>
 
-</dl>
+</dl>

cockatrice/resources/icons/arrow_history.svg

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-    <title>
-        history
-    </title>
-    <path d="M9 6v5h.06l2.48 2.47 1.41-1.41L11 10.11V6H9z"/>
-    <path d="M10 1a9 9 0 0 0-7.85 13.35L.5 16H6v-5.5l-2.38 2.38A7 7 0 1 1 10 17v2a9 9 0 0 0 0-18z"/>
-</svg>

cockatrice/resources/icons/arrow_redo.svg

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" x="0px"
-     y="0px" width="485.212px" height="485.212px" viewBox="0 0 485.212 485.212"
-     style="enable-background:new 0 0 485.212 485.212;" xml:space="preserve">
-<g>
-	<path d="M242.607,424.559c-75.252,0-136.468-61.209-136.468-136.465c0-75.252,61.216-136.466,136.468-136.466v90.978   l151.629-121.302L242.607,0v90.978c-108.687,0-197.117,88.432-197.117,197.117c0,108.691,88.43,197.118,197.117,197.118   c108.687,0,197.114-88.427,197.114-197.118h-60.645C379.077,363.35,317.859,424.559,242.607,424.559z"/>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-</svg>

cockatrice/resources/icons/arrow_undo.svg

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" x="0px"
-     y="0px" width="512px" height="512px" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;"
-     xml:space="preserve">
-<g>
-	<path d="M256,448c79.406,0,144-64.594,144-144s-64.594-144-144-144v96L96,128L256,0v96c114.688,0,208,93.313,208,208   c0,114.688-93.312,208-208,208c-114.687,0-208-93.312-208-208h64C112,383.406,176.594,448,256,448z"/>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-    <g>
-</g>
-</svg>

cockatrice/resources/icons/circle_half_stroke.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M512 320C512 214 426 128 320 128L320 512C426 512 512 426 512 320zM64 320C64 178.6 178.6 64 320 64C461.4 64 576 178.6 576 320C576 461.4 461.4 576 320 576C178.6 576 64 461.4 64 320z"/></svg>

cockatrice/resources/icons/dragon.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M352 188.5L300.1 175.5C293.6 173.9 288.8 168.4 288.1 161.7C287.4 155 290.9 148.6 296.8 145.6L337.6 125.2L294.3 92.7C288.8 88.6 286.5 81.4 288.7 74.8C290.9 68.2 297.1 64 304 64L464 64C494.2 64 522.7 78.2 540.8 102.4L598.4 179.2C604.6 187.5 608 197.6 608 208C608 234.5 586.5 256 560 256L538.5 256C521.5 256 505.2 249.3 493.2 237.3L479.9 224L447.9 224L447.9 245.5C447.9 270.3 460.7 293.4 481.7 306.6L588.3 373.2C620.4 393.3 639.9 428.4 639.9 466.3C639.9 526.9 590.8 576.1 530.1 576.1L32.3 576C29 576 25.7 575.6 22.7 574.6C13.5 571.8 6 565 2.3 556C1 552.7 .1 549.1 0 545.3C-.2 541.6 .3 538 1.3 534.6C4.1 525.4 10.9 517.9 19.9 514.2C22.9 513 26.1 512.2 29.4 512L433.3 476C441.6 475.3 448 468.3 448 459.9C448 455.6 446.3 451.5 443.3 448.5L398.9 404.1C368.9 374.1 352 333.4 352 291L352 188.5zM512 136.3C512 136.2 512 136.1 512 136C512 135.9 512 135.8 512 135.7L512 136.3zM510.7 143.7L464.3 132.1C464.1 133.4 464 134.7 464 136C464 149.3 474.7 160 488 160C498.6 160 507.5 153.2 510.7 143.7zM130.9 180.5C147.2 166 171.3 164.3 189.4 176.4L320 263.4L320 290.9C320 323.7 328.4 355.7 344 383.9L112 383.9C105.3 383.9 99.3 379.7 97 373.5C94.7 367.3 96.5 360.2 101.6 355.8L171 296.3L18.4 319.8C11.4 320.9 4.5 317.2 1.5 310.8C-1.5 304.4 .1 296.8 5.4 292L130.9 180.5z"/></svg>

cockatrice/resources/icons/filter.svg

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg fill="#000000" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg"
-     width="800px" height="800px" viewBox="0 0 971.986 971.986"
-     xml:space="preserve">
-<g>
-	<path d="M370.216,459.3c10.2,11.1,15.8,25.6,15.8,40.6v442c0,26.601,32.1,40.101,51.1,21.4l123.3-141.3
-		c16.5-19.8,25.6-29.601,25.6-49.2V500c0-15,5.7-29.5,15.8-40.601L955.615,75.5c26.5-28.8,6.101-75.5-33.1-75.5h-873
-		c-39.2,0-59.7,46.6-33.1,75.5L370.216,459.3z"/>
-</g>
-</svg>

cockatrice/resources/icons/floppy_disk.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M160 96C124.7 96 96 124.7 96 160L96 480C96 515.3 124.7 544 160 544L480 544C515.3 544 544 515.3 544 480L544 237.3C544 220.3 537.3 204 525.3 192L448 114.7C436 102.7 419.7 96 402.7 96L160 96zM192 192C192 174.3 206.3 160 224 160L384 160C401.7 160 416 174.3 416 192L416 256C416 273.7 401.7 288 384 288L224 288C206.3 288 192 273.7 192 256L192 192zM320 352C355.3 352 384 380.7 384 416C384 451.3 355.3 480 320 480C284.7 480 256 451.3 256 416C256 380.7 284.7 352 320 352z"/></svg>

cockatrice/resources/icons/gear.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M259.1 73.5C262.1 58.7 275.2 48 290.4 48L350.2 48C365.4 48 378.5 58.7 381.5 73.5L396 143.5C410.1 149.5 423.3 157.2 435.3 166.3L503.1 143.8C517.5 139 533.3 145 540.9 158.2L570.8 210C578.4 223.2 575.7 239.8 564.3 249.9L511 297.3C511.9 304.7 512.3 312.3 512.3 320C512.3 327.7 511.8 335.3 511 342.7L564.4 390.2C575.8 400.3 578.4 417 570.9 430.1L541 481.9C533.4 495 517.6 501.1 503.2 496.3L435.4 473.8C423.3 482.9 410.1 490.5 396.1 496.6L381.7 566.5C378.6 581.4 365.5 592 350.4 592L290.6 592C275.4 592 262.3 581.3 259.3 566.5L244.9 496.6C230.8 490.6 217.7 482.9 205.6 473.8L137.5 496.3C123.1 501.1 107.3 495.1 99.7 481.9L69.8 430.1C62.2 416.9 64.9 400.3 76.3 390.2L129.7 342.7C128.8 335.3 128.4 327.7 128.4 320C128.4 312.3 128.9 304.7 129.7 297.3L76.3 249.8C64.9 239.7 62.3 223 69.8 209.9L99.7 158.1C107.3 144.9 123.1 138.9 137.5 143.7L205.3 166.2C217.4 157.1 230.6 149.5 244.6 143.4L259.1 73.5zM320.3 400C364.5 399.8 400.2 363.9 400 319.7C399.8 275.5 363.9 239.8 319.7 240C275.5 240.2 239.8 276.1 240 320.3C240.2 364.5 276.1 400.2 320.3 400z"/></svg>

cockatrice/resources/icons/pen_to_square.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M535.6 85.7C513.7 63.8 478.3 63.8 456.4 85.7L432 110.1L529.9 208L554.3 183.6C576.2 161.7 576.2 126.3 554.3 104.4L535.6 85.7zM236.4 305.7C230.3 311.8 225.6 319.3 222.9 327.6L193.3 416.4C190.4 425 192.7 434.5 199.1 441C205.5 447.5 215 449.7 223.7 446.8L312.5 417.2C320.7 414.5 328.2 409.8 334.4 403.7L496 241.9L398.1 144L236.4 305.7zM160 128C107 128 64 171 64 224L64 480C64 533 107 576 160 576L416 576C469 576 512 533 512 480L512 384C512 366.3 497.7 352 480 352C462.3 352 448 366.3 448 384L448 480C448 497.7 433.7 512 416 512L160 512C142.3 512 128 497.7 128 480L128 224C128 206.3 142.3 192 160 192L256 192C273.7 192 288 177.7 288 160C288 142.3 273.7 128 256 128L160 128z"/></svg>

cockatrice/resources/icons/scale_balanced.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M384 96L512 96C529.7 96 544 110.3 544 128C544 145.7 529.7 160 512 160L398.4 160C393.2 185.8 375.5 207.1 352 217.3L352 512L512 512C529.7 512 544 526.3 544 544C544 561.7 529.7 576 512 576L128 576C110.3 576 96 561.7 96 544C96 526.3 110.3 512 128 512L288 512L288 217.3C264.5 207 246.8 185.7 241.6 160L128 160C110.3 160 96 145.7 96 128C96 110.3 110.3 96 128 96L256 96C270.6 76.6 293.8 64 320 64C346.2 64 369.4 76.6 384 96zM439.6 384L584.4 384L512 259.8L439.6 384zM512 480C449.1 480 396.8 446 386 401.1C383.4 390.1 387 378.8 392.7 369L487.9 205.8C492.9 197.2 502.1 192 512 192C521.9 192 531.1 197.3 536.1 205.8L631.3 369C637 378.8 640.6 390.1 638 401.1C627.2 445.9 574.9 480 512 480zM126.8 259.8L54.4 384L199.3 384L126.8 259.8zM.9 401.1C-1.7 390.1 1.9 378.8 7.6 369L102.8 205.8C107.8 197.2 117 192 126.9 192C136.8 192 146 197.3 151 205.8L246.2 369C251.9 378.8 255.5 390.1 252.9 401.1C242.1 445.9 189.8 480 126.9 480C64 480 11.7 446 .9 401.1z"/></svg>

cockatrice/resources/icons/scroll.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M32 176C32 134.5 63.6 100.4 104 96.4L104 96L384 96C437 96 480 139 480 192L480 368L304 368C264.2 368 232 400.2 232 440L232 500C232 524.3 212.3 544 188 544C163.7 544 144 524.3 144 500L144 272L80 272C53.5 272 32 250.5 32 224L32 176zM268.8 544C275.9 530.9 280 515.9 280 500L280 440C280 426.7 290.7 416 304 416L552 416C565.3 416 576 426.7 576 440L576 464C576 508.2 540.2 544 496 544L268.8 544zM112 144C94.3 144 80 158.3 80 176L80 224L144 224L144 176C144 158.3 129.7 144 112 144z"/></svg>

cockatrice/resources/icons/sort_arrow_down.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M278.6 438.6L182.6 534.6C170.1 547.1 149.8 547.1 137.3 534.6L41.3 438.6C28.8 426.1 28.8 405.8 41.3 393.3C53.8 380.8 74.1 380.8 86.6 393.3L128 434.7L128 128C128 110.3 142.3 96 160 96C177.7 96 192 110.3 192 128L192 434.7L233.4 393.3C245.9 380.8 266.2 380.8 278.7 393.3C291.2 405.8 291.2 426.1 278.7 438.6zM352 544C334.3 544 320 529.7 320 512C320 494.3 334.3 480 352 480L384 480C401.7 480 416 494.3 416 512C416 529.7 401.7 544 384 544L352 544zM352 416C334.3 416 320 401.7 320 384C320 366.3 334.3 352 352 352L448 352C465.7 352 480 366.3 480 384C480 401.7 465.7 416 448 416L352 416zM352 288C334.3 288 320 273.7 320 256C320 238.3 334.3 224 352 224L512 224C529.7 224 544 238.3 544 256C544 273.7 529.7 288 512 288L352 288zM352 160C334.3 160 320 145.7 320 128C320 110.3 334.3 96 352 96L576 96C593.7 96 608 110.3 608 128C608 145.7 593.7 160 576 160L352 160z"/></svg>

cockatrice/resources/usericons/pawn_donator_double.svg

@@ -350,11 +350,11 @@
        style="fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        d="M 49.84375 1.71875 C 36.719738 1.71875 26.0625 12.375988 26.0625 25.5 C 26.0625 32.977454 29.538325 39.612734 34.9375 43.96875 C 24.439951 49.943698 17.919149 62.196126 14.3125 75.65625 C 9.0380874 95.34065 30.224013 98.21875 49.84375 98.21875 C 69.463486 98.21875 90.549327 94.96715 85.375 75.65625 C 81.693381 61.916246 75.224585 49.827177 64.8125 43.9375 C 70.181573 39.580662 73.59375 32.953205 73.59375 25.5 C 73.59375 12.375988 62.967762 1.71875 49.84375 1.71875 z "
        transform="translate(0,952.36218)"
-       id="left" />
+       id="right" />
     <path
        style="opacity:1;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 51.28696,1001.834 0,-46.98372 1.434151,0.16768 c 5.155008,0.60274 9.462857,2.72154 12.938257,6.36366 4.74393,4.9715 6.87913,11.35611 6.16464,18.43328 -0.53702,5.31935 -3.09008,10.59498 -6.83833,14.13074 l -1.94072,1.83069 3.04083,2.20427 c 3.58084,2.5957 7.18975,6.4912 9.55296,10.3116 4.89572,7.9144 9.23593,21.4918 8.50487,26.6055 -0.81312,5.6877 -5.43872,9.6977 -13.62216,11.8093 -3.80822,0.9826 -7.68056,1.4713 -14.763321,1.8633 l -4.471177,0.2474 0,-46.9837 z"
-       id="right"
+       id="left"
        inkscape:connector-curvature="0" />
     <path
        style="display:inline;fill:url(#linearGradient3);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.77952756;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"

cockatrice/resources/usericons/pawn_judge_double.svg

@@ -321,11 +321,11 @@
        style="fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        d="M 49.84375 1.71875 C 36.719738 1.71875 26.0625 12.375988 26.0625 25.5 C 26.0625 32.977454 29.538325 39.612734 34.9375 43.96875 C 24.439951 49.943698 17.919149 62.196126 14.3125 75.65625 C 9.0380874 95.34065 30.224013 98.21875 49.84375 98.21875 C 69.463486 98.21875 90.549327 94.96715 85.375 75.65625 C 81.693381 61.916246 75.224585 49.827177 64.8125 43.9375 C 70.181573 39.580662 73.59375 32.953205 73.59375 25.5 C 73.59375 12.375988 62.967762 1.71875 49.84375 1.71875 z "
        transform="translate(0,952.36218)"
-       id="left" />
+       id="right" />
     <path
        style="opacity:1;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 51.28696,1001.834 0,-46.98372 1.434151,0.16768 c 5.155008,0.60274 9.462857,2.72154 12.938257,6.36366 4.74393,4.9715 6.87913,11.35611 6.16464,18.43328 -0.53702,5.31935 -3.09008,10.59498 -6.83833,14.13074 l -1.94072,1.83069 3.04083,2.20427 c 3.58084,2.5957 7.18975,6.4912 9.55296,10.3116 4.89572,7.9144 9.23593,21.4918 8.50487,26.6055 -0.81312,5.6877 -5.43872,9.6977 -13.62216,11.8093 -3.80822,0.9826 -7.68056,1.4713 -14.763321,1.8633 l -4.471177,0.2474 0,-46.9837 z"
-       id="right"
+       id="left"
        inkscape:connector-curvature="0" />
     <path
        d="m 46.656521,12.167234 18.055171,18.054184 a 6.6081919,6.6078288 0 0 1 -0.126303,9.352065 6.6804126,6.6800456 0 0 1 -8.233169,1.011048 l -7.944268,7.943843 6.463762,6.445343 a 6.9331851,6.9328042 0 0 1 5.741536,2.022073 l 28.057729,28.092294 a 6.9962797,6.9958953 0 0 1 -9.894222,9.893685 L 50.719018,66.907526 A 7.0595711,7.0591833 0 0 1 49.18433,59.270613 l -5.741527,-5.741238 -7.944298,7.943843 A 6.716523,6.7161541 0 0 1 25.134866,69.832263 L 7.079684,51.778091 a 6.716523,6.7161541 0 0 1 8.39566,-10.345064 L 36.31101,20.59853 a 6.716523,6.7161541 0 0 1 10.345612,-8.431329 z"

cockatrice/resources/usericons/pawn_vip_double.svg

@@ -340,11 +340,11 @@
        style="fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        d="M 49.84375 1.71875 C 36.719738 1.71875 26.0625 12.375988 26.0625 25.5 C 26.0625 32.977454 29.538325 39.612734 34.9375 43.96875 C 24.439951 49.943698 17.919149 62.196126 14.3125 75.65625 C 9.0380874 95.34065 30.224013 98.21875 49.84375 98.21875 C 69.463486 98.21875 90.549327 94.96715 85.375 75.65625 C 81.693381 61.916246 75.224585 49.827177 64.8125 43.9375 C 70.181573 39.580662 73.59375 32.953205 73.59375 25.5 C 73.59375 12.375988 62.967762 1.71875 49.84375 1.71875 z "
        transform="translate(0,952.36218)"
-       id="left" />
+       id="right" />
     <path
        style="opacity:1;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 51.28696,1001.834 0,-46.98372 1.434151,0.16768 c 5.155008,0.60274 9.462857,2.72154 12.938257,6.36366 4.74393,4.9715 6.87913,11.35611 6.16464,18.43328 -0.53702,5.31935 -3.09008,10.59498 -6.83833,14.13074 l -1.94072,1.83069 3.04083,2.20427 c 3.58084,2.5957 7.18975,6.4912 9.55296,10.3116 4.89572,7.9144 9.23593,21.4918 8.50487,26.6055 -0.81312,5.6877 -5.43872,9.6977 -13.62216,11.8093 -3.80822,0.9826 -7.68056,1.4713 -14.763321,1.8633 l -4.471177,0.2474 0,-46.9837 z"
-       id="right"
+       id="left"
        inkscape:connector-curvature="0" />
     <path
        sodipodi:type="star"

cockatrice/src/client/network/interfaces/deck_stats_interface.cpp

@@ -2,13 +2,13 @@
 
 #include <QDesktopServices>
 #include <QMessageBox>
+#include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QRegularExpression>
 #include <QUrlQuery>
 #include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/deck_list/tree/deck_list_card_node.h>
-#include <version_string.h>
+#include <libcockatrice/deck_list/deck_list_card_node.h>
 
 DeckStatsInterface::DeckStatsInterface(CardDatabase &_cardDatabase, QObject *parent)
     : QObject(parent), cardDatabase(_cardDatabase)
@@ -43,32 +43,31 @@ void DeckStatsInterface::queryFinished(QNetworkReply *reply)
     deleteLater();
 }
 
-void DeckStatsInterface::getAnalyzeRequestData(const DeckList &deck, QByteArray &data)
+void DeckStatsInterface::getAnalyzeRequestData(DeckList *deck, QByteArray *data)
 {
     DeckList deckWithoutTokens;
-    copyDeckWithoutTokens(deck, deckWithoutTokens);
+    copyDeckWithoutTokens(*deck, deckWithoutTokens);
 
     QUrl params;
     QUrlQuery urlQuery;
     urlQuery.addQueryItem("deck", deckWithoutTokens.writeToString_Plain());
-    urlQuery.addQueryItem("decktitle", deck.getName());
+    urlQuery.addQueryItem("decktitle", deck->getName());
     params.setQuery(urlQuery);
-    data.append(params.query(QUrl::EncodeReserved).toUtf8());
+    data->append(params.query(QUrl::EncodeReserved).toUtf8());
 }
 
-void DeckStatsInterface::analyzeDeck(const DeckList &deck)
+void DeckStatsInterface::analyzeDeck(DeckList *deck)
 {
     QByteArray data;
-    getAnalyzeRequestData(deck, data);
+    getAnalyzeRequestData(deck, &data);
 
     QNetworkRequest request(QUrl("https://deckstats.net/index.php"));
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
-    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
 
     manager->post(request, data);
 }
 
-void DeckStatsInterface::copyDeckWithoutTokens(const DeckList &source, DeckList &destination)
+void DeckStatsInterface::copyDeckWithoutTokens(DeckList &source, DeckList &destination)
 {
     auto copyIfNotAToken = [this, &destination](const auto node, const auto card) {
         CardInfoPtr dbCard = cardDatabase.query()->getCardInfo(card->getName());

cockatrice/src/client/network/interfaces/deck_stats_interface.h

@@ -7,6 +7,7 @@
 #ifndef DECKSTATS_INTERFACE_H
 #define DECKSTATS_INTERFACE_H
 
+#include <QObject>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/deck_list/deck_list.h>
 
@@ -28,15 +29,15 @@ private:
      * closest non-token card instead. So we construct a new deck which has no
      * tokens.
      */
-    void copyDeckWithoutTokens(const DeckList &source, DeckList &destination);
+    void copyDeckWithoutTokens(DeckList &source, DeckList &destination);
 
 private slots:
     void queryFinished(QNetworkReply *reply);
-    void getAnalyzeRequestData(const DeckList &deck, QByteArray &data);
+    void getAnalyzeRequestData(DeckList *deck, QByteArray *data);
 
 public:
     explicit DeckStatsInterface(CardDatabase &_cardDatabase, QObject *parent = nullptr);
-    void analyzeDeck(const DeckList &deck);
+    void analyzeDeck(DeckList *deck);
 };
 
 #endif

cockatrice/src/client/network/interfaces/tapped_out_interface.cpp

@@ -2,13 +2,13 @@
 
 #include <QDesktopServices>
 #include <QMessageBox>
+#include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QRegularExpression>
 #include <QUrlQuery>
 #include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/deck_list/tree/deck_list_card_node.h>
-#include <version_string.h>
+#include <libcockatrice/deck_list/deck_list_card_node.h>
 
 TappedOutInterface::TappedOutInterface(CardDatabase &_cardDatabase, QObject *parent)
     : QObject(parent), cardDatabase(_cardDatabase)
@@ -67,35 +67,32 @@ void TappedOutInterface::queryFinished(QNetworkReply *reply)
     deleteLater();
 }
 
-void TappedOutInterface::getAnalyzeRequestData(const DeckList &deck, QByteArray &data)
+void TappedOutInterface::getAnalyzeRequestData(DeckList *deck, QByteArray *data)
 {
     DeckList mainboard, sideboard;
-    copyDeckSplitMainAndSide(deck, mainboard, sideboard);
+    copyDeckSplitMainAndSide(*deck, mainboard, sideboard);
 
     QUrl params;
     QUrlQuery urlQuery;
-    urlQuery.addQueryItem("name", deck.getName());
+    urlQuery.addQueryItem("name", deck->getName());
     urlQuery.addQueryItem("mainboard", mainboard.writeToString_Plain(false, true));
     urlQuery.addQueryItem("sideboard", sideboard.writeToString_Plain(false, true));
     params.setQuery(urlQuery);
-    data.append(params.query(QUrl::EncodeReserved).toUtf8());
+    data->append(params.query(QUrl::EncodeReserved).toUtf8());
 }
 
-void TappedOutInterface::analyzeDeck(const DeckList &deck)
+void TappedOutInterface::analyzeDeck(DeckList *deck)
 {
     QByteArray data;
-    getAnalyzeRequestData(deck, data);
+    getAnalyzeRequestData(deck, &data);
 
     QNetworkRequest request(QUrl("https://tappedout.net/mtg-decks/paste/"));
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
-    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
-    // we interpret the redirect and open it in the browser instead, do not follow redirects
-    request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::ManualRedirectPolicy);
 
     manager->post(request, data);
 }
 
-void TappedOutInterface::copyDeckSplitMainAndSide(const DeckList &source, DeckList &mainboard, DeckList &sideboard)
+void TappedOutInterface::copyDeckSplitMainAndSide(DeckList &source, DeckList &mainboard, DeckList &sideboard)
 {
     auto copyMainOrSide = [this, &mainboard, &sideboard](const auto node, const auto card) {
         CardInfoPtr dbCard = cardDatabase.query()->getCardInfo(card->getName());

cockatrice/src/client/network/interfaces/tapped_out_interface.h

@@ -7,6 +7,8 @@
 #ifndef TAPPEDOUT_INTERFACE_H
 #define TAPPEDOUT_INTERFACE_H
 
+#include <QLoggingCategory>
+#include <QObject>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/deck_list/deck_list.h>
 
@@ -30,14 +32,14 @@ private:
     QNetworkAccessManager *manager;
 
     CardDatabase &cardDatabase;
-    void copyDeckSplitMainAndSide(const DeckList &source, DeckList &mainboard, DeckList &sideboard);
+    void copyDeckSplitMainAndSide(DeckList &source, DeckList &mainboard, DeckList &sideboard);
 private slots:
     void queryFinished(QNetworkReply *reply);
-    void getAnalyzeRequestData(const DeckList &deck, QByteArray &data);
+    void getAnalyzeRequestData(DeckList *deck, QByteArray *data);
 
 public:
     explicit TappedOutInterface(CardDatabase &_cardDatabase, QObject *parent = nullptr);
-    void analyzeDeck(const DeckList &deck);
+    void analyzeDeck(DeckList *deck);
 };
 
 #endif

cockatrice/src/client/network/parsers/interface_json_deck_parser.h

@@ -6,34 +6,31 @@
 
 #ifndef INTERFACE_JSON_DECK_PARSER_H
 #define INTERFACE_JSON_DECK_PARSER_H
-
-#include "../../../interface/deck_loader/card_node_function.h"
+#include "../../../interface/deck_loader/deck_loader.h"
 
 #include <QJsonArray>
 #include <QJsonObject>
-#include <libcockatrice/card/import/card_name_normalizer.h>
-#include <libcockatrice/deck_list/deck_list.h>
 
 class IJsonDeckParser
 {
 public:
     virtual ~IJsonDeckParser() = default;
 
-    virtual DeckList parse(const QJsonObject &obj) = 0;
+    virtual DeckLoader *parse(const QJsonObject &obj) = 0;
 };
 
 class ArchidektJsonParser : public IJsonDeckParser
 {
 public:
-    DeckList parse(const QJsonObject &obj) override
+    DeckLoader *parse(const QJsonObject &obj) override
     {
-        DeckList deckList;
+        DeckLoader *loader = new DeckLoader(nullptr);
 
         QString deckName = obj.value("name").toString();
         QString deckDescription = obj.value("description").toString();
 
-        deckList.setName(deckName);
-        deckList.setComments(deckDescription);
+        loader->getDeckList()->setName(deckName);
+        loader->getDeckList()->setComments(deckDescription);
 
         QString outputText;
         QTextStream outStream(&outputText);
@@ -50,25 +47,25 @@ public:
             outStream << quantity << ' ' << cardName << " (" << setName << ") " << collectorNumber << '\n';
         }
 
-        deckList.loadFromStream_Plain(outStream, false, CardNameNormalizer());
-        deckList.forEachCard(CardNodeFunction::ResolveProviderId());
+        loader->getDeckList()->loadFromStream_Plain(outStream, false);
+        loader->resolveSetNameAndNumberToProviderID();
 
-        return deckList;
+        return loader;
     }
 };
 
 class MoxfieldJsonParser : public IJsonDeckParser
 {
 public:
-    DeckList parse(const QJsonObject &obj) override
+    DeckLoader *parse(const QJsonObject &obj) override
     {
-        DeckList deckList;
+        DeckLoader *loader = new DeckLoader(nullptr);
 
         QString deckName = obj.value("name").toString();
         QString deckDescription = obj.value("description").toString();
 
-        deckList.setName(deckName);
-        deckList.setComments(deckDescription);
+        loader->getDeckList()->setName(deckName);
+        loader->getDeckList()->setComments(deckDescription);
 
         QString outputText;
         QTextStream outStream(&outputText);
@@ -97,8 +94,8 @@ public:
             outStream << quantity << ' ' << cardName << " (" << setName << ") " << collectorNumber << '\n';
         }
 
-        deckList.loadFromStream_Plain(outStream, false, CardNameNormalizer());
-        deckList.forEachCard(CardNodeFunction::ResolveProviderId());
+        loader->getDeckList()->loadFromStream_Plain(outStream, false);
+        loader->resolveSetNameAndNumberToProviderID();
 
         QJsonObject commandersObj = obj.value("commanders").toObject();
         if (!commandersObj.isEmpty()) {
@@ -109,12 +106,12 @@ public:
                 QString collectorNumber = cardData.value("cn").toString();
                 QString providerId = cardData.value("scryfall_id").toString();
 
-                deckList.setBannerCard({commanderName, providerId});
-                deckList.addCard(commanderName, DECK_ZONE_MAIN, -1, setName, collectorNumber, providerId);
+                loader->getDeckList()->setBannerCard({commanderName, providerId});
+                loader->getDeckList()->addCard(commanderName, DECK_ZONE_MAIN, -1, setName, collectorNumber, providerId);
             }
         }
 
-        return deckList;
+        return loader;
     }
 };
 

cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp

@@ -4,17 +4,18 @@
 #include "../../../../main.h"
 #include "../../../settings/cache_settings.h"
 
+#include <QApplication>
 #include <QCryptographicHash>
 #include <QDateTime>
 #include <QDebug>
 #include <QFile>
 #include <QLocale>
+#include <QMessageBox>
 #include <QNetworkReply>
 #include <QUrl>
 #include <QtConcurrent>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <version_string.h>
 
 #define SPOILERS_STATUS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/SpoilerSeasonEnabled"
 #define SPOILERS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/spoiler.xml"
@@ -40,9 +41,7 @@ void SpoilerBackgroundUpdater::startSpoilerDownloadProcess(QString url, bool sav
 void SpoilerBackgroundUpdater::downloadFromURL(QUrl url, bool saveResults)
 {
     auto *nam = new QNetworkAccessManager(this);
-    auto request = QNetworkRequest(url);
-    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
-    QNetworkReply *reply = nam->get(request);
+    QNetworkReply *reply = nam->get(QNetworkRequest(url));
 
     if (saveResults) {
         // This will write out to the file (used for spoiler.xml)

cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.h

@@ -22,7 +22,7 @@ public:
     inline QString getCardUpdaterBinaryName()
     {
         return "oracle";
-    }
+    };
     QByteArray getHash(const QString fileName);
     QByteArray getHash(QByteArray data);
     static bool deleteSpoilerFile();

cockatrice/src/client/network/update/client/update_downloader.cpp

@@ -1,5 +1,6 @@
 #include "update_downloader.h"
 
+#include <QDebug>
 #include <QUrl>
 
 UpdateDownloader::UpdateDownloader(QObject *parent) : QObject(parent), response(nullptr)

cockatrice/src/client/network/update/client/update_downloader.h

@@ -7,7 +7,9 @@
 #ifndef COCKATRICE_UPDATEDOWNLOADER_H
 #define COCKATRICE_UPDATEDOWNLOADER_H
 
+#include <QDate>
 #include <QObject>
+#include <QUrl>
 #include <QtNetwork>
 
 class UpdateDownloader : public QObject

cockatrice/src/client/settings/cache_settings.cpp

@@ -2,7 +2,6 @@
 
 #include "../network/update/client/release_channel.h"
 #include "card_counter_settings.h"
-#include "version_string.h"
 
 #include <QAbstractListModel>
 #include <QApplication>
@@ -199,13 +198,7 @@ SettingsCache::SettingsCache()
 
     mbDownloadSpoilers = settings->value("personal/downloadspoilers", false).toBool();
 
-    if (settings->contains("personal/startupUpdateCheck")) {
-        checkUpdatesOnStartup = settings->value("personal/startupUpdateCheck", true).toBool();
-    } else if (QString(VERSION_STRING).contains("custom", Qt::CaseInsensitive)) {
-        checkUpdatesOnStartup = false; // do not run auto updater on custom version
-    } else {
-        checkUpdatesOnStartup = true; // default to run auto updater
-    }
+    checkUpdatesOnStartup = settings->value("personal/startupUpdateCheck", true).toBool();
     startupCardUpdateCheckPromptForUpdate =
         settings->value("personal/startupCardUpdateCheckPromptForUpdate", true).toBool();
     startupCardUpdateCheckAlwaysUpdate = settings->value("personal/startupCardUpdateCheckAlwaysUpdate", false).toBool();
@@ -213,15 +206,7 @@ SettingsCache::SettingsCache()
     lastCardUpdateCheck = settings->value("personal/lastCardUpdateCheck", QDateTime::currentDateTime().date()).toDate();
     notifyAboutUpdates = settings->value("personal/updatenotification", true).toBool();
     notifyAboutNewVersion = settings->value("personal/newversionnotification", true).toBool();
-
-    if (settings->contains("personal/updatereleasechannel")) {
-        updateReleaseChannel = settings->value("personal/updatereleasechannel").toInt();
-    } else if (QString(VERSION_STRING).contains("beta", Qt::CaseInsensitive)) {
-        // default to beta if this is a beta release
-        updateReleaseChannel = 1;
-    } else {
-        updateReleaseChannel = 0; // stable
-    }
+    updateReleaseChannel = settings->value("personal/updatereleasechannel", 0).toInt();
 
     lang = settings->value("personal/lang").toString();
     keepalive = settings->value("personal/keepalive", 3).toInt();
@@ -239,7 +224,6 @@ SettingsCache::SettingsCache()
 
     homeTabBackgroundSource = settings->value("home/background", "themed").toString();
     homeTabBackgroundShuffleFrequency = settings->value("home/background/shuffleTimer", 0).toInt();
-    homeTabDisplayCardName = settings->value("home/background/displayCardName", true).toBool();
 
     tabVisualDeckStorageOpen = settings->value("tabs/visualDeckStorage", true).toBool();
     tabServerOpen = settings->value("tabs/server", true).toBool();
@@ -268,15 +252,18 @@ SettingsCache::SettingsCache()
     picDownload = settings->value("personal/picturedownload", true).toBool();
     showStatusBar = settings->value("personal/showStatusBar", false).toBool();
 
+    mainWindowGeometry = settings->value("interface/main_window_geometry").toByteArray();
+    tokenDialogGeometry = settings->value("interface/token_dialog_geometry").toByteArray();
+    setsDialogGeometry = settings->value("interface/sets_dialog_geometry").toByteArray();
     notificationsEnabled = settings->value("interface/notificationsenabled", true).toBool();
     spectatorNotificationsEnabled = settings->value("interface/specnotificationsenabled", false).toBool();
     buddyConnectNotificationsEnabled = settings->value("interface/buddyconnectnotificationsenabled", true).toBool();
     doubleClickToPlay = settings->value("interface/doubleclicktoplay", true).toBool();
     clickPlaysAllSelected = settings->value("interface/clickPlaysAllSelected", true).toBool();
     playToStack = settings->value("interface/playtostack", true).toBool();
-    doNotDeleteArrowsInSubPhases = settings->value("interface/doNotDeleteArrowsInSubPhases", true).toBool();
     startingHandSize = settings->value("interface/startinghandsize", 7).toInt();
     annotateTokens = settings->value("interface/annotatetokens", false).toBool();
+    tabGameSplitterSizes = settings->value("interface/tabgame_splittersizes").toByteArray();
     knownMissingFeatures = settings->value("interface/knownmissingfeatures", "").toString();
     useTearOffMenus = settings->value("interface/usetearoffmenus", true).toBool();
     cardViewInitialRowsMax = settings->value("interface/cardViewInitialRowsMax", 14).toInt();
@@ -284,11 +271,7 @@ SettingsCache::SettingsCache()
     closeEmptyCardView = settings->value("interface/closeEmptyCardView", true).toBool();
     focusCardViewSearchBar = settings->value("interface/focusCardViewSearchBar", true).toBool();
 
-    showDragSelectionCount = settings->value("interface/showlassoselectioncount", true).toBool();
-    showTotalSelectionCount = settings->value("interface/showpersistentselectioncount", true).toBool();
-
     showShortcuts = settings->value("menu/showshortcuts", true).toBool();
-    showGameSelectorFilterToolbar = settings->value("menu/showgameselectorfiltertoolbar", true).toBool();
     displayCardNames = settings->value("cards/displaycardnames", true).toBool();
     roundCardCorners = settings->value("cards/roundcardcorners", true).toBool();
     overrideAllCardArtWithPersonalPreference =
@@ -309,7 +292,6 @@ SettingsCache::SettingsCache()
     visualDeckStorageDefaultTagsList =
         settings->value("interface/visualdeckstoragedefaulttagslist", defaultTags).toStringList();
     visualDeckStorageSearchFolderNames = settings->value("interface/visualdeckstoragesearchfoldernames", true).toBool();
-    visualDeckStorageShowColorIdentity = settings->value("interface/visualdeckstorageshowcoloridentity", true).toBool();
     visualDeckStorageShowBannerCardComboBox =
         settings->value("interface/visualdeckstorageshowbannercardcombobox", true).toBool();
     visualDeckStorageShowTagsOnDeckPreviews =
@@ -327,15 +309,10 @@ SettingsCache::SettingsCache()
         settings->value("interface/visualdeckstorageselectionanimation", true).toBool();
     defaultDeckEditorType = settings->value("interface/defaultDeckEditorType", 1).toInt();
     visualDatabaseDisplayFilterToMostRecentSetsEnabled =
-        settings->value("interface/visualdatabasedisplayfiltertomostrecentsetsenabled", false).toBool();
+        settings->value("interface/visualdatabasedisplayfiltertomostrecentsetsenabled", true).toBool();
     visualDatabaseDisplayFilterToMostRecentSetsAmount =
         settings->value("interface/visualdatabasedisplayfiltertomostrecentsetsamount", 10).toInt();
     visualDeckEditorSampleHandSize = settings->value("interface/visualdeckeditorsamplehandsize", 7).toInt();
-    visualDeckEditorCardSize = settings->value("interface/visualdeckeditorcardsize", 100).toInt();
-    visualDatabaseDisplayCardSize = settings->value("interface/visualdatabasedisplaycardsize", 100).toInt();
-    edhrecCardSize = settings->value("interface/edhreccardsize", 100).toInt();
-    archidektPreviewSize = settings->value("interface/archidektpreviewsize", 100).toInt();
-
     horizontalHand = settings->value("hand/horizontal", true).toBool();
     invertVerticalCoordinate = settings->value("table/invert_vertical", false).toBool();
     minPlayersForMultiColumnLayout = settings->value("interface/min_players_multicolumn", 4).toInt();
@@ -388,13 +365,6 @@ SettingsCache::SettingsCache()
     defaultStartingLifeTotal = settings->value("game/defaultstartinglifetotal", 20).toInt();
     shareDecklistsOnLoad = settings->value("game/sharedecklistsonload", false).toBool();
     rememberGameSettings = settings->value("game/remembergamesettings", true).toBool();
-
-    // Local game settings use "localgameoptions/" prefix to keep them separate
-    // from server game settings which use "game/" prefix
-    localGameRememberSettings = settings->value("localgameoptions/remembersettings", false).toBool();
-    localGameMaxPlayers = settings->value("localgameoptions/maxplayers", 1).toInt();
-    localGameStartingLifeTotal = settings->value("localgameoptions/startinglifetotal", 20).toInt();
-
     clientID = settings->value("personal/clientid", CLIENT_INFO_NOT_SET).toString();
     clientVersion = settings->value("personal/clientversion", CLIENT_INFO_NOT_SET).toString();
 }
@@ -602,13 +572,6 @@ void SettingsCache::setHomeTabBackgroundShuffleFrequency(int _frequency)
     emit homeTabBackgroundShuffleFrequencyChanged();
 }
 
-void SettingsCache::setHomeTabDisplayCardName(QT_STATE_CHANGED_T _displayCardName)
-{
-    homeTabDisplayCardName = static_cast<bool>(_displayCardName);
-    settings->setValue("home/background/displayCardName", homeTabDisplayCardName);
-    emit homeTabDisplayCardNameChanged();
-}
-
 void SettingsCache::setTabVisualDeckStorageOpen(bool value)
 {
     tabVisualDeckStorageOpen = value;
@@ -701,12 +664,6 @@ void SettingsCache::setPlayToStack(QT_STATE_CHANGED_T _playToStack)
     settings->setValue("interface/playtostack", playToStack);
 }
 
-void SettingsCache::setDoNotDeleteArrowsInSubPhases(QT_STATE_CHANGED_T _doNotDeleteArrowsInSubPhases)
-{
-    doNotDeleteArrowsInSubPhases = static_cast<bool>(_doNotDeleteArrowsInSubPhases);
-    settings->setValue("interface/doNotDeleteArrowsInSubPhases", doNotDeleteArrowsInSubPhases);
-}
-
 void SettingsCache::setStartingHandSize(int _startingHandSize)
 {
     startingHandSize = _startingHandSize;
@@ -719,19 +676,18 @@ void SettingsCache::setAnnotateTokens(QT_STATE_CHANGED_T _annotateTokens)
     settings->setValue("interface/annotatetokens", annotateTokens);
 }
 
+void SettingsCache::setTabGameSplitterSizes(const QByteArray &_tabGameSplitterSizes)
+{
+    tabGameSplitterSizes = _tabGameSplitterSizes;
+    settings->setValue("interface/tabgame_splittersizes", tabGameSplitterSizes);
+}
+
 void SettingsCache::setShowShortcuts(QT_STATE_CHANGED_T _showShortcuts)
 {
     showShortcuts = static_cast<bool>(_showShortcuts);
     settings->setValue("menu/showshortcuts", showShortcuts);
 }
 
-void SettingsCache::setShowGameSelectorFilterToolbar(QT_STATE_CHANGED_T _showGameSelectorFilterToolbar)
-{
-    showGameSelectorFilterToolbar = static_cast<bool>(_showGameSelectorFilterToolbar);
-    settings->setValue("menu/showgameselectorfiltertoolbar", showGameSelectorFilterToolbar);
-    emit showGameSelectorFilterToolbarChanged(showGameSelectorFilterToolbar);
-}
-
 void SettingsCache::setDisplayCardNames(QT_STATE_CHANGED_T _displayCardNames)
 {
     displayCardNames = static_cast<bool>(_displayCardNames);
@@ -830,13 +786,6 @@ void SettingsCache::setVisualDeckStorageSearchFolderNames(QT_STATE_CHANGED_T val
     settings->setValue("interface/visualdeckstoragesearchfoldernames", visualDeckStorageSearchFolderNames);
 }
 
-void SettingsCache::setVisualDeckStorageShowColorIdentity(QT_STATE_CHANGED_T value)
-{
-    visualDeckStorageShowColorIdentity = value;
-    settings->setValue("interface/visualdeckstorageshowcoloridentity", visualDeckStorageShowColorIdentity);
-    emit visualDeckStorageShowColorIdentityChanged(visualDeckStorageShowColorIdentity);
-}
-
 void SettingsCache::setVisualDeckStorageShowBannerCardComboBox(QT_STATE_CHANGED_T _showBannerCardComboBox)
 {
     visualDeckStorageShowBannerCardComboBox = _showBannerCardComboBox;
@@ -907,34 +856,6 @@ void SettingsCache::setVisualDeckStorageSelectionAnimation(QT_STATE_CHANGED_T va
     emit visualDeckStorageSelectionAnimationChanged(visualDeckStorageSelectionAnimation);
 }
 
-void SettingsCache::setVisualDeckEditorCardSize(int _visualDeckEditorCardSize)
-{
-    visualDeckEditorCardSize = _visualDeckEditorCardSize;
-    settings->setValue("interface/visualdeckeditorcardsize", visualDeckEditorCardSize);
-    emit visualDeckEditorCardSizeChanged();
-}
-
-void SettingsCache::setVisualDatabaseDisplayCardSize(int _visualDatabaseDisplayCardSize)
-{
-    visualDatabaseDisplayCardSize = _visualDatabaseDisplayCardSize;
-    settings->setValue("interface/visualdatabasedisplaycardsize", visualDatabaseDisplayCardSize);
-    emit visualDatabaseDisplayCardSizeChanged();
-}
-
-void SettingsCache::setEDHRecCardSize(int _edhrecCardSize)
-{
-    edhrecCardSize = _edhrecCardSize;
-    settings->setValue("interface/edhreccardsize", edhrecCardSize);
-    emit edhRecCardSizeChanged();
-}
-
-void SettingsCache::setArchidektPreviewCardSize(int _archidektPreviewCardSize)
-{
-    archidektPreviewSize = _archidektPreviewCardSize;
-    settings->setValue("interface/archidektpreviewsize", archidektPreviewSize);
-    emit archidektPreviewSizeChanged();
-}
-
 void SettingsCache::setDefaultDeckEditorType(int value)
 {
     defaultDeckEditorType = value;
@@ -1090,6 +1011,24 @@ void SettingsCache::setIgnoreUnregisteredUserMessages(QT_STATE_CHANGED_T _ignore
     settings->setValue("chat/ignore_unregistered_messages", ignoreUnregisteredUserMessages);
 }
 
+void SettingsCache::setMainWindowGeometry(const QByteArray &_mainWindowGeometry)
+{
+    mainWindowGeometry = _mainWindowGeometry;
+    settings->setValue("interface/main_window_geometry", mainWindowGeometry);
+}
+
+void SettingsCache::setTokenDialogGeometry(const QByteArray &_tokenDialogGeometry)
+{
+    tokenDialogGeometry = _tokenDialogGeometry;
+    settings->setValue("interface/token_dialog_geometry", tokenDialogGeometry);
+}
+
+void SettingsCache::setSetsDialogGeometry(const QByteArray &_setsDialogGeometry)
+{
+    setsDialogGeometry = _setsDialogGeometry;
+    settings->setValue("interface/sets_dialog_geometry", setsDialogGeometry);
+}
+
 void SettingsCache::setPixmapCacheSize(const int _pixmapCacheSize)
 {
     pixmapCacheSize = _pixmapCacheSize;
@@ -1125,21 +1064,257 @@ void SettingsCache::setClientVersion(const QString &_clientVersion)
 
 QStringList SettingsCache::getCountries() const
 {
-    static const QStringList countries = {
-        "ad", "ae", "af", "ag", "ai", "al", "am", "ao", "aq", "ar", "as", "at", "au", "aw", "ax", "az", "ba", "bb",
-        "bd", "be", "bf", "bg", "bh", "bi", "bj", "bl", "bm", "bn", "bo", "bq", "br", "bs", "bt", "bv", "bw", "by",
-        "bz", "ca", "cc", "cd", "cf", "cg", "ch", "ci", "ck", "cl", "cm", "cn", "co", "cr", "cu", "cv", "cw", "cx",
-        "cy", "cz", "de", "dj", "dk", "dm", "do", "dz", "ec", "ee", "eg", "eh", "er", "es", "et", "eu", "fi", "fj",
-        "fk", "fm", "fo", "fr", "ga", "gb", "gd", "ge", "gf", "gg", "gh", "gi", "gl", "gm", "gn", "gp", "gq", "gr",
-        "gs", "gt", "gu", "gw", "gy", "hk", "hm", "hn", "hr", "ht", "hu", "id", "ie", "il", "im", "in", "io", "iq",
-        "ir", "is", "it", "je", "jm", "jo", "jp", "ke", "kg", "kh", "ki", "km", "kn", "kp", "kr", "kw", "ky", "kz",
-        "la", "lb", "lc", "li", "lk", "lr", "ls", "lt", "lu", "lv", "ly", "ma", "mc", "md", "me", "mf", "mg", "mh",
-        "mk", "ml", "mm", "mn", "mo", "mp", "mq", "mr", "ms", "mt", "mu", "mv", "mw", "mx", "my", "mz", "na", "nc",
-        "ne", "nf", "ng", "ni", "nl", "no", "np", "nr", "nu", "nz", "om", "pa", "pe", "pf", "pg", "ph", "pk", "pl",
-        "pm", "pn", "pr", "ps", "pt", "pw", "py", "qa", "re", "ro", "rs", "ru", "rw", "sa", "sb", "sc", "sd", "se",
-        "sg", "sh", "si", "sj", "sk", "sl", "sm", "sn", "so", "sr", "ss", "st", "sv", "sx", "sy", "sz", "tc", "td",
-        "tf", "tg", "th", "tj", "tk", "tl", "tm", "tn", "to", "tr", "tt", "tv", "tw", "tz", "ua", "ug", "um", "us",
-        "uy", "uz", "va", "vc", "ve", "vg", "vi", "vn", "vu", "wf", "ws", "xk", "ye", "yt", "za", "zm", "zw"};
+    static QStringList countries = QStringList() << "ad"
+                                                 << "ae"
+                                                 << "af"
+                                                 << "ag"
+                                                 << "ai"
+                                                 << "al"
+                                                 << "am"
+                                                 << "ao"
+                                                 << "aq"
+                                                 << "ar"
+                                                 << "as"
+                                                 << "at"
+                                                 << "au"
+                                                 << "aw"
+                                                 << "ax"
+                                                 << "az"
+                                                 << "ba"
+                                                 << "bb"
+                                                 << "bd"
+                                                 << "be"
+                                                 << "bf"
+                                                 << "bg"
+                                                 << "bh"
+                                                 << "bi"
+                                                 << "bj"
+                                                 << "bl"
+                                                 << "bm"
+                                                 << "bn"
+                                                 << "bo"
+                                                 << "bq"
+                                                 << "br"
+                                                 << "bs"
+                                                 << "bt"
+                                                 << "bv"
+                                                 << "bw"
+                                                 << "by"
+                                                 << "bz"
+                                                 << "ca"
+                                                 << "cc"
+                                                 << "cd"
+                                                 << "cf"
+                                                 << "cg"
+                                                 << "ch"
+                                                 << "ci"
+                                                 << "ck"
+                                                 << "cl"
+                                                 << "cm"
+                                                 << "cn"
+                                                 << "co"
+                                                 << "cr"
+                                                 << "cu"
+                                                 << "cv"
+                                                 << "cw"
+                                                 << "cx"
+                                                 << "cy"
+                                                 << "cz"
+                                                 << "de"
+                                                 << "dj"
+                                                 << "dk"
+                                                 << "dm"
+                                                 << "do"
+                                                 << "dz"
+                                                 << "ec"
+                                                 << "ee"
+                                                 << "eg"
+                                                 << "eh"
+                                                 << "er"
+                                                 << "es"
+                                                 << "et"
+                                                 << "eu"
+                                                 << "fi"
+                                                 << "fj"
+                                                 << "fk"
+                                                 << "fm"
+                                                 << "fo"
+                                                 << "fr"
+                                                 << "ga"
+                                                 << "gb"
+                                                 << "gd"
+                                                 << "ge"
+                                                 << "gf"
+                                                 << "gg"
+                                                 << "gh"
+                                                 << "gi"
+                                                 << "gl"
+                                                 << "gm"
+                                                 << "gn"
+                                                 << "gp"
+                                                 << "gq"
+                                                 << "gr"
+                                                 << "gs"
+                                                 << "gt"
+                                                 << "gu"
+                                                 << "gw"
+                                                 << "gy"
+                                                 << "hk"
+                                                 << "hm"
+                                                 << "hn"
+                                                 << "hr"
+                                                 << "ht"
+                                                 << "hu"
+                                                 << "id"
+                                                 << "ie"
+                                                 << "il"
+                                                 << "im"
+                                                 << "in"
+                                                 << "io"
+                                                 << "iq"
+                                                 << "ir"
+                                                 << "is"
+                                                 << "it"
+                                                 << "je"
+                                                 << "jm"
+                                                 << "jo"
+                                                 << "jp"
+                                                 << "ke"
+                                                 << "kg"
+                                                 << "kh"
+                                                 << "ki"
+                                                 << "km"
+                                                 << "kn"
+                                                 << "kp"
+                                                 << "kr"
+                                                 << "kw"
+                                                 << "ky"
+                                                 << "kz"
+                                                 << "la"
+                                                 << "lb"
+                                                 << "lc"
+                                                 << "li"
+                                                 << "lk"
+                                                 << "lr"
+                                                 << "ls"
+                                                 << "lt"
+                                                 << "lu"
+                                                 << "lv"
+                                                 << "ly"
+                                                 << "ma"
+                                                 << "mc"
+                                                 << "md"
+                                                 << "me"
+                                                 << "mf"
+                                                 << "mg"
+                                                 << "mh"
+                                                 << "mk"
+                                                 << "ml"
+                                                 << "mm"
+                                                 << "mn"
+                                                 << "mo"
+                                                 << "mp"
+                                                 << "mq"
+                                                 << "mr"
+                                                 << "ms"
+                                                 << "mt"
+                                                 << "mu"
+                                                 << "mv"
+                                                 << "mw"
+                                                 << "mx"
+                                                 << "my"
+                                                 << "mz"
+                                                 << "na"
+                                                 << "nc"
+                                                 << "ne"
+                                                 << "nf"
+                                                 << "ng"
+                                                 << "ni"
+                                                 << "nl"
+                                                 << "no"
+                                                 << "np"
+                                                 << "nr"
+                                                 << "nu"
+                                                 << "nz"
+                                                 << "om"
+                                                 << "pa"
+                                                 << "pe"
+                                                 << "pf"
+                                                 << "pg"
+                                                 << "ph"
+                                                 << "pk"
+                                                 << "pl"
+                                                 << "pm"
+                                                 << "pn"
+                                                 << "pr"
+                                                 << "ps"
+                                                 << "pt"
+                                                 << "pw"
+                                                 << "py"
+                                                 << "qa"
+                                                 << "re"
+                                                 << "ro"
+                                                 << "rs"
+                                                 << "ru"
+                                                 << "rw"
+                                                 << "sa"
+                                                 << "sb"
+                                                 << "sc"
+                                                 << "sd"
+                                                 << "se"
+                                                 << "sg"
+                                                 << "sh"
+                                                 << "si"
+                                                 << "sj"
+                                                 << "sk"
+                                                 << "sl"
+                                                 << "sm"
+                                                 << "sn"
+                                                 << "so"
+                                                 << "sr"
+                                                 << "ss"
+                                                 << "st"
+                                                 << "sv"
+                                                 << "sx"
+                                                 << "sy"
+                                                 << "sz"
+                                                 << "tc"
+                                                 << "td"
+                                                 << "tf"
+                                                 << "tg"
+                                                 << "th"
+                                                 << "tj"
+                                                 << "tk"
+                                                 << "tl"
+                                                 << "tm"
+                                                 << "tn"
+                                                 << "to"
+                                                 << "tr"
+                                                 << "tt"
+                                                 << "tv"
+                                                 << "tw"
+                                                 << "tz"
+                                                 << "ua"
+                                                 << "ug"
+                                                 << "um"
+                                                 << "us"
+                                                 << "uy"
+                                                 << "uz"
+                                                 << "va"
+                                                 << "vc"
+                                                 << "ve"
+                                                 << "vg"
+                                                 << "vi"
+                                                 << "vn"
+                                                 << "vu"
+                                                 << "wf"
+                                                 << "ws"
+                                                 << "xk"
+                                                 << "ye"
+                                                 << "yt"
+                                                 << "za"
+                                                 << "zm"
+                                                 << "zw";
 
     return countries;
 }
@@ -1252,24 +1427,6 @@ void SettingsCache::setRememberGameSettings(const bool _rememberGameSettings)
     settings->setValue("game/remembergamesettings", rememberGameSettings);
 }
 
-void SettingsCache::setLocalGameRememberSettings(bool value)
-{
-    localGameRememberSettings = value;
-    settings->setValue("localgameoptions/remembersettings", value);
-}
-
-void SettingsCache::setLocalGameMaxPlayers(int value)
-{
-    localGameMaxPlayers = value;
-    settings->setValue("localgameoptions/maxplayers", value);
-}
-
-void SettingsCache::setLocalGameStartingLifeTotal(int value)
-{
-    localGameStartingLifeTotal = value;
-    settings->setValue("localgameoptions/startinglifetotal", value);
-}
-
 void SettingsCache::setNotifyAboutUpdate(QT_STATE_CHANGED_T _notifyaboutupdate)
 {
     notifyAboutUpdates = static_cast<bool>(_notifyaboutupdate);
@@ -1311,18 +1468,6 @@ void SettingsCache::setRoundCardCorners(bool _roundCardCorners)
     emit roundCardCornersChanged(roundCardCorners);
 }
 
-void SettingsCache::setShowDragSelectionCount(QT_STATE_CHANGED_T _showDragSelectionCount)
-{
-    showDragSelectionCount = static_cast<bool>(_showDragSelectionCount);
-    settings->setValue("interface/showlassoselectioncount", showDragSelectionCount);
-}
-
-void SettingsCache::setShowTotalSelectionCount(QT_STATE_CHANGED_T _showTotalSelectionCount)
-{
-    showTotalSelectionCount = static_cast<bool>(_showTotalSelectionCount);
-    settings->setValue("interface/showpersistentselectioncount", showTotalSelectionCount);
-}
-
 void SettingsCache::loadPaths()
 {
     QString dataPath = getDataPath();

cockatrice/src/client/settings/cache_settings.h

@@ -11,6 +11,7 @@
 
 #include <QDate>
 #include <QLoggingCategory>
+#include <QObject>
 #include <QSize>
 #include <QStringList>
 #include <libcockatrice/interfaces/interface_card_database_path_provider.h>
@@ -143,10 +144,8 @@ signals:
     void themeChanged();
     void homeTabBackgroundSourceChanged();
     void homeTabBackgroundShuffleFrequencyChanged();
-    void homeTabDisplayCardNameChanged();
     void picDownloadChanged();
     void showStatusBarChanged(bool state);
-    void showGameSelectorFilterToolbarChanged(bool state);
     void displayCardNamesChanged();
     void overrideAllCardArtWithPersonalPreferenceChanged(bool _overrideAllCardArtWithPersonalPreference);
     void bumpSetsWithCardsInDeckToTopChanged();
@@ -158,7 +157,6 @@ signals:
     void deckEditorTagsWidgetVisibleChanged(bool _visible);
     void visualDeckStorageShowTagFilterChanged(bool _visible);
     void visualDeckStorageDefaultTagsListChanged();
-    void visualDeckStorageShowColorIdentityChanged(bool _visible);
     void visualDeckStorageShowBannerCardComboBoxChanged(bool _visible);
     void visualDeckStorageShowTagsOnDeckPreviewsChanged(bool _visible);
     void visualDeckStorageCardSizeChanged();
@@ -169,10 +167,6 @@ signals:
     void visualDatabaseDisplayFilterToMostRecentSetsEnabledChanged(bool enabled);
     void visualDatabaseDisplayFilterToMostRecentSetsAmountChanged(int amount);
     void visualDeckEditorSampleHandSizeAmountChanged(int amount);
-    void visualDeckEditorCardSizeChanged();
-    void visualDatabaseDisplayCardSizeChanged();
-    void edhRecCardSizeChanged();
-    void archidektPreviewSizeChanged();
     void horizontalHandChanged();
     void handJustificationChanged();
     void invertVerticalCoordinateChanged();
@@ -205,6 +199,9 @@ private:
     DebugSettings *debugSettings;
     CardCounterSettings *cardCounterSettings;
 
+    QByteArray mainWindowGeometry;
+    QByteArray tokenDialogGeometry;
+    QByteArray setsDialogGeometry;
     QString lang;
     QString deckPath, filtersPath, replaysPath, picsPath, redirectCachePath, customPicsPath, cardDatabasePath,
         customCardDatabasePath, themesPath, spoilerDatabasePath, tokenDatabasePath, themeName, homeTabBackgroundSource;
@@ -221,7 +218,6 @@ private:
     bool showTipsOnStartup;
     QList<int> seenTips;
     int homeTabBackgroundShuffleFrequency;
-    bool homeTabDisplayCardName;
     bool mbDownloadSpoilers;
     int updateReleaseChannel;
     int maxFontSize;
@@ -232,11 +228,10 @@ private:
     bool doubleClickToPlay;
     bool clickPlaysAllSelected;
     bool playToStack;
-    bool doNotDeleteArrowsInSubPhases;
     int startingHandSize;
     bool annotateTokens;
+    QByteArray tabGameSplitterSizes;
     bool showShortcuts;
-    bool showGameSelectorFilterToolbar;
     bool displayCardNames;
     bool overrideAllCardArtWithPersonalPreference;
     bool bumpSetsWithCardsInDeckToTop;
@@ -248,17 +243,12 @@ private:
     bool deckEditorTagsWidgetVisible;
     int visualDeckStorageSortingOrder;
     bool visualDeckStorageShowFolders;
-    bool visualDeckStorageShowColorIdentity;
     bool visualDeckStorageShowBannerCardComboBox;
     bool visualDeckStorageShowTagsOnDeckPreviews;
     bool visualDeckStorageShowTagFilter;
     QStringList visualDeckStorageDefaultTagsList;
     bool visualDeckStorageSearchFolderNames;
     int visualDeckStorageCardSize;
-    int visualDeckEditorCardSize;
-    int visualDatabaseDisplayCardSize;
-    int edhrecCardSize;
-    int archidektPreviewSize;
     bool visualDeckStorageDrawUnusedColorIdentities;
     int visualDeckStorageUnusedColorIdentitiesOpacity;
     int visualDeckStorageTooltipType;
@@ -326,158 +316,150 @@ private:
     int keepalive;
     int timeout;
     void translateLegacySettings();
-    [[nodiscard]] QString getSafeConfigPath(QString configEntry, QString defaultPath) const;
-    [[nodiscard]] QString getSafeConfigFilePath(QString configEntry, QString defaultPath) const;
+    QString getSafeConfigPath(QString configEntry, QString defaultPath) const;
+    QString getSafeConfigFilePath(QString configEntry, QString defaultPath) const;
     void loadPaths();
     bool rememberGameSettings;
-
-    // Local game settings (separate from server game settings in game/*)
-    bool localGameRememberSettings;
-    int localGameMaxPlayers;
-    int localGameStartingLifeTotal;
-
     QList<ReleaseChannel *> releaseChannels;
     bool isPortableBuild;
     bool roundCardCorners;
     bool showStatusBar;
-    bool showDragSelectionCount;
-    bool showTotalSelectionCount;
 
 public:
     SettingsCache();
     QString getDataPath();
     QString getSettingsPath();
-    [[nodiscard]] QString getCachePath() const;
-    [[nodiscard]] QString getNetworkCachePath() const;
-    [[nodiscard]] QString getLang() const
+    QString getCachePath() const;
+    QString getNetworkCachePath() const;
+    const QByteArray &getMainWindowGeometry() const
+    {
+        return mainWindowGeometry;
+    }
+    const QByteArray &getTokenDialogGeometry() const
+    {
+        return tokenDialogGeometry;
+    }
+    const QByteArray &getSetsDialogGeometry() const
+    {
+        return setsDialogGeometry;
+    }
+    QString getLang() const
     {
         return lang;
     }
-    [[nodiscard]] QString getDeckPath() const
+    QString getDeckPath() const
     {
         return deckPath;
     }
-    [[nodiscard]] QString getFiltersPath() const
+    QString getFiltersPath() const
     {
         return filtersPath;
     }
-    [[nodiscard]] QString getReplaysPath() const
+    QString getReplaysPath() const
     {
         return replaysPath;
     }
-    [[nodiscard]] QString getThemesPath() const
+    QString getThemesPath() const
     {
         return themesPath;
     }
-    [[nodiscard]] QString getPicsPath() const
+    QString getPicsPath() const
     {
         return picsPath;
     }
-    [[nodiscard]] QString getRedirectCachePath() const
+    QString getRedirectCachePath() const
     {
         return redirectCachePath;
     }
-    [[nodiscard]] QString getCustomPicsPath() const
+    QString getCustomPicsPath() const
     {
         return customPicsPath;
     }
-    [[nodiscard]] QString getCustomCardDatabasePath() const override
+    QString getCustomCardDatabasePath() const override
     {
         return customCardDatabasePath;
     }
-    [[nodiscard]] QString getCardDatabasePath() const override
+    QString getCardDatabasePath() const override
     {
         return cardDatabasePath;
     }
-    [[nodiscard]] QString getSpoilerCardDatabasePath() const override
+    QString getSpoilerCardDatabasePath() const override
     {
         return spoilerDatabasePath;
     }
-    [[nodiscard]] QString getTokenDatabasePath() const override
+    QString getTokenDatabasePath() const override
     {
         return tokenDatabasePath;
     }
-    [[nodiscard]] QString getThemeName() const
+    QString getThemeName() const
     {
         return themeName;
     }
-    [[nodiscard]] QString getHomeTabBackgroundSource() const
+    QString getHomeTabBackgroundSource() const
     {
         return homeTabBackgroundSource;
     }
-    [[nodiscard]] int getHomeTabBackgroundShuffleFrequency() const
+    int getHomeTabBackgroundShuffleFrequency() const
     {
         return homeTabBackgroundShuffleFrequency;
     }
-    [[nodiscard]] bool getHomeTabDisplayCardName() const
-    {
-        return homeTabDisplayCardName;
-    }
-    [[nodiscard]] bool getTabVisualDeckStorageOpen() const
+    bool getTabVisualDeckStorageOpen() const
     {
         return tabVisualDeckStorageOpen;
     }
-    [[nodiscard]] bool getTabServerOpen() const
+    bool getTabServerOpen() const
     {
         return tabServerOpen;
     }
-    [[nodiscard]] bool getTabAccountOpen() const
+    bool getTabAccountOpen() const
     {
         return tabAccountOpen;
     }
-    [[nodiscard]] bool getTabDeckStorageOpen() const
+    bool getTabDeckStorageOpen() const
     {
         return tabDeckStorageOpen;
     }
-    [[nodiscard]] bool getTabReplaysOpen() const
+    bool getTabReplaysOpen() const
     {
         return tabReplaysOpen;
     }
-    [[nodiscard]] bool getTabAdminOpen() const
+    bool getTabAdminOpen() const
     {
         return tabAdminOpen;
     }
-    [[nodiscard]] bool getTabLogOpen() const
+    bool getTabLogOpen() const
     {
         return tabLogOpen;
     }
-    [[nodiscard]] QString getChatMentionColor() const
+    QString getChatMentionColor() const
     {
         return chatMentionColor;
     }
-    [[nodiscard]] QString getChatHighlightColor() const
+    QString getChatHighlightColor() const
     {
         return chatHighlightColor;
     }
-    [[nodiscard]] bool getPicDownload() const
+    bool getPicDownload() const
     {
         return picDownload;
     }
-    [[nodiscard]] bool getShowStatusBar() const
+    bool getShowStatusBar() const
     {
         return showStatusBar;
     }
-    [[nodiscard]] bool getShowDragSelectionCount() const
-    {
-        return showDragSelectionCount;
-    }
-    [[nodiscard]] bool getShowTotalSelectionCount() const
-    {
-        return showTotalSelectionCount;
-    }
-    [[nodiscard]] bool getNotificationsEnabled() const
+    bool getNotificationsEnabled() const
     {
         return notificationsEnabled;
     }
-    [[nodiscard]] bool getSpectatorNotificationsEnabled() const
+    bool getSpectatorNotificationsEnabled() const
     {
         return spectatorNotificationsEnabled;
     }
-    [[nodiscard]] bool getBuddyConnectNotificationsEnabled() const
+    bool getBuddyConnectNotificationsEnabled() const
     {
         return buddyConnectNotificationsEnabled;
     }
-    [[nodiscard]] bool getCheckUpdatesOnStartup() const
+    bool getCheckUpdatesOnStartup() const
     {
         return checkUpdatesOnStartup;
     }
@@ -489,267 +471,243 @@ public:
     {
         return startupCardUpdateCheckAlwaysUpdate;
     }
-    [[nodiscard]] int getCardUpdateCheckInterval() const
+    int getCardUpdateCheckInterval() const
     {
         return cardUpdateCheckInterval;
     }
-    [[nodiscard]] QDate getLastCardUpdateCheck() const
+    QDate getLastCardUpdateCheck() const
     {
         return lastCardUpdateCheck;
     }
-    [[nodiscard]] bool getCardUpdateCheckRequired() const
+    bool getCardUpdateCheckRequired() const
     {
         return getLastCardUpdateCheck().daysTo(QDateTime::currentDateTime().date()) >= getCardUpdateCheckInterval() &&
                getLastCardUpdateCheck() != QDateTime::currentDateTime().date();
     }
-    [[nodiscard]] bool getNotifyAboutUpdates() const override
+    bool getNotifyAboutUpdates() const override
     {
         return notifyAboutUpdates;
     }
-    [[nodiscard]] bool getNotifyAboutNewVersion() const
+    bool getNotifyAboutNewVersion() const
     {
         return notifyAboutNewVersion;
     }
-    [[nodiscard]] bool getShowTipsOnStartup() const
+    bool getShowTipsOnStartup() const
     {
         return showTipsOnStartup;
     }
-    [[nodiscard]] QList<int> getSeenTips() const
+    QList<int> getSeenTips() const
     {
         return seenTips;
     }
-    [[nodiscard]] int getUpdateReleaseChannelIndex() const
+    int getUpdateReleaseChannelIndex() const
     {
         return updateReleaseChannel;
     }
-    [[nodiscard]] ReleaseChannel *getUpdateReleaseChannel() const
+    ReleaseChannel *getUpdateReleaseChannel() const
     {
         return releaseChannels.at(qMax(0, updateReleaseChannel));
     }
-    [[nodiscard]] QList<ReleaseChannel *> getUpdateReleaseChannels() const
+    QList<ReleaseChannel *> getUpdateReleaseChannels() const
     {
         return releaseChannels;
     }
 
-    [[nodiscard]] bool getDoubleClickToPlay() const
+    bool getDoubleClickToPlay() const
     {
         return doubleClickToPlay;
     }
-    [[nodiscard]] bool getClickPlaysAllSelected() const
+    bool getClickPlaysAllSelected() const
     {
         return clickPlaysAllSelected;
     }
-    [[nodiscard]] bool getPlayToStack() const
+    bool getPlayToStack() const
     {
         return playToStack;
     }
-    [[nodiscard]] bool getDoNotDeleteArrowsInSubPhases() const
-    {
-        return doNotDeleteArrowsInSubPhases;
-    }
-    [[nodiscard]] int getStartingHandSize() const
+    int getStartingHandSize() const
     {
         return startingHandSize;
     }
-    [[nodiscard]] bool getAnnotateTokens() const
+    bool getAnnotateTokens() const
     {
         return annotateTokens;
     }
-    [[nodiscard]] bool getShowShortcuts() const
+    QByteArray getTabGameSplitterSizes() const
+    {
+        return tabGameSplitterSizes;
+    }
+    bool getShowShortcuts() const
     {
         return showShortcuts;
     }
-    [[nodiscard]] bool getShowGameSelectorFilterToolbar() const
-    {
-        return showGameSelectorFilterToolbar;
-    }
-    [[nodiscard]] bool getDisplayCardNames() const
+    bool getDisplayCardNames() const
     {
         return displayCardNames;
     }
-    [[nodiscard]] bool getOverrideAllCardArtWithPersonalPreference() const
+    bool getOverrideAllCardArtWithPersonalPreference() const
     {
         return overrideAllCardArtWithPersonalPreference;
     }
-    [[nodiscard]] bool getBumpSetsWithCardsInDeckToTop() const
+    bool getBumpSetsWithCardsInDeckToTop() const
     {
         return bumpSetsWithCardsInDeckToTop;
     }
-    [[nodiscard]] int getPrintingSelectorSortOrder() const
+    int getPrintingSelectorSortOrder() const
     {
         return printingSelectorSortOrder;
     }
-    [[nodiscard]] int getPrintingSelectorCardSize() const
+    int getPrintingSelectorCardSize() const
     {
         return printingSelectorCardSize;
     }
-    [[nodiscard]] bool getIncludeRebalancedCards() const
+    bool getIncludeRebalancedCards() const
     {
         return includeRebalancedCards;
     }
-    [[nodiscard]] bool getPrintingSelectorNavigationButtonsVisible() const
+    bool getPrintingSelectorNavigationButtonsVisible() const
     {
         return printingSelectorNavigationButtonsVisible;
     }
-    [[nodiscard]] bool getDeckEditorBannerCardComboBoxVisible() const
+    bool getDeckEditorBannerCardComboBoxVisible() const
     {
         return deckEditorBannerCardComboBoxVisible;
     }
-    [[nodiscard]] bool getDeckEditorTagsWidgetVisible() const
+    bool getDeckEditorTagsWidgetVisible() const
     {
         return deckEditorTagsWidgetVisible;
     }
-    [[nodiscard]] int getVisualDeckStorageSortingOrder() const
+    int getVisualDeckStorageSortingOrder() const
     {
         return visualDeckStorageSortingOrder;
     }
-    [[nodiscard]] bool getVisualDeckStorageShowFolders() const
+    bool getVisualDeckStorageShowFolders() const
     {
         return visualDeckStorageShowFolders;
     }
-    [[nodiscard]] bool getVisualDeckStorageShowTagFilter() const
+    bool getVisualDeckStorageShowTagFilter() const
     {
         return visualDeckStorageShowTagFilter;
     }
-    [[nodiscard]] QStringList getVisualDeckStorageDefaultTagsList() const
+    QStringList getVisualDeckStorageDefaultTagsList() const
     {
         return visualDeckStorageDefaultTagsList;
     }
-    [[nodiscard]] bool getVisualDeckStorageSearchFolderNames() const
+    bool getVisualDeckStorageSearchFolderNames() const
     {
         return visualDeckStorageSearchFolderNames;
     }
-    [[nodiscard]] bool getVisualDeckStorageShowColorIdentity() const
-    {
-        return visualDeckStorageShowColorIdentity;
-    }
-    [[nodiscard]] bool getVisualDeckStorageShowBannerCardComboBox() const
+    bool getVisualDeckStorageShowBannerCardComboBox() const
     {
         return visualDeckStorageShowBannerCardComboBox;
     }
-    [[nodiscard]] bool getVisualDeckStorageShowTagsOnDeckPreviews() const
+    bool getVisualDeckStorageShowTagsOnDeckPreviews() const
     {
         return visualDeckStorageShowTagsOnDeckPreviews;
     }
-    [[nodiscard]] int getVisualDeckStorageCardSize() const
+    int getVisualDeckStorageCardSize() const
     {
         return visualDeckStorageCardSize;
     }
-    [[nodiscard]] bool getVisualDeckStorageDrawUnusedColorIdentities() const
+    bool getVisualDeckStorageDrawUnusedColorIdentities() const
     {
         return visualDeckStorageDrawUnusedColorIdentities;
     }
-    [[nodiscard]] int getVisualDeckStorageUnusedColorIdentitiesOpacity() const
+    int getVisualDeckStorageUnusedColorIdentitiesOpacity() const
     {
         return visualDeckStorageUnusedColorIdentitiesOpacity;
     }
-    [[nodiscard]] int getVisualDeckStorageTooltipType() const
+    int getVisualDeckStorageTooltipType() const
     {
         return visualDeckStorageTooltipType;
     }
-    [[nodiscard]] bool getVisualDeckStoragePromptForConversion() const
+    bool getVisualDeckStoragePromptForConversion() const
     {
         return visualDeckStoragePromptForConversion;
     }
-    [[nodiscard]] bool getVisualDeckStorageAlwaysConvert() const
+    bool getVisualDeckStorageAlwaysConvert() const
     {
         return visualDeckStorageAlwaysConvert;
     }
-    [[nodiscard]] bool getVisualDeckStorageInGame() const
+    bool getVisualDeckStorageInGame() const
     {
         return visualDeckStorageInGame;
     }
-    [[nodiscard]] bool getVisualDeckStorageSelectionAnimation() const
+    bool getVisualDeckStorageSelectionAnimation() const
     {
         return visualDeckStorageSelectionAnimation;
     }
-    [[nodiscard]] int getVisualDeckEditorCardSize() const
-    {
-        return visualDeckEditorCardSize;
-    }
-    [[nodiscard]] int getVisualDatabaseDisplayCardSize() const
-    {
-        return visualDatabaseDisplayCardSize;
-    }
-    [[nodiscard]] int getEDHRecCardSize() const
-    {
-        return edhrecCardSize;
-    }
-    [[nodiscard]] int getArchidektPreviewSize() const
-    {
-        return archidektPreviewSize;
-    }
-    [[nodiscard]] int getDefaultDeckEditorType() const
+    int getDefaultDeckEditorType() const
     {
         return defaultDeckEditorType;
     }
-    [[nodiscard]] bool getVisualDatabaseDisplayFilterToMostRecentSetsEnabled() const
+    bool getVisualDatabaseDisplayFilterToMostRecentSetsEnabled() const
     {
         return visualDatabaseDisplayFilterToMostRecentSetsEnabled;
     }
-    [[nodiscard]] int getVisualDatabaseDisplayFilterToMostRecentSetsAmount() const
+    int getVisualDatabaseDisplayFilterToMostRecentSetsAmount() const
     {
         return visualDatabaseDisplayFilterToMostRecentSetsAmount;
     }
-    [[nodiscard]] int getVisualDeckEditorSampleHandSize() const
+    int getVisualDeckEditorSampleHandSize() const
     {
         return visualDeckEditorSampleHandSize;
     }
-    [[nodiscard]] bool getHorizontalHand() const
+    bool getHorizontalHand() const
     {
         return horizontalHand;
     }
-    [[nodiscard]] bool getInvertVerticalCoordinate() const
+    bool getInvertVerticalCoordinate() const
     {
         return invertVerticalCoordinate;
     }
-    [[nodiscard]] int getMinPlayersForMultiColumnLayout() const
+    int getMinPlayersForMultiColumnLayout() const
     {
         return minPlayersForMultiColumnLayout;
     }
-    [[nodiscard]] bool getTapAnimation() const
+    bool getTapAnimation() const
     {
         return tapAnimation;
     }
-    [[nodiscard]] bool getAutoRotateSidewaysLayoutCards() const
+    bool getAutoRotateSidewaysLayoutCards() const
     {
         return autoRotateSidewaysLayoutCards;
     }
-    [[nodiscard]] bool getOpenDeckInNewTab() const
+    bool getOpenDeckInNewTab() const
     {
         return openDeckInNewTab;
     }
-    [[nodiscard]] int getRewindBufferingMs() const
+    int getRewindBufferingMs() const
     {
         return rewindBufferingMs;
     }
-    [[nodiscard]] bool getChatMention() const
+    bool getChatMention() const
     {
         return chatMention;
     }
-    [[nodiscard]] bool getChatMentionCompleter() const
+    bool getChatMentionCompleter() const
     {
         return chatMentionCompleter;
     }
-    [[nodiscard]] bool getChatMentionForeground() const
+    bool getChatMentionForeground() const
     {
         return chatMentionForeground;
     }
-    [[nodiscard]] bool getChatHighlightForeground() const
+    bool getChatHighlightForeground() const
     {
         return chatHighlightForeground;
     }
     /**
      * Currently selected index for the `Group by X` QComboBox
      */
-    [[nodiscard]] int getZoneViewGroupByIndex() const
+    int getZoneViewGroupByIndex() const
     {
         return zoneViewGroupByIndex;
     }
     /**
      * Currently selected index for the `Sort by X` QComboBox
      */
-    [[nodiscard]] int getZoneViewSortByIndex() const
+    int getZoneViewSortByIndex() const
     {
         return zoneViewSortByIndex;
     }
@@ -757,148 +715,136 @@ public:
        Returns if the view should be sorted into pile view.
        @return zoneViewPileView if the view should be sorted into pile view.
      */
-    [[nodiscard]] bool getZoneViewPileView() const
+    bool getZoneViewPileView() const
     {
         return zoneViewPileView;
     }
-    [[nodiscard]] bool getSoundEnabled() const
+    bool getSoundEnabled() const
     {
         return soundEnabled;
     }
-    [[nodiscard]] QString getSoundThemeName() const
+    QString getSoundThemeName() const
     {
         return soundThemeName;
     }
-    [[nodiscard]] bool getIgnoreUnregisteredUsers() const
+    bool getIgnoreUnregisteredUsers() const
     {
         return ignoreUnregisteredUsers;
     }
-    [[nodiscard]] bool getIgnoreUnregisteredUserMessages() const
+    bool getIgnoreUnregisteredUserMessages() const
     {
         return ignoreUnregisteredUserMessages;
     }
-    [[nodiscard]] int getPixmapCacheSize() const
+    int getPixmapCacheSize() const
     {
         return pixmapCacheSize;
     }
-    [[nodiscard]] int getNetworkCacheSizeInMB() const
+    int getNetworkCacheSizeInMB() const
     {
         return networkCacheSize;
     }
-    [[nodiscard]] int getRedirectCacheTtl() const
+    int getRedirectCacheTtl() const
     {
         return redirectCacheTtl;
     }
-    [[nodiscard]] bool getScaleCards() const
+    bool getScaleCards() const
     {
         return scaleCards;
     }
-    [[nodiscard]] int getStackCardOverlapPercent() const
+    int getStackCardOverlapPercent() const
     {
         return verticalCardOverlapPercent;
     }
-    [[nodiscard]] bool getShowMessagePopup() const
+    bool getShowMessagePopup() const
     {
         return showMessagePopups;
     }
-    [[nodiscard]] bool getShowMentionPopup() const
+    bool getShowMentionPopup() const
     {
         return showMentionPopups;
     }
-    [[nodiscard]] bool getRoomHistory() const
+    bool getRoomHistory() const
     {
         return roomHistory;
     }
-    [[nodiscard]] bool getLeftJustified() const
+    bool getLeftJustified() const
     {
         return leftJustified;
     }
-    [[nodiscard]] int getMasterVolume() const
+    int getMasterVolume() const
     {
         return masterVolume;
     }
-    [[nodiscard]] int getCardInfoViewMode() const
+    int getCardInfoViewMode() const
     {
         return cardInfoViewMode;
     }
-    [[nodiscard]] QStringList getCountries() const;
-    [[nodiscard]] QString getHighlightWords() const
+    QStringList getCountries() const;
+    QString getHighlightWords() const
     {
         return highlightWords;
     }
-    [[nodiscard]] QString getGameDescription() const
+    QString getGameDescription() const
     {
         return gameDescription;
     }
-    [[nodiscard]] int getMaxPlayers() const
+    int getMaxPlayers() const
     {
         return maxPlayers;
     }
-    [[nodiscard]] QString getGameTypes() const
+    QString getGameTypes() const
     {
         return gameTypes;
     }
-    [[nodiscard]] bool getOnlyBuddies() const
+    bool getOnlyBuddies() const
     {
         return onlyBuddies;
     }
-    [[nodiscard]] bool getOnlyRegistered() const
+    bool getOnlyRegistered() const
     {
         return onlyRegistered;
     }
-    [[nodiscard]] bool getSpectatorsAllowed() const
+    bool getSpectatorsAllowed() const
     {
         return spectatorsAllowed;
     }
-    [[nodiscard]] bool getSpectatorsNeedPassword() const
+    bool getSpectatorsNeedPassword() const
     {
         return spectatorsNeedPassword;
     }
-    [[nodiscard]] bool getSpectatorsCanTalk() const
+    bool getSpectatorsCanTalk() const
     {
         return spectatorsCanTalk;
     }
-    [[nodiscard]] bool getSpectatorsCanSeeEverything() const
+    bool getSpectatorsCanSeeEverything() const
     {
         return spectatorsCanSeeEverything;
     }
-    [[nodiscard]] int getDefaultStartingLifeTotal() const
+    int getDefaultStartingLifeTotal() const
     {
         return defaultStartingLifeTotal;
     }
-    [[nodiscard]] bool getShareDecklistsOnLoad() const
+    bool getShareDecklistsOnLoad() const
     {
         return shareDecklistsOnLoad;
     }
-    [[nodiscard]] bool getCreateGameAsSpectator() const
+    bool getCreateGameAsSpectator() const
     {
         return createGameAsSpectator;
     }
-    [[nodiscard]] bool getRememberGameSettings() const
+    bool getRememberGameSettings() const
     {
         return rememberGameSettings;
     }
-    [[nodiscard]] bool getLocalGameRememberSettings() const
-    {
-        return localGameRememberSettings;
-    }
-    [[nodiscard]] int getLocalGameMaxPlayers() const
-    {
-        return localGameMaxPlayers;
-    }
-    [[nodiscard]] int getLocalGameStartingLifeTotal() const
-    {
-        return localGameStartingLifeTotal;
-    }
-    [[nodiscard]] int getKeepAlive() const override
+    int getKeepAlive() const override
     {
         return keepalive;
     }
-    [[nodiscard]] int getTimeOut() const override
+    int getTimeOut() const override
     {
         return timeout;
     }
-    [[nodiscard]] int getMaxFontSize() const
+    int getMaxFontSize() const
     {
         return maxFontSize;
     }
@@ -926,73 +872,73 @@ public:
     {
         return useTearOffMenus;
     }
-    [[nodiscard]] int getCardViewInitialRowsMax() const
+    int getCardViewInitialRowsMax() const
     {
         return cardViewInitialRowsMax;
     }
-    [[nodiscard]] int getCardViewExpandedRowsMax() const
+    int getCardViewExpandedRowsMax() const
     {
         return cardViewExpandedRowsMax;
     }
-    [[nodiscard]] bool getCloseEmptyCardView() const
+    bool getCloseEmptyCardView() const
     {
         return closeEmptyCardView;
     }
-    [[nodiscard]] bool getFocusCardViewSearchBar() const
+    bool getFocusCardViewSearchBar() const
     {
         return focusCardViewSearchBar;
     }
-    [[nodiscard]] ShortcutsSettings &shortcuts() const
+    ShortcutsSettings &shortcuts() const
     {
         return *shortcutsSettings;
     }
-    [[nodiscard]] CardDatabaseSettings *cardDatabase() const
+    CardDatabaseSettings *cardDatabase() const
     {
         return cardDatabaseSettings;
     }
-    [[nodiscard]] ServersSettings &servers() const
+    ServersSettings &servers() const
     {
         return *serversSettings;
     }
-    [[nodiscard]] MessageSettings &messages() const
+    MessageSettings &messages() const
     {
         return *messageSettings;
     }
-    [[nodiscard]] GameFiltersSettings &gameFilters() const
+    GameFiltersSettings &gameFilters() const
     {
         return *gameFiltersSettings;
     }
-    [[nodiscard]] LayoutsSettings &layouts() const
+    LayoutsSettings &layouts() const
     {
         return *layoutsSettings;
     }
-    [[nodiscard]] DownloadSettings &downloads() const
+    DownloadSettings &downloads() const
     {
         return *downloadSettings;
     }
-    [[nodiscard]] RecentsSettings &recents() const
+    RecentsSettings &recents() const
     {
         return *recentsSettings;
     }
-    [[nodiscard]] CardOverrideSettings &cardOverrides() const
+    CardOverrideSettings &cardOverrides() const
     {
         return *cardOverrideSettings;
     }
-    [[nodiscard]] DebugSettings &debug() const
+    DebugSettings &debug() const
     {
         return *debugSettings;
     }
-    [[nodiscard]] CardCounterSettings &cardCounters() const;
+    CardCounterSettings &cardCounters() const;
 
-    [[nodiscard]] bool getIsPortableBuild() const
+    bool getIsPortableBuild() const
     {
         return isPortableBuild;
     }
-    [[nodiscard]] bool getDownloadSpoilersStatus() const
+    bool getDownloadSpoilersStatus() const
     {
         return mbDownloadSpoilers;
     }
-    [[nodiscard]] bool getRoundCardCorners() const
+    bool getRoundCardCorners() const
     {
         return roundCardCorners;
     }
@@ -1003,6 +949,9 @@ public:
 public slots:
     void setDownloadSpoilerStatus(bool _spoilerStatus);
 
+    void setMainWindowGeometry(const QByteArray &_mainWindowGeometry);
+    void setTokenDialogGeometry(const QByteArray &_tokenDialog);
+    void setSetsDialogGeometry(const QByteArray &_setsDialog);
     void setLang(const QString &_lang);
     void setShowTipsOnStartup(bool _showTipsOnStartup);
     void setSeenTips(const QList<int> &_seenTips);
@@ -1018,7 +967,6 @@ public slots:
     void setThemeName(const QString &_themeName);
     void setHomeTabBackgroundSource(const QString &_backgroundSource);
     void setHomeTabBackgroundShuffleFrequency(int _frequency);
-    void setHomeTabDisplayCardName(QT_STATE_CHANGED_T _displayCardName);
     void setTabVisualDeckStorageOpen(bool value);
     void setTabServerOpen(bool value);
     void setTabAccountOpen(bool value);
@@ -1036,11 +984,10 @@ public slots:
     void setDoubleClickToPlay(QT_STATE_CHANGED_T _doubleClickToPlay);
     void setClickPlaysAllSelected(QT_STATE_CHANGED_T _clickPlaysAllSelected);
     void setPlayToStack(QT_STATE_CHANGED_T _playToStack);
-    void setDoNotDeleteArrowsInSubPhases(QT_STATE_CHANGED_T _doNotDeleteArrowsInSubPhases);
     void setStartingHandSize(int _startingHandSize);
     void setAnnotateTokens(QT_STATE_CHANGED_T _annotateTokens);
+    void setTabGameSplitterSizes(const QByteArray &_tabGameSplitterSizes);
     void setShowShortcuts(QT_STATE_CHANGED_T _showShortcuts);
-    void setShowGameSelectorFilterToolbar(QT_STATE_CHANGED_T _showGameSelectorFilterToolbar);
     void setDisplayCardNames(QT_STATE_CHANGED_T _displayCardNames);
     void setOverrideAllCardArtWithPersonalPreference(QT_STATE_CHANGED_T _overrideAllCardArt);
     void setBumpSetsWithCardsInDeckToTop(QT_STATE_CHANGED_T _bumpSetsWithCardsInDeckToTop);
@@ -1055,7 +1002,6 @@ public slots:
     void setVisualDeckStorageShowTagFilter(QT_STATE_CHANGED_T _showTags);
     void setVisualDeckStorageDefaultTagsList(QStringList _defaultTagsList);
     void setVisualDeckStorageSearchFolderNames(QT_STATE_CHANGED_T value);
-    void setVisualDeckStorageShowColorIdentity(QT_STATE_CHANGED_T value);
     void setVisualDeckStorageShowBannerCardComboBox(QT_STATE_CHANGED_T _showBannerCardComboBox);
     void setVisualDeckStorageShowTagsOnDeckPreviews(QT_STATE_CHANGED_T _showTags);
     void setVisualDeckStorageCardSize(int _visualDeckStorageCardSize);
@@ -1066,10 +1012,6 @@ public slots:
     void setVisualDeckStorageAlwaysConvert(bool _visualDeckStorageAlwaysConvert);
     void setVisualDeckStorageInGame(QT_STATE_CHANGED_T value);
     void setVisualDeckStorageSelectionAnimation(QT_STATE_CHANGED_T value);
-    void setVisualDeckEditorCardSize(int _visualDeckEditorCardSize);
-    void setVisualDatabaseDisplayCardSize(int _visualDatabaseDisplayCardSize);
-    void setEDHRecCardSize(int _EDHRecCardSize);
-    void setArchidektPreviewCardSize(int _archidektPreviewCardSize);
     void setDefaultDeckEditorType(int value);
     void setVisualDatabaseDisplayFilterToMostRecentSetsEnabled(QT_STATE_CHANGED_T _enabled);
     void setVisualDatabaseDisplayFilterToMostRecentSetsAmount(int _amount);
@@ -1117,9 +1059,6 @@ public slots:
     void setDefaultStartingLifeTotal(const int _defaultStartingLifeTotal);
     void setShareDecklistsOnLoad(const bool _shareDecklistsOnLoad);
     void setRememberGameSettings(const bool _rememberGameSettings);
-    void setLocalGameRememberSettings(bool value);
-    void setLocalGameMaxPlayers(int value);
-    void setLocalGameStartingLifeTotal(int value);
     void setCheckUpdatesOnStartup(QT_STATE_CHANGED_T value);
     void setStartupCardUpdateCheckPromptForUpdate(bool value);
     void setStartupCardUpdateCheckAlwaysUpdate(bool value);
@@ -1130,7 +1069,6 @@ public slots:
     void setUpdateReleaseChannelIndex(int value);
     void setMaxFontSize(int _max);
     void setRoundCardCorners(bool _roundCardCorners);
-    void setShowDragSelectionCount(QT_STATE_CHANGED_T _showDragSelectionCount);
-    void setShowTotalSelectionCount(QT_STATE_CHANGED_T _showTotalSelectionCount);
 };
+
 #endif

cockatrice/src/client/settings/card_counter_settings.cpp

@@ -11,8 +11,6 @@ CardCounterSettings::CardCounterSettings(const QString &settingsPath, QObject *p
 
 void CardCounterSettings::setColor(int counterId, const QColor &color)
 {
-    QSettings settings = getSettings();
-
     QString key = QString("cards/counters/%1/color").arg(counterId);
 
     if (settings.value(key).value<QColor>() == color)
@@ -38,7 +36,7 @@ QColor CardCounterSettings::color(int counterId) const
         defaultColor = QColor::fromHsv(h, s, v);
     }
 
-    return getSettings().value(QString("cards/counters/%1/color").arg(counterId), defaultColor).value<QColor>();
+    return settings.value(QString("cards/counters/%1/color").arg(counterId), defaultColor).value<QColor>();
 }
 
 QString CardCounterSettings::displayName(int counterId) const

cockatrice/src/client/settings/card_counter_settings.h

@@ -7,6 +7,7 @@
 #ifndef CARD_COUNTER_SETTINGS_H
 #define CARD_COUNTER_SETTINGS_H
 
+#include <QObject>
 #include <libcockatrice/settings/settings_manager.h>
 
 class QSettings;
@@ -19,9 +20,9 @@ class CardCounterSettings : public SettingsManager
 public:
     CardCounterSettings(const QString &settingsPath, QObject *parent = nullptr);
 
-    [[nodiscard]] QColor color(int counterId) const;
+    QColor color(int counterId) const;
 
-    [[nodiscard]] QString displayName(int counterId) const;
+    QString displayName(int counterId) const;
 
 public slots:
     void setColor(int counterId, const QColor &color);

cockatrice/src/client/settings/shortcut_treeview.cpp

@@ -150,7 +150,12 @@ void ShortcutTreeView::currentChanged(const QModelIndex &current, const QModelIn
  */
 void ShortcutTreeView::updateSearchString(const QString &searchString)
 {
-    QStringList searchWords = searchString.split(" ", Qt::SkipEmptyParts);
+#if QT_VERSION > QT_VERSION_CHECK(5, 14, 0)
+    const auto skipEmptyParts = Qt::SkipEmptyParts;
+#else
+    const auto skipEmptyParts = QString::SkipEmptyParts;
+#endif
+    QStringList searchWords = searchString.split(" ", skipEmptyParts);
 
     auto escapeRegex = [](const QString &s) { return QRegularExpression::escape(s); };
     std::transform(searchWords.begin(), searchWords.end(), searchWords.begin(), escapeRegex);

cockatrice/src/client/settings/shortcut_treeview.h

@@ -7,6 +7,7 @@
 #ifndef SHORTCUT_TREEVIEW_H
 #define SHORTCUT_TREEVIEW_H
 
+#include <QModelIndex>
 #include <QSortFilterProxyModel>
 #include <QStandardItemModel>
 #include <QTreeView>
@@ -21,7 +22,7 @@ public:
     explicit ShortcutFilterProxyModel(QObject *parent = nullptr);
 
 protected:
-    [[nodiscard]] bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
+    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
 };
 
 class ShortcutTreeView : public QTreeView

cockatrice/src/client/settings/shortcuts_settings.h

@@ -99,15 +99,15 @@ public:
     void setSequence(const QList &_sequence)
     {
         QList::operator=(_sequence);
-    }
-    [[nodiscard]] QString getName() const
+    };
+    QString getName() const
     {
         return QApplication::translate("shortcutsTab", name.toUtf8().data());
-    }
-    [[nodiscard]] QString getGroupName() const
+    };
+    QString getGroupName() const
     {
         return ShortcutGroup::getGroupName(group);
-    }
+    };
 
 private:
     QString name;
@@ -120,24 +120,24 @@ class ShortcutsSettings : public QObject
 public:
     explicit ShortcutsSettings(const QString &settingsFilePath, QObject *parent = nullptr);
 
-    [[nodiscard]] ShortcutKey getDefaultShortcut(const QString &name) const;
-    [[nodiscard]] ShortcutKey getShortcut(const QString &name) const;
-    [[nodiscard]] QKeySequence getSingleShortcut(const QString &name) const;
-    [[nodiscard]] QString getDefaultShortcutString(const QString &name) const;
-    [[nodiscard]] QString getShortcutString(const QString &name) const;
-    [[nodiscard]] QString getShortcutFriendlyName(const QString &shortcutName) const;
-    [[nodiscard]] QList<QString> getAllShortcutKeys() const
+    ShortcutKey getDefaultShortcut(const QString &name) const;
+    ShortcutKey getShortcut(const QString &name) const;
+    QKeySequence getSingleShortcut(const QString &name) const;
+    QString getDefaultShortcutString(const QString &name) const;
+    QString getShortcutString(const QString &name) const;
+    QString getShortcutFriendlyName(const QString &shortcutName) const;
+    QList<QString> getAllShortcutKeys() const
     {
         return shortCuts.keys();
-    }
+    };
 
     void setShortcuts(const QString &name, const QList<QKeySequence> &Sequence);
     void setShortcuts(const QString &name, const QKeySequence &Sequence);
     void setShortcuts(const QString &name, const QString &sequences);
 
-    [[nodiscard]] bool isKeyAllowed(const QString &name, const QString &sequences) const;
-    [[nodiscard]] bool isValid(const QString &name, const QString &sequences) const;
-    [[nodiscard]] QStringList findOverlaps(const QString &name, const QString &sequences) const;
+    bool isKeyAllowed(const QString &name, const QString &sequences) const;
+    bool isValid(const QString &name, const QString &sequences) const;
+    QStringList findOverlaps(const QString &name, const QString &sequences) const;
 
     void resetAllShortcuts();
     void clearAllShortcuts();
@@ -152,8 +152,8 @@ private:
     QString settingsFilePath;
     QHash<QString, ShortcutKey> shortCuts;
 
-    [[nodiscard]] QString stringifySequence(const QList<QKeySequence> &Sequence) const;
-    [[nodiscard]] QList<QKeySequence> parseSequenceString(const QString &stringSequence) const;
+    QString stringifySequence(const QList<QKeySequence> &Sequence) const;
+    QList<QKeySequence> parseSequenceString(const QString &stringSequence) const;
 
     const QHash<QString, ShortcutKey> defaultShortCuts = {
         {"MainWindow/aCheckCardUpdates", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Check for Card Updates..."),
@@ -501,7 +501,7 @@ private:
         {"Player/aUntapAll", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Untap All"),
                                          parseSequenceString("Ctrl+U"),
                                          ShortcutGroup::Playing_Area)},
-        {"Player/aDoesntUntap", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Toggle Skip Untapping"),
+        {"Player/aDoesntUntap", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Toggle Untap"),
                                             parseSequenceString("Alt+U"),
                                             ShortcutGroup::Playing_Area)},
         {"Player/aFlip", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Turn Card Over"),
@@ -513,9 +513,6 @@ private:
         {"Player/aPlay", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Play Card"),
                                      parseSequenceString(""),
                                      ShortcutGroup::Playing_Area)},
-        {"Player/aPlayFacedown", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Play Card, Face Down"),
-                                             parseSequenceString(""),
-                                             ShortcutGroup::Playing_Area)},
         {"Player/aAttach", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Attach Card..."),
                                        parseSequenceString("Ctrl+Alt+A"),
                                        ShortcutGroup::Playing_Area)},
@@ -563,9 +560,12 @@ private:
         {"Player/aMoveToTopLibrary", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Top of Library"),
                                                  parseSequenceString(""),
                                                  ShortcutGroup::Move_selected)},
-        {"Player/aMoveToTable", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Battlefield"),
-                                            parseSequenceString(""),
-                                            ShortcutGroup::Move_selected)},
+        {"Player/aPlayFacedown", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Battlefield, Face Down"),
+                                             parseSequenceString(""),
+                                             ShortcutGroup::Move_selected)},
+        {"Player/aPlay", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Battlefield"),
+                                     parseSequenceString(""),
+                                     ShortcutGroup::Move_selected)},
         {"Player/aViewHand",
          ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Hand"), parseSequenceString(""), ShortcutGroup::View)},
         {"Player/aViewGraveyard",
@@ -598,19 +598,11 @@ private:
         {"Player/aMoveTopCardsToGraveyard", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Graveyard (Multiple)"),
                                                         parseSequenceString("Alt+M"),
                                                         ShortcutGroup::Move_top)},
-        {"Player/aMoveTopCardsToGraveyardFaceDown",
-         ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Graveyard (Multiple), Face Down"),
-                     parseSequenceString(""),
-                     ShortcutGroup::Move_top)},
         {"Player/aMoveTopCardToExile",
          ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Exile"), parseSequenceString(""), ShortcutGroup::Move_top)},
         {"Player/aMoveTopCardsToExile", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Exile (Multiple)"),
                                                     parseSequenceString(""),
                                                     ShortcutGroup::Move_top)},
-        {"Player/aMoveTopCardsToExileFaceDown",
-         ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Exile (Multiple), Face Down"),
-                     parseSequenceString(""),
-                     ShortcutGroup::Move_top)},
         {"Player/aMoveTopCardsUntil", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Stack Until Found"),
                                                   parseSequenceString("Ctrl+Shift+Y"),
                                                   ShortcutGroup::Move_top)},
@@ -628,19 +620,11 @@ private:
         {"Player/aMoveBottomCardsToGrave", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Graveyard (Multiple)"),
                                                        parseSequenceString(""),
                                                        ShortcutGroup::Move_bottom)},
-        {"Player/aMoveBottomCardsToGraveFaceDown",
-         ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Graveyard (Multiple), Face Down"),
-                     parseSequenceString(""),
-                     ShortcutGroup::Move_bottom)},
         {"Player/aMoveBottomCardToExile",
          ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Exile"), parseSequenceString(""), ShortcutGroup::Move_bottom)},
         {"Player/aMoveBottomCardsToExile", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Exile (Multiple)"),
                                                        parseSequenceString(""),
                                                        ShortcutGroup::Move_bottom)},
-        {"Player/aMoveBottomCardsToExileFaceDown",
-         ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Exile (Multiple), Face Down"),
-                     parseSequenceString(""),
-                     ShortcutGroup::Move_bottom)},
         {"Player/aMoveBottomCardToTop", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Top of Library"),
                                                     parseSequenceString(""),
                                                     ShortcutGroup::Move_bottom)},
@@ -676,12 +660,6 @@ private:
         {"Player/aMulligan", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Mulligan"),
                                          parseSequenceString("Ctrl+M"),
                                          ShortcutGroup::Drawing)},
-        {"Player/aMulliganSame", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Mulligan (Same hand size)"),
-                                             parseSequenceString("Ctrl+Shift+M"),
-                                             ShortcutGroup::Drawing)},
-        {"Player/aMulliganMinusOne", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Mulligan (Hand size - 1)"),
-                                                 parseSequenceString("Ctrl+Shift+Alt+M"),
-                                                 ShortcutGroup::Drawing)},
         {"Player/aDrawCard", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Draw a Card"),
                                          parseSequenceString("Ctrl+D"),
                                          ShortcutGroup::Drawing)},

cockatrice/src/database/interface/settings_card_preference_provider.h

@@ -7,15 +7,15 @@
 class SettingsCardPreferenceProvider : public ICardPreferenceProvider
 {
 public:
-    [[nodiscard]] QString getCardPreferenceOverride(const QString &cardName) const override
+    QString getCardPreferenceOverride(const QString &cardName) const override
     {
         return SettingsCache::instance().cardOverrides().getCardPreferenceOverride(cardName);
     }
 
-    [[nodiscard]] bool getIncludeRebalancedCards() const override
+    bool getIncludeRebalancedCards() const override
     {
         return SettingsCache::instance().getIncludeRebalancedCards();
-    }
+    };
 };
 
 #endif // COCKATRICE_SETTINGS_CARD_PREFERENCE_PROVIDER_H

cockatrice/src/filters/deck_filter_string.cpp

@@ -1,6 +1,5 @@
 #include "deck_filter_string.h"
 
-#include <QFileInfo>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/filters/filter_string.h>
 #include <libcockatrice/utility/peglib.h>
@@ -13,7 +12,7 @@ QueryPartList <- ComplexQueryPart ( ws ("AND" ws)? ComplexQueryPart)* ws*
 ComplexQueryPart <- SomewhatComplexQueryPart ws "OR" ws ComplexQueryPart / SomewhatComplexQueryPart
 SomewhatComplexQueryPart <- [(] QueryPartList [)] / QueryPart
 
-QueryPart <- NotQuery / DeckContentQuery / DeckNameQuery / FileNameQuery / PathQuery / FormatQuery / CommentQuery / GenericQuery
+QueryPart <- NotQuery / DeckContentQuery / DeckNameQuery / FileNameQuery / PathQuery / GenericQuery
 
 NotQuery <- ('NOT' ws/'-') SomewhatComplexQueryPart
 
@@ -22,16 +21,14 @@ CardSearch <- '[[' CardFilterString ']]'
 CardFilterString <- (!']]'.)*
 
 DeckNameQuery <- ([Dd] 'eck')? [Nn] 'ame'? [:] String
-FileNameQuery <- [Ff] ([Nn] / 'ile' ([Nn] 'ame')?) [:] String
+FileNameQuery <- [Ff] ('ile' 'name'?)? [:] String
 PathQuery <- [Pp] 'ath'? [:] String
-FormatQuery <- [Ff] 'ormat'? [:] String
-CommentQuery <- [Cc] ('omment' 's'?)? [:] String
 
 GenericQuery <- String
 
 NonDoubleQuoteUnlessEscaped <- '\\\"'. / !["].
 NonSingleQuoteUnlessEscaped <- "\\\'". / !['].
-UnescapedStringListPart <- !['":<>()=! ].
+UnescapedStringListPart <- !['":<>=! ].
 SingleApostropheString <- (UnescapedStringListPart+ ws*)* ['] (UnescapedStringListPart+ ws*)*
 
 String <- SingleApostropheString / UnescapedStringListPart+ / ["] <NonDoubleQuoteUnlessEscaped*> ["] / ['] <NonSingleQuoteUnlessEscaped*> [']
@@ -120,13 +117,12 @@ static void setupParserRules()
 
         return [=](const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &) -> bool {
             int count = 0;
-            auto cardNodes = deck->deckLoader->getDeck().deckList.getCardNodes();
-            for (auto node : cardNodes) {
+            deck->deckLoader->getDeckList()->forEachCard([&](InnerDecklistNode *, const DecklistCardNode *node) {
                 auto cardInfoPtr = CardDatabaseManager::query()->getCardInfo(node->getName());
                 if (!cardInfoPtr.isNull() && cardFilter.check(cardInfoPtr)) {
                     count += node->getNumber();
                 }
-            }
+            });
             return numberMatcher(count);
         };
     };
@@ -140,7 +136,7 @@ static void setupParserRules()
     search["DeckNameQuery"] = [](const peg::SemanticValues &sv) -> DeckFilter {
         auto name = std::any_cast<QString>(sv[0]);
         return [=](const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &) {
-            return deck->deckLoader->getDeck().deckList.getName().contains(name, Qt::CaseInsensitive);
+            return deck->deckLoader->getDeckList()->getName().contains(name, Qt::CaseInsensitive);
         };
     };
 
@@ -159,22 +155,6 @@ static void setupParserRules()
         };
     };
 
-    search["FormatQuery"] = [](const peg::SemanticValues &sv) -> DeckFilter {
-        auto format = std::any_cast<QString>(sv[0]);
-        return [=](const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &) {
-            auto gameFormat = deck->deckLoader->getDeck().deckList.getGameFormat();
-            return QString::compare(format, gameFormat, Qt::CaseInsensitive) == 0;
-        };
-    };
-
-    search["CommentQuery"] = [](const peg::SemanticValues &sv) -> DeckFilter {
-        auto value = std::any_cast<QString>(sv[0]);
-        return [=](const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &) {
-            auto comments = deck->deckLoader->getDeck().deckList.getComments();
-            return comments.contains(value, Qt::CaseInsensitive);
-        };
-    };
-
     search["GenericQuery"] = [](const peg::SemanticValues &sv) -> DeckFilter {
         auto name = std::any_cast<QString>(sv[0]);
         return [=](const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &) {

cockatrice/src/filters/deck_filter_string.h

@@ -10,8 +10,10 @@
 #include "../interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h"
 
 #include <QLoggingCategory>
+#include <QMap>
 #include <QString>
 #include <functional>
+#include <utility>
 
 inline Q_LOGGING_CATEGORY(DeckFilterStringLog, "deck_filter_string");
 
@@ -38,7 +40,7 @@ public:
         return filter(deck, info);
     }
 
-    [[nodiscard]] bool valid() const
+    bool valid() const
     {
         return _error.isEmpty();
     }

cockatrice/src/filters/filter_tree_model.h

@@ -24,8 +24,8 @@ public slots:
     void addFilter(const CardFilter *f);
     void removeFilter(const CardFilter *f);
     void clearFiltersOfType(CardFilter::Attr filterType);
-    [[nodiscard]] QList<const CardFilter *> getFiltersOfType(CardFilter::Attr filterType) const;
-    [[nodiscard]] QList<const CardFilter *> allFilters() const;
+    QList<const CardFilter *> getFiltersOfType(CardFilter::Attr filterType) const;
+    QList<const CardFilter *> allFilters() const;
 
 private slots:
     void proxyBeginInsertRow(const FilterTreeNode *, int);
@@ -34,23 +34,23 @@ private slots:
     void proxyEndRemoveRow(const FilterTreeNode *, int);
 
 private:
-    [[nodiscard]] FilterTreeNode *indexToNode(const QModelIndex &idx) const;
+    FilterTreeNode *indexToNode(const QModelIndex &idx) const;
     QModelIndex nodeIndex(const FilterTreeNode *node, int row, int column) const;
 
 public:
     FilterTreeModel(QObject *parent = nullptr);
     ~FilterTreeModel() override;
-    [[nodiscard]] FilterTree *filterTree() const
+    FilterTree *filterTree() const
     {
         return fTree;
     }
-    [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-    [[nodiscard]] int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const override;
-    [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
     bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
-    [[nodiscard]] Qt::ItemFlags flags(const QModelIndex &index) const override;
-    [[nodiscard]] QModelIndex parent(const QModelIndex &ind) const override;
-    [[nodiscard]] QModelIndex index(int row, int column, const QModelIndex &parent) const override;
+    Qt::ItemFlags flags(const QModelIndex &index) const override;
+    QModelIndex parent(const QModelIndex &ind) const override;
+    QModelIndex index(int row, int column, const QModelIndex &parent) const override;
     bool removeRows(int row, int count, const QModelIndex &parent) override;
     void clear();
 };

cockatrice/src/game/abstract_game.cpp

@@ -1,9 +1,8 @@
 #include "abstract_game.h"
 
-#include "../interface/widgets/tabs/tab_game.h"
 #include "player/player.h"
 
-AbstractGame::AbstractGame(TabGame *_tab) : QObject(_tab), tab(_tab)
+AbstractGame::AbstractGame(TabGame *_tab) : tab(_tab)
 {
     gameMetaInfo = new GameMetaInfo(this);
     gameEventHandler = new GameEventHandler(this);

cockatrice/src/game/board/abstract_card_drag_item.cpp

@@ -1,13 +1,14 @@
 #include "abstract_card_drag_item.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../z_values.h"
 
 #include <QCursor>
 #include <QDebug>
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
 
+static const float CARD_WIDTH_HALF = CARD_WIDTH / 2;
+static const float CARD_HEIGHT_HALF = CARD_HEIGHT / 2;
 const QColor GHOST_MASK = QColor(255, 255, 255, 50);
 
 AbstractCardDragItem::AbstractCardDragItem(AbstractCardItem *_item,
@@ -17,19 +18,19 @@ AbstractCardDragItem::AbstractCardDragItem(AbstractCardItem *_item,
 {
     if (parentDrag) {
         parentDrag->addChildDrag(this);
-        setZValue(ZValues::childDragZValue(hotSpot.x(), hotSpot.y()));
+        setZValue(2000000007 + hotSpot.x() * 1000000 + hotSpot.y() * 1000 + 1000);
         connect(parentDrag, &QObject::destroyed, this, &AbstractCardDragItem::deleteLater);
     } else {
-        hotSpot = QPointF{qBound(0.0, hotSpot.x(), CardDimensions::WIDTH_F - 1),
-                          qBound(0.0, hotSpot.y(), CardDimensions::HEIGHT_F - 1)};
+        hotSpot = QPointF{qBound(0.0, hotSpot.x(), static_cast<qreal>(CARD_WIDTH - 1)),
+                          qBound(0.0, hotSpot.y(), static_cast<qreal>(CARD_HEIGHT - 1))};
         setCursor(Qt::ClosedHandCursor);
-        setZValue(ZValues::DRAG_ITEM);
+        setZValue(2000000007);
     }
     if (item->getTapped())
         setTransform(QTransform()
-                         .translate(CardDimensions::WIDTH_HALF_F, CardDimensions::HEIGHT_HALF_F)
+                         .translate(CARD_WIDTH_HALF, CARD_HEIGHT_HALF)
                          .rotate(90)
-                         .translate(-CardDimensions::WIDTH_HALF_F, -CardDimensions::HEIGHT_HALF_F));
+                         .translate(-CARD_WIDTH_HALF, -CARD_HEIGHT_HALF));
 
     setCacheMode(DeviceCoordinateCache);
 
@@ -46,7 +47,7 @@ AbstractCardDragItem::AbstractCardDragItem(AbstractCardItem *_item,
 QPainterPath AbstractCardDragItem::shape() const
 {
     QPainterPath shape;
-    qreal cardCornerRadius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * CardDimensions::WIDTH_F : 0.0;
+    qreal cardCornerRadius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * CARD_WIDTH : 0.0;
     shape.addRoundedRect(boundingRect(), cardCornerRadius, cardCornerRadius);
     return shape;
 }

cockatrice/src/game/board/abstract_card_drag_item.h

@@ -34,7 +34,7 @@ public:
     AbstractCardDragItem(AbstractCardItem *_item, const QPointF &_hotSpot, AbstractCardDragItem *parentDrag = 0);
     [[nodiscard]] QRectF boundingRect() const override
     {
-        return QRectF(0, 0, CardDimensions::WIDTH_F, CardDimensions::HEIGHT_F);
+        return QRectF(0, 0, CARD_WIDTH, CARD_HEIGHT);
     }
     [[nodiscard]] QPainterPath shape() const override;
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;

cockatrice/src/game/board/abstract_card_item.cpp

@@ -3,7 +3,6 @@
 #include "../../client/settings/cache_settings.h"
 #include "../../interface/card_picture_loader/card_picture_loader.h"
 #include "../game_scene.h"
-#include "../z_values.h"
 
 #include <QCursor>
 #include <QGraphicsScene>
@@ -39,13 +38,13 @@ AbstractCardItem::~AbstractCardItem()
 
 QRectF AbstractCardItem::boundingRect() const
 {
-    return QRectF(0, 0, CardDimensions::WIDTH_F, CardDimensions::HEIGHT_F);
+    return QRectF(0, 0, CARD_WIDTH, CARD_HEIGHT);
 }
 
 QPainterPath AbstractCardItem::shape() const
 {
     QPainterPath shape;
-    qreal cardCornerRadius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * CardDimensions::WIDTH_F : 0.0;
+    qreal cardCornerRadius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * CARD_WIDTH : 0.0;
     shape.addRoundedRect(boundingRect(), cardCornerRadius, cardCornerRadius);
     return shape;
 }
@@ -61,8 +60,7 @@ void AbstractCardItem::refreshCardInfo()
     exactCard = CardDatabaseManager::query()->getCard(cardRef);
 
     if (!exactCard && !cardRef.name.isEmpty()) {
-        CardInfo::UiAttributes attributes = {.tableRow = -1};
-        auto info = CardInfo::newInstance(cardRef.name, "", true, {}, {}, {}, {}, attributes);
+        auto info = CardInfo::newInstance(cardRef.name, "", true, {}, {}, {}, {}, false, false, -1, false);
         exactCard = ExactCard(info);
     }
     if (exactCard) {
@@ -216,9 +214,9 @@ void AbstractCardItem::setHovered(bool _hovered)
     if (_hovered)
         processHoverEvent();
     isHovered = _hovered;
-    setZValue(_hovered ? ZValues::HOVERED_CARD : realZValue);
+    setZValue(_hovered ? 2000000004 : realZValue);
     setScale(_hovered && SettingsCache::instance().getScaleCards() ? 1.1 : 1);
-    setTransformOriginPoint(_hovered ? CardDimensions::WIDTH_HALF_F : 0, _hovered ? CardDimensions::HEIGHT_HALF_F : 0);
+    setTransformOriginPoint(_hovered ? CARD_WIDTH / 2 : 0, _hovered ? CARD_HEIGHT / 2 : 0);
     update();
 }
 
@@ -274,9 +272,9 @@ void AbstractCardItem::setTapped(bool _tapped, bool canAnimate)
     else {
         tapAngle = tapped ? 90 : 0;
         setTransform(QTransform()
-                         .translate(CardDimensions::WIDTH_HALF_F, CardDimensions::HEIGHT_HALF_F)
+                         .translate((float)CARD_WIDTH / 2, (float)CARD_HEIGHT / 2)
                          .rotate(tapAngle)
-                         .translate(-CardDimensions::WIDTH_HALF_F, -CardDimensions::HEIGHT_HALF_F));
+                         .translate((float)-CARD_WIDTH / 2, (float)-CARD_HEIGHT / 2));
         update();
     }
 }

cockatrice/src/game/board/abstract_card_item.h

@@ -7,15 +7,17 @@
 #ifndef ABSTRACTCARDITEM_H
 #define ABSTRACTCARDITEM_H
 
-#include "../../game_graphics/board/graphics_item_type.h"
-#include "../card_dimensions.h"
 #include "arrow_target.h"
+#include "graphics_item_type.h"
 
 #include <libcockatrice/card/printing/exact_card.h>
 #include <libcockatrice/utility/card_ref.h>
 
 class Player;
 
+const int CARD_WIDTH = 72;
+const int CARD_HEIGHT = 102;
+
 class AbstractCardItem : public ArrowTarget
 {
     Q_OBJECT

cockatrice/src/game/board/abstract_counter.cpp

@@ -3,14 +3,15 @@
 #include "../../client/settings/cache_settings.h"
 #include "../../interface/widgets/tabs/tab_game.h"
 #include "../player/player.h"
-#include "../player/player_actions.h"
 #include "translate_counter_name.h"
 
 #include <QAction>
 #include <QApplication>
+#include <QGraphicsSceneHoverEvent>
 #include <QGraphicsSceneMouseEvent>
 #include <QKeyEvent>
 #include <QMenu>
+#include <QPainter>
 #include <QString>
 #include <libcockatrice/protocol/pb/command_inc_counter.pb.h>
 #include <libcockatrice/protocol/pb/command_set_counter.pb.h>

cockatrice/src/game/board/abstract_counter.h

@@ -8,7 +8,6 @@
 #define COUNTER_H
 
 #include "../../interface/widgets/menus/tearoff_menu.h"
-#include "../player/menu/abstract_player_component.h"
 
 #include <QGraphicsItem>
 #include <QInputDialog>
@@ -19,7 +18,7 @@ class QKeyEvent;
 class QMenu;
 class QString;
 
-class AbstractCounter : public QObject, public QGraphicsItem, public AbstractPlayerComponent
+class AbstractCounter : public QObject, public QGraphicsItem
 {
     Q_OBJECT
     Q_INTERFACES(QGraphicsItem)
@@ -57,10 +56,10 @@ public:
                     QGraphicsItem *parent = nullptr);
     ~AbstractCounter() override;
 
-    void retranslateUi() override;
+    void retranslateUi();
     void setValue(int _value);
-    void setShortcutsActive() override;
-    void setShortcutsInactive() override;
+    void setShortcutsActive();
+    void setShortcutsInactive();
     void delCounter();
 
     QMenu *getMenu() const

cockatrice/src/game/board/abstract_graphics_item.cpp

@@ -17,7 +17,12 @@ void AbstractGraphicsItem::paintNumberEllipse(int number,
     font.setWeight(QFont::Bold);
 
     QFontMetrics fm(font);
-    double w = 1.3 * fm.horizontalAdvance(numStr);
+    double w = 1.3 *
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
+               fm.horizontalAdvance(numStr);
+#else
+               fm.width(numStr);
+#endif
     double h = fm.height() * 1.3;
     if (w < h)
         w = h;

cockatrice/src/game/board/arrow_item.cpp

@@ -3,9 +3,7 @@
 
 #include "../../client/settings/cache_settings.h"
 #include "../player/player.h"
-#include "../player/player_actions.h"
 #include "../player/player_target.h"
-#include "../z_values.h"
 #include "../zones/card_zone.h"
 #include "card_item.h"
 
@@ -19,13 +17,12 @@
 #include <libcockatrice/protocol/pb/command_create_arrow.pb.h>
 #include <libcockatrice/protocol/pb/command_delete_arrow.pb.h>
 #include <libcockatrice/utility/color.h>
-#include <libcockatrice/utility/zone_names.h>
 
 ArrowItem::ArrowItem(Player *_player, int _id, ArrowTarget *_startItem, ArrowTarget *_targetItem, const QColor &_color)
     : QGraphicsItem(), player(_player), id(_id), startItem(_startItem), targetItem(_targetItem), targetLocked(false),
       color(_color), fullColor(true)
 {
-    setZValue(ZValues::ARROWS);
+    setZValue(2000000005);
 
     if (startItem)
         startItem->addArrowFrom(this);
@@ -154,8 +151,8 @@ void ArrowItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
     }
 }
 
-ArrowDragItem::ArrowDragItem(Player *_owner, ArrowTarget *_startItem, const QColor &_color, int _deleteInPhase)
-    : ArrowItem(_owner, -1, _startItem, 0, _color), deleteInPhase(_deleteInPhase)
+ArrowDragItem::ArrowDragItem(Player *_owner, ArrowTarget *_startItem, const QColor &_color)
+    : ArrowItem(_owner, -1, _startItem, 0, _color)
 {
 }
 
@@ -234,28 +231,20 @@ void ArrowDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
             cmd.set_target_player_id(targetZone->getPlayer()->getPlayerInfo()->getId());
             cmd.set_target_zone(targetZone->getName().toStdString());
             cmd.set_target_card_id(targetCard->getId());
-        } else { // failed to cast target to card, this means it's a player
+        } else {
             PlayerTarget *targetPlayer = qgraphicsitem_cast<PlayerTarget *>(targetItem);
             cmd.set_target_player_id(targetPlayer->getOwner()->getPlayerInfo()->getId());
         }
-
-        // if the card is in hand then we will move the card to stack or table as part of drawing the arrow
-        if (startZone->getName() == ZoneNames::HAND) {
+        if (startZone->getName().compare("hand") == 0) {
             startCard->playCard(false);
             CardInfoPtr ci = startCard->getCard().getCardPtr();
-            bool playToStack = SettingsCache::instance().getPlayToStack();
-            if (ci && ((!playToStack && ci->getUiAttributes().tableRow == 3) ||
-                       (playToStack && ci->getUiAttributes().tableRow != 0 &&
-                        startCard->getZone()->getName() != ZoneNames::STACK)))
-                cmd.set_start_zone(ZoneNames::STACK);
+            if (ci && ((!SettingsCache::instance().getPlayToStack() && ci->getTableRow() == 3) ||
+                       (SettingsCache::instance().getPlayToStack() && ci->getTableRow() != 0 &&
+                        startCard->getZone()->getName().toStdString() != "stack")))
+                cmd.set_start_zone("stack");
             else
-                cmd.set_start_zone(playToStack ? ZoneNames::STACK : ZoneNames::TABLE);
+                cmd.set_start_zone(SettingsCache::instance().getPlayToStack() ? "stack" : "table");
         }
-
-        if (deleteInPhase != 0) {
-            cmd.set_delete_in_phase(deleteInPhase);
-        }
-
         player->getPlayerActions()->sendGameCommand(cmd);
     }
     delArrow();
@@ -319,7 +308,7 @@ void ArrowAttachItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 void ArrowAttachItem::attachCards(CardItem *startCard, const CardItem *targetCard)
 {
     // do nothing if target is already attached to another card or is not in play
-    if (targetCard->getAttachedTo() || targetCard->getZone()->getName() != ZoneNames::TABLE) {
+    if (targetCard->getAttachedTo() || targetCard->getZone()->getName() != "table") {
         return;
     }
 
@@ -327,12 +316,12 @@ void ArrowAttachItem::attachCards(CardItem *startCard, const CardItem *targetCar
     CardZoneLogic *targetZone = targetCard->getZone();
 
     // move card onto table first if attaching from some other zone
-    if (startZone->getName() != ZoneNames::TABLE) {
+    if (startZone->getName() != "table") {
         player->getPlayerActions()->playCardToTable(startCard, false);
     }
 
     Command_AttachCard cmd;
-    cmd.set_start_zone(ZoneNames::TABLE);
+    cmd.set_start_zone("table");
     cmd.set_card_id(startCard->getId());
     cmd.set_target_player_id(targetZone->getPlayer()->getPlayerInfo()->getId());
     cmd.set_target_zone(targetZone->getName().toStdString());

cockatrice/src/game/board/arrow_item.h

@@ -82,11 +82,10 @@ class ArrowDragItem : public ArrowItem
 {
     Q_OBJECT
 private:
-    int deleteInPhase;
     QList<ArrowDragItem *> childArrows;
 
 public:
-    ArrowDragItem(Player *_owner, ArrowTarget *_startItem, const QColor &_color, int _deleteInPhase);
+    ArrowDragItem(Player *_owner, ArrowTarget *_startItem, const QColor &_color);
     void addChildArrow(ArrowDragItem *childArrow);
 
 protected:

cockatrice/src/game/board/arrow_target.h

@@ -7,7 +7,7 @@
 #ifndef ARROWTARGET_H
 #define ARROWTARGET_H
 
-#include "../../game_graphics/board/abstract_graphics_item.h"
+#include "abstract_graphics_item.h"
 
 #include <QList>
 

cockatrice/src/game/board/card_drag_item.cpp

@@ -13,10 +13,9 @@
 CardDragItem::CardDragItem(CardItem *_item,
                            int _id,
                            const QPointF &_hotSpot,
-                           bool _forceFaceDown,
+                           bool _faceDown,
                            AbstractCardDragItem *parentDrag)
-    : AbstractCardDragItem(_item, _hotSpot, parentDrag), id(_id), forceFaceDown(_forceFaceDown), occupied(false),
-      currentZone(0)
+    : AbstractCardDragItem(_item, _hotSpot, parentDrag), id(_id), faceDown(_faceDown), occupied(false), currentZone(0)
 {
 }
 

cockatrice/src/game/board/card_drag_item.h

@@ -16,7 +16,7 @@ class CardDragItem : public AbstractCardDragItem
     Q_OBJECT
 private:
     int id;
-    bool forceFaceDown;
+    bool faceDown;
     bool occupied;
     CardZone *currentZone;
 
@@ -24,15 +24,15 @@ public:
     CardDragItem(CardItem *_item,
                  int _id,
                  const QPointF &_hotSpot,
-                 bool _forceFaceDown,
+                 bool _faceDown,
                  AbstractCardDragItem *parentDrag = 0);
     int getId() const
     {
         return id;
     }
-    bool isForceFaceDown() const
+    bool getFaceDown() const
     {
-        return forceFaceDown;
+        return faceDown;
     }
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
     void updatePosition(const QPointF &cursorScenePos) override;

cockatrice/src/game/board/card_item.cpp

@@ -3,9 +3,8 @@
 #include "../../client/settings/cache_settings.h"
 #include "../../interface/widgets/tabs/tab_game.h"
 #include "../game_scene.h"
-#include "../phase.h"
 #include "../player/player.h"
-#include "../player/player_actions.h"
+#include "../zones/card_zone.h"
 #include "../zones/logic/view_zone_logic.h"
 #include "../zones/table_zone.h"
 #include "../zones/view_zone.h"
@@ -212,12 +211,10 @@ void CardItem::setAttachedTo(CardItem *_attachedTo)
     }
 }
 
-/**
- * @brief Resets the fields that should be reset after a zone transition
- */
 void CardItem::resetState(bool keepAnnotations)
 {
     attacking = false;
+    facedown = false;
     counters.clear();
     pt.clear();
     if (!keepAnnotations) {
@@ -253,10 +250,10 @@ void CardItem::processCardInfo(const ServerInfo_Card &_info)
     setDoesntUntap(_info.doesnt_untap());
 }
 
-CardDragItem *CardItem::createDragItem(int _id, const QPointF &_pos, const QPointF &_scenePos, bool forceFaceDown)
+CardDragItem *CardItem::createDragItem(int _id, const QPointF &_pos, const QPointF &_scenePos, bool faceDown)
 {
     deleteDragItem();
-    dragItem = new CardDragItem(this, _id, _pos, forceFaceDown);
+    dragItem = new CardDragItem(this, _id, _pos, faceDown);
     dragItem->setVisible(false);
     scene()->addItem(dragItem);
     dragItem->updatePosition(_scenePos);
@@ -278,14 +275,9 @@ void CardItem::drawArrow(const QColor &arrowColor)
     if (owner->getGame()->getPlayerManager()->isSpectator())
         return;
 
-    auto *game = owner->getGame();
-    Player *arrowOwner = game->getPlayerManager()->getActiveLocalPlayer(game->getGameState()->getActivePlayer());
-    int phase = 0; // 0 means to not set the phase
-    if (SettingsCache::instance().getDoNotDeleteArrowsInSubPhases()) {
-        int currentPhase = game->getGameState()->getCurrentPhase();
-        phase = Phases::getLastSubphase(currentPhase) + 1;
-    }
-    ArrowDragItem *arrow = new ArrowDragItem(arrowOwner, this, arrowColor, phase);
+    Player *arrowOwner =
+        owner->getGame()->getPlayerManager()->getActiveLocalPlayer(owner->getGame()->getGameState()->getActivePlayer());
+    ArrowDragItem *arrow = new ArrowDragItem(arrowOwner, this, arrowColor);
     scene()->addItem(arrow);
     arrow->grabMouse();
 
@@ -296,7 +288,7 @@ void CardItem::drawArrow(const QColor &arrowColor)
         if (card->getZone() != zone)
             continue;
 
-        ArrowDragItem *childArrow = new ArrowDragItem(arrowOwner, card, arrowColor, phase);
+        ArrowDragItem *childArrow = new ArrowDragItem(arrowOwner, card, arrowColor);
         scene()->addItem(childArrow);
         arrow->addChildArrow(childArrow);
     }
@@ -354,7 +346,7 @@ void CardItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 
         // Use the buttonDownPos to align the hot spot with the position when
         // the user originally clicked
-        createDragItem(id, event->buttonDownPos(Qt::LeftButton), event->scenePos(), forceFaceDown);
+        createDragItem(id, event->buttonDownPos(Qt::LeftButton), event->scenePos(), facedown || forceFaceDown);
         dragItem->grabMouse();
 
         int childIndex = 0;
@@ -367,7 +359,7 @@ void CardItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
             if (zone->getHasCardAttr())
                 childPos = card->pos() - pos();
             else
-                childPos = QPointF(childIndex * CardDimensions::WIDTH_HALF_F, 0);
+                childPos = QPointF(childIndex * CARD_WIDTH / 2, 0);
             CardDragItem *drag =
                 new CardDragItem(card, card->getId(), childPos, card->getFaceDown() || forceFaceDown, dragItem);
             drag->setPos(dragItem->pos() + childPos);
@@ -476,9 +468,9 @@ bool CardItem::animationEvent()
     }
 
     setTransform(QTransform()
-                     .translate(CardDimensions::WIDTH_HALF_F, CardDimensions::HEIGHT_HALF_F)
+                     .translate(CARD_WIDTH_HALF, CARD_HEIGHT_HALF)
                      .rotate(tapAngle)
-                     .translate(-CardDimensions::WIDTH_HALF_F, -CardDimensions::HEIGHT_HALF_F));
+                     .translate(-CARD_WIDTH_HALF, -CARD_HEIGHT_HALF));
     setHovered(false);
     update();
 

cockatrice/src/game/board/card_item.h

@@ -21,6 +21,8 @@ class QAction;
 class QColor;
 
 const int MAX_COUNTERS_ON_CARD = 999;
+const float CARD_WIDTH_HALF = CARD_WIDTH / 2;
+const float CARD_HEIGHT_HALF = CARD_HEIGHT / 2;
 const int ROTATION_DEGREES_PER_FRAME = 10;
 
 class CardItem : public AbstractCardItem
@@ -140,7 +142,7 @@ public:
     void processCardInfo(const ServerInfo_Card &_info);
 
     bool animationEvent();
-    CardDragItem *createDragItem(int _id, const QPointF &_pos, const QPointF &_scenePos, bool forceFaceDown);
+    CardDragItem *createDragItem(int _id, const QPointF &_pos, const QPointF &_scenePos, bool faceDown);
     void deleteDragItem();
     void drawArrow(const QColor &arrowColor);
     void drawAttachArrow();

cockatrice/src/game/board/counter_general.cpp

@@ -1,7 +1,7 @@
 #include "counter_general.h"
 
-#include "../../game_graphics/board/abstract_graphics_item.h"
 #include "../../interface/pixel_map_generator.h"
+#include "abstract_graphics_item.h"
 
 #include <QPainter>
 

cockatrice/src/game/card_dimensions.h

@@ -1,29 +0,0 @@
-#ifndef CARD_DIMENSIONS_H
-#define CARD_DIMENSIONS_H
-
-#include <QtGlobal>
-
-/**
- * @file card_dimensions.h
- * @brief Canonical card dimension constants for layout and Z-value calculations.
- *
- * These values represent the logical pixel dimensions of a standard card graphic.
- * They are used throughout the game scene for layout, rendering, and Z-value computation.
- */
-namespace CardDimensions
-{
-/// Card width in pixels
-constexpr int WIDTH = 72;
-/// Card height in pixels
-constexpr int HEIGHT = 102;
-
-/// Pre-converted for floating-point contexts (Z-value calculations)
-constexpr qreal WIDTH_F = static_cast<qreal>(WIDTH);
-constexpr qreal HEIGHT_F = static_cast<qreal>(HEIGHT);
-
-/// Half-dimensions for centering and rotation transforms
-constexpr qreal WIDTH_HALF_F = WIDTH_F / 2;
-constexpr qreal HEIGHT_HALF_F = HEIGHT_F / 2;
-} // namespace CardDimensions
-
-#endif // CARD_DIMENSIONS_H

cockatrice/src/game/deckview/deck_view.cpp

@@ -10,7 +10,7 @@
 #include <algorithm>
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/deck_list/tree/deck_list_card_node.h>
+#include <libcockatrice/deck_list/deck_list_card_node.h>
 
 DeckViewCardDragItem::DeckViewCardDragItem(DeckViewCard *_item,
                                            const QPointF &_hotSpot,
@@ -95,9 +95,8 @@ void DeckViewCard::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
     pen.setJoinStyle(Qt::MiterJoin);
     pen.setColor(originZone == DECK_ZONE_MAIN ? Qt::green : Qt::red);
     painter->setPen(pen);
-    qreal cardRadius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * (CardDimensions::WIDTH_F - 3) : 0.0;
-    painter->drawRoundedRect(QRectF(1.5, 1.5, CardDimensions::WIDTH_F - 3, CardDimensions::HEIGHT_F - 3), cardRadius,
-                             cardRadius);
+    qreal cardRadius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * (CARD_WIDTH - 3) : 0.0;
+    painter->drawRoundedRect(QRectF(1.5, 1.5, CARD_WIDTH - 3., CARD_HEIGHT - 3.), cardRadius, cardRadius);
     painter->restore();
 }
 
@@ -123,7 +122,7 @@ void DeckViewCard::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
         if (c == this)
             continue;
         ++j;
-        auto childPos = QPointF(j * CardDimensions::WIDTH_HALF_F, 0);
+        auto childPos = QPointF(j * CARD_WIDTH / 2, 0);
         auto *drag = new DeckViewCardDragItem(c, childPos, dragItem);
         drag->setPos(dragItem->pos() + childPos);
         scene()->addItem(drag);
@@ -205,7 +204,7 @@ void DeckViewCardContainer::paint(QPainter *painter, const QStyleOptionGraphicsI
             painter->setPen(QColor(255, 255, 255, 100));
             painter->drawLine(QPointF(0, yUntilNow - paddingY / 2), QPointF(width, yUntilNow - paddingY / 2));
         }
-        qreal thisRowHeight = CardDimensions::HEIGHT_F * currentRowsAndCols[i].first;
+        qreal thisRowHeight = CARD_HEIGHT * currentRowsAndCols[i].first;
         QRectF textRect(0, yUntilNow, totalTextWidth, thisRowHeight);
         yUntilNow += thisRowHeight + paddingY;
 
@@ -261,9 +260,9 @@ QSizeF DeckViewCardContainer::calculateBoundingRect(const QList<QPair<int, int>>
 
     // Calculate space needed for cards
     for (int i = 0; i < rowsAndCols.size(); ++i) {
-        totalHeight += CardDimensions::HEIGHT_F * rowsAndCols[i].first + paddingY;
-        if (CardDimensions::WIDTH_F * rowsAndCols[i].second > totalWidth)
-            totalWidth = CardDimensions::WIDTH_F * rowsAndCols[i].second;
+        totalHeight += CARD_HEIGHT * rowsAndCols[i].first + paddingY;
+        if (CARD_WIDTH * rowsAndCols[i].second > totalWidth)
+            totalWidth = CARD_WIDTH * rowsAndCols[i].second;
     }
 
     return QSizeF(getCardTypeTextWidth() + totalWidth, totalHeight + separatorY + paddingY);
@@ -290,10 +289,9 @@ void DeckViewCardContainer::rearrangeItems(const QList<QPair<int, int>> &rowsAnd
         std::sort(row.begin(), row.end(), DeckViewCardContainer::sortCardsByName);
         for (int j = 0; j < row.size(); ++j) {
             DeckViewCard *card = row[j];
-            card->setPos(x + (j % tempCols) * CardDimensions::WIDTH_F,
-                         yUntilNow + (j / tempCols) * CardDimensions::HEIGHT_F);
+            card->setPos(x + (j % tempCols) * CARD_WIDTH, yUntilNow + (j / tempCols) * CARD_HEIGHT);
         }
-        yUntilNow += tempRows * CardDimensions::HEIGHT_F + paddingY;
+        yUntilNow += tempRows * CARD_HEIGHT + paddingY;
     }
 
     prepareGeometryChange();
@@ -332,7 +330,7 @@ void DeckViewScene::setDeck(const DeckList &_deck)
     if (deck)
         delete deck;
 
-    deck = new DeckList(_deck.writeToString_Native());
+    deck = new DeckList(_deck);
     rebuildTree();
     applySideboardPlan(deck->getCurrentSideboardPlan());
     rearrangeItems();
@@ -345,7 +343,10 @@ void DeckViewScene::rebuildTree()
     if (!deck)
         return;
 
-    for (auto *currentZone : deck->getZoneNodes()) {
+    InnerDecklistNode *listRoot = deck->getRoot();
+    for (int i = 0; i < listRoot->size(); i++) {
+        auto *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
+
         DeckViewCardContainer *container = cardContainers.value(currentZone->getName(), 0);
         if (!container) {
             container = new DeckViewCardContainer(currentZone->getName());
@@ -394,7 +395,7 @@ void DeckViewScene::applySideboardPlan(const QList<MoveCard_ToZone> &plan)
 
 void DeckViewScene::rearrangeItems()
 {
-    const int spacing = CardDimensions::HEIGHT / 3;
+    const int spacing = CARD_HEIGHT / 3;
     QList<DeckViewCardContainer *> contList = cardContainers.values();
 
     // Initialize space requirements

cockatrice/src/game/deckview/deck_view.h

@@ -9,8 +9,11 @@
 
 #include "../board/abstract_card_drag_item.h"
 
+#include <QGraphicsScene>
 #include <QGraphicsView>
 #include <QMap>
+#include <QMultiMap>
+#include <QPixmap>
 #include <libcockatrice/protocol/pb/move_card_to_zone.pb.h>
 
 class DeckList;

cockatrice/src/game/deckview/deck_view_container.cpp

@@ -8,9 +8,13 @@
 #include "../../interface/widgets/dialogs/dlg_load_deck_from_website.h"
 #include "../../interface/widgets/dialogs/dlg_load_remote_deck.h"
 #include "../../interface/widgets/tabs/tab_game.h"
+#include "../game_scene.h"
 #include "deck_view.h"
 
 #include <QMessageBox>
+#include <QMouseEvent>
+#include <QToolButton>
+#include <google/protobuf/descriptor.h>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/protocol/pb/command_deck_select.pb.h>
@@ -259,21 +263,22 @@ void DeckViewContainer::loadLocalDeck()
 
 void DeckViewContainer::loadDeckFromFile(const QString &filePath)
 {
-    DeckFileFormat::Format fmt = DeckFileFormat::getFormatFromName(filePath);
+    DeckLoader::FileFormat fmt = DeckLoader::getFormatFromName(filePath);
+    DeckLoader deck(this);
 
-    std::optional<LoadedDeck> deckOpt = DeckLoader::loadFromFile(filePath, fmt, true);
+    bool success = deck.loadFromFile(filePath, fmt, true);
 
-    if (!deckOpt) {
+    if (!success) {
         QMessageBox::critical(this, tr("Error"), tr("The selected file could not be loaded."));
         return;
     }
 
-    loadDeckFromDeckList(deckOpt.value().deckList);
+    loadDeckFromDeckLoader(&deck);
 }
 
-void DeckViewContainer::loadDeckFromDeckList(const DeckList &deck)
+void DeckViewContainer::loadDeckFromDeckLoader(DeckLoader *deck)
 {
-    QString deckString = deck.writeToString_Native();
+    QString deckString = deck->getDeckList()->writeToString_Native();
 
     if (deckString.length() > MAX_FILE_LENGTH) {
         QMessageBox::critical(this, tr("Error"), tr("Deck is greater than maximum file size."));
@@ -307,8 +312,8 @@ void DeckViewContainer::loadFromClipboard()
         return;
     }
 
-    DeckList deck = dlg.getDeckList();
-    loadDeckFromDeckList(deck);
+    DeckLoader *deck = dlg.getDeckList();
+    loadDeckFromDeckLoader(deck);
 }
 
 void DeckViewContainer::loadFromWebsite()
@@ -319,15 +324,16 @@ void DeckViewContainer::loadFromWebsite()
         return;
     }
 
-    DeckList deck = dlg.getDeck();
-    loadDeckFromDeckList(deck);
+    DeckLoader *deck = dlg.getDeck();
+    loadDeckFromDeckLoader(deck);
 }
 
 void DeckViewContainer::deckSelectFinished(const Response &r)
 {
     const Response_DeckDownload &resp = r.GetExtension(Response_DeckDownload::ext);
-    DeckList newDeck = DeckList(QString::fromStdString(resp.deck()));
-    CardPictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(newDeck.getCardRefList()));
+    DeckLoader newDeck(this, new DeckList(QString::fromStdString(resp.deck())));
+    CardPictureLoader::cacheCardPixmaps(
+        CardDatabaseManager::query()->getCards(newDeck.getDeckList()->getCardRefList()));
     setDeck(newDeck);
     switchToDeckLoadedView();
 }
@@ -408,8 +414,8 @@ void DeckViewContainer::setSideboardLocked(bool locked)
         deckView->resetSideboardPlan();
 }
 
-void DeckViewContainer::setDeck(const DeckList &deck)
+void DeckViewContainer::setDeck(DeckLoader &deck)
 {
-    deckView->setDeck(deck);
+    deckView->setDeck(*deck.getDeckList());
     switchToDeckLoadedView();
 }

cockatrice/src/game/deckview/deck_view_container.h

@@ -85,12 +85,12 @@ public:
     void setReadyStart(bool ready);
     void readyAndUpdate();
     void setSideboardLocked(bool locked);
-    void setDeck(const DeckList &deck);
+    void setDeck(DeckLoader &deck);
     void setVisualDeckStorageExists(bool exists);
 
 public slots:
     void loadDeckFromFile(const QString &filePath);
-    void loadDeckFromDeckList(const DeckList &deck);
+    void loadDeckFromDeckLoader(DeckLoader *deck);
 };
 
 #endif // DECK_VIEW_CONTAINER_H

cockatrice/src/game/dialogs/dlg_create_token.cpp

@@ -16,6 +16,7 @@
 #include <QLineEdit>
 #include <QRadioButton>
 #include <QTreeView>
+#include <QVBoxLayout>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/models/database/card_database_model.h>
@@ -117,7 +118,11 @@ DlgCreateToken::DlgCreateToken(const QStringList &_predefinedTokens, QWidget *pa
         chooseTokenFromDeckRadioButton->setDisabled(true); // No tokens in deck = no need for option
     } else {
         chooseTokenFromDeckRadioButton->setChecked(true);
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
         cardDatabaseDisplayModel->setCardNameSet(QSet<QString>(predefinedTokens.begin(), predefinedTokens.end()));
+#else
+        cardDatabaseDisplayModel->setCardNameSet(QSet<QString>::fromList(predefinedTokens));
+#endif
     }
 
     auto *tokenChooseLayout = new QVBoxLayout;
@@ -146,13 +151,13 @@ DlgCreateToken::DlgCreateToken(const QStringList &_predefinedTokens, QWidget *pa
     setWindowTitle(tr("Create token"));
 
     resize(600, 500);
-    restoreGeometry(SettingsCache::instance().layouts().getTokenDialogGeometry());
+    restoreGeometry(SettingsCache::instance().getTokenDialogGeometry());
 }
 
 void DlgCreateToken::closeEvent(QCloseEvent *event)
 {
     event->accept();
-    SettingsCache::instance().layouts().setTokenDialogGeometry(saveGeometry());
+    SettingsCache::instance().setTokenDialogGeometry(saveGeometry());
 }
 
 void DlgCreateToken::faceDownCheckBoxToggled(bool checked)
@@ -219,19 +224,23 @@ void DlgCreateToken::actChooseTokenFromAll(bool checked)
 void DlgCreateToken::actChooseTokenFromDeck(bool checked)
 {
     if (checked) {
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
         cardDatabaseDisplayModel->setCardNameSet(QSet<QString>(predefinedTokens.begin(), predefinedTokens.end()));
+#else
+        cardDatabaseDisplayModel->setCardNameSet(QSet<QString>::fromList(predefinedTokens));
+#endif
     }
 }
 
 void DlgCreateToken::actOk()
 {
-    SettingsCache::instance().layouts().setTokenDialogGeometry(saveGeometry());
+    SettingsCache::instance().setTokenDialogGeometry(saveGeometry());
     accept();
 }
 
 void DlgCreateToken::actReject()
 {
-    SettingsCache::instance().layouts().setTokenDialogGeometry(saveGeometry());
+    SettingsCache::instance().setTokenDialogGeometry(saveGeometry());
     reject();
 }
 

cockatrice/src/game/dialogs/dlg_create_token.h

@@ -8,6 +8,7 @@
 #define DLG_CREATETOKEN_H
 
 #include <QDialog>
+#include <QModelIndex>
 
 class QLabel;
 class QLineEdit;

cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp

@@ -12,7 +12,8 @@
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/filters/filter_string.h>
 
-DlgMoveTopCardsUntil::DlgMoveTopCardsUntil(QWidget *parent, const MoveTopCardsUntilOptions &options) : QDialog(parent)
+DlgMoveTopCardsUntil::DlgMoveTopCardsUntil(QWidget *parent, QStringList exprs, uint _numberOfHits, bool autoPlay)
+    : QDialog(parent)
 {
     exprLabel = new QLabel(tr("Card name (or search expressions):"));
 
@@ -20,13 +21,13 @@ DlgMoveTopCardsUntil::DlgMoveTopCardsUntil(QWidget *parent, const MoveTopCardsUn
     exprComboBox->setFocus();
     exprComboBox->setEditable(true);
     exprComboBox->setInsertPolicy(QComboBox::InsertAtTop);
-    exprComboBox->insertItems(0, options.exprs);
+    exprComboBox->insertItems(0, exprs);
     exprLabel->setBuddy(exprComboBox);
 
     numberOfHitsLabel = new QLabel(tr("Number of hits:"));
     numberOfHitsEdit = new QSpinBox(this);
     numberOfHitsEdit->setRange(1, 99);
-    numberOfHitsEdit->setValue(options.numberOfHits);
+    numberOfHitsEdit->setValue(_numberOfHits);
     numberOfHitsLabel->setBuddy(numberOfHitsEdit);
 
     auto *grid = new QGridLayout;
@@ -34,7 +35,7 @@ DlgMoveTopCardsUntil::DlgMoveTopCardsUntil(QWidget *parent, const MoveTopCardsUn
     grid->addWidget(numberOfHitsEdit, 0, 1);
 
     autoPlayCheckBox = new QCheckBox(tr("Auto play hits"));
-    autoPlayCheckBox->setChecked(options.autoPlay);
+    autoPlayCheckBox->setChecked(autoPlay);
 
     buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
     connect(buttonBox, &QDialogButtonBox::accepted, this, &DlgMoveTopCardsUntil::validateAndAccept);
@@ -117,13 +118,6 @@ QString DlgMoveTopCardsUntil::getExpr() const
     return exprComboBox->currentText();
 }
 
-MoveTopCardsUntilOptions DlgMoveTopCardsUntil::getOptions() const
-{
-    return {.exprs = getExprs(),
-            .numberOfHits = numberOfHitsEdit->text().toInt(),
-            .autoPlay = autoPlayCheckBox->isChecked()};
-}
-
 QStringList DlgMoveTopCardsUntil::getExprs() const
 {
     QStringList exprs;
@@ -131,4 +125,14 @@ QStringList DlgMoveTopCardsUntil::getExprs() const
         exprs.append(exprComboBox->itemText(i));
     }
     return exprs;
-}
+}
+
+uint DlgMoveTopCardsUntil::getNumberOfHits() const
+{
+    return numberOfHitsEdit->text().toUInt();
+}
+
+bool DlgMoveTopCardsUntil::isAutoPlay() const
+{
+    return autoPlayCheckBox->isChecked();
+}

cockatrice/src/game/dialogs/dlg_move_top_cards_until.h

@@ -16,13 +16,6 @@
 
 class FilterString;
 
-struct MoveTopCardsUntilOptions
-{
-    QStringList exprs = {};
-    int numberOfHits = 1;
-    bool autoPlay = false;
-};
-
 class DlgMoveTopCardsUntil : public QDialog
 {
     Q_OBJECT
@@ -36,12 +29,15 @@ class DlgMoveTopCardsUntil : public QDialog
     void validateAndAccept();
     bool validateMatchExists(const FilterString &filterString);
 
-    [[nodiscard]] QStringList getExprs() const;
-
 public:
-    explicit DlgMoveTopCardsUntil(QWidget *parent = nullptr, const MoveTopCardsUntilOptions &options = {});
+    explicit DlgMoveTopCardsUntil(QWidget *parent = nullptr,
+                                  QStringList exprs = QStringList(),
+                                  uint numberOfHits = 1,
+                                  bool autoPlay = false);
     [[nodiscard]] QString getExpr() const;
-    [[nodiscard]] MoveTopCardsUntilOptions getOptions() const;
+    [[nodiscard]] QStringList getExprs() const;
+    [[nodiscard]] uint getNumberOfHits() const;
+    [[nodiscard]] bool isAutoPlay() const;
 };
 
 #endif // DLG_MOVE_TOP_CARDS_UNTIL_H