[Oracle] Skip low-memory prompt in background mode, guard with HAS_LZMA

Use QRegularExpression behind the same Qt version guard as
totalMemoryBytes() in availableMemoryBytes(), where a bare QRegExp
broke every Qt6 Linux build. hasAtLeastGiB() now treats a 0 reading
(unsupported platform or failed query) as unknown and skips the
low-memory prompt instead of misreading it as low memory.

.ci/Arch/Dockerfile

@@ -8,13 +8,10 @@ RUN pacman --sync --refresh --sysupgrade --needed --noconfirm \
         gtest \
         mariadb-libs \
         ninja \
-        openssl \
         protobuf \
         qt6-base \
-        qt6-declarative \
         qt6-imageformats \
         qt6-multimedia \
-        qt6-shadertools \
         qt6-svg \
         qt6-tools \
         qt6-translations \

.ci/Debian11/Dockerfile

@@ -0,0 +1,26 @@
+FROM debian:11
+
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+        build-essential \
+        ccache \
+        clang-format \
+        cmake \
+        file \
+        g++ \
+        git \
+        liblzma-dev \
+        libmariadb-dev-compat \
+        libprotobuf-dev \
+        libqt5multimedia5-plugins \
+        libqt5sql5-mysql \
+        libqt5svg5-dev \
+        libqt5websockets5-dev \
+        ninja-build \
+        protobuf-compiler \
+        qt5-image-formats-plugins \
+        qtmultimedia5-dev \
+        qttools5-dev \
+        qttools5-dev-tools \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*

.ci/Debian12/Dockerfile

@@ -15,14 +15,11 @@ RUN apt-get update && \
         libprotobuf-dev \
         libqt6multimedia6 \
         libqt6sql6-mysql \
-        libssl-dev \
         ninja-build \
         protobuf-compiler \
-        qt6-declarative-dev \
         qt6-image-formats-plugins \
         qt6-l10n-tools \
         qt6-multimedia-dev \
-        qt6-shadertools-dev \
         qt6-svg-dev \
         qt6-tools-dev \
         qt6-tools-dev-tools \

.ci/Debian13/Dockerfile

@@ -16,14 +16,11 @@ RUN apt-get update && \
         libprotobuf-dev \
         libqt6multimedia6 \
         libqt6sql6-mysql \
-        libssl-dev \
         ninja-build \
         protobuf-compiler \
-        qt6-declarative-dev \
         qt6-image-formats-plugins \
         qt6-l10n-tools \
         qt6-multimedia-dev \
-        qt6-shadertools-dev \
         qt6-svg-dev \
         qt6-tools-dev \
         qt6-tools-dev-tools \

.ci/Fedora42/Dockerfile

@@ -1,4 +1,4 @@
-FROM fedora:44
+FROM fedora:42
 
 RUN dnf install -y \
         ccache \
@@ -7,9 +7,8 @@ RUN dnf install -y \
         git \
         mariadb-devel \
         ninja-build \
-        openssl-devel \
         protobuf-devel \
-        qt6-{qtdeclarative,qtmultimedia,qtshadertools,qtsvg,qttools,qtwebsockets}-devel \
+        qt6-{qttools,qtsvg,qtmultimedia,qtwebsockets}-devel \
         qt6-qtimageformats \
         rpm-build \
         xz-devel \

.ci/Fedora43/Dockerfile

@@ -7,9 +7,8 @@ RUN dnf install -y \
         git \
         mariadb-devel \
         ninja-build \
-        openssl-devel \
         protobuf-devel \
-        qt6-{qtdeclarative,qtmultimedia,qtshadertools,qtsvg,qttools,qtwebsockets}-devel \
+        qt6-{qttools,qtsvg,qtmultimedia,qtwebsockets}-devel \
         qt6-qtimageformats \
         rpm-build \
         xz-devel \

.ci/Servatrice_Debian11/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:12
+FROM debian:11
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -11,12 +11,11 @@ RUN apt-get update && \
         git \
         libmariadb-dev-compat \
         libprotobuf-dev \
-        libqt6sql6-mysql \
-        libssl-dev \
+        libqt5sql5-mysql \
+        libqt5websockets5-dev \
         ninja-build \
         protobuf-compiler \
-        qt6-tools-dev \
-        qt6-tools-dev-tools \
-        qt6-websockets-dev \
+        qttools5-dev \
+        qttools5-dev-tools \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*

.ci/Ubuntu22.04/Dockerfile

@@ -1,15 +1,13 @@
-FROM ubuntu:26.04
+FROM ubuntu:22.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++ \
-        gcovr \
         git \
         libgl-dev \
         liblzma-dev \
@@ -17,17 +15,14 @@ RUN apt-get update && \
         libprotobuf-dev \
         libqt6multimedia6 \
         libqt6sql6-mysql \
-        libssl-dev \
+        libqt6svg6-dev \
+        libqt6websockets6-dev \
         ninja-build \
         protobuf-compiler \
-        qt6-declarative-dev \
         qt6-image-formats-plugins \
         qt6-l10n-tools \
         qt6-multimedia-dev \
-        qt6-shadertools-dev \
-        qt6-svg-dev \
         qt6-tools-dev \
         qt6-tools-dev-tools \
-        qt6-websockets-dev \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*

.ci/Ubuntu24.04/Dockerfile

@@ -15,14 +15,11 @@ RUN apt-get update && \
         libprotobuf-dev \
         libqt6multimedia6 \
         libqt6sql6-mysql \
-        libssl-dev \
         ninja-build \
         protobuf-compiler \
-        qt6-declarative-dev \
         qt6-image-formats-plugins \
         qt6-l10n-tools \
         qt6-multimedia-dev \
-        qt6-shadertools-dev \
         qt6-svg-dev \
         qt6-tools-dev \
         qt6-tools-dev-tools \

.ci/compile.sh

@@ -8,17 +8,12 @@
 # --suffix <suffix> renames package with this suffix, requires arg
 # --server compiles servatrice
 # --test runs tests
-# --sanitize builds with AddressSanitizer and UndefinedBehaviorSanitizer, gcc/clang only
-# --coverage instruments the test run for line coverage and prints a gcovr summary, gcc only
-
 # --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 MAKE_SANITIZE MAKE_COVERAGE
-# (correspond to args: --debug/--release --install --package <package type> --suffix <suffix> --server --test --sanitize --coverage --ccache <ccache_size> --dir <dir>)
+# 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
 
 # Read arguments
@@ -60,14 +55,6 @@ while [[ $# != 0 ]]; do
       MAKE_TEST=1
       shift
       ;;
-    '--sanitize')
-      MAKE_SANITIZE=1
-      shift
-      ;;
-    '--coverage')
-      MAKE_COVERAGE=1
-      shift
-      ;;
     '--debug')
       BUILDTYPE="Debug"
       shift
@@ -84,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
@@ -106,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,15 +111,6 @@ if [[ ! $BUILD_DIR ]]; then
   BUILD_DIR="build"
 fi
 mkdir -p "$BUILD_DIR"
-
-if [[ $MAKE_COVERAGE ]]; then
-  # Resolved while the working directory is still the source root. $0 is relative to the
-  # directory the script was invoked from, so after the cd below it no longer resolves, and
-  # under `set -e` the failed subshell would abort the build rather than just yielding an empty
-  # variable. Only the coverage report needs this, so only coverage pays for it.
-  SRC_ROOT="$(cd "$(dirname "$0")/.." && pwd)"
-fi
-
 cd "$BUILD_DIR"
 
 # Set minimum CMake Version
@@ -162,27 +122,13 @@ 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")
 fi
-if [[ $MAKE_SANITIZE ]]; then
-  flags+=("-DENABLE_SANITIZERS=ON")
-else
-  # The release-package step re-runs cmake in the same build dir, so an
-  # ENABLE_SANITIZERS=ON left over from the debug step would otherwise leak
-  # into the shipped binaries (libasan/libubsan Depends in the DEB).
-  flags+=("-DENABLE_SANITIZERS=OFF")
-fi
-if [[ $MAKE_COVERAGE ]]; then
-  flags+=("-DENABLE_COVERAGE=ON")
-fi
 if [[ $USE_CCACHE ]]; then
   flags+=("-DUSE_CCACHE=1")
-  # PCH-aware caching is required or ccache refuses to cache any TU that
-  # consumes a precompiled header, silently recompiling everything on every run.
-  ccache --set-config sloppiness=pch_defines,time_macros
   if [[ $CCACHE_SIZE ]]; then
     # note, this setting persists after running the script
     ccache --max-size "$CCACHE_SIZE"
@@ -193,7 +139,6 @@ if [[ $PACKAGE_TYPE ]]; then
 fi
 if [[ $USE_VCPKG ]]; then
   flags+=("-DUSE_VCPKG=1")
-  flags+=("-DVCPKG_INSTALL_OPTIONS=--x-abi-tools-use-exact-versions")
 fi
 
 # Add cmake --build flags
@@ -211,18 +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
@@ -238,11 +171,7 @@ if [[ $RUNNER_OS == macOS ]]; then
       arch="x64"
     fi
     mkdir -p "$triplets_dir"
-    triplet_source="../vcpkg/triplets/$arch-osx.cmake"
-    if [[ ! -f "$triplet_source" ]]; then
-      triplet_source="../vcpkg/triplets/community/$arch-osx.cmake"
-    fi
-    cp "$triplet_source" "$triplet_file"
+    cp "../vcpkg/triplets/$arch-osx.cmake" "$triplet_file"
     echo "set(VCPKG_CMAKE_SYSTEM_VERSION $TARGET_MACOS_VERSION)" >>"$triplet_file"
     echo "set(VCPKG_OSX_DEPLOYMENT_TARGET $TARGET_MACOS_VERSION)" >>"$triplet_file"
     flags+=("-DVCPKG_OVERLAY_TRIPLETS=$triplets_dir")
@@ -310,21 +239,14 @@ 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
+  for app in cockatrice oracle servatrice dbconverter; do
     binary="$GITHUB_WORKSPACE/build/$app/$app.app/Contents/MacOS/$app"
     echo "Inspecting $app..."
     vtool -show-build "$binary"
@@ -337,50 +259,7 @@ fi
 
 if [[ $MAKE_TEST ]]; then
   echo "::group::Run tests"
-  if [[ $MAKE_SANITIZE ]]; then
-    # detect_leaks=0: Qt and the sanitizers' own runtimes both leak at exit by design, and
-    # LeakSanitizer's default is aggressive enough to bury our real findings under hundreds
-    # of process-teardown reports. Malloc/free misuse and use-after-free are what ASan is for
-    # and they stay fully on.
-    # abort_on_error=1: a bad access leaves the process in an unusable state, so continuing
-    # only produces a second, more confusing report from the wreckage.
-    # UBSAN halt_on_error=1: without it UBSan prints "runtime error: ..." but the
-    # process exits 0 (recover mode), so gtest/ctest report a pass and the job
-    # stays green. Combined with -fno-sanitize-recover=undefined at compile time,
-    # the first finding aborts the test process with a non-zero exit.
-    export ASAN_OPTIONS="detect_leaks=0:abort_on_error=1:print_stacktrace=1:symbolize=1"
-    export UBSAN_OPTIONS="print_stacktrace=1:halt_on_error=1:symbolize=1"
-  fi
-  # Every TEST() is its own CTest entry, so the suite is process-spawn bound rather than CPU
-  # bound and -j recovers nearly all of the per-process overhead. The test binaries are safe to
-  # run concurrently: the only one that claims a fixed resource is single_instance_manager_test,
-  # which already scopes its local socket name to its own pid so parallel copies cannot collide.
-  ctest -C "$BUILDTYPE" --output-on-failure -j "${CTEST_JOBS:-4}"
-  echo "::endgroup::"
-fi
-
-if [[ $MAKE_COVERAGE ]]; then
-  # gcovr is not a build dependency and is not available everywhere, so a missing one is reported
-  # and skipped rather than failing an otherwise green build.
-  echo "::group::Coverage report"
-  GCOVR="$(command -v gcovr || true)"
-  if [[ -z $GCOVR ]]; then
-    echo "gcovr not found; install it to produce a coverage report"
-  else
-    "$GCOVR" --version
-    # This script configures with `cmake ..`, so the build dir it was started from is the object
-    # directory and the source root is one level up. Both are passed explicitly: gcovr otherwise
-    # walks the current directory and trips over in-tree build directories left by other tooling,
-    # whose stale .gcno files cannot be resolved. --config is named too, so the filters apply no
-    # matter what directory gcovr happens to start from.
-    GCOVR_ARGS=("." --root "$SRC_ROOT" --object-directory "." --config "$SRC_ROOT/gcovr.cfg")
-    "$GCOVR" "${GCOVR_ARGS[@]}" --txt --decisions
-    "$GCOVR" "${GCOVR_ARGS[@]}" --html-details coverage-details.html --html-title "Cockatrice line coverage"
-    "$GCOVR" "${GCOVR_ARGS[@]}" --lcov -o coverage.lcov
-    "$GCOVR" "${GCOVR_ARGS[@]}" --cobertura-pretty -o coverage.xml
-    "$GCOVR" "${GCOVR_ARGS[@]}" --json-summary-pretty -o coverage-summary.json
-    echo "Coverage artifacts written to coverage-details.html, coverage.lcov, coverage.xml and coverage-summary.json"
-  fi
+  ctest -C "$BUILDTYPE" --output-on-failure
   echo "::endgroup::"
 fi
 
@@ -401,153 +280,4 @@ if [[ $MAKE_PACKAGE ]]; then
     BUILD_DIR="$BUILD_DIR" .ci/name_build.sh "$PACKAGE_SUFFIX"
     echo "::endgroup::"
   fi
-
-  if [[ $RUNNER_OS == Windows ]]; then
-    echo "::group::Check installer for build-tree artifacts"
-    cd "$BUILD_DIR"
-    package="$(find . -maxdepth 1 -type f -name 'Cockatrice-*.exe' -print -quit)"
-    if [[ ! $package ]]; then
-      echo "::error file=$0::Could not find installer to inspect"
-      exit 1
-    fi
-    seven_zip="$(command -v 7z || true)"
-    if [[ ! $seven_zip ]]; then
-      seven_zip="/c/Program Files/7-Zip/7z.exe"
-    fi
-    if [[ ! -f $seven_zip ]]; then
-      echo "::warning file=$0::7-Zip not found, skipping installer content check"
-    else
-      echo "Inspecting $package"
-      # Fail the build if the installer contains any path left behind by the MSBuild or
-      # Qt AUTOMOC tooling (build-tree artifacts must live in the build dir, not the install)
-      if "$seven_zip" l "$package" |
-        grep -E "_autogen|\.dir[\\/]|\.tlog|(^|[\\/])x64[\\/]|(^|[\\/])\.qt[\\/]|(^|[\\/])\.qsb[\\/]|(^|[\\/])\.lupdate[\\/]|CMakeFiles"; then
-        echo "::error file=$0::Installer contains build-tree artifacts"
-        exit 1
-      fi
-      echo "Installer content is clean"
-
-      # Fail the build if the installer does not carry the runtime the
-      # applications link against - a file that must be there, or a DLL that must
-      # not be. The runtime DLLs reach the package by globbing every *.dll out of
-      # the build output directories, so anything that build produced can ride
-      # along and nothing else in the build objects to it: a Qt module the client
-      # links statically (Qt6Multimedia.dll, Qt6QuickWidgets.dll) can be left out,
-      # and the test framework's gtest.dll can be shipped. Either only surfaces on
-      # a user's machine after an update has already replaced their install, as
-      # "The code execution cannot proceed because Qt6Multimedia.dll was not
-      # found" or "abseil_dll.dll is either not designed to run on Windows or it
-      # contains an error". required-runtime.txt is written by the top level
-      # CMakeLists.txt from the same module lists the targets are built against
-      # plus the vcpkg bin directory the app-local copies come from.
-      if [[ ! -f required-runtime.txt ]]; then
-        echo "::error file=$0::required-runtime.txt not found in the build dir, cannot verify the runtime"
-        exit 1
-      fi
-      # 7-Zip writes CRLF on Windows, so the \r has to come off before any
-      # whole-line comparison below. Normalize separators to /, and strip the
-      # install-root prefixes an NSIS listing may carry, so the entries can be
-      # compared as exact relative paths. -xF keeps a '.' in a DLL name from
-      # being a wildcard; -i because that is how the installed tree behaves -
-      # the uninstaller clears both $INSTDIR\plugins and $INSTDIR\Plugins.
-      # The archive side and the manifest side have to agree on line endings.
-      # CMake writes required-runtime.txt with the platform's line ending and
-      # 7-Zip writes CRLF on Windows, so a trailing \r survives on $entry and
-      # defeats the whole-line match - every entry then reads as missing even
-      # though the listing holds it verbatim.
-      # [$] rather than \$ so the literal dollar is a bracket expression and the
-      # linter does not read these as unexpanded shell variables (SC2016).
-      installer_paths="$("$seven_zip" l -slt "$package" | tr -d '\r' |
-        sed -n 's/^Path = //p' |
-        sed -e 's|\\|/|g' -e 's|^[$]INSTDIR/||' -e 's|^[$]OUTDIR/||' -e 's|^[$]PLUGINSDIR/||' -e 's|^\./||' -e 's|^/||')"
-      manifest="$(tr -d '\r' <required-runtime.txt)"
-      missing=""
-      checked=0
-      while IFS= read -r entry; do
-        if [[ -z $entry || $entry == \#* ]]; then
-          continue
-        fi
-        checked=$((checked + 1))
-        if ! grep -qxiF "$entry" <<<"$installer_paths"; then
-          missing+=" $entry"
-        fi
-      done <<<"$manifest"
-      if [[ -n $missing ]]; then
-        echo "::error file=$0::Installer is missing required runtime files:$missing"
-        # Print both sides of the comparison. A mismatch here has twice been
-        # caused by the shape of 7-Zip's output rather than by a missing file,
-        # and a bare "missing" line cannot tell those apart.
-        echo "required-runtime.txt asked for $checked path(s); 7-Zip listed $(grep -c '' <<<"$installer_paths") path(s)"
-        # Indent with parameter expansion rather than sed 's/^/  /', which the
-        # linter reports as SC2001.
-        echo "--- required ---"
-        echo "${manifest//$'\n'/$'\n  '}"
-        echo "--- first 40 paths 7-Zip lists in the installer ---"
-        listed_head="$(head -40 <<<"$installer_paths")"
-        echo "${listed_head//$'\n'/$'\n  '}"
-        exit 1
-      fi
-      echo "Installer carries the Qt runtime of every module the three applications link ($checked files)"
-
-      # Now the other direction: a top level DLL in the package that the manifest
-      # does not name. The missing check above cannot see a runtime that was
-      # never expected.
-      #
-      # Two things are reported here and neither may fail the build.
-      #
-      # The test framework is a fact rather than a guess - no shipped executable
-      # links gtest or gmock, and the build output directories the "*.dll" glob
-      # reads are shared with the test targets, so gtest.dll and gmock.dll are
-      # one filter away from shipping in every release. Even so it is reported
-      # instead of enforced: a check that has never passed on a real package has
-      # not earned the right to block a release, and the first Windows run of an
-      # enforcing version is exactly when its own wrong assumptions show up.
-      #
-      # Everything else is expected to be there. required-runtime.txt names the
-      # Qt modules the three applications link, and the protobuf, Abseil,
-      # OpenSSL, liblzma, ffmpeg and Qt debug DLLs in the package come in on the
-      # build output glob instead, because nothing in the build declares them by
-      # name. So this list is a report of what the package carries, not a verdict.
-      # Read it when a dependency is added; do not fail on it.
-      forbidden=""
-      unexpected=""
-      while IFS= read -r entry; do
-        [[ -z $entry ]] && continue
-        # Top level only. A DLL under Plugins/ or a nested image format plugin is
-        # a plugin the platform loads by name, not a runtime the executable
-        # imports, and requiring one here would list all of them every run.
-        [[ $entry == */* ]] && continue
-        if grep -qxiF "$entry" <<<"$manifest"; then
-          continue
-        fi
-        # NSIS extracts its plugins to $PLUGINSDIR, which the path normalization
-        # above strips, so they arrive here looking like payload files. They are
-        # part of the installer, not of the installed tree.
-        if [[ $entry == [Nn][Ss][Dd][Ii][Aa][Ll][Oo][Gg][Ss].dll ||
-          $entry == [Nn][Ss][Ee][Xx][Ee][Cc].dll ||
-          $entry == [Ss][Yy][Ss][Tt][Ee][Mm].dll ||
-          $entry == [Uu][Ss][Ee][Rr][Ii][Nn][Ff][Oo].dll ||
-          $entry == [Ii][Nn][Ee][Tt].dll ]]; then
-          continue
-        fi
-        if [[ $entry == [Gg][Tt][Ee][Ss][Tt]* || $entry == [Gg][Mm][Oo][Cc][Kk]* ]]; then
-          forbidden+=" $entry"
-        else
-          unexpected+=" $entry"
-        fi
-      done < <(grep -i '\.dll$' <<<"$installer_paths")
-      if [[ -n $forbidden ]]; then
-        echo "::warning file=$0::Installer contains test framework DLLs that no shipped executable links:$forbidden"
-        echo "A build output directory shared with the test targets has leaked into the package."
-      fi
-      if [[ -n $unexpected ]]; then
-        echo "Top level DLLs in the package beyond the linked Qt modules:$unexpected"
-        echo "These arrive on the build output glob, not from required-runtime.txt, so they are reported and not required."
-      fi
-      if [[ -z $forbidden && -z $unexpected ]]; then
-        echo "Installer carries no runtime files beyond the linked Qt modules"
-      fi
-    fi
-    echo "::endgroup::"
-  fi
 fi

.ci/docker.sh

@@ -3,34 +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 IMAGE_SUFFIX CACHE BUILD GET SAVE INTERACTIVE
+# 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
-#
-# IMAGE_SUFFIX is optional and only appended to the image name, never to NAME, so that a matrix
-# leg can have its own image and image cache without needing its own directory under .ci. Two legs
-# building and tagging the same image concurrently would race on `docker build --tag`.
-# It is deliberately not called SUFFIX: compile.sh already uses SUFFIX for output file names, and
-# a job-level SUFFIX would be silently overridden by those per-step env blocks.
-#
-# 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"
@@ -58,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
@@ -87,7 +65,7 @@ if ! [[ $NAME ]]; then
   return 3
 fi
 
-export IMAGE_NAME="${project_name,,}_${NAME,,}${IMAGE_SUFFIX:+_${IMAGE_SUFFIX,,}}" # lower case
+export IMAGE_NAME="${project_name,,}_${NAME,,}" # lower case
 
 docker_dir=".ci/$NAME"
 if ! [[ -r $docker_dir/Dockerfile ]]; then
@@ -171,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/lint_cpp.sh

@@ -13,9 +13,17 @@ fi
 # Check formatting using format.sh
 echo "Checking your code using format.sh..."
 
-./format.sh --color-diff --cmake --shell --print-version --branch origin/master
+diff="$(./format.sh --diff --cmake --shell --print-version --branch origin/master)"
 err=$?
 
+sep="
+----------
+"
+used_version="${diff%%"$sep"*}"
+diff="${diff#*"$sep"}"
+changes_to_make="${diff%%"$sep"*}"
+files_to_edit="${diff#*"$sep"}"
+
 case $err in
   1)
     cat <<EOM
@@ -28,10 +36,19 @@ case $err in
 ***  Then commit and push those changes to this branch. ***
 ***   Check our CONTRIBUTING.md file for more details.  ***
 ***                                                     ***
-***                    Thank you ❤️                     ***
+***                    Thank you ❤️                      ***
 ***                                                     ***
 ***********************************************************
 
+Used version:
+$used_version
+
+Affected files:
+$files_to_edit
+
+The following changes should be made:
+$changes_to_make
+
 Exiting...
 EOM
     exit 2
@@ -48,6 +65,9 @@ EOM
 ***                                                     ***
 ***********************************************************
 
+Used version:
+$used_version
+
 Exiting...
 EOM
     exit 0

.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/prep_release.sh

@@ -89,8 +89,6 @@ else
       echo "'$previous' to '$TAG' ($count commits)"
       # --> is the markdown comment escape sequence, emojis are way better
       generated_list="${generated_list//-->/→}"
-      # Escape & to preserve it from commit message into markdown output
-      generated_list="${generated_list//&/\\&}"
       body="${body//--REPLACE-WITH-GENERATED-LIST--/$generated_list}"
       body="${body//--REPLACE-WITH-COMMIT-COUNT--/$count}"
       body="${body//--REPLACE-WITH-PREVIOUS-RELEASE-TAG--/$previous}"

.ci/release_template.md

@@ -10,24 +10,24 @@ 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>
-   • <kbd>macOS 14+</kbd> <sub><i>Sonoma</i></sub>
-   • <kbd>macOS 13+</kbd> <sub><i>Ventura (x86)</i></sub>
+   • <kbd>macOS 15+</kbd> <sub><i>Sequoia</i></sub> <sub>Apple M</sub>
+   • <kbd>macOS 14+</kbd> <sub><i>Sonoma</i></sub> <sub>Apple M</sub>
+   • <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>
    • <kbd>Debian 12</kbd> <sub><i>Bookworm</i></sub>
-   • <kbd>Fedora 44</kbd>
+   • <kbd>Debian 11</kbd> <sub><i>Bullseye</i></sub>
    • <kbd>Fedora 43</kbd>
+   • <kbd>Fedora 42</kbd>
 
-   <sub>General Linux support is available via a <kbd>flatpak</kbd> package hosted at <a href="https://flathub.org/apps/io.github.Cockatrice.cockatrice">Flathub</a> (x86 & ARM)!</sub>
-   <sub>Thanks to courtesy of @FFY00, the app is also available in <kbd>Arch Linux</kbd>'s <a href="https://archlinux.org/packages/extra/x86_64/cockatrice">official extra repository</a>.</sub>
-
- <sub>We maintain a <kbd>Docker</kbd> image for "Servatrice" in <a href="https://github.com/Cockatrice/Cockatrice/pkgs/container/servatrice">GHCR</a> (x86 & ARM). You can docker pull it or use our Docker Compose files!</sub>
+<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>
 </pre>
 
 
@@ -83,6 +83,7 @@ Remove empty headers when done.
 ### Under the Hood
 ### Oracle
 ### Servatrice
+### Webatrice
 
 </details>
 

.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::"

.clang-format

@@ -3,9 +3,7 @@ AccessModifierOffset: -4
 ColumnLimit: 120
 ---
 Language: Cpp
-AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortFunctionsOnASingleLine: None
-BinPackParameters: false
+BreakBeforeBraces: Custom
 BraceWrapping:
   AfterClass: true
   AfterControlStatement: false
@@ -20,14 +18,16 @@ BraceWrapping:
   SplitEmptyFunction: true
   SplitEmptyRecord: true
   SplitEmptyNamespace: true
-BreakBeforeBraces: Custom
-IncludeBlocks: Regroup
+AllowShortFunctionsOnASingleLine: None
+BinPackParameters: false
+AllowAllParametersOfDeclarationOnNextLine: false
 IndentCaseLabels: true
-InsertBraces: true
 PointerAlignment: Right
-RemoveSemicolon: true
 SortIncludes: true
+IncludeBlocks: Regroup
 StatementAttributeLikeMacros: [emit]
+# requires clang-format 16
+# RemoveSemicolon: true
 ---
 Language: Proto
 AllowShortFunctionsOnASingleLine: None

.codacy.yml

@@ -0,0 +1,5 @@
+---
+exclude_paths:
+  - '**/translations/*.ts'
+
+# codacy config documentation: https://support.codacy.com/hc/en-us/articles/115002130625-Codacy-Configuration-File

.dockerignore

@@ -1,3 +1,4 @@
+.git/
 build/
 .github/
 .tx/

.github/CONTRIBUTING.md

@@ -209,16 +209,6 @@ nowadays and clean it up for you.
 Lines should be 120 characters or less. Please break up lines that are too long
 into smaller parts, for example at spaces or after opening a brace.
 
-### Documentation Comments ###
-
-Use [Doxygen](https://www.doxygen.nl/) for code documentation:
-
-- **Doc blocks**: Use `/** @brief Description */` (Javadoc-style), not `///`
-- **Member comments**: Use trailing `///<` for inline member documentation
-- **TODOs**: Use `//! \todo Description` (Qt-style), Doxygen collects them into a Todo List
-  (uses [Qt-style comments](https://www.doxygen.nl/manual/docblocks.html) with
-  Doxygen's [\todo command](https://www.doxygen.nl/manual/commands.html#cmdtodo))
-
 ### Memory Management ###
 
 New code should be written using references over pointers and stack allocation
@@ -334,7 +324,7 @@ the tr() call, also you can add an extra string as a hint for translators:
 QString message = tr("Everyone draws %n cards", "english hint for translators", amount);
 ```
 See [Qt's wiki on translations](
-https://doc.qt.io/qt-6/i18n-source-translation.html#handling-plurals)
+https://doc.qt.io/qt-5/i18n-source-translation.html#handling-plurals)
 
 If you're about to propose a change that adds or modifies any translatable
 string in the code, you don't need to take care of adding the new strings to
@@ -471,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)
-      - 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:
@@ -39,3 +37,13 @@ updates:
       interval: "weekly"
     # Limit the amout of open PR's (default = 5, disabled = 0, security updates are not impacted)
     open-pull-requests-limit: 2
+
+ # # Enable version updates for npm
+ # - package-ecosystem: "npm"
+ #   # Look for `package.json` and `lock` files in the `webclient` subdirectory
+ #   directory: "/webclient"
+ #   # Check the npm registry for updates once a week
+ #   schedule:
+ #     interval: "weekly"
+ #   # Limit the amout of open PR's (default = 5, disabled = 0, security updates are not impacted)
+ #   open-pull-requests-limit: 5

.github/workflows/codeql.yml

@@ -1,95 +0,0 @@
-# GitHub Docs on Code Scanning:
-# https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning
-# https://docs.github.com/en/code-security/how-tos/find-and-fix-code-vulnerabilities/manage-your-configuration
-# https://docs.github.com/en/code-security/reference/code-scanning/workflow-configuration-options
-#
-# CodeQL Docs:
-# https://codeql.github.com/docs/
-
-name: CodeQL
-
-permissions:
-  contents: read
-  security-events: write    # needed to post results
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-
-# Cancel earlier, unfinished runs of this workflow on the same branch
-concurrency:
-  group: "${{ github.workflow }} @ ${{ github.ref_name }}"
-  cancel-in-progress: true
-
-jobs:
-  analyze:
-    name: Analyze (${{ matrix.language }})
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        # https://codeql.github.com/docs/codeql-overview/supported-languages-and-frameworks/
-        - language: cpp
-          build-mode: manual
-        - language: actions
-          build-mode: none
-
-    steps:
-    - name: "Checkout repository"
-      uses: actions/checkout@v7
-
-    - name: "Initialize CodeQL"
-      uses: github/codeql-action/init@v4
-      with:
-        languages: ${{ matrix.language }}
-        build-mode: ${{ matrix.build-mode }}
-        # https://docs.github.com/en/code-security/reference/code-scanning/codeql/codeql-queries/c-cpp-built-in-queries
-        # https://docs.github.com/en/code-security/reference/code-scanning/codeql/codeql-queries/actions-built-in-queries
-        queries: security-extended
-        dependency-caching: true
-
-    - name: "[C++] Install dependencies"
-      if: matrix.language == 'cpp' && matrix.build-mode == 'manual'
-      shell: bash
-      env:
-        DEBIAN_FRONTEND: noninteractive
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y --no-install-recommends \
-          cmake \
-          g++ \
-          libgl-dev \
-          liblzma-dev \
-          libmariadb-dev-compat \
-          libprotobuf-dev \
-          ninja-build \
-          protobuf-compiler \
-          qt6-declarative-dev \
-          qt6-multimedia-dev \
-          qt6-shadertools-dev \
-          qt6-svg-dev \
-          qt6-tools-dev \
-          qt6-tools-dev-tools \
-          qt6-websockets-dev
-
-# Minimize dependency install
-# Add ccache usage for faster compilation, (install ccache dep, actions/cache step + append DUSE_CCACHE=1 in cmake config, CCACHE env values)
-
-    - name: "[C++] Configure CMake"
-      if: matrix.language == 'cpp' && matrix.build-mode == 'manual'
-      shell: bash
-      run: cmake -S . -B build -G Ninja -DWITH_SERVER=1 -DCMAKE_BUILD_TYPE=Release
-
-    - name: "[C++] Build application"
-      if: matrix.language == 'cpp' && matrix.build-mode == 'manual'
-      shell: bash
-      run: cmake --build build
-
-    - name: "Perform CodeQL Analysis"
-      uses: github/codeql-action/analyze@v4
-      with:
-        category: "/language:${{ matrix.language }}"

.github/workflows/desktop-build.yml

@@ -1,10 +1,10 @@
 name: Build Desktop
 
 permissions:
-  actions: write    # needed to delete entries in GHA cache (update ccache)
-  attestations: write    # needed to persist the attestation.
-  contents: write    # needed for e.g. vcpkg dependency graph updates
-  id-token: write    # needed for signing certificate in attestation
+  contents: write
+  id-token: write
+  attestations: write
+  actions: write # needed for ccache action to be able to delete gha caches
 
 on:
   push:
@@ -14,12 +14,14 @@ on:
       - '*/**'    # matches all files not in root
       - '!**.md'
       - '!.github/**'
+      - '!.husky/**'
       - '!.tx/**'
       - '!doc/**'
+      - '!webclient/**'
       - '.github/workflows/desktop-build.yml'
       - 'CMakeLists.txt'
       - 'vcpkg.json'
-      - 'vcpkg'    # needed to match submodule bumps (gitlink)
+      - 'vcpkg'
     tags:
       - '*'
   pull_request:
@@ -27,283 +29,221 @@ on:
       - '*/**'    # matches all files not in root
       - '!**.md'
       - '!.github/**'
+      - '!.husky/**'
       - '!.tx/**'
       - '!doc/**'
+      - '!webclient/**'
       - '.github/workflows/desktop-build.yml'
       - 'CMakeLists.txt'
       - 'vcpkg.json'
-      - 'vcpkg'    # needed to match submodule bumps (gitlink)
+      - 'vcpkg'
 
-# Cancel earlier, unfinished runs of this workflow on the same branch (unless on tag --> 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    # https://github.com/actions/runner-images/blob/main/images/ubuntu-slim/ubuntu-slim-Readme.md
+    runs-on: ubuntu-latest
     outputs:
-      tag: ${{ steps.configure.outputs.tag }}
-      sha: ${{ steps.configure.outputs.sha }}
+      tag: ${{steps.configure.outputs.tag}}
+      sha: ${{steps.configure.outputs.sha}}
 
-    steps:
-      - name: "Configure"
-        env:
-          RESOLVED_SHA: ${{ case(github.event_name == 'pull_request', github.event.pull_request.head.sha, github.sha) }}
+    steps:  
+      - name: Configure
         id: configure
         shell: bash
         run: |
-          if [[ "$GITHUB_REF_TYPE" == 'tag' ]]; then    # release
-            echo "tag=$GITHUB_REF_NAME" >> "$GITHUB_OUTPUT"
+          tag_regex='^refs/tags/'
+          if [[ $GITHUB_EVENT_NAME == pull-request ]]; then    # pull request
+            sha="${{github.event.pull_request.head.sha}}"
+          elif [[ $GITHUB_REF =~ $tag_regex ]]; then    # release
+            sha="$GITHUB_SHA"
+            tag="${GITHUB_REF/refs\/tags\//}"
+            echo "tag=$tag" >>"$GITHUB_OUTPUT"
+          else    # push to branch
+            sha="$GITHUB_SHA"
           fi
-          echo "sha=$RESOLVED_SHA" >> "$GITHUB_OUTPUT"
+          echo "sha=$sha" >>"$GITHUB_OUTPUT"
 
-      - name: "Checkout"
+      - name: Checkout
         if: steps.configure.outputs.tag != null
-        uses: actions/checkout@v7
+        uses: actions/checkout@v6
         with:
-          fetch-depth: 0    # fetch all history for all branches and tags
+          fetch-depth: 0
 
-      - name: "Prepare release parameters"
+      - name: Prepare release parameters
         id: prepare
         if: steps.configure.outputs.tag != null
         shell: bash
         env:
-          TAG: ${{ steps.configure.outputs.tag }}
+          TAG: ${{steps.configure.outputs.tag}}
         run: .ci/prep_release.sh
 
-      - name: "Create release"
+      - name: Create release
         if: steps.configure.outputs.tag != null
         id: create_release
         shell: bash
         env:
-          GH_TOKEN: ${{ github.token }}
-          tag_name: ${{ steps.configure.outputs.tag }}
-          target: ${{ steps.configure.outputs.sha }}
-          release_name: ${{ steps.prepare.outputs.title }}
-          body_path: ${{ steps.prepare.outputs.body_path }}
-          prerelease: ${{ steps.prepare.outputs.is_beta }}
+          GH_TOKEN: ${{github.token}}
+          tag_name: ${{steps.configure.outputs.tag}}
+          target: ${{steps.configure.outputs.sha}}
+          release_name: ${{steps.prepare.outputs.title}}
+          body_path: ${{steps.prepare.outputs.body_path}}
+          prerelease: ${{steps.prepare.outputs.is_beta}}
         run: |
-          args=()
-          [[ $prerelease == yes ]] && args+=(--prerelease)
-
-          gh release create "$tag_name" --verify-tag --draft "${args[@]}" \
-            --target "$target" \
-            --title "$release_name" \
-            --notes-file "$body_path"
+          if [[ $prerelease == yes ]]; then
+            args="--prerelease"
+          fi
+          gh release create "$tag_name" --draft --verify-tag $args \
+              --target "$target" --title "$release_name" \
+              --notes-file "$body_path"
 
   build-linux:
     strategy:
       fail-fast: false
       matrix:
-        # The files in ".ci/$distro$version" correspond to the values given here
+        # These names correspond to the files in ".ci/$distro$version"
         include:
           - distro: Arch
-
-            allow-failure: yes
             package: skip    # We are packaged in Arch already
+            allow-failure: yes
+
+          - distro: Debian
+            version: 11
+            package: DEB
 
           - distro: Servatrice_Debian
-            version: 12
-
+            version: 11
             package: DEB
-            server_only: yes
             test: skip
+            server_only: yes
 
           - distro: Debian
             version: 12
-
             package: DEB
             test: skip    # Running tests on all distros is superfluous
 
           - distro: Debian
             version: 13
-
             package: DEB
 
+          - distro: Fedora
+            version: 42
+            package: RPM
+            test: skip    # Running tests on all distros is superfluous
+
           - distro: Fedora
             version: 43
-
             package: RPM
+
+          - distro: Ubuntu
+            version: 22.04
+            package: DEB
             test: skip    # Running tests on all distros is superfluous
 
-          - distro: Fedora
-            version: 44
-
-            package: RPM
-
           - distro: Ubuntu
             version: 24.04
-
-            package: DEB
-            test: skip    # Running tests on all distros is superfluous
-
-          - distro: Ubuntu
-            version: 26.04
-
             package: DEB
 
-            # The one leg that runs the suite under AddressSanitizer and
-            # UndefinedBehaviorSanitizer. Debian 13 and Fedora 44 keep covering the
-            # uninstrumented suite, so nothing is lost by instrumenting this one.
-            sanitize: yes
-
-          - distro: Ubuntu
-            version: 26.04
-            variant: cover    # separate image and ccache, same distro
-
-            # The one leg that runs instrumented for line coverage and publishes the report as
-            # a workflow artifact. It is a separate leg rather than a second flag on the
-            # sanitizer leg because the two instruments answer different questions: the
-            # sanitizer leg reports what the run did wrong, the coverage leg reports what the
-            # run never touched at all. Combining them would also slow both down. Packaging is
-            # skipped because the leg above already publishes the DEB for this distro.
-            coverage: yes
-            package: skip
-
-    name: ${{ matrix.distro }} ${{ matrix.version }}${{ matrix.variant && format(' {0}', matrix.variant) || '' }}
+    name: ${{matrix.distro}} ${{matrix.version}}
     needs: configure
-    runs-on: ubuntu-latest    # https://github.com/actions/runner-images
-    continue-on-error: ${{ matrix.allow-failure == 'yes' }}
-    timeout-minutes: 70
+    runs-on: ubuntu-latest
+    continue-on-error: ${{matrix.allow-failure == 'yes'}}
     env:
-      CACHE: ${{ github.workspace }}/.cache/${{ matrix.distro }}${{ matrix.version }}${{ matrix.variant }}    # directory for caching docker image and ccache
-      CCACHE_EVICTION_AGE: 7d
-      CCACHE_SIZE: 600M    # space of all repo is 10Gi: https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
+      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: 500M
       CMAKE_GENERATOR: 'Ninja'
-      NAME: ${{ matrix.distro }}${{ matrix.version }}
-      IMAGE_SUFFIX: ${{ matrix.variant }}
 
     steps:
-      - name: "Checkout"
-        uses: actions/checkout@v7
+      - name: Checkout
+        uses: actions/checkout@v6
 
-      - name: "Restore compiler cache (ccache)"
-        id: restore_ccache
-        uses: actions/cache/restore@v6
+      - name: Restore compiler cache (ccache)
+        id: ccache_restore
+        uses: actions/cache/restore@v4
+        env:
+          BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
         with:
-          key: ccache-${{ matrix.distro }}${{ matrix.version }}${{ matrix.variant }}
-          path: ${{ env.CACHE }}
+          path: ${{env.CACHE}}
+          key: ccache-${{matrix.distro}}${{matrix.version}}-${{env.BRANCH_NAME}}
+          restore-keys: ccache-${{matrix.distro}}${{matrix.version}}-
 
-      - name: "Build ${{ matrix.distro }} ${{ matrix.version }} Docker image"
+      - name: Build ${{matrix.distro}} ${{matrix.version}} Docker image
         shell: bash
         run: source .ci/docker.sh --build
 
-      - name: "Build debug and test"
+      - name: Build debug and test
         if: matrix.test != 'skip'
         shell: bash
         env:
-          sanitize: '${{ matrix.sanitize }}'
-          coverage: '${{ matrix.coverage }}'
+          CMAKE_GENERATOR: '${{env.CMAKE_GENERATOR}}'
         run: |
           source .ci/docker.sh
-          args=()
-          [[ $GITHUB_REF == "refs/heads/master" ]] && args+=(--evict-ccache "$CCACHE_EVICTION_AGE")
-          args+=(--ccache "$CCACHE_SIZE")
-          args+=(--cmake-generator "$CMAKE_GENERATOR")
+          RUN --server --debug --test --ccache "$CCACHE_SIZE"
 
-          extra=()
-          [[ $sanitize == yes ]] && extra+=(--sanitize)
-          [[ $coverage == yes ]] && extra+=(--coverage)
-
-          RUN --server --debug --test "${extra[@]}" "${args[@]}"
-
-      # RUN bind-mounts the workspace into the container, so the report the build wrote into
-      # build/ is already on the host and no second container is needed to collect it.
-      - name: "Collect coverage report"
-        if: matrix.coverage == 'yes'
-        shell: bash
-        run: |
-          mkdir -p coverage
-          # --html-details writes one page per source file plus a stylesheet and script, and the
-          # index links to all of them by relative name. Copying the index alone would publish a
-          # report where every link 404s, so the whole family has to travel together.
-          cp build/coverage-details* coverage/
-          cp build/coverage.lcov build/coverage.xml build/coverage-summary.json coverage/
-          ls -la coverage/
-
-      - name: "Upload coverage artifact"
-        if: matrix.coverage == 'yes'
-        uses: actions/upload-artifact@v4
-        with:
-          name: coverage-report
-          path: coverage/
-          if-no-files-found: warn
-
-      - name: "Build release package"
+      - name: Build release package
         id: build
         if: matrix.package != 'skip'
         shell: bash
         env:
-          SUFFIX: '-${{ matrix.distro }}${{ matrix.version }}'
-          package: '${{ matrix.package }}'
-          server_only: '${{ matrix.server_only }}'
+          BUILD_DIR: build
+          SUFFIX: '-${{matrix.distro}}${{matrix.version}}'
+          package: '${{matrix.package}}'
+          CMAKE_GENERATOR: '${{env.CMAKE_GENERATOR}}'
+          NO_CLIENT: ${{matrix.server_only == 'yes' && '--no-client' || '' }}
         run: |
           source .ci/docker.sh
-          args=()
-          [[ $server_only == yes ]] && args+=(--no-client)
-          [[ $GITHUB_REF == "refs/heads/master" ]] && args+=(--evict-ccache "$CCACHE_EVICTION_AGE")
-          args+=(--ccache "$CCACHE_SIZE")
-          args+=(--cmake-generator "$CMAKE_GENERATOR")
-          args+=(--suffix "$SUFFIX")
+          RUN --server --release --package "$package" --dir "$BUILD_DIR" \
+                  --ccache "$CCACHE_SIZE" $NO_CLIENT
+          .ci/name_build.sh
 
-          RUN --server --release --package "$package" "${args[@]}"
-
-      # 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.restore_ccache.outputs.cache-hit
-        continue-on-error: true
-        env:
-          CACHE_PRIMARY_KEY: ${{ steps.restore_ccache.outputs.cache-primary-key }}
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          if gh cache delete --repo "$GITHUB_REPOSITORY" "$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@v6
+        uses: actions/cache/save@v4
         with:
-          key: ${{ steps.restore_ccache.outputs.cache-primary-key }}
-          path: ${{ env.CACHE }}
+          path: ${{env.CACHE}}
+          key: ${{ steps.ccache_restore.outputs.cache-primary-key }}
 
-      - name: "Upload artifact"
+      - name: Upload artifact
         id: upload_artifact
         if: matrix.package != 'skip'
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v5
         with:
-          archive: false
+          name: ${{matrix.distro}}${{matrix.version}}-package
+          path: ${{steps.build.outputs.path}}
           if-no-files-found: error
-          path: ${{ steps.build.outputs.path }}
 
-      - name: "Upload to release"
+      - name: Upload to release
         id: upload_release
         if: matrix.package != 'skip' && needs.configure.outputs.tag != null
         shell: bash
         env:
-          asset_name: ${{ steps.build.outputs.fullname }}
-          asset_path: ${{ steps.build.outputs.path }}
-          GH_TOKEN: ${{ github.token }}
-          tag_name: ${{ needs.configure.outputs.tag }}
+          GH_TOKEN: ${{github.token}}
+          tag_name: ${{needs.configure.outputs.tag}}
+          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"
+      - name: Attest binary provenance
         id: attestation
         if: steps.upload_release.outcome == 'success'
-        uses: actions/attest@v4
+        uses: actions/attest-build-provenance@v3
         with:
-          show-summary: false
-          subject-path: ${{ steps.build.outputs.path }}
+          subject-name: ${{steps.build.outputs.name}}
+          subject-digest: sha256:${{ steps.upload_artifact.outputs.artifact-digest }}
 
-      - name: "Verify binary attestation"
+      - name: Verify binary attestation
         if: steps.attestation.outcome == 'success'
         shell: bash
         env:
-          BUILD_PATH: ${{ steps.build.outputs.path }}
-          GH_TOKEN: ${{ github.token }}
-        run: gh attestation verify "$BUILD_PATH" --repo Cockatrice/Cockatrice
+          GH_TOKEN: ${{github.token}}
+        run: gh attestation verify ${{steps.build.outputs.path}} -R Cockatrice/Cockatrice
 
   build-vcpkg:
     strategy:
@@ -311,252 +251,176 @@ jobs:
       matrix:
         include:
           - os: macOS
-            target: 13    # EOL 2025-09-15
-            runner: macos-15-intel    # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md
-                                      # macos-26-intel is very slow and fails in CPack during DMG config if not increasing Finder timeout
-
-            ccache_eviction_age: 7d
-            cmake_generator: Ninja
-            make_package: 1
-            override_target: 13
-            package_suffix: "-macOS13_Intel"
-            qt_version: 6.11.*
-            qt_modules: qtimageformats qtmultimedia qtshadertools qtwebsockets
+            target: 13
+            runner: macos-15-intel
             soc: Intel
+            xcode: "16.4"
             type: Release
+            override_target: 13
+            make_package: 1
+            package_suffix: "-macOS13_Intel"
+            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
-            xcode: "26.3"
 
           - os: macOS
-            target: 14    # EOL 2026-??
-            runner: macos-26    # https://github.com/actions/runner-images/blob/main/images/macos/macos-26-arm64-Readme.md
-
-            ccache_eviction_age: 7d
-            cmake_generator: Ninja
-            make_package: 1
-            override_target: 14
-            package_suffix: "-macOS14"
-            qt_version: 6.11.*
-            qt_modules: qtimageformats qtmultimedia qtshadertools qtwebsockets
+            target: 14
+            runner: macos-14
             soc: Apple
+            xcode: "15.4"
             type: Release
+            make_package: 1
+            package_suffix: "-macOS14"
+            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
-            xcode: "26.6"
 
           - os: macOS
             target: 15
-            runner: macos-26    # https://github.com/actions/runner-images/blob/main/images/macos/macos-26-arm64-Readme.md
-
-            ccache_eviction_age: 7d
-            cmake_generator: Ninja
-            make_package: 1
-            override_target: 15
-            package_suffix: "-macOS15"
-            qt_version: 6.11.*
-            qt_modules: qtimageformats qtmultimedia qtshadertools qtwebsockets
+            runner: macos-15
             soc: Apple
+            xcode: "16.4"
             type: Release
+            make_package: 1
+            package_suffix: "-macOS15"
+            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
-            xcode: "26.6"
 
           - os: macOS
-            target: 26
-            runner: macos-26    # https://github.com/actions/runner-images/blob/main/images/macos/macos-26-arm64-Readme.md
-
-            ccache_eviction_age: 7d
-            cmake_generator: Ninja
-            qt_version: 6.11.*
-            qt_modules: qtimageformats qtmultimedia qtshadertools qtwebsockets
+            target: 15
+            runner: macos-15
             soc: Apple
+            xcode: "16.4"
             type: Debug
+            qt_version: 6.6.*
+            qt_arch: clang_64
+            qt_modules: qtimageformats qtmultimedia qtwebsockets
+            cache_qt: false
+            cmake_generator: Ninja
             use_ccache: 1
-            xcode: "26.6"
+
+          - 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    # https://github.com/actions/runner-images/blob/main/images/windows/Windows2025-VS2026-Readme.md
-
-            cmake_generator: "Visual Studio 18 2026"
-            cmake_generator_platform: x64
+            runner: windows-2022
+            type: Release
             make_package: 1
             package_suffix: "-Win10"
-            qt_version: 6.11.*
-            qt_modules: qtimageformats qtmultimedia qtshadertools qtwebsockets
-            type: Release
+            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' || '' }}
+    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/
-      CCACHE_SIZE: 600M    # space of all repo is 10Gi: https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
+    runs-on: ${{matrix.runner}}
 
     steps:
-      - name: "Checkout"
-        uses: actions/checkout@v7
+      - name: Checkout
+        uses: actions/checkout@v6
         with:
           submodules: recursive
 
-      - name: "[Windows] Add msbuild to PATH"
+      - name: Add msbuild to PATH
         if: matrix.os == 'Windows'
-        uses: microsoft/setup-msbuild@v3
+        id: add-msbuild
+        uses: microsoft/setup-msbuild@v2
         with:
           msbuild-architecture: x64
 
-      - name: "[macOS] Setup ccache"
-        if: matrix.os == 'macOS' && matrix.use_ccache == 1
-        run: brew install ccache
-
-      - name: "[macOS] Restore compiler cache (ccache)"
-        if: matrix.os == 'macOS' && matrix.use_ccache == 1
-        id: restore_ccache
-        uses: actions/cache/restore@v6
+      # 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
+        uses: jianmingyong/ccache-action@v1
         with:
-          key: ccache-${{ matrix.runner }}_${{ matrix.override_target }}-Xcode${{ matrix.xcode }}
-          path: ${{ env.CCACHE_DIR }}
+          install-type: "binary"
+          ccache-key-prefix: ccache-${{matrix.runner}}-${{matrix.soc}}-${{matrix.type}}
+          max-size: 500M
+          gh-token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: "[macOS] Install aqtinstall"
-        if: matrix.os == 'macOS'
-        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: "[macOS] Resolve latest Qt from ${{ matrix.qt_version }} input"
-        if: matrix.os == 'macOS'
-        env:
-          QT_VERSION: ${{ matrix.qt_version }}
-        id: resolve_qt_version
-        shell: bash
-        run: .ci/resolve_latest_aqt_qt_version.sh "$QT_VERSION"
-
-      - name: "[macOS] Restore thin Qt ${{ steps.resolve_qt_version.outputs.version }}"
-        if: matrix.os == 'macOS'
-        id: restore_qt
-        uses: actions/cache/restore@v6
-        with:
-          key: Qt-${{ steps.resolve_qt_version.outputs.version }}-macOS-${{ matrix.soc }}-${{ matrix.qt_modules }}-thin
-          path: ${{ github.workspace }}/Qt
-
-      # 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: "[macOS] Install fat Qt ${{ matrix.qt_version }}"
-        if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true'
+      - name: Install Qt ${{matrix.qt_version}}
         uses: jurplel/install-qt-action@v4
         with:
-          cache: false
-          # cache-key-prefix: Qt
-          dir: ${{ github.workspace }}    # thinning script depends on this location
-          modules: ${{ matrix.qt_modules }}
-          version: ${{ matrix.qt_version }}
+          version: ${{matrix.qt_version}}
+          arch: ${{matrix.qt_arch}}
+          modules: ${{matrix.qt_modules}}
+          cache: ${{matrix.cache_qt}}
 
-      - name: "[macOS] Create thin Qt libraries"
-        if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true'
-        run: .ci/thin_macos_qtlib.sh
-
-      - name: "[macOS] Cache thin Qt libraries"
-        if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true' && github.ref == 'refs/heads/master'
-        uses: actions/cache/save@v6
-        with:
-          key: ${{ steps.restore_qt.outputs.cache-primary-key }}
-          path: ${{ github.workspace }}/Qt
-
-      - name: "[Windows] Install Qt ${{ matrix.qt_version }}"
-        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
-          cache: ${{ github.ref == 'refs/heads/master' }}
-          cache-key-prefix: Qt
-          modules: ${{ matrix.qt_modules }}
-          version: ${{ matrix.qt_version }}
-
-      - name: "[Windows] Install NSIS"
-        if: matrix.os == 'Windows'
-        shell: bash
-        run: choco install nsis
-
-      - name: "Setup vcpkg cache"
+      - name: Setup vcpkg cache
         id: vcpkg-cache
         uses: TAServers/vcpkg-cache@v3
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      # Uses environment variables, see compile.sh for more details
-      - name: "Build Cockatrice"
+      # uses environment variables, see compile.sh for more details
+      - name: Build Cockatrice
         id: build
         shell: bash
         env:
-          BUILDTYPE: '${{ matrix.type }}'
-          CCACHE_EVICTION_AGE: ${{ matrix.ccache_eviction_age }}
-          CMAKE_GENERATOR: ${{ matrix.cmake_generator }}
-          CMAKE_GENERATOR_PLATFORM: ${{ matrix.cmake_generator_platform }}
-          DEVELOPER_DIR: '/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer'
-          GITHUB_TOKEN: ${{ github.token }}    # needed for vcpkg dependency graph updates, see VCPKG_FEATURE_FLAGS
-          MACOS_CERTIFICATE: ${{ secrets.PROD_MACOS_CERTIFICATE }}
-          MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }}
-          MACOS_CERTIFICATE_PWD: ${{ secrets.PROD_MACOS_CERTIFICATE_PWD }}
-          MACOS_CI_KEYCHAIN_PWD: ${{ secrets.PROD_MACOS_CI_KEYCHAIN_PWD }}
-          MAKE_PACKAGE: '${{ matrix.make_package }}'
-          PACKAGE_SUFFIX: '${{ matrix.package_suffix }}'
-          TARGET_MACOS_VERSION: ${{ matrix.override_target }}
-          USE_CCACHE: ${{ matrix.use_ccache }}
-          VCPKG_BINARY_SOURCES: "clear;files,${{ steps.vcpkg-cache.outputs.path }},${{ case(github.ref == 'refs/heads/master', 'readwrite', 'read') }}"
+          BUILDTYPE: '${{matrix.type}}'
+          MAKE_PACKAGE: '${{matrix.make_package}}'
+          PACKAGE_SUFFIX: '${{matrix.package_suffix}}'
+          CMAKE_GENERATOR: ${{matrix.cmake_generator}}
+          CMAKE_GENERATOR_PLATFORM: ${{matrix.cmake_generator_platform}}
+          USE_CCACHE: ${{matrix.use_ccache}}
           VCPKG_DISABLE_METRICS: 1
-          VCPKG_FEATURE_FLAGS: dependencygraph
+          VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite'
+          # macOS-specific environment variables, will be ignored on Windows
+          MACOS_CERTIFICATE: ${{ secrets.PROD_MACOS_CERTIFICATE }}
+          MACOS_CERTIFICATE_PWD: ${{ secrets.PROD_MACOS_CERTIFICATE_PWD }}
+          MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }}
+          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 }}
         run: .ci/compile.sh --server --test --vcpkg
 
-      # CPack reports a failed makensis run as "Problem running NSIS command"
-      # plus a path to NSISOutput.log, and that log lives only on the runner, so
-      # the actual compile error is otherwise nowhere in the workflow output.
-      # Dump it, or a broken installer script is undiagnosable from CI alone.
-      # shell: bash matters here - the default pwsh resolves `find` to Windows'
-      # text-search find.exe, which errors instead of searching.
-      - name: "Dump NSIS compile log"
-        if: failure() && matrix.os == 'Windows'
-        shell: bash
-        run: find . -name NSISOutput.log -exec cat {} +
-
-      # Delete used cache to emulate a ccache update. See https://github.com/actions/cache/issues/342
-      - name: "[macOS] Delete remote compiler cache (ccache)"
-        if: matrix.os == 'macOS' && matrix.use_ccache == 1 && github.ref == 'refs/heads/master' && steps.restore_ccache.outputs.cache-hit
-        continue-on-error: true
+      - name: Sign app bundle
+        if: matrix.os == 'macOS' && matrix.make_package && (github.ref == 'refs/heads/master' || needs.configure.outputs.tag != null)
         env:
-          CACHE_PRIMARY_KEY: ${{ steps.restore_ccache.outputs.cache-primary-key }}
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          if gh cache delete --repo "$GITHUB_REPOSITORY" "$CACHE_PRIMARY_KEY"; then
-            echo "Cache deleted successfully"
-          fi
-
-      - name: "[macOS] Cache updated compiler cache (ccache)"
-        if: matrix.os == 'macOS' && matrix.use_ccache == 1 && github.ref == 'refs/heads/master'
-        uses: actions/cache/save@v6
-        with:
-          key: ${{ steps.restore_ccache.outputs.cache-primary-key }}
-          path: ${{ env.CCACHE_DIR }}
-
-      - name: "[macOS] Sign app bundle"
-        if: matrix.os == 'macOS' && matrix.make_package && needs.configure.outputs.tag != null
-        id: sign_macos
-        env:
-          BUILD_PATH: ${{ steps.build.outputs.path }}
           MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }}
           MACOS_CI_KEYCHAIN_PWD: ${{ secrets.PROD_MACOS_CI_KEYCHAIN_PWD }}
         run: |
           if [[ -n "$MACOS_CERTIFICATE_NAME" ]]
           then
             security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
-            /usr/bin/codesign --sign="$MACOS_CERTIFICATE_NAME" --entitlements=".ci/macos.entitlements" --options=runtime --force --deep --timestamp --verbose "$BUILD_PATH"
+            /usr/bin/codesign --sign="$MACOS_CERTIFICATE_NAME" --entitlements=".ci/macos.entitlements" --options=runtime --force --deep --timestamp --verbose ${{steps.build.outputs.path}}
           fi
 
-      - name: "[macOS] Notarize app bundle"
-        if: matrix.os == 'macOS' && steps.sign_macos.outcome == 'success'
+      - name: Notarize app bundle
+        if: matrix.os == 'macOS' && matrix.make_package && (github.ref == 'refs/heads/master' || needs.configure.outputs.tag != null)
         env:
-          BUILD_PATH: ${{ steps.build.outputs.path }}
           MACOS_NOTARIZATION_APPLE_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_APPLE_ID }}
-          MACOS_NOTARIZATION_PWD: ${{ secrets.PROD_MACOS_NOTARIZATION_PWD }}
           MACOS_NOTARIZATION_TEAM_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_TEAM_ID }}
+          MACOS_NOTARIZATION_PWD: ${{ secrets.PROD_MACOS_NOTARIZATION_PWD }}
         run: |
           if [[ -n "$MACOS_NOTARIZATION_APPLE_ID" ]]
           then
@@ -568,7 +432,7 @@ jobs:
             # Therefore, we create a zip file containing our app bundle, so that we can send it to the
             # notarization service
             echo "Creating temp notarization archive"
-            ditto -c -k --keepParent "$BUILD_PATH" "notarization.zip"
+            ditto -c -k --keepParent ${{steps.build.outputs.path}} "notarization.zip"
 
             # Here we send the notarization request to the Apple's Notarization service, waiting for the result.
             # This typically takes a few seconds inside a CI environment, but it might take more depending on the App
@@ -580,52 +444,50 @@ jobs:
             # Finally, we need to "attach the staple" to our executable, which will allow our app to be
             # validated by macOS even when an internet connection is not available.
             echo "Attach staple"
-            xcrun stapler staple "$BUILD_PATH"
+            xcrun stapler staple ${{steps.build.outputs.path}}
           fi
 
-      - name: "Upload artifact"
-        if: matrix.make_package
+      - name: Upload artifact
         id: upload_artifact
-        uses: actions/upload-artifact@v7
+        if: matrix.make_package
+        uses: actions/upload-artifact@v5
         with:
-          archive: false
+          name: ${{matrix.artifact_name}}
+          path: ${{steps.build.outputs.path}}
           if-no-files-found: error
-          path: ${{ steps.build.outputs.path }}
 
-      - name: "[Windows] 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:
-          if-no-files-found: error
-          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'
+      - name: Upload to release
         id: upload_release
+        if: needs.configure.outputs.tag != null
         shell: bash
         env:
-          asset_name: ${{ steps.build.outputs.fullname }}
-          asset_path: ${{ steps.build.outputs.path }}
-          GH_TOKEN: ${{ github.token }}
-          tag_name: ${{ needs.configure.outputs.tag }}
+          GH_TOKEN: ${{github.token}}
+          tag_name: ${{needs.configure.outputs.tag}}
+          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'
+      - name: Attest binary provenance
         id: attestation
-        uses: actions/attest@v4
+        if: steps.upload_release.outcome == 'success'
+        uses: actions/attest-build-provenance@v3
         with:
-          show-summary: false
-          subject-path: ${{ steps.build.outputs.path }}
+          subject-name: ${{steps.build.outputs.name}}
+          subject-digest: sha256:${{ steps.upload_artifact.outputs.artifact-digest }}
 
-      - name: "Verify binary attestation"
+      - name: Verify binary attestation
         if: steps.attestation.outcome == 'success'
         shell: bash
         env:
-          BUILD_PATH: ${{ steps.build.outputs.path }}
-          GH_TOKEN: ${{ github.token }}
-        run: gh attestation verify "$BUILD_PATH" --repo Cockatrice/Cockatrice
+          GH_TOKEN: ${{github.token}}
+        run: gh attestation verify ${{steps.build.outputs.path}} -R Cockatrice/Cockatrice

.github/workflows/desktop-lint.yml

@@ -1,18 +1,17 @@
 name: Code Style (C++) 
 
-permissions:
-  contents: read
-
 on:
-  # Push trigger not needed for linting, we do not allow direct pushes to master
+  # push trigger not needed for linting, we do not allow direct pushes to master
   pull_request:
     paths:
       - '*/**'    # matches all files not in root
       - '!**.md'
       - '!.ci/**'
       - '!.github/**'
+      - '!.husky/**'
       - '!.tx/**'
       - '!doc/**'
+      - '!webclient/**'
       - '.ci/lint_cpp.sh'
       - '.github/workflows/desktop-lint.yml'
       - '.clang-format'
@@ -21,23 +20,20 @@ on:
 
 jobs:
   format:
-    runs-on: ubuntu-slim
+    runs-on: ubuntu-22.04
 
     steps:
-    - name: "Checkout"
-      uses: actions/checkout@v7
+    - name: Checkout
+      uses: actions/checkout@v6
       with:
-        fetch-depth: 20    # should be enough to find merge base
+        fetch-depth: 20 # should be enough to find merge base
 
-    - name: "Install dependencies"
+    - name: Install dependencies
       shell: bash
       run: |
         sudo apt-get update
-        sudo apt-get install -y --no-install-recommends \
-          clang-format \
-          cmake-format \
-          shellcheck
+        sudo apt-get install -y --no-install-recommends clang-format cmake-format shellcheck
 
-    - name: "Check code formatting"
+    - name: Check code formatting
       shell: bash
       run: ./.ci/lint_cpp.sh

.github/workflows/docker-release.yml

@@ -1,11 +1,9 @@
-name: Build Docker
-
-permissions:
-  contents: read    # needed to checkout repo
-  packages: write    # needed for interacting with GHCR
+name: Build Docker Image
 
 on:
   push:
+    tags:
+      - '*Release*'
     branches:
       - master
   pull_request:
@@ -13,185 +11,56 @@ on:
       - master
     paths:
       - '.github/workflows/docker-release.yml'
-      - '.dockerignore'
       - 'Dockerfile'
-      - 'docker-compose.yml'
-      - 'docker-compose.yml.windows'
-  release:
-    types:
-      - released    # publishing of stable releases
-  workflow_dispatch:    # (re)publish the image for an existing stable release
-    inputs:
-      tag:
-        description: 'Existing release tag to build and publish (e.g. 2026-10-03-Release-3.1.0)'
-        required: true
-        type: string
-      latest:
-        description: 'Also update the "latest" tag'
-        required: true
-        type: boolean
-        default: true
-
-# Cancel earlier, unfinished runs of this workflow on the same branch (unless publishing)
-concurrency:
-  group: "${{ github.workflow }} @ ${{ inputs.tag || github.ref_name }}"
-  cancel-in-progress: ${{ github.event_name != 'release' && github.event_name != 'workflow_dispatch' }}
-
-env:
-  GHCR_IMAGE: ghcr.io/cockatrice/servatrice
-  OCI_DESCRIPTION: Server for Cockatrice, a cross-platform virtual tabletop for multiplayer card games
-  OCI_TITLE: Servatrice
-  OCI_URL: https://cockatrice.github.io/
 
 jobs:
-  # Create one platform-specific image and publish its OCI image manifest per matrix job
-  build:
-    name: "Servatrice (${{ matrix.label }})"
-    if: github.repository_owner == 'Cockatrice'
-    runs-on: ${{ matrix.runner }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - label: x86
-            platform: linux/amd64
-            runner: ubuntu-latest    # https://github.com/actions/runner-images
-
-          - label: arm
-            platform: linux/arm64
-            runner: ubuntu-24.04-arm    # https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Arm64-Readme.md, replace with "ubuntu-latest-arm" once available
-
-    env:
-      CACHE_SCOPE: servatrice-${{ matrix.label }}
+  docker:
+    name: amd64 & arm64
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
 
     steps:
-      - name: "Checkout"
-        uses: actions/checkout@v7
-        with:
-          ref: ${{ case(github.event_name == 'workflow_dispatch', format('refs/tags/{0}', inputs.tag), '') }}
+      - name: Checkout
+        uses: actions/checkout@v6
 
-      - name: "Set up Docker buildx"
-        uses: docker/setup-buildx-action@v4
-
-      - name: "Login to GitHub Container Registry (GHCR)"
-        if: (github.event_name == 'release' && github.event.release.prerelease == false) || github.event_name == 'workflow_dispatch'
-        id: login
-        uses: docker/login-action@v4
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ github.token }}
-
-      # Don't push for non-publishing triggers
-      - name: "Build image"
-        if: steps.login.outcome != 'success'
-        uses: docker/build-push-action@v7
-        with:
-          cache-from: type=gha,scope=${{ env.CACHE_SCOPE }}
-          cache-to: ${{ case(github.ref == 'refs/heads/master', format('type=gha,mode=max,scope={0}', env.CACHE_SCOPE), '') }}
-          context: .
-          platforms: ${{ matrix.platform }}
-          push: false
-
-      # Add OCI labels and push single-platform image by digest (without tags)
-      - name: "Build image and push by digest"
-        if: steps.login.outcome == 'success'
-        id: build
-        uses: docker/build-push-action@v7
-        with:
-          cache-from: type=gha,scope=${{ env.CACHE_SCOPE }}
-          cache-to: type=gha,mode=max,scope=${{ env.CACHE_SCOPE }}
-          context: .
-          labels: |
-            org.opencontainers.image.description=${{ env.OCI_DESCRIPTION }}
-            org.opencontainers.image.title=${{ env.OCI_TITLE }}
-            org.opencontainers.image.url=${{ env.OCI_URL }}
-          outputs: type=image,name=${{ env.GHCR_IMAGE }},name-canonical=true,push=true,push-by-digest=true
-          platforms: ${{ matrix.platform }}
-          provenance: mode=max    # Do not pass secrets as build arguments with this option
-          sbom: true
-
-      - name: "Export digest"
-        if: steps.login.outcome == 'success'
-        env:
-          DIGEST: ${{ steps.build.outputs.digest }}
-        run: |
-          mkdir -p "$RUNNER_TEMP/digests"
-          touch "$RUNNER_TEMP/digests/${DIGEST#sha256:}"
-
-      - name: "Upload digest"
-        if: steps.login.outcome == 'success'
-        uses: actions/upload-artifact@v7
-        with:
-          if-no-files-found: error
-          name: digest-${{ matrix.label }}
-          path: ${{ runner.temp }}/digests/*
-          retention-days: 1
-
-
-  # Create an OCI image index from the platform-specific image manifests
-  index:
-    name: "Publish multi-platform Servatrice image"
-    if: github.repository_owner == 'Cockatrice' && ((github.event_name == 'release' && github.event.release.prerelease == false) || github.event_name == 'workflow_dispatch')
-    needs: build
-    runs-on: ubuntu-slim    # https://github.com/actions/runner-images/blob/main/images/ubuntu-slim/ubuntu-slim-Readme.md
-
-    steps:
-      - name: "Download digests"
-        uses: actions/download-artifact@v8
-        with:
-          path: ${{ runner.temp }}/digests
-          pattern: digest-*
-          merge-multiple: true
-
-      - name: "Login to GitHub Container Registry (GHCR)"
-        uses: docker/login-action@v4
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ github.token }}
-
-      - name: "Docker metadata"
+      - name: Docker metadata
         id: metadata
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
-          images: ${{ env.GHCR_IMAGE }}
-          flavor: |
-            latest=auto
-          # if semver, also: type=semver,pattern={{version}} / {{major}}.{{minor}}
-          tags: |
-            type=ref,event=tag
-            type=raw,value=${{ inputs.tag }},enable=${{ github.event_name == 'workflow_dispatch' }}
-            type=raw,value=latest,enable=${{ github.event_name == 'workflow_dispatch' && inputs.latest }}
+          images: |
+            ghcr.io/cockatrice/servatrice
+          labels: |
+            org.opencontainers.image.title=Servatrice
+            org.opencontainers.image.url=https://cockatrice.github.io/
+            org.opencontainers.image.description=Server for Cockatrice, a cross-platform virtual tabletop for multiplayer card games
+          annotations: |
+            org.opencontainers.image.title=Servatrice
+            org.opencontainers.image.url=https://cockatrice.github.io/
+            org.opencontainers.image.description=Server for Cockatrice, a cross-platform virtual tabletop for multiplayer card games  
 
-      # Add OCI annotations to image index and publish tags
-      - name: "Create image index"
-        env:
-          DOCKER_TAGS: ${{ steps.metadata.outputs.tags }}
-        working-directory: ${{ runner.temp }}/digests
-        run: |
-          TAG_ARGS=()
-          while IFS= read -r tag; do
-            TAG_ARGS+=(--tag "$tag")
-          done <<< "$DOCKER_TAGS"
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
 
-          DIGEST_ARGS=()
-          for digest in *; do
-            DIGEST_ARGS+=("$GHCR_IMAGE@sha256:$digest")
-          done
+      - name: Set up Docker buildx
+        uses: docker/setup-buildx-action@v3
 
-          docker buildx imagetools create \
-            --prefer-index=true \
-            --annotation "index:org.opencontainers.image.description=$OCI_DESCRIPTION" \
-            --annotation "index:org.opencontainers.image.title=$OCI_TITLE" \
-            --annotation "index:org.opencontainers.image.url=$OCI_URL" \
-            "${TAG_ARGS[@]}" \
-            "${DIGEST_ARGS[@]}"
+      - name: Login to GitHub Container Registry
+        if: github.ref_type == 'tag'
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ github.token }}
 
-      - name: "Inspect images"
-        env:
-          GITHUB_TAG: ${{ inputs.tag || github.ref_name }}
-        run: |
-          docker buildx imagetools inspect "$GHCR_IMAGE:latest"
-          docker buildx imagetools inspect "$GHCR_IMAGE:$GITHUB_TAG"
+      - name: Build and push Docker image
+        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 }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/documentation-build.yml

@@ -1,26 +1,18 @@
 name: Generate Docs
 
-permissions:
-  contents: read    # write permission to the destination repo come from 'deploy_key'
-
 on:
+  push:
+    tags:
+      - '*'   # Only re-generate docs when a new tagged version is pushed
   pull_request:
     paths:
       - 'doc/doxygen/**'
       - '.github/workflows/documentation-build.yml'
       - 'Doxyfile'
-  release:
-    types:
-      - published    # publishing of stable releases and pre-releases
   workflow_dispatch:
 
-# 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.event_name != 'release' }}
-
 env:
-  COCKATRICE_REF: ${{ github.ref_name }}    # tag name if the commit is tagged, otherwise branch name
+  COCKATRICE_REF: ${{ github.ref_name }}    # Tag name if the commit is tagged, otherwise branch name
 
 jobs:
   docs:
@@ -28,24 +20,20 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: "Checkout"
-        uses: actions/checkout@v7
-        with:
-          submodules: recursive
+      - name: Checkout code
+        uses: actions/checkout@v6
 
-      - name: "Install Graphviz"
-        shell: bash
+      - name: Install Graphviz
         run: |
           sudo apt-get install -y graphviz
           dot -V
 
-      - name: "Install Doxygen"
-        uses: ssciwr/doxygen-install@v2
+      - name: Install Doxygen
+        uses: ssciwr/doxygen-install@v1
         with:
-          version: "1.18.0"
+          version: "1.14.0"
 
-      - name: "Update Doxygen Configuration"
-        shell: bash
+      - name: Update Doxygen Configuration
         run: |
           git diff Doxyfile
           doxygen -u Doxyfile
@@ -58,22 +46,16 @@ jobs:
             exit 1
           fi
 
-      - name: "Generate Documentation"
+      - name: Generate Documentation
         if: always()
-        shell: bash
         run: doxygen Doxyfile
 
-      - name: "Deploy to cockatrice.github.io/docs"
-        if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
+      - name: Deploy to cockatrice.github.io
+        if: github.event_name != 'pull_request'
         uses: peaceiris/actions-gh-pages@v4
         with:
           deploy_key: ${{ secrets.DOCS_DEPLOY_KEY }}
-          destination_dir: docs    # docs will be available at https://cockatrice.github.io/docs/
           external_repository: Cockatrice/cockatrice.github.io
           publish_branch: master
           publish_dir: ./docs/html
-
-      - name: Link to Documentation Page
-        if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
-        shell: bash
-        run: echo "::notice title=New documentation published::Shortly available at https://cockatrice.github.io/docs/"
+          destination_dir: docs   # Docs will live under https://cockatrice.github.io/docs/

.github/workflows/translations-pull.yml

@@ -1,18 +1,14 @@
 name: Update Translations
 
-permissions:
-  contents: write
-  pull-requests: write
-
 on:
+  workflow_dispatch:
+  schedule:
+    # runs in the middle of each month starting a quarter (UTC) = two weeks after new strings are built
+    - cron: '0 0 15 1,4,7,10 *'
   pull_request:
     paths:
       - '.tx/**'
       - '.github/workflows/translations-pull.yml'
-  schedule:
-    # Runs in the middle of each month starting a quarter (UTC) = two weeks after new strings are built
-    - cron: '0 0 15 1,4,7,10 *'
-  workflow_dispatch:
 
 jobs:
   translations:
@@ -20,56 +16,58 @@ 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@v7
+      - name: Checkout repo
+        uses: actions/checkout@v6
 
-      - name: "Pull translated strings from Transifex"
-        # Do not run this step for PR's from forks, they don't have access to the secret
-        if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.fork == false
+      - name: Pull translated strings from Transifex
         uses: transifex/cli-action@v2
         with:
-          # Used config file: https://github.com/Cockatrice/Cockatrice/blob/master/.tx/config
-          # Docs: https://github.com/transifex/cli#pulling-files-from-transifex
-          args: pull --force --all
+          # used config file: https://github.com/Cockatrice/Cockatrice/blob/master/.tx/config
+          # https://github.com/transifex/cli#pulling-files-from-transifex
           token: ${{ secrets.TX_TOKEN }}
+          args: pull --force --all
 
-      - name: "Create pull request"
+      - 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
             oracle/translations/*.ts
-          author: github-actions <github-actions@github.com>    # owner of the commit
+            webclient/public/locales/*/translation.json
+          commit-message: Update translation files
+          # author is the owner of the commit
+          author: github-actions <github-actions@github.com>
+          branch: ci-update_translations
+          delete-branch: true
+          title: 'Update translations'
           body: |
             Pulled all translated strings from [Transifex][1].
-
+            
             ---
             *This PR is automatically generated and updated by the workflow at `.github/workflows/translations-pull.yml`. Review [action runs][2].*<br>
             *After merging, all new languages and translations are available in the next build.*
-
+            
             [1]: https://explore.transifex.com/cockatrice/cockatrice/
             [2]: https://github.com/Cockatrice/Cockatrice/actions/workflows/translations-pull.yml?query=branch%3Amaster
-          branch: ci-update_translations
-          commit-message: Update translation files
-          delete-branch: true
-          draft: false
           labels: |
             CI
             Translation
-          title: 'Update translations'
+          draft: false
 
-      - name: "PR Status"
+      - name: PR Status
         if: github.event_name != 'pull_request'
         shell: bash
         env:
-          PR_NUMBER: ${{ steps.create_pr.outputs.pull-request-number }}
-          PR_URL: ${{ steps.create_pr.outputs.pull-request-url }}
-          STATUS: ${{ case(steps.create_pr.outputs.pull-request-operation == 'none', 'unchanged', steps.create_pr.outputs.pull-request-operation) }}
+          STATUS: ${{ steps.create_pr.outputs.pull-request-operation }}
         run: |
-          echo "PR #$PR_NUMBER $STATUS!" >> "$GITHUB_STEP_SUMMARY"
-          echo "URL: $PR_URL" >> "$GITHUB_STEP_SUMMARY"
+          if [[ "$STATUS" == "none" ]]; then
+            echo "PR #${{ steps.create_pr.outputs.pull-request-number }} unchanged!" >> $GITHUB_STEP_SUMMARY
+          else
+            echo "PR #${{ steps.create_pr.outputs.pull-request-number }} $STATUS!" >> $GITHUB_STEP_SUMMARY
+          fi
+          echo "URL: ${{ steps.create_pr.outputs.pull-request-url }}" >> $GITHUB_STEP_SUMMARY

.github/workflows/translations-push.yml

@@ -1,18 +1,14 @@
 name: Update Translation Source
 
-permissions:
-  contents: write
-  pull-requests: write
-
 on:
+  workflow_dispatch:
+  schedule:
+    # runs at the start of each quarter (UTC)
+    - cron: '0 0 1 1,4,7,10 *'
   pull_request:
     paths:
       - '.ci/update_translation_source_strings.sh'
       - '.github/workflows/translations-push.yml'
-  schedule:
-    # Runs at the start of each quarter (UTC)
-    - cron: '0 0 1 1,4,7,10 *'
-  workflow_dispatch:
 
 jobs:
   translations:
@@ -20,38 +16,37 @@ 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@v7
+      - name: Checkout repo
+        uses: actions/checkout@v6
 
-      - name: "Install lupdate"
+      - name: Install lupdate
         shell: bash
         run: |
           sudo apt-get update
           sudo apt-get install -y --no-install-recommends qttools5-dev-tools
 
-      - name: "Update Cockatrice translation source"
-        env:
-          FILE: cockatrice/cockatrice_en@source.ts
+      - name: Update Cockatrice translation source
         id: cockatrice
         shell: bash
-        run: >
-          DIRS="cockatrice/src $(find . -maxdepth 1 -type d -name 'libcockatrice_*')"
-          .ci/update_translation_source_strings.sh
+        run: |
+          FILE="cockatrice/cockatrice_en@source.ts"
+          export DIRS="cockatrice/src $(find . -maxdepth 1 -type d -name 'libcockatrice_*')"
+          FILE="$FILE" DIRS="$DIRS" .ci/update_translation_source_strings.sh
 
-      - name: "Update Oracle translation source"
+      - name: Update Oracle translation source
         id: oracle
         shell: bash
         env:
-          DIRS: 'oracle/src'
           FILE: 'oracle/oracle_en@source.ts'
+          DIRS: 'oracle/src'
         run: .ci/update_translation_source_strings.sh
 
-      - name: "Render template"
+      - 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: |
@@ -59,32 +54,35 @@ jobs:
             oracle_output: ${{ steps.oracle.outputs.output }}
             commit: ${{ github.sha }}
 
-      - name: "Create pull request"
+      - 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
             oracle/oracle_en@source.ts
-          author: github-actions <github-actions@github.com>    # owner of the commit
-          body: ${{ steps.template.outputs.result }}
-          branch: ci-update_translation_source
           commit-message: Update translation source strings
+          # author is the owner of the commit
+          author: github-actions <github-actions@github.com>
+          branch: ci-update_translation_source
           delete-branch: true
-          draft: false
+          title: 'Update source strings'
+          body: ${{ steps.template.outputs.result }}
           labels: |
             CI
             Translation
-          title: 'Update source strings'
+          draft: false
 
-      - name: "PR Status"
+      - name: PR Status
         if: github.event_name != 'pull_request'
         shell: bash
         env:
-          PR_NUMBER: ${{ steps.create_pr.outputs.pull-request-number }}
-          PR_URL: ${{ steps.create_pr.outputs.pull-request-url }}
-          STATUS: ${{ case(steps.create_pr.outputs.pull-request-operation == 'none', 'unchanged', steps.create_pr.outputs.pull-request-operation) }}
+          STATUS: ${{ steps.create_pr.outputs.pull-request-operation }}
         run: |
-          echo "PR #$PR_NUMBER $STATUS!" >> "$GITHUB_STEP_SUMMARY"
-          echo "URL: $PR_URL" >> "$GITHUB_STEP_SUMMARY"
+          if [[ "$STATUS" == "none" ]]; then
+            echo "PR #${{ steps.create_pr.outputs.pull-request-number }} unchanged!" >> $GITHUB_STEP_SUMMARY
+          else
+            echo "PR #${{ steps.create_pr.outputs.pull-request-number }} $STATUS!" >> $GITHUB_STEP_SUMMARY
+          fi
+          echo "URL: ${{ steps.create_pr.outputs.pull-request-url }}" >> $GITHUB_STEP_SUMMARY

.github/workflows/web-build.yml

@@ -0,0 +1,54 @@
+name: Build Web
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - '.husky/**'
+      - 'webclient/**'
+      - '!**.md'
+      - '.github/workflows/web-build.yml'
+  pull_request:
+    paths:
+      - '.husky/**'
+      - 'webclient/**'
+      - '!**.md'
+      - '.github/workflows/web-build.yml'
+
+jobs:
+  build-web:
+    name: React (Node ${{matrix.node_version}})
+
+    runs-on: ubuntu-latest
+
+    defaults:
+      run:
+        working-directory: webclient
+
+    strategy:
+      fail-fast: false
+      matrix:
+        node_version:
+          - 16
+          - lts/*
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v6
+        with:
+          node-version: ${{matrix.node_version}}
+          cache: 'npm'
+          cache-dependency-path: 'webclient/package-lock.json'
+
+      - name: Install dependencies
+        run: npm clean-install
+
+      - name: Build app
+        run: npm run build
+
+      - name: Test app
+        run: npm run test

.github/workflows/web-lint.yml

@@ -0,0 +1,33 @@
+name: Code Style (TypeScript) 
+
+on:
+  # push trigger not needed for linting, we do not allow direct pushes to master
+  pull_request:
+    paths:
+      - 'webclient/**'
+      - '!**.md'
+      - '.github/workflows/web-lint.yml'
+
+jobs:
+  ESLint:
+    runs-on: ubuntu-latest
+    
+    defaults:
+      run:
+        working-directory: webclient
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v6
+
+    - name: Setup Node.js
+      uses: actions/setup-node@v6
+      with:
+        cache: 'npm'
+        cache-dependency-path: 'webclient/package-lock.json'
+
+    - name: Install ESLint
+      run: npm clean-install --ignore-scripts
+
+    - name: Run ESLint
+      run: npm run lint

.gitignore

@@ -6,7 +6,6 @@ mysql.cnf
 .DS_Store
 .idea/
 *.aps
-*.cache
 cmake-build*
 preferences
 compile_commands.json

.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

.husky/pre-commit

@@ -0,0 +1,7 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+cd webclient
+npm run translate
+
+git add src/i18n-default.json

.tx/config

@@ -16,3 +16,11 @@ source_file = oracle/oracle_en@source.ts
 file_filter = oracle/translations/oracle_<lang>.ts
 type = QT
 minimum_perc = 10
+
+[o:cockatrice:p:cockatrice:r:webclient-src-i18n-default-json--master]
+resource_name = Webclient
+source_lang = en
+source_file = webclient/src/i18n-default.json
+file_filter = webclient/public/locales/<lang>/translation.json
+type = KEYVALUEJSON
+minimum_perc = 10

CMakeLists.txt

@@ -5,27 +5,25 @@
 # This file sets all the variables shared between the projects
 # like the installation path, compilation flags etc..
 
-# 3.16 required for Qt6 and target_precompile_headers()
-cmake_minimum_required(VERSION 3.16)
+# cmake 3.16 is required if using qt6
+cmake_minimum_required(VERSION 3.10)
 
-# Use compiler cache (ccache)
+# Early detect ccache
 option(USE_CCACHE "Cache the build results with ccache" ON)
 # Treat warnings as errors (Debug builds only)
 option(WARNING_AS_ERROR "Treat warnings as errors in debug builds" ON)
 # Check for translation updates
 option(UPDATE_TRANSLATIONS "Update translations on compile" OFF)
-# Compile Cockatrice
-option(WITH_CLIENT "Build Cockatrice client" ON)
-# Compile Oracle
-option(WITH_ORACLE "Build Cockatrice card database tool (Oracle)" ON)
-# Compile Servatrice
-option(WITH_SERVER "Build Cockatrice server (Servatrice)" OFF)
+# Compile servatrice
+option(WITH_SERVER "build servatrice" OFF)
+# Compile cockatrice
+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)
-# Build with AddressSanitizer and UndefinedBehaviorSanitizer
-option(ENABLE_SANITIZERS "Build with AddressSanitizer and UndefinedBehaviorSanitizer" OFF)
-# Build instrumented for GCC line coverage, reported with gcovr
-option(ENABLE_COVERAGE "Build instrumented for GCC line coverage" OFF)
+option(TEST "build tests" OFF)
 # Use vcpkg regardless of OS
 option(USE_VCPKG "Use vcpkg regardless of OS" OFF)
 
@@ -43,24 +41,13 @@ else()
   )
 endif()
 
-# ccache does not support MSVC and must not auto-engage on Windows
-# (it is installed unintentionally on the Windows CI runner).
-# NOTE: this keys off the target OS, so a mingw/Ninja configuration on Windows
-# also opts out of ccache even though the GNUCXX branch below supports it.
-if(USE_CCACHE AND NOT WIN32)
+if(USE_CCACHE)
   find_program(CCACHE_PROGRAM ccache)
   if(CCACHE_PROGRAM)
     # Support Unix Makefiles and Ninja
     set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
-    # PCH-aware caching, matching .ci/compile.sh: without this ccache refuses
-    # to cache any TU that consumes a precompiled header, so every PCH-backed
-    # target recompiles from scratch on each build.
-    execute_process(COMMAND ${CCACHE_PROGRAM} --set-config sloppiness=pch_defines,time_macros)
     message(STATUS "Found CCache ${CCACHE_PROGRAM}")
   endif()
-elseif(USE_CCACHE AND WIN32)
-  # An explicit opt-in must not disappear silently on Windows.
-  message(STATUS "ccache disabled: not supported for the MSVC toolchain on Windows")
 endif()
 
 if(WIN32 OR USE_VCPKG)
@@ -79,22 +66,21 @@ if(WIN32 OR USE_VCPKG)
   else()
     set(QTDIR
         ""
-        CACHE PATH "Path to Qt (e.g. C:/Qt/6.4.2/msvc2019_64)"
+        CACHE PATH "Path to Qt (e.g. C:/Qt/5.7/msvc2015_64)"
     )
     message(
-      WARNING
-        "QTDIR variable is missing.  Please set this variable to specify path to Qt (e.g. C:/Qt/6.4.2/msvc2019_64)"
+      WARNING "QTDIR variable is missing.  Please set this variable to specify path to Qt (e.g. C:/Qt/5.7/msvc2015_64)"
     )
   endif()
 endif()
 
 # A project name is needed for CPack
 # Version can be overriden by git tags, see cmake/getversion.cmake
-project("Cockatrice" VERSION 3.1.2)
+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 "Reality Check")
+  set(GIT_TAG_RELEASENAME "Omenpath")
 endif()
 
 # Use c++20 for all targets
@@ -190,7 +176,6 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
       -Wno-error=delete-non-virtual-dtor
       -Wno-error=sign-compare
       -Wno-error=missing-declarations
-      -Wno-error=sfinae-incomplete # GCC 16+: Qt MOC + protobuf forward decls trigger this
   )
 
   foreach(FLAG ${ADDITIONAL_DEBUG_FLAGS})
@@ -199,9 +184,6 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
       set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${FLAG}")
     endif()
   endforeach()
-
-  # Reduce compiler I/O by using pipes between stages instead of temp files
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe")
 else()
   # other: osx/llvm, bsd/llvm
   set(CMAKE_CXX_FLAGS_RELEASE "-O2")
@@ -210,17 +192,8 @@ else()
   else()
     set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall -Wextra")
   endif()
-
-  # Reduce compiler I/O by using pipes between stages instead of temp files
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe")
 endif()
 
-# Always included, because they define cockatrice_disable_sanitizers_for() and
-# cockatrice_disable_coverage_for() for the vendored trees. They only touch the global flags
-# when ENABLE_SANITIZERS or ENABLE_COVERAGE is on.
-include(Sanitizers)
-include(Coverage)
-
 # GNU systems need to define the Mersenne exponent for the RNG to compile w/o warning
 if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
   add_definitions("-DSFMT_MEXP=19937")
@@ -266,6 +239,11 @@ if(WIN32)
   find_package(OpenSSL REQUIRED)
   if(OPENSSL_FOUND)
     include_directories(${OPENSSL_INCLUDE_DIRS})
+  else()
+    message(
+      WARNING
+        "Could not find OpenSSL runtime libraries. They are not required for compiling, but needs to be available at runtime."
+    )
   endif()
 endif()
 
@@ -278,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}")
@@ -303,7 +279,11 @@ if(UNIX)
     if(CPACK_GENERATOR STREQUAL "RPM")
       set(CPACK_RPM_PACKAGE_LICENSE "GPLv2")
       set(CPACK_RPM_MAIN_COMPONENT "cockatrice")
-      set(CPACK_RPM_PACKAGE_REQUIRES "protobuf, qt6-qtimageformats, qt6-qtmultimedia, qt6-qtsvg, qt6-qttools")
+      if(Qt6_FOUND)
+        set(CPACK_RPM_PACKAGE_REQUIRES "protobuf, qt6-qttools, qt6-qtsvg, qt6-qtmultimedia, qt6-qtimageformats")
+      elseif(Qt5_FOUND)
+        set(CPACK_RPM_PACKAGE_REQUIRES "protobuf, qt5-qttools, qt5-qtsvg, qt5-qtmultimedia")
+      endif()
       set(CPACK_RPM_PACKAGE_GROUP "Amusements/Games")
       set(CPACK_RPM_PACKAGE_URL "http://github.com/Cockatrice/Cockatrice")
       # stop directories from making package conflicts
@@ -321,8 +301,12 @@ if(UNIX)
       set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
       set(CPACK_DEBIAN_PACKAGE_SECTION "games")
       set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "http://github.com/Cockatrice/Cockatrice")
-      set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt6multimedia6, libqt6svg6, qt6-image-formats-plugins, qt6-qpa-plugins")
-      set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "libqt6sql6-mysql") # for connecting servatrice to a mysql db
+      if(Qt6_FOUND)
+        set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt6multimedia6, libqt6svg6, qt6-qpa-plugins, qt6-image-formats-plugins")
+        set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "libqt6sql6-mysql") # for connecting servatrice to a mysql db
+      elseif(Qt5_FOUND)
+        set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt5multimedia5-plugins, libqt5svg5")
+      endif()
     endif()
   endif()
 elseif(WIN32)
@@ -336,55 +320,6 @@ elseif(WIN32)
   # Configure file with custom definitions for NSIS.
   configure_file("${COCKATRICE_CMAKE_PATH}/NSIS.definitions.nsh.in" "${PROJECT_BINARY_DIR}/NSIS.definitions.nsh")
 
-  # Every runtime DLL a Windows install has to contain, as paths relative to the
-  # install root. .ci/compile.sh reads this and fails the build when the packaged
-  # installer is missing one of them, or carries a runtime it does not know about.
-  #
-  # All three applications are packaged into the same directory on Windows, so
-  # this is the union of their Qt module lists, not just the client's: Servatrice
-  # contributes Qt6Sql.dll and Oracle contributes nothing the client lacks, and a
-  # client-only manifest leaves Qt6Sql.dll unasserted even though servatrice.exe
-  # is installed next to cockatrice.exe and cannot start without it.
-  #
-  # A statically linked Qt module ships no runtime DLL, so requiring one would
-  # fail the package check on a static build for no reason. cockatrice/CMakeLists.txt
-  # installs the runtime of every module listed here, and skips static ones the
-  # same way, so the two can never disagree.
-  #
-  # Only the Qt modules, and that is deliberate. protobuf, Abseil, liblzma, zlib
-  # and OpenSSL also ride in on the "*.dll" glob, and a client whose runtime is
-  # absent, stale or of the wrong architecture fails to start with "abseil_dll.dll
-  # is either not designed to run on Windows or it contains an error", so they
-  # are exactly the files worth asserting.
-  #
-  # Their names cannot be derived from the vcpkg bin directory, which is what a
-  # first attempt did and what a Windows build immediately refuted: bin holds
-  # everything vcpkg installed, not everything the applications import. It also
-  # contains gmock.dll, libprotobuf-lite.dll, libprotoc.dll, legacy.dll and three
-  # pthreadVC*.dll FindThreads probes, none of which any shipped executable
-  # links, so requiring them failed a build over a package that was correct.
-  #
-  # Deriving them from the executables' own import tables is the real answer,
-  # and fixup_bundle already walks it to decide what to copy. Until that result
-  # is available to CMake, requiring the vcpkg half would mean guessing names
-  # again, which is what produced this bug report in the first place. So assert
-  # what is derived from the build's own link lists and leave the rest to the
-  # purge in cmake/NSIS.template.in, which removes every DLL regardless of name.
-  set(_required_runtime "")
-  foreach(_qt_module IN LISTS COCKATRICE_QT_MODULES SERVATRICE_QT_MODULES ORACLE_QT_MODULES)
-    get_target_property(_qt_module_type ${_qt_module} TYPE)
-    if(_qt_module_type STREQUAL "SHARED_LIBRARY")
-      string(REGEX REPLACE "^Qt6::" "" _qt_component "${_qt_module}")
-      list(APPEND _required_runtime "Qt6${_qt_component}.dll")
-    endif()
-  endforeach()
-  list(APPEND _required_runtime "Plugins/platforms/qwindows.dll")
-
-  list(REMOVE_DUPLICATES _required_runtime)
-  list(SORT _required_runtime)
-  string(REPLACE ";" "\n" _required_runtime "${_required_runtime}")
-  file(WRITE "${PROJECT_BINARY_DIR}/required-runtime.txt" "${_required_runtime}\n")
-
   # include vcredist into the package; NSIS will take care of running it
   if(VCREDISTRUNTIME_FOUND)
     install(FILES "${VCREDISTRUNTIME_FILE}" DESTINATION ./)
@@ -395,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)
@@ -426,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

@@ -1,49 +1,37 @@
 # -------- Build Stage --------
-FROM ubuntu:26.04 AS build
+FROM ubuntu:24.04 AS build
 
 ARG DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-      build-essential \
-      cmake \
-      ninja-build \
-      file \
-      g++ \
-      git \
-      libmariadb-dev-compat \
-      libprotobuf-dev \
-      libqt6sql6-mysql \
-      libssl-dev \
-      qt6-websockets-dev \
-      protobuf-compiler \
-      qt6-tools-dev \
-      qt6-tools-dev-tools
+RUN apt-get update && apt-get install -y --no-install-recommends \
+  build-essential \
+  cmake \
+  file \
+  g++ \
+  git \
+  libmariadb-dev-compat \
+  libprotobuf-dev \
+  libqt6sql6-mysql \
+  qt6-websockets-dev \
+  protobuf-compiler \
+  qt6-tools-dev \
+  qt6-tools-dev-tools
 
 WORKDIR /src
 COPY . .
-RUN cmake \
-      -S . \
-      -B build \
-      -G Ninja \
-      -DWITH_CLIENT=0 \
-      -DWITH_ORACLE=0 \
-      -DWITH_SERVER=1 \
-    && cmake --build build \
-    && cmake --install build
+RUN mkdir build && cd build && \
+    cmake .. -DWITH_SERVER=1 -DWITH_CLIENT=0 -DWITH_ORACLE=0 -DWITH_DBCONVERTER=0 && \
+    make -j$(nproc) && \
+    make install
 
 
 # -------- Runtime Stage (clean) --------
-FROM ubuntu:26.04
+FROM ubuntu:24.04
 
-ARG DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-      libprotobuf32t64 \
-      libqt6sql6-mysql \
-      libqt6websockets6 \
-      libssl3 \
+RUN apt-get update && apt-get install -y --no-install-recommends \
+  libprotobuf32t64 \
+  libqt6sql6-mysql \
+  libqt6websockets6 \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 

Doxyfile

@@ -1,4 +1,4 @@
-# Doxyfile 1.18.0
+# Doxyfile 1.14.0
 
 # This file describes the settings to be used by the documentation system
 # Doxygen (www.doxygen.org) for a project.
@@ -11,7 +11,7 @@
 # TAG = value [value, ...]
 # For lists, items can also be appended using:
 # TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ").
+# Values that contain spaces should be placed between quotes (\" \").
 #
 # Note:
 #
@@ -54,7 +54,7 @@ PROJECT_NUMBER         = $(COCKATRICE_REF)
 # 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          = "A cross-platform virtual tabletop for multiplayer card games"
 
 # 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
@@ -81,7 +81,7 @@ OUTPUT_DIRECTORY       = docs
 # and will distribute the generated files over these directories. Enabling this
 # option can be useful when feeding Doxygen a huge amount of source files, where
 # putting all generated files in the same directory would otherwise cause
-# performance problems for the file system. Adjust CREATE_SUBDIRS_LEVEL to
+# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to
 # control the number of sub-directories.
 # The default value is: NO.
 
@@ -349,7 +349,7 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 #
 # Note see also the list of default file extension mappings.
 
-EXTENSION_MAPPING      = proto=C++
+EXTENSION_MAPPING      =
 
 # If the MARKDOWN_SUPPORT tag is enabled then Doxygen pre-processes all comments
 # according to the Markdown format, which allows for more readable
@@ -361,20 +361,6 @@ EXTENSION_MAPPING      = proto=C++
 
 MARKDOWN_SUPPORT       = YES
 
-# If the MARKDOWN_STRICT tag is enabled then Doxygen treats text in comments as
-# Markdown formatted also in cases where Doxygen's native markup format
-# conflicts with that of Markdown. This is only relevant in cases where
-# backticks are used. Doxygen's native markup style allows a single quote to end
-# a text fragment started with a backtick and then treat it as a piece of quoted
-# text, whereas in Markdown such text fragment is treated as verbatim and only
-# ends when a second matching backtick is found. Also, Doxygen's native markup
-# format requires double quotes to be escaped when they appear in a backtick
-# section, whereas this is not needed for Markdown.
-# The default value is: YES.
-# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
-
-MARKDOWN_STRICT        = YES
-
 # When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
 # to that level are automatically included in the table of contents, even if
 # they do not have an id attribute.
@@ -406,8 +392,8 @@ AUTOLINK_SUPPORT       = YES
 
 # This tag specifies a list of words that, when matching the start of a word in
 # the documentation, will suppress auto links generation, if it is enabled via
-# AUTOLINK_SUPPORT. This list does not affect links explicitly created using #
-# or the \link or \ref commands.
+# AUTOLINK_SUPPORT. This list does not affect links explicitly created using \#
+# or the \link or commands.
 # This tag requires that the tag AUTOLINK_SUPPORT is set to YES.
 
 AUTOLINK_IGNORE_WORDS  =
@@ -524,9 +510,9 @@ LOOKUP_CACHE_SIZE      = 0
 # which effectively disables parallel processing. Please report any issues you
 # encounter. Generating dot graphs in parallel is controlled by the
 # DOT_NUM_THREADS setting.
-# Minimum value: 0, maximum value: 512, default value: 1.
+# Minimum value: 0, maximum value: 32, default value: 1.
 
-NUM_PROC_THREADS       = 0
+NUM_PROC_THREADS       = 1
 
 # If the TIMESTAMP tag is set different from NO then each generated page will
 # contain the date or date and time when the page was generated. Setting this to
@@ -793,27 +779,6 @@ GENERATE_BUGLIST       = YES
 
 GENERATE_DEPRECATEDLIST= YES
 
-# The GENERATE_REQUIREMENTS tag can be used to enable (YES) or disable (NO) the
-# requirements page. When enabled, this page is automatically created when at
-# least one comment block with a \requirement command appears in the input.
-# The default value is: YES.
-
-GENERATE_REQUIREMENTS  = YES
-
-# The REQ_TRACEABILITY_INFO tag controls if traceability information is shown on
-# the requirements page (only relevant when using \requirement comment blocks).
-# The setting NO will disable the traceability information altogether. The
-# setting UNSATISFIED_ONLY will show a list of requirements that are missing a
-# satisfies relation (through the command: \satisfies). Similarly the setting
-# UNVERIFIED_ONLY will show a list of requirements that are missing a verifies
-# relation (through the command: \verifies). Setting the tag to YES (the
-# default) will show both lists if applicable.
-# Possible values are: YES, NO, UNSATISFIED_ONLY and UNVERIFIED_ONLY.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_REQUIREMENTS is set to YES.
-
-REQ_TRACEABILITY_INFO  = YES
-
 # The ENABLED_SECTIONS tag can be used to enable conditional documentation
 # sections, marked by \if <section_label> ... \endif and \cond <section_label>
 # ... \endcond blocks.
@@ -855,8 +820,8 @@ SHOW_NAMESPACES        = YES
 # The FILE_VERSION_FILTER tag can be used to specify a program or script that
 # Doxygen should invoke to get the current version for each file (typically from
 # the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command command input_file, where command is the value of the
-# FILE_VERSION_FILTER tag, and input_file is the name of an input file provided
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
 # by Doxygen. Whatever the program writes to standard output is used as the file
 # version. For an example see the documentation.
 
@@ -1066,14 +1031,27 @@ 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          = *.cpp \
+FILE_PATTERNS          = *.cc \
+                         *.cxx \
+                         *.cxxm \
+                         *.cpp \
                          *.cppm \
+                         *.ccm \
+                         *.c++ \
+                         *.c++m \
+                         *.ii \
+                         *.ixx \
                          *.ipp \
+                         *.i++ \
                          *.inl \
                          *.h \
+                         *.hh \
+                         *.hxx \
+                         *.hpp \
+                         *.h++ \
+                         *.markdown \
                          *.md \
-                         *.dox \
-                         *.proto
+                         *.dox
 
 # The RECURSIVE tag can be used to specify whether or not subdirectories should
 # be searched for input files as well.
@@ -1090,10 +1068,9 @@ RECURSIVE              = YES
 
 EXCLUDE                = build/ \
                          cmake/ \
-                         cmake-build-debug/ \
-                         doc/doxygen/theme/docs/ \
-                         doc/doxygen/theme/include/ \
-                         vcpkg/
+                         dbconverter/ \
+                         vcpkg/ \
+                         webclient/
 
 # 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
@@ -1183,7 +1160,7 @@ INPUT_FILTER           =
 # need to set EXTENSION_MAPPING for the extension otherwise the files are not
 # properly processed by Doxygen.
 
-FILTER_PATTERNS        = "*.proto=python doc/doxygen/filters/proto2cpp.py"
+FILTER_PATTERNS        =
 
 # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
 # INPUT_FILTER) will also be used to filter the input files that are used for
@@ -1454,9 +1431,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
@@ -1479,7 +1454,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        = AUTO_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
@@ -1629,8 +1604,8 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # a.o. the download links, offline (the HTML help workshop was already many
 # years in maintenance mode). You can download the HTML help workshop from the
 # web archives at Installation executable (see:
-# http://web.archive.org/web/20160201063255/https://download.microsoft.com/downl
-# oad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by Doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1790,7 +1765,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
@@ -1909,7 +1884,7 @@ USE_MATHJAX            = NO
 # regards to the different settings, so it is possible that also other MathJax
 # settings have to be changed when switching between the different MathJax
 # versions.
-# Possible values are: MathJax_2, MathJax_3 and MathJax_4.
+# Possible values are: MathJax_2 and MathJax_3.
 # The default value is: MathJax_2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1918,10 +1893,9 @@ MATHJAX_VERSION        = MathJax_2
 # When MathJax is enabled you can set the default output format to be used for
 # the MathJax output. For more details about the output format see MathJax
 # version 2 (see:
-# https://docs.mathjax.org/en/v2.7/output.html), MathJax version 3 (see:
-# https://docs.mathjax.org/en/v3.2/output/index.html) and MathJax version 4
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
 # (see:
-# https://docs.mathjax.org/en/v4.0/output/index.htm).
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
 # compatibility. This is the name for Mathjax version 2, for MathJax version 3
 # this will be translated into chtml), NativeMML (i.e. MathML. Only supported
@@ -1934,50 +1908,36 @@ MATHJAX_VERSION        = MathJax_2
 MATHJAX_FORMAT         = HTML-CSS
 
 # When MathJax is enabled you need to specify the location relative to the HTML
-# output directory using the MATHJAX_RELPATH option. For Mathjax version 2 the
-# destination directory should contain the MathJax.js script. For instance, if
-# the mathjax directory is located at the same level as the HTML output
-# directory, then MATHJAX_RELPATH should be ../mathjax. For Mathjax versions 3
-# and 4 the destination directory should contain the tex-<format>.js script
-# (where <format> is either chtml or svg). The default value points to the
-# MathJax Content Delivery Network so you can quickly see the result without
-# installing MathJax. However, it is strongly recommended to install a local
-# copy of MathJax from https://www.mathjax.org before deployment. The default
-# value is:
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from https://www.mathjax.org before deployment. The default value is:
 # - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
 # - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
-# - in case of MathJax version 4: https://cdn.jsdelivr.net/npm/mathjax@4
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        =
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
-# for MathJax version 2 (see https://docs.mathjax.org/en/v2.7/tex.html):
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
 # For example for MathJax version 3 (see
-# https://docs.mathjax.org/en/v3.2/input/tex/extensions/):
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
 # MATHJAX_EXTENSIONS = ams
-# For example for MathJax version 4 (see
-# https://docs.mathjax.org/en/v4.0/input/tex/extensions/):
-# MATHJAX_EXTENSIONS = units
-# Note that for Mathjax version 4 quite a few extensions are already
-# automatically loaded. To disable a package in Mathjax version 4 one can use
-# the package name prepended with a minus sign (- like MATHJAX_EXTENSIONS +=
-# -textmacros)
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
 
 # The MATHJAX_CODEFILE tag can be used to specify a file with JavaScript pieces
-# of code that will be used on startup of the MathJax code. See the Mathjax site
-# for more details:
-# - MathJax version 2 (see:
-# https://docs.mathjax.org/en/v2.7/)
-# - MathJax version 3 (see:
-# https://docs.mathjax.org/en/v3.2/)
-# - MathJax version 4 (see:
-# https://docs.mathjax.org/en/v4.0/) For an example see the documentation.
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details. For an
+# example see the documentation.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_CODEFILE       =
@@ -2158,8 +2118,9 @@ EXTRA_PACKAGES         =
 #
 # Note: Only use a user-defined header if you know what you are doing!
 # Note: The header is subject to change so you typically have to regenerate the
-# default header when upgrading to a newer version of Doxygen. For a description
-# of the possible markers and block names see the documentation.
+# default header when upgrading to a newer version of Doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
@@ -2637,24 +2598,11 @@ HAVE_DOT               = YES
 # processors available in the system. You can set it explicitly to a value
 # larger than 0 to get control over the balance between CPU load and processing
 # speed.
-# Minimum value: 0, maximum value: 512, default value: 0.
+# Minimum value: 0, maximum value: 32, default value: 0.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_NUM_THREADS        = 0
 
-# The DOT_BATCH_SIZE specifies the number of dot graphs Doxygen is allowed to
-# compile in a single invocation of dot. When set to 1 Doxygen will invoke dot
-# for each graph separately, which can cause significant process creation
-# overhead especially on systems with many CPU cores. Together with
-# DOT_NUM_THREADS this setting can be used to optimise the dot processing speed
-# for a particular system. Doxygen will try to give each thread a balanced batch
-# of work. If the total number of graphs to process exceeds DOT_NUM_THREADS *
-# DOT_BATCH_SIZE then additional batches will be created for dot to process.
-# Minimum value: 1, maximum value: 1000, default value: 50.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_BATCH_SIZE         = 50
-
 # DOT_COMMON_ATTR is common attributes for nodes, edges and labels of
 # subgraphs. When you want a differently looking font in the dot files that
 # Doxygen generates you can specify fontname, fontcolor and fontsize attributes.
@@ -2946,58 +2894,6 @@ PLANTUML_INCLUDE_PATH  =
 
 PLANTUMLFILE_DIRS      =
 
-# When using Mermaid diagrams with CLI rendering, the MERMAID_PATH tag should be
-# used to specify the directory where the mmdc (Mermaid CLI) executable can be
-# found. If left blank, CLI-based rendering is disabled. For HTML output,
-# client-side rendering via JavaScript is used by default and does not require
-# mmdc. For LaTeX/PDF output, mmdc is required to pre-generate images. Doxygen
-# will generate a warning when CLI rendering is needed but mmdc is not
-# available.
-
-MERMAID_PATH           =
-
-# When using Mermaid diagrams, the MERMAID_CONFIG_FILE tag can be used to
-# specify a JSON configuration file for the Mermaid CLI tool (mmdc). This file
-# can contain theme settings and other Mermaid configuration options.
-
-MERMAID_CONFIG_FILE    =
-
-# The MERMAID_RENDER_MODE tag selects how Mermaid diagrams are rendered.
-# Possible values are: AUTO (use client-side rendering for HTML and mmdc for
-# LaTeX/PDF and other formats. If MERMAID_PATH is not set, non-HTML diagrams
-# will produce a warning), CLI (use the mmdc tool to pre-generate images
-# (requires Node.js and mermaid-js/mermaid-cli). Works for all output formats)
-# and CLIENT_SIDE (embed mermaid.js in HTML output for client-side rendering.
-# Does not require mmdc but only works for HTML output).
-# The default value is: AUTO.
-
-MERMAID_RENDER_MODE    = AUTO
-
-# The MERMAID_JS_URL tag specifies the URL to load mermaid.js from when using
-# client-side rendering (MERMAID_RENDER_MODE is CLIENT_SIDE or AUTO). The
-# default points to the latest Mermaid v11 release on the jsDelivr CDN.
-#
-# The default CDN URL requires internet access when viewing the generated
-# documentation. For offline use, download mermaid.esm.min.mjs and set this to a
-# relative path, or use MERMAID_RENDER_MODE=CLI to pre-generate images instead.
-# Examples:
-# - Latest v11 (default):
-# https://cdn.jsdelivr.net/npm/mermaid@11/dist/mermaid.esm.min.mjs
-# - Pinned version:
-# https://cdn.jsdelivr.net/npm/mermaid@11.3.0/dist/mermaid.esm.min.mjs
-# - Local copy: ./mermaid.esm.min.mjs (user must place file in HTML output
-# directory)
-# The default value is:
-# https://cdn.jsdelivr.net/npm/mermaid@11/dist/mermaid.esm.min.mjs.
-
-MERMAID_JS_URL         = https://cdn.jsdelivr.net/npm/mermaid@11/dist/mermaid.esm.min.mjs
-
-# The MERMAIDFILE_DIRS tag can be used to specify one or more directories that
-# contain Mermaid files that are included in the documentation (see the
-# \mermaidfile command).
-
-MERMAIDFILE_DIRS       =
-
 # The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
 # that will be shown in the graph. If the number of nodes in a graph becomes
 # larger than this value, Doxygen will truncate the graph, which is visualized
@@ -3022,6 +2918,15 @@ DOT_GRAPH_MAX_NODES    = 50
 
 MAX_DOT_GRAPH_DEPTH    = 0
 
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_MULTI_TARGETS      = NO
+
 # If the GENERATE_LEGEND tag is set to YES Doxygen will generate a legend page
 # explaining the meaning of the various boxes and arrows in the dot generated
 # graphs.

README.md

@@ -8,7 +8,7 @@
    <a href="#related-repositories">Related</a> <b>|</b>
    <a href="#community-resources-">Community</a> <b>|</b>
    <a href="#contribute">Contribute</a> <b>|</b>
-   <a href="#build--">Build</a> <b>|</b>
+   <a href="#build---">Build</a> <b>|</b>
    <a href="#run">Run</a>
 </p>
 
@@ -25,6 +25,7 @@
 
 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.<br><br>
 This project uses <kbd>C++</kbd> and the <kbd>Qt</kbd> libraries.<br>
+First work on a webclient with <kbd>Typescript</kbd> was started as well.<br>
 
 
 # Download [![Cockatrice Eternal Download Count](https://img.shields.io/github/downloads/cockatrice/cockatrice/total.svg)](https://tooomm.github.io/github-release-stats/?username=Cockatrice&repository=Cockatrice&search=0)
@@ -43,43 +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)
-- [Webatrice](https://github.com/Cockatrice/Webatrice): Web client for Cockatrice servers (TypeScript / React)
+- [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,27 +75,25 @@ 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`
-- [Official CONTRIBUTING](https://github.com/Cockatrice/Cockatrice/blob/master/.github/CONTRIBUTING.md)
-
 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>
 
-Cockatrice uses Transifex to manage translations. You can help us bring <kbd>Cockatrice</kbd> and <kbd>Oracle</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/). The [Webatrice](https://github.com/seavor/Webatrice) web client manages its own translations in its repo.<br>
+### Translations [![Transifex Project](https://img.shields.io/badge/translate-on%20transifex-brightgreen)](https://explore.transifex.com/cockatrice/cockatrice/)
 
-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>
+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 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)
+# 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)
 
 Dependencies: *(for minimum versions search our [CMake file](https://github.com/Cockatrice/Cockatrice/blob/master/CMakeLists.txt))*
 - [Qt](https://www.qt.io/developers/)
@@ -144,27 +124,22 @@ 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>
 
 The following flags (with their non-default values) can be passed to `cmake`:
-| Flag                       | Description                                                                                                                                   |
-| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- |
-| `-DWITH_SERVER=1`          | Build <kbd>Servatrice</kbd> server                                                                                                            |
-| `-DWITH_CLIENT=0`          | Don't build <kbd>Cockatrice</kbd> client                                                                                                      |
-| `-DWITH_ORACLE=0`          | Don't build <kbd>Oracle</kbd> card database tool                                                                                              |
-| `-DCMAKE_BUILD_TYPE=Debug` | Compile in debug mode<br> Enables extra logging output, debug symbols, and much more verbose compiler warnings                                |
-| `-DWARNING_AS_ERROR=0`     | Don't treat compilation warnings as errors in debug mode                                                                                      |
-| `-DUPDATE_TRANSLATIONS=1`  |  Configure `make` to update the translation .ts files for new strings in the source code<br> **Note:** `make clean` will remove the .ts files |
-| `-DTEST=1`                 | Enable regression tests<br> **Note:** `make test` to run tests, *googletest* will be downloaded if not available                              |
-
-> [!TIP]
-> Build code documentation ([Doxygen](https://www.doxygen.nl)) according to our [configuration](https://github.com/Cockatrice/Cockatrice/blob/master/Doxyfile) into `/docs`:
-> ```bash
-> doxygen Doxyfile
-> ```
+| Flag | Description |
+| --- | --- |
+| `-DWITH_SERVER=1` | Build <kbd>Servatrice</kbd> server |
+| `-DWITH_CLIENT=0` | Don't build <kbd>Cockatrice</kbd> client |
+| `-DWITH_ORACLE=0` | Don't build <kbd>Oracle</kbd> card database tool |
+| `-DCMAKE_BUILD_TYPE=Debug` | Compile in debug mode<br> Enables extra logging output, debug symbols, and much more verbose compiler warnings |
+| `-DWARNING_AS_ERROR=0` | Don't treat compilation warnings as errors in debug mode |
+| `-DUPDATE_TRANSLATIONS=1` |  Configure `make` to update the translation .ts files for new strings in the source code<br> **Note:** `make clean` will remove the .ts files |
+| `-DTEST=1` | Enable regression tests<br> **Note:** `make test` to run tests, *googletest* will be downloaded if not available |
+| `-DFORCE_USE_QT5=1` | Skip looking for Qt6 before trying to find Qt5 |
 
 
 # Run

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/Coverage.cmake

@@ -1,75 +0,0 @@
-# Line-coverage instrumentation opt-in, plus per-source opt-out
-# Input: ENABLE_COVERAGE
-# Defines: cockatrice_disable_coverage_for
-#
-# Included once from the root CMakeLists.txt, immediately after the per-compiler flag
-# block, so add_compile_options() reaches every library and executable defined below.
-#
-# Note the name deliberately shadows CMake's own built-in Modules/Coverage.cmake. It resolves
-# to this file only because the root CMakeLists.txt puts cmake/ at the front of
-# CMAKE_MODULE_PATH; if that ever moves, include(Coverage) would silently pick up the built-in
-# module, which only defines a `COVERAGE` custom target and touches no global flags, so
-# instrumentation would quietly stop happening rather than erroring.
-
-include(CheckCXXSourceCompiles)
-
-# Opt a set of vendored sources out of instrumentation.
-#
-# cockatrice_disable_coverage_for(<source> ...)
-#
-# Third-party code drags the total down with lines no test can ever reach, and a total that
-# cannot move is not a useful signal. This is the same carve-out the sanitizer build uses.
-#
-# The sources must be named relative to the directory that compiles them. CMake resolves a
-# source-file property against the directory scope the target was declared in, so calling
-# this from the root with absolute paths silently does nothing. That is why the call sites
-# live next to the add_library/add_executable that pull the vendored code in.
-#
-# SKIP_PRECOMPILE_HEADERS mirrors the sanitizer helper. The precompiled header carries the
-# instrumentation flags, and mixing an instrumented PCH with an uninstrumented translation
-# unit makes GCC reject it.
-function(cockatrice_disable_coverage_for)
-  if(NOT ENABLE_COVERAGE)
-    return()
-  endif()
-  # There is no -fno-coverage: --coverage is shorthand for -fprofile-arcs -ftest-coverage, so both
-  # halves have to be negated. CC rejects "-fno-coverage" outright, which is how the vendored C
-  # files below hit it first.
-  set_source_files_properties(
-    ${ARGN} PROPERTIES COMPILE_OPTIONS "-fno-profile-arcs;-fno-test-coverage" SKIP_PRECOMPILE_HEADERS ON
-  )
-endfunction()
-
-if(ENABLE_COVERAGE)
-  # Line coverage needs the compiler's own toolchain, so only GCC is supported. Clang's
-  # equivalent is llvm-cov, which reads a different intermediate format and would need a
-  # separate report path; rejecting it is better than emitting .gcno files that gcovr cannot
-  # read.
-  if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    message(FATAL_ERROR "ENABLE_COVERAGE requires GCC, but the compiler is ${CMAKE_CXX_COMPILER_ID}. "
-                        "Clang coverage needs llvm-cov and is not wired up."
-    )
-  endif()
-
-  # Probe the way the flag will actually be used: compile AND link. A .gcno file comes from the
-  # compile step, but the runtime that writes .gcda files comes from the link step, so probing
-  # only the compile step would pass on a toolchain that cannot actually produce coverage.
-  set(_cockatrice_saved_required_flags "${CMAKE_REQUIRED_FLAGS}")
-  set(_cockatrice_saved_required_link_options "${CMAKE_REQUIRED_LINK_OPTIONS}")
-  set(CMAKE_REQUIRED_FLAGS "-O0 -g")
-  set(CMAKE_REQUIRED_LINK_OPTIONS -fprofile-arcs -ftest-coverage)
-  check_cxx_source_compiles("int main() { return 0; }" COCKATRICE_HAVE_COVERAGE_FLAGS)
-  set(CMAKE_REQUIRED_FLAGS "${_cockatrice_saved_required_flags}")
-  set(CMAKE_REQUIRED_LINK_OPTIONS "${_cockatrice_saved_required_link_options}")
-
-  if(NOT COCKATRICE_HAVE_COVERAGE_FLAGS)
-    message(FATAL_ERROR "ENABLE_COVERAGE is on, but this toolchain rejected the coverage flags.")
-  endif()
-
-  # -O0 keeps the line mapping honest: at higher optimisation levels the compiler merges and
-  # relocates lines, and the report describes code that no longer exists in that form.
-  add_compile_options(--coverage -O0 -g)
-  add_link_options(--coverage)
-
-  message(STATUS "Coverage instrumentation enabled (--coverage). Report with gcovr over the build dir.")
-endif()

cmake/FindQtRuntime.cmake

@@ -1,18 +1,14 @@
 # Find a compatible Qt version
-# Inputs: WITH_SERVER, WITH_CLIENT, WITH_ORACLE
+# 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
-# Output: COCKATRICE_QT_VERSION_NAME -- Example values: Qt6
+# 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
 
-# Every Qt module an application links against, as the DLL names a Windows
-# install has to contain. Core is listed explicitly rather than left to arrive
-# transitively: it is the one module nothing can do without, and required-runtime.txt
-# is built from these lists, so a module missing here is a runtime the package
-# check never asserts. That is how Qt6Core.dll went unasserted while every other
-# Qt module was checked.
 set(REQUIRED_QT_COMPONENTS Core)
 if(WITH_SERVER)
   set(_SERVATRICE_NEEDED Network Sql WebSockets)
@@ -20,67 +16,94 @@ endif()
 if(WITH_CLIENT)
   set(_COCKATRICE_NEEDED
       Concurrent
-      Core
       Gui
       Multimedia
       Network
       PrintSupport
-      ShaderTools
       Svg
       WebSockets
       Widgets
       Xml
-      Quick
-      QuickWidgets
   )
 endif()
 if(WITH_ORACLE)
-  set(_ORACLE_NEEDED Concurrent Network Svg Widgets Xml)
+  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.
-  # Test is QtTest: it brings QAbstractItemModelTester and QSignalSpy, which are how the Qt model
-  # and signal contracts get verified without standing up a GUI.
-  set(_TEST_NEEDED Concurrent Network Svg Widgets Test)
+  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)
 
-# Linguist is now a component in Qt6 instead of an external package
-find_package(
-  Qt6 6.4.2
-  COMPONENTS ${REQUIRED_QT_COMPONENTS} Linguist
-  QUIET HINTS ${Qt6_DIR}
-)
-if(NOT Qt6_FOUND)
-  message(FATAL_ERROR "No suitable version of Qt was found")
+if(NOT FORCE_USE_QT5)
+  # Linguist is now a component in Qt6 instead of an external package
+  find_package(
+    Qt6 6.2.3
+    COMPONENTS ${REQUIRED_QT_COMPONENTS} Linguist
+    QUIET HINTS ${Qt6_DIR}
+  )
 endif()
-set(COCKATRICE_QT_VERSION_NAME Qt6)
+if(Qt6_FOUND)
+  set(COCKATRICE_QT_VERSION_NAME Qt6)
 
-list(FIND Qt6LinguistTools_TARGETS Qt6::lrelease QT6_LRELEASE_INDEX)
-if(QT6_LRELEASE_INDEX EQUAL -1)
-  message(WARNING "Qt6 lrelease not found.")
+  list(FIND Qt6LinguistTools_TARGETS Qt6::lrelease QT6_LRELEASE_INDEX)
+  if(QT6_LRELEASE_INDEX EQUAL -1)
+    message(WARNING "Qt6 lrelease not found.")
+  endif()
+
+  list(FIND Qt6LinguistTools_TARGETS Qt6::lupdate QT6_LUPDATE_INDEX)
+  if(QT6_LUPDATE_INDEX EQUAL -1)
+    message(WARNING "Qt6 lupdate not found.")
+  endif()
+else()
+  find_package(
+    Qt5 5.8.0
+    COMPONENTS ${REQUIRED_QT_COMPONENTS}
+    QUIET HINTS ${Qt5_DIR}
+  )
+  if(Qt5_FOUND)
+    set(COCKATRICE_QT_VERSION_NAME Qt5)
+  else()
+    message(FATAL_ERROR "No suitable version of Qt was found")
+  endif()
+
+  # Qt5 Linguist is in a separate package
+  find_package(Qt5LinguistTools QUIET)
+  if(Qt5LinguistTools_FOUND)
+    if(NOT Qt5_LRELEASE_EXECUTABLE)
+      message(WARNING "Qt5 lrelease not found.")
+    endif()
+    if(NOT Qt5_LUPDATE_EXECUTABLE)
+      message(WARNING "Qt5 lupdate not found.")
+    endif()
+  else()
+    message(WARNING "Linguist Tools not found, cannot handle translations")
+  endif()
 endif()
 
-list(FIND Qt6LinguistTools_TARGETS Qt6::lupdate QT6_LUPDATE_INDEX)
-if(QT6_LUPDATE_INDEX EQUAL -1)
-  message(WARNING "Qt6 lupdate not found.")
+if(Qt5_POSITION_INDEPENDENT_CODE OR Qt6_FOUND)
+  set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 endif()
 
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-
 # Establish Qt Plugins directory & Library directories
 get_target_property(QT_LIBRARY_DIR ${COCKATRICE_QT_VERSION_NAME}::Core LOCATION)
 get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} DIRECTORY)
-get_filename_component(QT_PLUGINS_DIR "${Qt6Core_DIR}/../../../${QT6_INSTALL_PLUGINS}" ABSOLUTE)
-get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/../../.." ABSOLUTE)
-if(UNIX AND APPLE)
-  # Mac needs a bit more help finding all necessary components
-  list(APPEND QT_LIBRARY_DIR "/usr/local/lib")
+if(Qt6_FOUND)
+  get_filename_component(QT_PLUGINS_DIR "${Qt6Core_DIR}/../../../${QT6_INSTALL_PLUGINS}" ABSOLUTE)
+  get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/../../.." ABSOLUTE)
+  if(UNIX AND APPLE)
+    # Mac needs a bit more help finding all necessary components
+    list(APPEND QT_LIBRARY_DIR "/usr/local/lib")
+  endif()
+elseif(Qt5_FOUND)
+  get_filename_component(QT_PLUGINS_DIR "${Qt5Core_DIR}/../../../plugins" ABSOLUTE)
+  get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE)
 endif()
 message(DEBUG "QT_PLUGINS_DIR = ${QT_PLUGINS_DIR}")
 message(DEBUG "QT_LIBRARY_DIR = ${QT_LIBRARY_DIR}")
@@ -89,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/Info.plist

@@ -1,118 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
- "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-
-    <!-- ========================= -->
-    <!-- CORE BUNDLE METADATA -->
-    <!-- ========================= -->
-
     <key>CFBundleDevelopmentRegion</key>
     <string>English</string>
-
     <key>CFBundleExecutable</key>
     <string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
-
     <key>CFBundleGetInfoString</key>
     <string>${MACOSX_BUNDLE_INFO_STRING}</string>
-
     <key>CFBundleIconFile</key>
     <string>${MACOSX_BUNDLE_ICON_FILE}</string>
-
     <key>CFBundleIdentifier</key>
     <string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
-
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
-
     <key>CFBundleLongVersionString</key>
     <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
-
     <key>CFBundleName</key>
     <string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
-
     <key>CFBundlePackageType</key>
     <string>APPL</string>
-
     <key>CFBundleShortVersionString</key>
     <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
-
     <key>CFBundleSignature</key>
     <string>????</string>
-
     <key>CFBundleVersion</key>
     <string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
-
+    <key>CSResourcesFileMapped</key>
+    <true/>
+    <key>LSRequiresCarbon</key>
+    <true/>
     <key>NSHumanReadableCopyright</key>
     <string>${MACOSX_BUNDLE_COPYRIGHT}</string>
-
     <key>NSHighResolutionCapable</key>
     <true/>
-
-    <!-- ========================= -->
-    <!-- FILE TYPE (.cod) SUPPORT -->
-    <!-- ========================= -->
-
-    <key>UTExportedTypeDeclarations</key>
-    <array>
-        <dict>
-            <key>UTTypeIdentifier</key>
-            <string>org.cockatrice.deck</string>
-
-            <key>UTTypeDescription</key>
-            <string>Cockatrice Deck</string>
-
-            <key>UTTypeConformsTo</key>
-            <array>
-                <string>public.data</string>
-            </array>
-
-            <key>UTTypeTagSpecification</key>
-            <dict>
-                <key>public.filename-extension</key>
-                <array>
-                    <string>cod</string>
-                </array>
-            </dict>
-        </dict>
-    </array>
-
-    <key>CFBundleDocumentTypes</key>
-    <array>
-        <dict>
-            <key>CFBundleTypeName</key>
-            <string>Cockatrice Deck</string>
-
-            <key>CFBundleTypeRole</key>
-            <string>Editor</string>
-
-            <key>LSHandlerRank</key>
-            <string>Default</string>
-
-            <key>LSItemContentTypes</key>
-            <array>
-                <string>org.cockatrice.deck</string>
-            </array>
-        </dict>
-    </array>
-
-    <!-- ========================= -->
-    <!-- URL SCHEME (cockatrice://) -->
-    <!-- ========================= -->
-
-    <key>CFBundleURLTypes</key>
-    <array>
-        <dict>
-            <key>CFBundleURLName</key>
-            <string>Cockatrice URL Scheme</string>
-
-            <key>CFBundleURLSchemes</key>
-            <array>
-                <string>cockatrice</string>
-            </array>
-        </dict>
-    </array>
-
 </dict>
 </plist>

cmake/Sanitizers.cmake

@@ -1,109 +0,0 @@
-# AddressSanitizer + UndefinedBehaviorSanitizer opt-in, plus per-source opt-out
-# Input: ENABLE_SANITIZERS
-# Defines: cockatrice_disable_sanitizers_for
-#
-# Included once from the root CMakeLists.txt, immediately after the per-compiler flag
-# block, so add_compile_options() reaches every library and executable defined below.
-
-include(CheckCXXSourceCompiles)
-
-# Opt a set of vendored sources out of instrumentation.
-#
-# cockatrice_disable_sanitizers_for(<source> ...)
-#
-# Sanitizer findings inside vendored code are not actionable for us, and letting them
-# through buries our own bugs in noise until everyone learns to skip the job.
-#
-# The sources must be named relative to the directory that compiles them. CMake resolves a
-# source-file property against the directory scope the target was declared in, so calling
-# this from the root with absolute paths silently does nothing. That is why the call sites
-# live next to the add_library/add_executable that pull the vendored code in.
-#
-# SKIP_PRECOMPILE_HEADERS is not optional. The precompiled header is built with the
-# sanitizer flags, so it defines __SANITIZE_ADDRESS__; a translation unit compiled with
-# -fno-sanitize=all does not, and GCC then refuses the PCH with
-# "not used because __SANITIZE_ADDRESS__ not defined", which is a fatal -Werror=invalid-pch
-# in the servatrice and oracle builds.
-function(cockatrice_disable_sanitizers_for)
-  if(NOT ENABLE_SANITIZERS)
-    return()
-  endif()
-  set_source_files_properties(${ARGN} PROPERTIES COMPILE_OPTIONS "-fno-sanitize=all" SKIP_PRECOMPILE_HEADERS ON)
-endfunction()
-
-if(ENABLE_SANITIZERS)
-  # Probe a flag the way it will actually be used: on the compile step AND the link step.
-  # check_cxx_compiler_flag() only probes the compile step, which makes every sanitizer
-  # flag look unsupported because linking an ASan object without -fsanitize=address leaves
-  # __asan_init undefined. That is a silent misconfiguration rather than an error, so the
-  # probe has to link.
-  function(cockatrice_probe_flag FLAG VARNAME)
-    set(CMAKE_REQUIRED_FLAGS "${FLAG}")
-    set(CMAKE_REQUIRED_LINK_OPTIONS "${FLAG}")
-    check_cxx_source_compiles("int main() { return 0; }" ${VARNAME})
-    unset(CMAKE_REQUIRED_FLAGS)
-    unset(CMAKE_REQUIRED_LINK_OPTIONS)
-  endfunction()
-
-  set(SANITIZER_FLAGS
-      -fsanitize=address,undefined
-      -fno-omit-frame-pointer
-      # UBSan defaults to recover mode: it prints "runtime error: ..." but the
-      # process exits 0, so gtest/ctest report a pass and CI stays green.
-      # -fno-sanitize-recover makes the first finding abort instead. This is
-      # probed like the other cosmetic flags, but CI also sets
-      # UBSAN_OPTIONS=halt_on_error=1 as the runtime-side guarantee.
-      -fno-sanitize-recover=undefined
-      # Qt builds QObject subclasses into raw storage and writes the vptr afterwards, which
-      # the vptr check reports on essentially every QObject instantiation. The check has no
-      # value for us because nothing outside moc-generated code inherits QObject, so it is
-      # off outright rather than suppressed piecemeal.
-      -fno-sanitize=vptr
-  )
-
-  # MSVC has no ASan/UBSan equivalent, and clang-cl would need /fsanitize=address plus a
-  # matching runtime link, which is a separate piece of work.
-  if(MSVC)
-    message(FATAL_ERROR "ENABLE_SANITIZERS is not supported with MSVC")
-  endif()
-
-  # Probe rather than assume, so an older toolchain gets the sanitizers it can support
-  # instead of failing the build on a flag it does not recognize.
-  set(SANITIZER_SUPPORTED_FLAGS)
-  foreach(FLAG ${SANITIZER_FLAGS})
-    string(MAKE_C_IDENTIFIER "COCKATRICE_HAS${FLAG}" _FLAG_VAR)
-    cockatrice_probe_flag("${FLAG}" ${_FLAG_VAR})
-    if(${_FLAG_VAR})
-      list(APPEND SANITIZER_SUPPORTED_FLAGS ${FLAG})
-    else()
-      message(STATUS "Sanitizers: ${FLAG} unsupported by ${CMAKE_CXX_COMPILER_ID}, skipping")
-    endif()
-  endforeach()
-
-  # The whole point of the option is the sanitizers, so an unsupported pair is fatal even
-  # though the cosmetic flags above are allowed to degrade.
-  if(NOT "-fsanitize=address,undefined" IN_LIST SANITIZER_SUPPORTED_FLAGS)
-    message(FATAL_ERROR "ENABLE_SANITIZERS requires -fsanitize=address,undefined, which "
-                        "${CMAKE_CXX_COMPILER_ID} does not accept"
-    )
-  endif()
-
-  add_compile_options(${SANITIZER_SUPPORTED_FLAGS})
-  add_link_options(-fsanitize=address,undefined)
-
-  # Recorded so the test tree can label its entries and a plain `make` at the same time
-  # cannot quietly disagree with what CI ran.
-  set(COCKATRICE_SANITIZERS
-      ON
-      CACHE INTERNAL "AddressSanitizer and UBSan are enabled"
-  )
-else()
-  # ENABLE_SANITIZERS is OFF, but COCKATRICE_SANITIZERS is CACHE INTERNAL, so a
-  # reused build dir (e.g. CI's release-package step reconfiguring the same dir
-  # after the sanitized debug step) would otherwise keep skipping NO_SANITIZE
-  # tests and keep the 300s discovery timeout. Reset it explicitly.
-  set(COCKATRICE_SANITIZERS
-      OFF
-      CACHE INTERNAL "AddressSanitizer and UBSan are enabled" FORCE
-  )
-endif()

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")
 

cmake/getversion.cmake

@@ -213,8 +213,7 @@ set(PROJECT_VERSION_FRIENDLY "${PROJECT_VERSION} (${GIT_COMMIT_DATE_FRIENDLY})")
 # Format: <program name>[-ReleaseName]-MAJ.MIN.PATCH[-prerelease_label]
 set(PROJECT_VERSION_FILENAME "${PROJECT_NAME}")
 if(PROJECT_VERSION_RELEASENAME)
-  string(REPLACE " " "-" PROJECT_VERSION_RELEASENAME_SAFE "${PROJECT_VERSION_RELEASENAME}")
-  set(PROJECT_VERSION_FILENAME "${PROJECT_VERSION_FILENAME}-${PROJECT_VERSION_RELEASENAME_SAFE}")
+  set(PROJECT_VERSION_FILENAME "${PROJECT_VERSION_FILENAME}-${PROJECT_VERSION_RELEASENAME}")
 endif()
 set(PROJECT_VERSION_FILENAME "${PROJECT_VERSION_FILENAME}-${PROJECT_VERSION}")
 

cmake/gtest-CMakeLists.txt.in

@@ -1,16 +1,15 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.2)
 
 project(gtest-download LANGUAGES NONE)
 
 include(ExternalProject)
-externalproject_add(
-  googletest
-  URL https://github.com/google/googletest/archive/refs/tags/v1.17.0.zip
-  URL_HASH SHA1=f638fa0e724760e2ba07ff8cfba32cd644e1ce28
+ExternalProject_Add(googletest
+  URL https://github.com/google/googletest/archive/release-1.11.0.zip
+  URL_HASH SHA1=9ffb7b5923f4a8fcdabf2f42c6540cce299f44c0
   SOURCE_DIR "${CMAKE_BINARY_DIR}/gtest-src"
   BINARY_DIR "${CMAKE_BINARY_DIR}/gtest-build"
   CONFIGURE_COMMAND ""
-  BUILD_COMMAND ""
-  INSTALL_COMMAND ""
-  TEST_COMMAND ""
+  BUILD_COMMAND     ""
+  INSTALL_COMMAND   ""
+  TEST_COMMAND      ""
 )

cmake/pch/qtcore_pch.h

@@ -1,55 +0,0 @@
-/** @file qtcore_pch.h
- *  @brief Precompiled header for all Qt targets (Qt Core only).
- *
- * Safe for every target that links Qt Core, including the headless
- * Servatrice binary. Keep this header free of any widget/gui types.
- *
- * Candidates are chosen from IWYU include statistics: a header earns a
- * spot when it is not already reachable from the rest of this list and
- * enough translation units re-parse it. Qt headers are stable across
- * builds, so the precompiled header rarely invalidates.
- */
-
-#include <QBasicTimer>
-#include <QByteArray>
-#include <QCommandLineParser>
-#include <QCoreApplication>
-#include <QCryptographicHash>
-#include <QDateTime>
-#include <QDebug>
-#include <QDir>
-#include <QElapsedTimer>
-#include <QFile>
-#include <QFileInfo>
-#include <QHash>
-#include <QItemSelectionModel>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonValue>
-#include <QList>
-#include <QLoggingCategory>
-#include <QMap>
-#include <QMetaEnum>
-#include <QMetaObject>
-#include <QMutex>
-#include <QMutexLocker>
-#include <QObject>
-#include <QPointer>
-#include <QPropertyAnimation>
-#include <QRandomGenerator>
-#include <QReadWriteLock>
-#include <QRegularExpression>
-#include <QSet>
-#include <QSettings>
-#include <QSharedPointer>
-#include <QSortFilterProxyModel>
-#include <QString>
-#include <QStringList>
-#include <QTemporaryDir>
-#include <QThread>
-#include <QTimer>
-#include <QUuid>
-#include <QVariant>
-#include <QXmlStreamReader>
-#include <QXmlStreamWriter>

cmake/pch/qtwidgets_pch.h

@@ -1,59 +0,0 @@
-/** @file qtwidgets_pch.h
- *  @brief Precompiled header for GUI targets (Cockatrice client, Oracle).
- *
- * Includes the Qt Core precompiled header plus the heavy Gui, Widgets and
- * Network layers that virtually every client translation unit re-parses.
- * Do not use on Servatrice (headless, QT_DONT_USE_QTGUI).
- *
- * Candidates are chosen from IWYU include statistics: a header earns a
- * spot when it is not already reachable from the rest of this list and
- * enough translation units re-parse it. Qt headers are stable across
- * builds, so the precompiled header rarely invalidates.
- */
-
-#include "qtcore_pch.h"
-
-#include <QAction>
-#include <QApplication>
-#include <QCheckBox>
-#include <QComboBox>
-#include <QCompleter>
-#include <QDialogButtonBox>
-#include <QDockWidget>
-#include <QFileDialog>
-#include <QFormLayout>
-#include <QFrame>
-#include <QGraphicsItem>
-#include <QGraphicsScene>
-#include <QGraphicsSceneMouseEvent>
-#include <QGraphicsView>
-#include <QGridLayout>
-#include <QGroupBox>
-#include <QHBoxLayout>
-#include <QHeaderView>
-#include <QImage>
-#include <QImageReader>
-#include <QInputDialog>
-#include <QLabel>
-#include <QLayout>
-#include <QListWidget>
-#include <QMainWindow>
-#include <QMenu>
-#include <QMessageBox>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QPainter>
-#include <QPlainTextEdit>
-#include <QPushButton>
-#include <QScrollArea>
-#include <QSpinBox>
-#include <QSplitter>
-#include <QStandardItemModel>
-#include <QTabWidget>
-#include <QTableWidget>
-#include <QTableWidgetItem>
-#include <QToolBar>
-#include <QToolButton>
-#include <QTreeWidget>
-#include <QVBoxLayout>
-#include <QWidget>

cockatrice/CMakeLists.txt

@@ -7,7 +7,6 @@ project(Cockatrice VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${
 set(cockatrice_SOURCES
     ${VERSION_STRING_CPP}
     # sort by alphabetical order, so that there is no debate about where to add new sources to the list
-    src/client/network/connection_controller/remote_connection_controller.cpp
     src/client/network/update/client/update_downloader.cpp
     src/client/network/interfaces/deck_stats_interface.cpp
     src/client/network/interfaces/tapped_out_interface.cpp
@@ -15,18 +14,12 @@ set(cockatrice_SOURCES
     src/client/network/update/client/client_update_checker.cpp
     src/client/network/update/client/release_channel.cpp
     src/client/network/update/card_spoiler/spoiler_background_updater.cpp
-    src/client/latency_graph_widget.cpp
-    src/client/latency_status_widget.cpp
-    src/client/lag_monitor.cpp
     src/client/sound_engine.cpp
     src/client/settings/cache_settings.cpp
     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,112 +32,87 @@ set(cockatrice_SOURCES
     src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp
     src/interface/widgets/dialogs/dlg_forgot_password_request.cpp
     src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp
-    src/interface/widgets/dialogs/dlg_invite_to_game.cpp
     src/interface/widgets/dialogs/dlg_load_deck.cpp
     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_login_prompt.cpp
     src/interface/widgets/dialogs/dlg_manage_sets.cpp
-    src/interface/widgets/dialogs/dlg_my_reports.cpp
     src/interface/widgets/dialogs/dlg_register.cpp
-    src/interface/widgets/dialogs/dlg_report_user.cpp
     src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp
-    src/interface/widgets/dialogs/dlg_share_deck.cpp
-    src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp
     src/interface/widgets/dialogs/dlg_settings.cpp
     src/interface/widgets/dialogs/dlg_startup_card_check.cpp
     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/path_safety_warning.cpp
     src/interface/widgets/dialogs/tip_of_the_day.cpp
-    src/interface/widgets/deck_share/deck_share_utils.cpp
-    src/interface/widgets/deck_share/shared_deck_preview_widget.cpp
-    src/interface/widgets/deck_share/share_bar_widget.cpp
     src/filters/deck_filter_string.cpp
     src/filters/filter_builder.cpp
     src/filters/filter_tree_model.cpp
     src/filters/syntax_help.cpp
     src/game/abstract_game.cpp
-    src/game/arrow_registry.cpp
-    src/game_graphics/board/abstract_card_drag_item.cpp
-    src/game_graphics/board/abstract_card_item.cpp
-    src/game_graphics/board/abstract_counter.cpp
-    src/game/board/arrow_data.cpp
-    src/game_graphics/board/arrow_item.cpp
-    src/game_graphics/board/arrow_target.cpp
-    src/game_graphics/board/card_drag_item.cpp
-    src/game_graphics/board/card_item.cpp
+    src/game/board/abstract_card_drag_item.cpp
+    src/game/board/abstract_card_item.cpp
+    src/game/board/abstract_counter.cpp
+    src/game/board/arrow_item.cpp
+    src/game/board/arrow_target.cpp
+    src/game/board/card_drag_item.cpp
+    src/game/board/card_item.cpp
     src/game/board/card_list.cpp
-    src/game/board/card_state.cpp
-    src/game_graphics/board/counter_general.cpp
-    src/game/board/counter_state.cpp
-    src/game_graphics/board/translate_counter_name.cpp
-    src/game_graphics/deckview/deck_view.cpp
-    src/game_graphics/deckview/deck_view_container.cpp
-    src/game_graphics/deckview/tabbed_deck_view_container.cpp
-    src/game_graphics/dialogs/dlg_create_token.cpp
-    src/game_graphics/dialogs/dlg_move_top_cards_until.cpp
-    src/game_graphics/dialogs/dlg_roll_dice.cpp
+    src/game/board/counter_general.cpp
+    src/game/board/translate_counter_name.cpp
+    src/game/deckview/deck_view.cpp
+    src/game/deckview/deck_view_container.cpp
+    src/game/deckview/tabbed_deck_view_container.cpp
+    src/game/dialogs/dlg_create_token.cpp
+    src/game/dialogs/dlg_move_top_cards_until.cpp
+    src/game/dialogs/dlg_roll_dice.cpp
     src/game/game.cpp
     src/game/game_event_handler.cpp
     src/game/game_meta_info.cpp
-    src/game_graphics/game_scene.cpp
+    src/game/game_scene.cpp
     src/game/game_state.cpp
-    src/game_graphics/game_view.cpp
-    src/game_graphics/hand_counter.cpp
-    src/game_graphics/log/message_log_widget.cpp
+    src/game/game_view.cpp
+    src/game/hand_counter.cpp
+    src/game/log/message_log_widget.cpp
     src/game/phase.cpp
-    src/game_graphics/phases_toolbar.cpp
-    src/game_graphics/player/menu/card_menu.cpp
-    src/game_graphics/player/menu/custom_zone_menu.cpp
-    src/game_graphics/player/menu/grave_menu.cpp
-    src/game_graphics/player/menu/hand_menu.cpp
-    src/game_graphics/player/menu/library_menu.cpp
-    src/game_graphics/player/menu/move_menu.cpp
-    src/game_graphics/player/menu/player_menu.cpp
-    src/game_graphics/player/menu/pt_menu.cpp
-    src/game_graphics/player/menu/rfg_menu.cpp
-    src/game_graphics/player/menu/say_menu.cpp
-    src/game_graphics/player/menu/sideboard_menu.cpp
-    src/game_graphics/player/menu/tally_menu.cpp
-    src/game_graphics/player/menu/utility_menu.cpp
-    src/game_graphics/tally/stats_tally.cpp
-    src/game_graphics/tally/subtype_tally.cpp
-    src/game_graphics/tally/tally.cpp
+    src/game/phases_toolbar.cpp
+    src/game/player/menu/card_menu.cpp
+    src/game/player/menu/custom_zone_menu.cpp
+    src/game/player/menu/grave_menu.cpp
+    src/game/player/menu/hand_menu.cpp
+    src/game/player/menu/library_menu.cpp
+    src/game/player/menu/move_menu.cpp
+    src/game/player/menu/player_menu.cpp
+    src/game/player/menu/pt_menu.cpp
+    src/game/player/menu/rfg_menu.cpp
+    src/game/player/menu/say_menu.cpp
+    src/game/player/menu/sideboard_menu.cpp
+    src/game/player/menu/utility_menu.cpp
+    src/game/player/player.cpp
     src/game/player/player_actions.cpp
-    src/game_graphics/player/player_area.cpp
-    src/game_graphics/player/player_dialogs.cpp
+    src/game/player/player_area.cpp
     src/game/player/player_event_handler.cpp
-    src/game_graphics/player/player_graphics_item.cpp
+    src/game/player/player_graphics_item.cpp
     src/game/player/player_info.cpp
-    src/game_graphics/player/player_list_widget.cpp
-    src/game/player/player_logic.cpp
+    src/game/player/player_list_widget.cpp
     src/game/player/player_manager.cpp
-    src/game_graphics/player/player_target.cpp
+    src/game/player/player_target.cpp
     src/game/replay.cpp
-    src/game/zones/card_zone_logic.cpp
-    src/game/zones/hand_zone_logic.cpp
-    src/game/zones/pile_zone_logic.cpp
-    src/game/zones/stack_zone_logic.cpp
-    src/game/zones/table_zone_logic.cpp
-    src/game/zones/view_zone_logic.cpp
-    src/game_graphics/zones/card_zone.cpp
-    src/game_graphics/zones/hand_zone.cpp
-    src/game_graphics/zones/pile_zone.cpp
-    src/game_graphics/zones/select_zone.cpp
-    src/game_graphics/zones/stack_zone.cpp
-    src/game_graphics/zones/table_zone.cpp
-    src/game_graphics/zones/view_zone.cpp
-    src/game_graphics/zones/view_zone_widget.cpp
+    src/game/zones/card_zone.cpp
+    src/game/zones/hand_zone.cpp
+    src/game/zones/logic/card_zone_logic.cpp
+    src/game/zones/logic/hand_zone_logic.cpp
+    src/game/zones/logic/pile_zone_logic.cpp
+    src/game/zones/logic/stack_zone_logic.cpp
+    src/game/zones/logic/table_zone_logic.cpp
+    src/game/zones/logic/view_zone_logic.cpp
+    src/game/zones/pile_zone.cpp
+    src/game/zones/select_zone.cpp
+    src/game/zones/stack_zone.cpp
+    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_database_update/card_database_update_status_bar.cpp
-    src/interface/card_database_update/card_database_update_status_bar.h
-    src/interface/card_database_update/card_update_progress.cpp
-    src/interface/card_database_update/card_update_progress.h
     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
@@ -152,33 +120,14 @@ set(cockatrice_SOURCES
     src/interface/card_picture_loader/card_picture_loader_worker.cpp
     src/interface/card_picture_loader/card_picture_loader_worker_work.cpp
     src/interface/card_picture_loader/card_picture_to_load.cpp
-    src/interface/intents/intent.cpp
-    src/interface/intents/intent.h
-    src/interface/intents/intent_open_local_deck.cpp
-    src/interface/intents/intent_open_local_deck.h
-    src/interface/intents/intent_wait_for_database_load.cpp
-    src/interface/intents/intent_wait_for_database_load.h
     src/interface/layouts/flow_layout.cpp
     src/interface/layouts/overlap_layout.cpp
-    src/interface/widgets/utility/card_completer_delegate.cpp
-    src/interface/widgets/utility/card_completer_styler.cpp
-    src/interface/widgets/utility/completer_utils.cpp
     src/interface/widgets/utility/line_edit_completer.cpp
-    src/interface/widgets/utility/reversed_completer_model.cpp
     src/interface/pixel_map_generator.cpp
-    src/interface/theme_config.cpp
     src/interface/theme_manager.cpp
-    src/interface/palette_editor/color_button.cpp
-    src/interface/palette_editor/palette_generator.cpp
-    src/interface/palette_editor/quick_setup_panel.cpp
-    src/interface/palette_editor/palette_grid_widget.cpp
-    src/interface/palette_editor/palette_editor_dialog.cpp
     src/interface/widgets/cards/additional_info/color_identity_widget.cpp
-    src/interface/widgets/cards/additional_info/deck_color_identity.cpp
     src/interface/widgets/cards/additional_info/mana_cost_widget.cpp
     src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp
-    src/interface/widgets/cards/art_crop_attribution.cpp
-    src/interface/widgets/cards/card_art_utils.cpp
     src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp
     src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp
     src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp
@@ -192,59 +141,29 @@ 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/card_database_view.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_list_history_manager_widget.cpp
-    src/interface/widgets/deck_editor/deck_editor_card_database_dock_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/deck_zone_dialog.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/color_bar.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_tab_button_color.h
     src/interface/widgets/general/home_widget.cpp
     src/interface/widgets/general/layout_containers/flow_widget.cpp
     src/interface/widgets/general/layout_containers/overlap_control_widget.cpp
@@ -255,63 +174,31 @@ 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
     src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.cpp
-    src/interface/widgets/playmat/playmat_collection_dialog.cpp
-    src/interface/widgets/playmat/playmat_collection_dialog.h
-    src/interface/widgets/playmat/playmat_preview_widget.cpp
-    src/interface/widgets/playmat/playmat_settings_dialog.cpp
     src/interface/widgets/quick_settings/settings_button_widget.cpp
     src/interface/widgets/quick_settings/settings_popup_widget.cpp
     src/interface/widgets/replay/replay_manager.cpp
-    src/interface/widgets/replay/replay_quick_settings_widget.cpp
     src/interface/widgets/replay/replay_timeline_widget.cpp
-    src/interface/widgets/replay/replay_widget.cpp
     src/interface/widgets/server/chat_view/chat_view.cpp
-    src/interface/widgets/server/game_filter_configs.cpp
-    src/interface/widgets/server/game_link.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
     src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp
-    src/interface/widgets/server/user/user_avatar_provider.cpp
-    src/interface/widgets/server/user/user_card_art_provider.cpp
-    src/interface/widgets/server/user/user_card_settings_dialog.cpp
     src/interface/widgets/server/user/user_context_menu.cpp
     src/interface/widgets/server/user/user_info_box.cpp
     src/interface/widgets/server/user/user_info_connection.cpp
-    src/interface/widgets/server/user/user_list_dialog.cpp
     src/interface/widgets/server/user/user_list_manager.cpp
-    src/interface/widgets/server/user/user_list_painter.cpp
-    src/interface/widgets/server/user/user_list_panel_widget.cpp
     src/interface/widgets/server/user/user_list_widget.cpp
-    src/interface/widgets/settings_page/abstract_settings_page.cpp
-    src/interface/widgets/settings_page/appearance_settings_page.cpp
-    src/interface/widgets/settings_page/deck_editor_settings_page.cpp
-    src/interface/widgets/settings_page/general_settings_page.cpp
-    src/interface/widgets/settings_page/messages_settings_page.cpp
-    src/interface/widgets/settings_page/settings_search_delegate.cpp
-    src/interface/widgets/settings_page/settings_search_model.cpp
-    src/interface/widgets/settings_page/shortcut_settings_page.cpp
-    src/interface/widgets/settings_page/sound_settings_page.cpp
-    src/interface/widgets/settings_page/storage_settings_page.cpp
-    src/interface/widgets/settings_page/user_interface_settings_page.cpp
     src/interface/widgets/utility/custom_line_edit.cpp
     src/interface/widgets/utility/get_text_with_max.cpp
-    src/interface/widgets/utility/report_utils.cpp
-    src/interface/widgets/utility/report_utils.h
     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
@@ -319,7 +206,6 @@ set(cockatrice_SOURCES
     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
@@ -329,23 +215,17 @@ set(cockatrice_SOURCES
     src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp
     src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.cpp
     src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp
-    src/interface/widgets/visual_deck_storage/deck_preview/public_deck_preview_widget.cpp
-    src/interface/widgets/visual_deck_storage/remote_public_decks_model.cpp
     src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp
-    src/interface/widgets/visual_deck_storage/visual_deck_storage_model.cpp
     src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp
     src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp
-    src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.cpp
     src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp
     src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp
     src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
     src/interface/window_main.cpp
     src/main.cpp
-    src/single_instance_manager.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
@@ -357,13 +237,6 @@ set(cockatrice_SOURCES
     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/commander_spellbook/api_response/card_in_deck_request.cpp
-    src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_deck_request.cpp
-    src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_card_result.cpp
-    src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_variant_result.cpp
-    src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_estimate_bracket_result.cpp
-    src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_bracket_explainer.cpp
-    src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.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
@@ -393,17 +266,12 @@ set(cockatrice_SOURCES
     src/interface/widgets/tabs/tab.cpp
     src/interface/widgets/tabs/tab_account.cpp
     src/interface/widgets/tabs/tab_admin.cpp
-    src/interface/widgets/tabs/tab_card_art_rules.cpp
     src/interface/widgets/tabs/tab_deck_editor.cpp
     src/interface/widgets/tabs/tab_deck_storage.cpp
-    src/interface/widgets/tabs/tab_developer.cpp
     src/interface/widgets/tabs/tab_game.cpp
     src/interface/widgets/tabs/tab_home.cpp
     src/interface/widgets/tabs/tab_logs.cpp
     src/interface/widgets/tabs/tab_message.cpp
-    src/interface/widgets/tabs/tab_moderation.cpp
-    src/interface/widgets/tabs/tab_public_decks.cpp
-    src/interface/widgets/tabs/tab_report.cpp
     src/interface/widgets/tabs/tab_replays.cpp
     src/interface/widgets/tabs/tab_room.cpp
     src/interface/widgets/tabs/tab_server.cpp
@@ -414,57 +282,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/commander_spellbook/commander_bracket_service.cpp
-    src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp
-    src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.cpp
-    src/interface/widgets/onboarding/banner_shader_config.h
-    src/interface/widgets/onboarding/brand_colors.h
-    src/interface/widgets/onboarding/first_run_wizard.cpp
-    src/interface/widgets/onboarding/first_run_wizard.h
-    src/interface/widgets/onboarding/first_run_wizard_page.cpp
-    src/interface/widgets/onboarding/first_run_wizard_page.h
-    src/interface/widgets/onboarding/pages/account_setup_page.cpp
-    src/interface/widgets/onboarding/pages/account_setup_page.h
-    src/interface/widgets/onboarding/pages/card_database_setup_page.cpp
-    src/interface/widgets/onboarding/pages/card_database_setup_page.h
-    src/interface/widgets/onboarding/pages/finish_page.cpp
-    src/interface/widgets/onboarding/pages/finish_page.h
-    src/interface/widgets/onboarding/pages/preferences_setup_page.cpp
-    src/interface/widgets/onboarding/pages/preferences_setup_page.h
-    src/interface/widgets/onboarding/pages/theme_setup_page.cpp
-    src/interface/widgets/onboarding/pages/theme_setup_page.h
-    src/interface/widgets/onboarding/pages/welcome_page.cpp
-    src/interface/widgets/onboarding/pages/welcome_page.h
-    src/interface/widgets/onboarding/shader_banner_widget.cpp
-    src/interface/widgets/onboarding/shader_banner_widget.h
-    src/interface/widgets/onboarding/step_indicator_widget.cpp
-    src/interface/widgets/onboarding/step_indicator_widget.h
-    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
-    src/interface/widgets/utility/compact_push_button.cpp
-    src/interface/widgets/utility/compact_push_button.h
-    src/single_instance_manager.h
-    src/client/url_scheme_event_filter.h
-    src/interface/intents/intent_connect_to_server.cpp
-    src/interface/intents/intent_connect_to_server.h
-    src/interface/intents/intent_disconnect_from_server.cpp
-    src/interface/intents/intent_disconnect_from_server.h
-    src/interface/intents/intent_join_server_game.cpp
-    src/interface/intents/intent_join_server_game.h
-    src/interface/intents/intent_join_server_room.cpp
-    src/interface/intents/intent_join_server_room.h
-    src/interface/intents/intent_login.cpp
-    src/interface/intents/intent_login.h
-    src/interface/intents/intent_open_server_room_by_name.cpp
-    src/interface/intents/intent_open_server_room_by_name.h
-    src/interface/intents/intent_open_shared_deck.cpp
-    src/interface/intents/intent_open_shared_deck.h
-    src/interface/intents/url_parser.cpp
-    src/interface/intents/url_parser.h
-    src/interface/widgets/server/user/user_info_popup.cpp
-    src/interface/widgets/server/user/user_info_popup.h
 )
 
 add_subdirectory(sounds)
@@ -506,7 +323,11 @@ if(APPLE)
   set(cockatrice_SOURCES ${cockatrice_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns)
 endif(APPLE)
 
-qt6_add_resources(cockatrice_RESOURCES_RCC ${cockatrice_RESOURCES})
+if(Qt6_FOUND)
+  qt6_add_resources(cockatrice_RESOURCES_RCC ${cockatrice_RESOURCES})
+elseif(Qt5_FOUND)
+  qt5_add_resources(cockatrice_RESOURCES_RCC ${cockatrice_RESOURCES})
+endif()
 
 # Declare path variables
 set(ICONDIR
@@ -518,62 +339,71 @@ set(DESKTOPDIR
     CACHE STRING "desktop file destination"
 )
 
-set(MIMEDIR
-    share/mime/packages
-    CACHE STRING "mime file destination"
-)
-
 set(COCKATRICE_MAC_QM_INSTALL_DIR "cockatrice.app/Contents/Resources/translations")
 set(COCKATRICE_UNIX_QM_INSTALL_DIR "share/cockatrice/translations")
 set(COCKATRICE_WIN32_QM_INSTALL_DIR "translations")
 
-qt6_add_executable(
-  cockatrice
-  WIN32
-  MACOSX_BUNDLE
-  ${cockatrice_SOURCES}
-  ${cockatrice_RESOURCES_RCC}
-  ${cockatrice_MOC_SRCS}
-  MANUAL_FINALIZATION
-)
+if(Qt6_FOUND)
+  qt6_add_executable(
+    cockatrice
+    WIN32
+    MACOSX_BUNDLE
+    ${cockatrice_SOURCES}
+    ${cockatrice_RESOURCES_RCC}
+    ${cockatrice_MOC_SRCS}
+    MANUAL_FINALIZATION
+  )
+elseif(Qt5_FOUND)
+  # Qt5 Translations need to be linked at executable creation time
+  if(Qt5LinguistTools_FOUND)
+    if(UPDATE_TRANSLATIONS)
+      qt5_create_translation(cockatrice_QM ${translate_SRCS} ${cockatrice_TS})
+    else()
+      qt5_add_translation(cockatrice_QM ${cockatrice_TS})
+    endif()
+  endif()
+  add_executable(
+    cockatrice WIN32 MACOSX_BUNDLE ${cockatrice_MOC_SRCS} ${cockatrice_QM} ${cockatrice_RESOURCES_RCC}
+                                   ${cockatrice_SOURCES}
+  )
+  if(UNIX)
+    if(APPLE)
+      install(FILES ${cockatrice_QM} DESTINATION ${COCKATRICE_MAC_QM_INSTALL_DIR})
+    else()
+      install(FILES ${cockatrice_QM} DESTINATION ${COCKATRICE_UNIX_QM_INSTALL_DIR})
+    endif()
+  elseif(WIN32)
+    install(FILES ${cockatrice_QM} DESTINATION ${COCKATRICE_WIN32_QM_INSTALL_DIR})
+  endif()
+endif()
 
-target_precompile_headers(cockatrice PRIVATE "${CMAKE_SOURCE_DIR}/cmake/pch/qtwidgets_pch.h")
-
-qt6_add_shaders(
-  cockatrice
-  "onboarding_shaders"
-  PREFIX
-  "/onboarding/shaders"
-  BASE
-  "src/interface/widgets/onboarding/shaders"
-  FILES
-  src/interface/widgets/onboarding/shaders/brand_banner.frag
-  src/interface/widgets/onboarding/shaders/brand_plate.frag
-)
-
-qt6_add_resources(
-  cockatrice
-  "onboarding_qml"
-  PREFIX
-  "/onboarding/qml"
-  BASE
-  "src/interface/widgets/onboarding/qml"
-  FILES
-  src/interface/widgets/onboarding/qml/BrandBanner.qml
-)
-
-target_link_libraries(
-  cockatrice
-  PUBLIC libcockatrice_card
-         libcockatrice_deck_list
-         libcockatrice_filters
-         libcockatrice_utility
-         libcockatrice_network
-         libcockatrice_models
-         libcockatrice_rng
-         libcockatrice_settings
-         ${COCKATRICE_QT_MODULES}
-)
+if(Qt5_FOUND)
+  target_link_libraries(
+    cockatrice
+    libcockatrice_card
+    libcockatrice_deck_list
+    libcockatrice_filters
+    libcockatrice_utility
+    libcockatrice_network
+    libcockatrice_models
+    libcockatrice_rng
+    libcockatrice_settings
+    ${COCKATRICE_QT_MODULES}
+  )
+else()
+  target_link_libraries(
+    cockatrice
+    PUBLIC libcockatrice_card
+           libcockatrice_deck_list
+           libcockatrice_filters
+           libcockatrice_utility
+           libcockatrice_network
+           libcockatrice_models
+           libcockatrice_rng
+           libcockatrice_settings
+           ${COCKATRICE_QT_MODULES}
+  )
+endif()
 
 if(UNIX)
   if(APPLE)
@@ -593,23 +423,6 @@ if(UNIX)
     install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/cockatrice.png DESTINATION ${ICONDIR}/hicolor/48x48/apps)
     install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/cockatrice.svg DESTINATION ${ICONDIR}/hicolor/scalable/apps)
     install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cockatrice.desktop DESTINATION ${DESKTOPDIR})
-    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cockatrice-cod.xml DESTINATION ${MIMEDIR})
-
-    # Refresh the freedesktop databases so the file associations and scheme
-    # handler register without requiring the user to run them manually. The
-    # tools may be missing on minimal systems; that is fine, packaging systems
-    # usually refresh these databases through their own triggers.
-    find_program(UPDATE_MIME_DATABASE update-mime-database)
-    if(UPDATE_MIME_DATABASE)
-      install(CODE "execute_process(COMMAND \"${UPDATE_MIME_DATABASE}\" \"${CMAKE_INSTALL_PREFIX}/share/mime\")")
-    endif()
-
-    find_program(UPDATE_DESKTOP_DATABASE update-desktop-database)
-    if(UPDATE_DESKTOP_DATABASE)
-      install(
-        CODE "execute_process(COMMAND \"${UPDATE_DESKTOP_DATABASE}\" \"${CMAKE_INSTALL_PREFIX}/share/applications\")"
-      )
-    endif()
   endif()
 elseif(WIN32)
   install(TARGETS cockatrice RUNTIME DESTINATION ./)
@@ -620,7 +433,7 @@ if(APPLE)
   set(plugin_dest_dir cockatrice.app/Contents/Plugins)
   set(qtconf_dest_dir cockatrice.app/Contents/Resources)
 
-  # Qt plugins: audio, iconengines, imageformats, multimedia, platforms, printsupport, styles, tls
+  # Qt plugins: audio (Qt5), iconengines, imageformats, multimedia (Qt6), platforms, printsupport (Qt5), styles, tls (Qt6)
   install(
     DIRECTORY "${QT_PLUGINS_DIR}/"
     DESTINATION ${plugin_dest_dir}
@@ -673,56 +486,20 @@ if(WIN32)
   set(qtconf_dest_dir .)
 
   install(
-    DIRECTORY "$<TARGET_FILE_DIR:cockatrice>/"
+    DIRECTORY "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${CMAKE_BUILD_TYPE}/"
     DESTINATION ./
     FILES_MATCHING
     PATTERN "*.dll"
-    PATTERN "*.pdb" EXCLUDE
-    PATTERN "*.dir*" EXCLUDE
-    PATTERN "*_autogen*" EXCLUDE
-    PATTERN "*.tlog*" EXCLUDE
-    PATTERN "CMakeFiles*" EXCLUDE
-    PATTERN "x64*" EXCLUDE
-    PATTERN ".qt*" EXCLUDE
-    PATTERN ".qsb*" EXCLUDE
-    PATTERN ".lupdate*" EXCLUDE
   )
 
-  # fixup_bundle further down copies only the DLLs it can find in Cockatrice.exe's
-  # import table, and the glob above only sees DLLs that were already copied next
-  # to the executable. Qt6::Concurrent is linked but never imported - QtConcurrent::run
-  # and QFutureWatcher are header-only in Qt 6 - so neither step ships
-  # Qt6Concurrent.dll, even though required-runtime.txt lists it and the
-  # Windows package check then fails on a package that is fine to run.
-  # Qt6::ShaderTools is skipped for the same reason.
-  #
-  # Install the runtime of every linked module explicitly. An unused DLL costs a
-  # few hundred kilobytes; a missing one is what stops the client starting after
-  # an update, and it stays invisible until then.
-  foreach(_qt_module IN LISTS COCKATRICE_QT_MODULES)
-    get_target_property(_qt_module_type ${_qt_module} TYPE)
-    if(_qt_module_type STREQUAL "SHARED_LIBRARY")
-      install(FILES "$<TARGET_FILE:${_qt_module}>" DESTINATION ./)
-    endif()
-  endforeach()
-
   install(
     DIRECTORY "${CMAKE_BINARY_DIR}/cockatrice/"
     DESTINATION ./
     FILES_MATCHING
     PATTERN "*.ini"
-    PATTERN "CMakeFiles*" EXCLUDE
-    PATTERN "*.dir*" EXCLUDE
-    PATTERN "*_autogen*" EXCLUDE
-    PATTERN "*.tlog*" EXCLUDE
-    PATTERN "*.pdb" EXCLUDE
-    PATTERN "x64*" EXCLUDE
-    PATTERN ".qt*" EXCLUDE
-    PATTERN ".qsb*" EXCLUDE
-    PATTERN ".lupdate*" EXCLUDE
   )
 
-  # Qt plugins: audio, iconengines, imageformats, multimedia, platforms, printsupport, styles, tls
+  # Qt plugins: audio (Qt5), iconengines, imageformats, multimedia (Qt6) platforms, printsupport (Qt5), styles, tls (Qt6)
   install(
     DIRECTORY "${QT_PLUGINS_DIR}/"
     DESTINATION ${plugin_dest_dir}
@@ -744,23 +521,16 @@ 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"
   )
 
-  # The Windows install has no Resources directory: the .qm files go to
-  # ${COCKATRICE_WIN32_QM_INSTALL_DIR} and main.cpp looks for them at
-  # applicationDirPath() + "/translations". The macOS bundle above keeps
-  # Resources/translations, which is correct for it.
   install(
     CODE "
         file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths]
 Plugins = Plugins
-Translations = translations
+Translations = Resources/translations
 Data = Resources\")
     "
     COMPONENT Runtime
@@ -776,9 +546,13 @@ Data = Resources\")
         "
     COMPONENT Runtime
   )
+
+  if(OPENSSL_FOUND)
+    install(FILES ${OPENSSL_INCLUDE_DIRS} DESTINATION ./)
+  endif()
 endif()
 
-if(Qt6LinguistTools_FOUND)
+if(Qt6_FOUND AND Qt6LinguistTools_FOUND)
   #Qt6 Translations happen after the executable is built up
   if(UPDATE_TRANSLATIONS)
     qt6_add_translations(
@@ -803,18 +577,8 @@ if(Qt6LinguistTools_FOUND)
   elseif(WIN32)
     install(FILES ${cockatrice_QM} DESTINATION ${COCKATRICE_WIN32_QM_INSTALL_DIR})
   endif()
-
-  # Qt attaches the .qm files to the default build target only, so building the executable on its own
-  # (CLion, --target cockatrice) leaves it without any translations: nothing is translated and the
-  # language selector stays empty.
-  # Depend on Qt's own lrelease target instead of attaching the .qm custom commands to a second
-  # target: two independent targets owning the same outputs race on MSBuild/Makefiles and are an
-  # error on Xcode. Older Qt versions already add this dependency themselves.
-  foreach(_lrelease_target Cockatrice_lrelease cockatrice_lrelease)
-    if(TARGET ${_lrelease_target})
-      add_dependencies(cockatrice ${_lrelease_target})
-    endif()
-  endforeach()
 endif()
 
-qt6_finalize_target(cockatrice)
+if(Qt6_FOUND)
+  qt6_finalize_target(cockatrice)
+endif()

cockatrice/cockatrice-cod.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-    <mime-type type="application/x-cockatrice">
-        <comment>Cockatrice Deck File</comment>
-        <glob pattern="*.cod"/>
-    </mime-type>
-</mime-info>

cockatrice/cockatrice.desktop

@@ -3,7 +3,6 @@
 Version=1.0
 Type=Application
 Name=Cockatrice
-Exec=cockatrice %U
+Exec=cockatrice
 Icon=cockatrice
 Categories=Game;CardGame;
-MimeType=application/x-cockatrice;x-scheme-handler/cockatrice;

cockatrice/cockatrice.qrc

@@ -2,7 +2,6 @@
     <qresource prefix="/">
         <file>resources/cardback.svg</file>
         <file>resources/cockatrice.svg</file>
-        <file>resources/cockatrice-logo-white.svg</file>
         <file>resources/hand.svg</file>
         <file>resources/hr.jpg</file>
 
@@ -16,24 +15,18 @@
         <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>
@@ -41,13 +34,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>
@@ -56,24 +46,18 @@
         <file>resources/icons/view.svg</file>
 
         <file>resources/icons/mana/B.svg</file>
-        <file>resources/icons/mana/C.svg</file>
         <file>resources/icons/mana/G.svg</file>
         <file>resources/icons/mana/R.svg</file>
         <file>resources/icons/mana/U.svg</file>
         <file>resources/icons/mana/W.svg</file>
 
-        <file>resources/backgrounds/home.jpg</file>
-        <file>resources/backgrounds/home-dark.jpg</file>
-        <file>resources/backgrounds/home-light.jpg</file>
-        <file>resources/backgrounds/card_triplet.svg</file>
-        <file>resources/backgrounds/placeholder_printing_selector.svg</file>
+        <file>resources/backgrounds/home.png</file>
 
         <file>resources/config/general.svg</file>
         <file>resources/config/appearance.svg</file>
         <file>resources/config/interface.svg</file>
         <file>resources/config/messages.svg</file>
         <file>resources/config/deckeditor.svg</file>
-        <file>resources/config/storage.svg</file>
         <file>resources/config/shorcuts.svg</file>
         <file>resources/config/sound.svg</file>
         <file>resources/config/debug.ini</file>
@@ -365,8 +349,6 @@
 
         <file>resources/usericons/pawn_single.svg</file>
         <file>resources/usericons/pawn_double.svg</file>
-        <file>resources/usericons/pawn_dev_single.svg</file>
-        <file>resources/usericons/pawn_dev_double.svg</file>
         <file>resources/usericons/pawn_donator_single.svg</file>
         <file>resources/usericons/pawn_donator_double.svg</file>
         <file>resources/usericons/pawn_judge_single.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
@@ -28,8 +24,6 @@
 #dlg_tip_of_the_day = true
 #dlg_update = true
 
-#general_settings_page = true
-
 #settings_cache = true
 #servers_settings = true
 #shortcuts_settings = true

cockatrice/resources/config/storage.svg

@@ -1,799 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   width="62.636364"
-   height="62.090908"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="1.4.3 (0d15f75042, 2025-12-25)"
-   sodipodi:docname="storage.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0"
-   xml:space="preserve"
-   xmlns="http://www.w3.org/2000/svg"><defs
-     id="defs4"><linearGradient
-       id="linearGradient3169"><stop
-         style="stop-color:#0000ff;stop-opacity:1;"
-         offset="0"
-         id="stop3171" /><stop
-         style="stop-color:#000067;stop-opacity:1;"
-         offset="1"
-         id="stop3173" /></linearGradient><linearGradient
-       id="linearGradient4766"><stop
-         style="stop-color:#784421;stop-opacity:1;"
-         offset="0"
-         id="stop4768" /><stop
-         style="stop-color:#3d2210;stop-opacity:0;"
-         offset="1"
-         id="stop4770" /></linearGradient><linearGradient
-       id="linearGradient4758"><stop
-         style="stop-color:#a05a2c;stop-opacity:1;"
-         offset="0"
-         id="stop4760" /><stop
-         style="stop-color:#3d2210;stop-opacity:1;"
-         offset="1"
-         id="stop4762" /></linearGradient><inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" /><inkscape:perspective
-       id="perspective2484"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4758"
-       id="linearGradient4764"
-       x1="466.09601"
-       y1="485.96021"
-       x2="715.14801"
-       y2="485.96021"
-       gradientUnits="userSpaceOnUse" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4766"
-       id="linearGradient4772"
-       x1="496.548"
-       y1="485.26816"
-       x2="683.31201"
-       y2="485.26816"
-       gradientUnits="userSpaceOnUse" /><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="radialGradient3175"
-       cx="120.07376"
-       cy="56.138123"
-       fx="120.07376"
-       fy="56.138123"
-       r="82.790039"
-       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
-       gradientUnits="userSpaceOnUse" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6482"
-       id="linearGradient6488"
-       x1="32.18182"
-       y1="3.2835093"
-       x2="32.18182"
-       y2="13.02554"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0281354,0,0,1.0429299,85.21874,131.0326)" /><linearGradient
-       id="linearGradient6482"><stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop6484" /><stop
-         style="stop-color:#00ff00;stop-opacity:0;"
-         offset="1"
-         id="stop6486" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6464"
-       id="linearGradient6470"
-       x1="32.090908"
-       y1="1.8181819"
-       x2="31.09091"
-       y2="62.909088"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-0.1818182)" /><linearGradient
-       id="linearGradient6464"><stop
-         style="stop-color:#0061ff;stop-opacity:1;"
-         offset="0"
-         id="stop6466" /><stop
-         style="stop-color:#001c4c;stop-opacity:1;"
-         offset="1"
-         id="stop6468" /></linearGradient><linearGradient
-       y2="62.909088"
-       x2="31.09091"
-       y1="1.8181819"
-       x1="32.090908"
-       gradientTransform="translate(86.2151,131.5372)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4477"
-       xlink:href="#linearGradient6464"
-       inkscape:collect="always" /><linearGradient
-       inkscape:collect="always"
-       id="linearGradient2916"><stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop2918" /><stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop2920" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       id="linearGradient2902"><stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop2905" /><stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop2907" /></linearGradient><linearGradient
-       id="linearGradient2064"><stop
-         id="stop2066"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" /><stop
-         style="stop-color:#555753;stop-opacity:0.60000002;"
-         offset="0.5"
-         id="stop2070" /><stop
-         id="stop2068"
-         offset="1"
-         style="stop-color:#555753;stop-opacity:0;" /></linearGradient><linearGradient
-       id="linearGradient9641"><stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0"
-         id="stop9643" /><stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="1"
-         id="stop9645" /></linearGradient><linearGradient
-       id="linearGradient9633"><stop
-         style="stop-color:#eeeeec;stop-opacity:1"
-         offset="0"
-         id="stop9635" /><stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="1"
-         id="stop9639" /></linearGradient><linearGradient
-       id="linearGradient9613"><stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0"
-         id="stop9615" /><stop
-         id="stop9619"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:1;" /><stop
-         style="stop-color:#cccfca;stop-opacity:1"
-         offset="1"
-         id="stop9617" /></linearGradient><linearGradient
-       id="linearGradient8710"><stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop8712" /><stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="1"
-         id="stop8714" /></linearGradient><linearGradient
-       id="linearGradient8631"><stop
-         id="stop8633"
-         offset="0"
-         style="stop-color:#eeeeec;stop-opacity:1" /><stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0.2"
-         id="stop8637" /><stop
-         id="stop8635"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8625"><stop
-         id="stop8627"
-         offset="0"
-         style="stop-color:white;stop-opacity:1" /><stop
-         id="stop8629"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient8613"><stop
-         style="stop-color:#babdb6;stop-opacity:1"
-         offset="0"
-         id="stop8615" /><stop
-         style="stop-color:#2e3436;stop-opacity:1"
-         offset="1"
-         id="stop8617" /></linearGradient><linearGradient
-       id="linearGradient5740"><stop
-         style="stop-color:#d0d0cb;stop-opacity:1;"
-         offset="0"
-         id="stop5742" /><stop
-         style="stop-color:#babdb6;stop-opacity:1"
-         offset="1"
-         id="stop5744" /></linearGradient><linearGradient
-       id="linearGradient5690"><stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop5692" /><stop
-         style="stop-color:#888a85;stop-opacity:0.59848487"
-         offset="1"
-         id="stop5694" /></linearGradient><linearGradient
-       id="linearGradient2899"><stop
-         id="stop2901"
-         offset="0"
-         style="stop-color:#555753;stop-opacity:1" /><stop
-         id="stop2903"
-         offset="1"
-         style="stop-color:#2e3436;stop-opacity:1" /></linearGradient><linearGradient
-       id="linearGradient3468"><stop
-         style="stop-color:#fdfdfc;stop-opacity:1"
-         offset="0"
-         id="stop3470" /><stop
-         style="stop-color:white;stop-opacity:0.37121212"
-         offset="1"
-         id="stop3472" /></linearGradient><linearGradient
-       id="linearGradient2909"><stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="0"
-         id="stop2911" /><stop
-         id="stop2917"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:1;" /><stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop2913" /></linearGradient><linearGradient
-       id="linearGradient2839"><stop
-         style="stop-color:white;stop-opacity:0.25773194;"
-         offset="0"
-         id="stop2841" /><stop
-         id="stop2847"
-         offset="0.5472973"
-         style="stop-color:white;stop-opacity:1;" /><stop
-         style="stop-color:white;stop-opacity:0.24705882;"
-         offset="0.66243607"
-         id="stop2849" /><stop
-         id="stop2851"
-         offset="0.875"
-         style="stop-color:white;stop-opacity:0.83505154;" /><stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop2843" /></linearGradient><linearGradient
-       id="linearGradient2900"><stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="0"
-         id="stop2902" /><stop
-         id="stop2908"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" /><stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop2904" /></linearGradient><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3468"
-       id="linearGradient3474"
-       x1="24.748737"
-       y1="35.354588"
-       x2="24.998737"
-       y2="14.997767"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.995556,0,-3.931113)" /><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2902"
-       id="radialGradient4700"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(4.095822,0,0,3.101282,-9.53921,-94.5433)"
-       cx="0"
-       cy="17"
-       fx="0"
-       fy="17"
-       r="2" /><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2902"
-       id="radialGradient4702"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(4.095822,0,0,3.101282,38.20996,-10.90025)"
-       cx="0"
-       cy="17"
-       fx="0"
-       fy="17"
-       r="2" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2900"
-       id="linearGradient4704"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.047911,0,0,2.067521,1.347566,6.673675)"
-       x1="9.8994951"
-       y1="20"
-       x2="9.8994951"
-       y2="13.979153" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2909"
-       id="linearGradient4711"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.42294,10.5,-14.95703)"
-       x1="15.335379"
-       y1="33.06237"
-       x2="20.329321"
-       y2="36.37693" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2909"
-       id="linearGradient4713"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.42294,-0.875,-15.04578)"
-       x1="15.335379"
-       y1="33.06237"
-       x2="20.329321"
-       y2="36.37693" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2909"
-       id="linearGradient4715"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.459833,0,-0.391165,1.370105,40.62503,-13.29892)"
-       x1="15.335379"
-       y1="33.06237"
-       x2="20.329321"
-       y2="36.37693" /><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5740"
-       id="radialGradient5748"
-       cx="25.251999"
-       cy="16.47991"
-       fx="25.251999"
-       fy="16.47991"
-       r="21.980215"
-       gradientTransform="matrix(1.032991,-0.596398,0.575121,0.99614,-12.23456,11.55448)"
-       gradientUnits="userSpaceOnUse" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2064"
-       id="linearGradient5790"
-       gradientUnits="userSpaceOnUse"
-       x1="18.048874"
-       y1="25.461344"
-       x2="22.211937"
-       y2="12.143078"
-       gradientTransform="matrix(0.940224,0,0,0.931632,1.331811,1.401537)" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8631"
-       id="linearGradient5865"
-       x1="24"
-       y1="36.638382"
-       x2="25.818018"
-       y2="6.8314762"
-       gradientUnits="userSpaceOnUse" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2839"
-       id="linearGradient7658"
-       gradientUnits="userSpaceOnUse"
-       x1="27.057796"
-       y1="12.669416"
-       x2="32.042896"
-       y2="31.219666" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5690"
-       id="linearGradient8603"
-       x1="20.304037"
-       y1="24.035707"
-       x2="18.498415"
-       y2="40.647167"
-       gradientUnits="userSpaceOnUse" /><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8613"
-       id="radialGradient8619"
-       cx="7.5177727"
-       cy="30.573555"
-       fx="7.5177727"
-       fy="30.573555"
-       r="0.53125"
-       gradientTransform="matrix(1.662477,0,0,1.61358,-4.989175,-18.65647)"
-       gradientUnits="userSpaceOnUse" /><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9613"
-       id="radialGradient8623"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.389748,0,0,1.348872,-2.91982,-10.63815)"
-       cx="7.5191436"
-       cy="30.304251"
-       fx="7.5191436"
-       fy="30.304251"
-       r="0.53125" /><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9633"
-       id="radialGradient8664"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.569487,0,0,1.523325,-4.288627,-15.92107)"
-       cx="7.5336008"
-       cy="30.307562"
-       fx="7.5336008"
-       fy="30.307562"
-       r="0.53125" /><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8613"
-       id="radialGradient8666"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.662477,0,0,1.61358,-4.989175,-18.65647)"
-       cx="7.5177727"
-       cy="30.573555"
-       fx="7.5177727"
-       fy="30.573555"
-       r="0.53125" /><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8625"
-       id="radialGradient8676"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.662477,0,0,1.61358,-4.989175,-18.65647)"
-       cx="7.4792061"
-       cy="30.36071"
-       fx="7.4792061"
-       fy="30.36071"
-       r="0.53125" /><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8613"
-       id="radialGradient8678"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.662477,0,0,1.61358,-4.989175,-18.65647)"
-       cx="7.5177727"
-       cy="30.573555"
-       fx="7.5177727"
-       fy="30.573555"
-       r="0.53125" /><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9641"
-       id="radialGradient8680"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.662477,0,0,1.61358,-4.989175,-18.65647)"
-       cx="7.4893188"
-       cy="30.337601"
-       fx="7.4893188"
-       fy="30.337601"
-       r="0.53125" /><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8613"
-       id="radialGradient8682"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.662477,0,0,1.61358,-4.989175,-18.65647)"
-       cx="7.5177727"
-       cy="30.573555"
-       fx="7.5177727"
-       fy="30.573555"
-       r="0.53125" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8710"
-       id="linearGradient8716"
-       x1="40.617188"
-       y1="30.554688"
-       x2="40.710938"
-       y2="30.359375"
-       gradientUnits="userSpaceOnUse" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8710"
-       id="linearGradient9605"
-       gradientUnits="userSpaceOnUse"
-       x1="40.617188"
-       y1="30.554688"
-       x2="40.710938"
-       y2="30.359375"
-       gradientTransform="matrix(0.602867,-0.797841,0.797841,0.602867,-41.12611,44.62773)" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8710"
-       id="linearGradient9649"
-       gradientUnits="userSpaceOnUse"
-       x1="40.617188"
-       y1="30.554688"
-       x2="40.710938"
-       y2="30.359375"
-       gradientTransform="rotate(-30.000012,-5.5813167,76.089146)" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8710"
-       id="linearGradient9654"
-       gradientUnits="userSpaceOnUse"
-       x1="40.617188"
-       y1="30.554688"
-       x2="40.710938"
-       y2="30.359375"
-       gradientTransform="matrix(0.707107,0.527555,-0.707107,0.527555,29.0058,-24.09196)" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2916"
-       id="linearGradient2973"
-       x1="12.5"
-       y1="43.1875"
-       x2="12.5"
-       y2="34.045513"
-       gradientUnits="userSpaceOnUse" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2899"
-       id="linearGradient5655"
-       gradientUnits="userSpaceOnUse"
-       x1="53.812813"
-       y1="43.573235"
-       x2="-2.8138931"
-       y2="35.500015"
-       gradientTransform="translate(0,50)" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2902"
-       id="linearGradient2992"
-       x1="21.9375"
-       y1="39"
-       x2="21.9375"
-       y2="37.995617"
-       gradientUnits="userSpaceOnUse" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2902"
-       id="linearGradient2910"
-       x1="22.101398"
-       y1="27.658131"
-       x2="22.971142"
-       y2="20.903238"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,2)" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2916"
-       id="linearGradient2922"
-       x1="24.847851"
-       y1="28.908398"
-       x2="24.847851"
-       y2="25.757175"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,2)" /></defs><sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.8830488"
-     inkscape:cx="-3.9945275"
-     inkscape:cy="-14.363301"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="2560"
-     inkscape:window-height="1408"
-     inkscape:window-x="0"
-     inkscape:window-y="32"
-     inkscape:window-maximized="1"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:showpageshadow="0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#505050" /><metadata
-     id="metadata7"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-86.987816,-132.85536)"><rect
-       style="fill:url(#linearGradient4477);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-opacity:1"
-       id="rect6462"
-       width="61.636364"
-       height="61.090908"
-       x="87.487816"
-       y="133.35536"
-       ry="5.6363635" /><rect
-       style="fill:url(#linearGradient6488);fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect6472"
-       width="59.796619"
-       height="13.251164"
-       x="88.407707"
-       y="134.45705"
-       ry="4.7325583" /><g
-       inkscape:label="Livello 1"
-       id="layer1-3"
-       style="display:inline"
-       transform="matrix(1.1537183,0,0,1.1537183,91.003924,136.40297)"><g
-         id="g3519"
-         style="opacity:0.7"
-         transform="matrix(1.030831,0,0,1.151147,-0.73609,-12.57431)"
-         inkscape:export-filename="/home/lapo/Desktop/uhm.png"
-         inkscape:export-xdpi="90"
-         inkscape:export-ydpi="90"><rect
-           transform="scale(-1)"
-           y="-48.024086"
-           x="-9.5392103"
-           height="12.405126"
-           width="8.1916437"
-           id="rect2884"
-           style="opacity:1;fill:url(#radialGradient4700);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /><rect
-           y="35.618961"
-           x="38.209965"
-           height="12.405126"
-           width="8.1916437"
-           id="rect2894"
-           style="opacity:1;fill:url(#radialGradient4702);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /><rect
-           y="35.618961"
-           x="9.5392103"
-           height="12.405126"
-           width="28.670753"
-           id="rect2898"
-           style="opacity:1;fill:url(#linearGradient4704);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /></g><g
-         id="g5672"
-         transform="translate(0,-48.99747)"><path
-           sodipodi:nodetypes="ccccccccccccc"
-           id="rect2010"
-           d="M 4.5182287,80.500013 H 43.481768 c 0.564099,0 1.018229,0.45413 1.018229,1.018229 v 2.963543 c 0,1.315584 -0.450231,3.018228 -2.455729,3.018228 L 40.5,87.5 v 1 h -33 v -1 l -1.8567713,1.3e-5 c -1.2712053,0 -2.1432282,-0.884627 -2.1432282,-2.255665 v -3.726106 c 0,-0.564099 0.4541297,-1.018229 1.0182282,-1.018229 z"
-           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5655);fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><path
-           transform="translate(0,50)"
-           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2973);stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
-           d="m 4.59375,31.59375 v 3.729743 c 0,0.599619 0.3756505,1.104854 0.8863276,1.104854 H 42.426407 c 0.512469,0 0.979843,-0.507235 0.979843,-1.016466 V 31.59375 Z"
-           id="path2076"
-           sodipodi:nodetypes="ccccccc" /><g
-           transform="translate(0,50)"
-           style="opacity:0.5"
-           id="g4706"><path
-             style="opacity:0.109524;fill:url(#linearGradient4711);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 26.144738,32.088747 c 0,0 -1.502602,5.533939 -3.226175,5.911253 0,0 6.231378,-0.125771 6.231378,-0.125771 1.387072,-0.317461 3.358758,-5.785482 3.358758,-5.785482 z"
-             id="path2907"
-             sodipodi:nodetypes="ccccc"
-             inkscape:export-filename="/home/lapo/Desktop/uhm.png"
-             inkscape:export-xdpi="90"
-             inkscape:export-ydpi="90" /><path
-             inkscape:export-ydpi="90"
-             inkscape:export-xdpi="90"
-             inkscape:export-filename="/home/lapo/Desktop/uhm.png"
-             sodipodi:nodetypes="ccccc"
-             id="path2892"
-             d="m 14.769738,32 c 0,0 -1.502602,5.533939 -3.226175,5.911253 0,0 6.231378,-0.125771 6.231378,-0.125771 C 19.162013,37.468021 21.133699,32 21.133699,32 Z"
-             style="opacity:0.109524;fill:url(#linearGradient4713);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
-             inkscape:export-ydpi="90"
-             inkscape:export-xdpi="90"
-             inkscape:export-filename="/home/lapo/Desktop/uhm.png"
-             sodipodi:nodetypes="ccccc"
-             id="path2896"
-             d="m 34.886139,32 c 0,0 -2.212224,5.328458 -3.108503,5.691761 0,0 2.899969,-0.121101 2.899969,-0.121101 C 35.402697,37.264987 37.8125,32 37.8125,32 Z"
-             style="opacity:0.109524;fill:url(#linearGradient4715);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /></g></g><path
-         style="fill:url(#radialGradient5748);fill-opacity:1;stroke:#888a85;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-         d="m 11.693127,10.498788 h 24.572566 c 1.68417,0 2.396517,0.117479 3.040019,2.385005 l 5.074491,17.881119 c 0.501024,1.765471 -1.355848,2.735101 -3.040018,2.735101 H 6.6186312 c -1.868408,0 -3.4893833,-1.181417 -3.0400182,-2.735101 L 8.8290448,12.611497 c 0.5683008,-1.964905 1.1799122,-2.112709 2.8640822,-2.112709 z"
-         id="rect1879"
-         sodipodi:nodetypes="cczzcczzc"
-         inkscape:export-filename="/home/lapo/Desktop/uhm.png"
-         inkscape:export-xdpi="90"
-         inkscape:export-ydpi="90" /><path
-         sodipodi:type="inkscape:offset"
-         inkscape:radius="-0.5"
-         inkscape:original="M 11.6875 10.5 C 10.00333 10.5 9.4120513 10.660095 8.84375 12.625 L 3.59375 30.75 C 3.1443849 32.303684 4.7565918 33.500002 6.625 33.5 L 41.34375 33.5 C 43.02792 33.5 44.876024 32.515471 44.375 30.75 L 39.3125 12.875 C 38.668998 10.607474 37.965419 10.5 36.28125 10.5 L 11.6875 10.5 z "
-         style="display:inline;opacity:0.462406;fill:url(#linearGradient7658);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-         id="path5806"
-         d="m 11.6875,11 c -0.826242,0 -1.28475,0.05742 -1.5625,0.242188 -0.2777497,0.184768 -0.5284825,0.580009 -0.8007812,1.521484 l -5.2500001,18.125 c -0.1708248,0.590628 0.021709,1.039316 0.4902344,1.4375 C 5.0329784,32.724356 5.7975106,33.000001 6.625,33 h 34.71875 c 0.744655,0 1.538941,-0.232575 2.03125,-0.609375 0.492309,-0.3768 0.719298,-0.799984 0.519531,-1.503906 l -5.0625,-17.875 C 38.52278,11.922001 38.224454,11.462814 37.910156,11.253906 37.595859,11.044998 37.112699,11 36.28125,11 Z" /><ellipse
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient8623);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
-         id="path8621"
-         transform="matrix(-2.628602,0,0,1.777765,27.79309,-23.77739)"
-         cx="7.625"
-         cy="30.578125"
-         rx="0.53125"
-         ry="0.515625" /><path
-         style="fill:none;fill-opacity:1;stroke:url(#linearGradient5790);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="m 16.110953,12.552805 c -0.573581,0 -1.02837,0.431821 -1.02837,0.989859 l -0.940223,3.230801 c -2.859962,1.276514 -4.6423552,3.099073 -4.6423552,5.123976 0,3.856957 6.4790242,6.987239 14.4853222,6.98724 8.006296,0 14.514705,-3.130284 14.514704,-6.98724 0,-2.039034 -1.835591,-3.875388 -4.730501,-5.153089 l -0.940224,-3.201688 c 0,-0.558038 -0.454788,-0.989859 -1.02837,-0.989859 z"
-         id="path2784"
-         sodipodi:nodetypes="cccssscccc" /><path
-         style="display:inline;fill:none;fill-opacity:1;stroke:url(#linearGradient3474);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-         d="m 11.6875,11.500005 c -0.803124,0 -1.097168,0.07051 -1.21875,0.155556 -0.121582,0.08504 -0.357707,0.40212 -0.6875,1.306667 l -5.25,18.137786 c -0.1337204,0.366765 -0.054827,0.533865 0.3125,0.84 0.3673267,0.306136 1.066693,0.56 1.78125,0.560001 h 34.71875 c 0.639793,0 1.393345,-0.237954 1.78125,-0.52889 0.387905,-0.290935 0.488311,-0.382809 0.3125,-0.871111 L 38.375,13.242228 c -0.377206,-1.04766 -0.68208,-1.439297 -0.84375,-1.555556 -0.16167,-0.116259 -0.443711,-0.186667 -1.25,-0.186667 z"
-         id="path3394"
-         sodipodi:nodetypes="csccsccsccscc" /><g
-         id="g5657"
-         transform="translate(7,-1)"
-         style="opacity:0.302857"><rect
-           ry="0.74712253"
-           rx="0.75130093"
-           y="35.500008"
-           x="18.499996"
-           height="1.9999924"
-           width="14.000004"
-           id="rect5641"
-           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#eeeeec;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><rect
-           y="36"
-           x="19"
-           height="1"
-           width="1"
-           id="rect5645"
-           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><rect
-           y="36"
-           x="22"
-           height="1"
-           width="1"
-           id="rect5647"
-           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><rect
-           y="36"
-           x="24"
-           height="1"
-           width="1"
-           id="rect5649"
-           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><rect
-           y="36"
-           x="26"
-           height="1"
-           width="1"
-           id="rect5651"
-           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><rect
-           y="36"
-           x="29"
-           height="1"
-           width="2"
-           id="rect5653"
-           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /></g><path
-         sodipodi:type="inkscape:offset"
-         inkscape:radius="-0.44194174"
-         inkscape:original="M 16.125 12.5625 C 15.55142 12.5625 15.09375 12.973212 15.09375 13.53125 L 14.15625 16.78125 C 11.296288 18.057765 9.5 19.881347 9.5 21.90625 C 9.5 25.763206 15.993702 28.874999 24 28.875 C 32.006296 28.874999 38.500001 25.763206 38.5 21.90625 C 38.5 19.867215 36.67616 18.027701 33.78125 16.75 L 32.84375 13.53125 C 32.843748 12.973212 32.386082 12.5625 31.8125 12.5625 L 16.125 12.5625 z "
-         style="display:inline;fill:url(#linearGradient5865);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="path5857"
-         d="m 16.125,13.003906 c -0.362612,0 -0.589844,0.210942 -0.589844,0.527344 a 0.44198593,0.44198593 0 0 1 -0.01758,0.123047 l -0.9375,3.25 a 0.44198593,0.44198593 0 0 1 -0.24414,0.28125 c -1.389903,0.620369 -2.504368,1.368471 -3.25586,2.177734 -0.751491,0.809263 -1.1386718,1.661199 -1.1386717,2.542969 0,1.680455 1.4530107,3.311153 3.9980467,4.533203 2.545037,1.22205 6.114654,1.99414 10.060547,1.994141 3.945892,-1e-6 7.51551,-0.772091 10.060547,-1.994141 2.545037,-1.22205 3.998047,-2.852748 3.998047,-4.533203 0,-0.887751 -0.391823,-1.747213 -1.154297,-2.5625 -0.762474,-0.815287 -1.893636,-1.568394 -3.300781,-2.189453 a 0.44198593,0.44198593 0 0 1 -0.246094,-0.28125 l -0.9375,-3.21875 a 0.44198593,0.44198593 0 0 1 -0.01758,-0.123047 c -10e-7,-0.316404 -0.22723,-0.527344 -0.589844,-0.527344 z" /><ellipse
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.9;fill:#000000;fill-opacity:0.0530303;fill-rule:nonzero;stroke:url(#linearGradient8603);stroke-width:2.52015;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
-         id="path8595"
-         transform="matrix(0.449978,0,0,0.349909,16.36363,12.21469)"
-         cx="16.970562"
-         cy="25.107418"
-         rx="7.7781744"
-         ry="4.2868347" /><ellipse
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient8619);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
-         id="path8611"
-         transform="matrix(1.411772,0,0,0.969697,-3.014767,0.848485)"
-         cx="7.625"
-         cy="30.578125"
-         rx="0.53125"
-         ry="0.515625" /><ellipse
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient8664);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.462594;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
-         id="path8660"
-         transform="matrix(-2.628602,0,0,1.777765,60.79309,-23.77739)"
-         cx="7.625"
-         cy="30.578125"
-         rx="0.53125"
-         ry="0.515625" /><ellipse
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient8666);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
-         id="path8662"
-         transform="matrix(1.411772,0,0,0.969697,29.98523,0.848485)"
-         cx="7.625"
-         cy="30.578125"
-         rx="0.53125"
-         ry="0.515625" /><ellipse
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient8676);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
-         id="path8668"
-         transform="matrix(-2.628602,0,0,1.777765,31.79309,-40.77739)"
-         cx="7.625"
-         cy="30.578125"
-         rx="0.53125"
-         ry="0.515625" /><ellipse
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient8678);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
-         id="path8670"
-         transform="matrix(1.411772,0,0,0.969697,0.985233,-16.15152)"
-         cx="7.625"
-         cy="30.578125"
-         rx="0.53125"
-         ry="0.515625" /><ellipse
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient8680);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
-         id="path8672"
-         transform="matrix(-2.628602,0,0,1.777765,56.3029,-40.77739)"
-         cx="7.625"
-         cy="30.578125"
-         rx="0.53125"
-         ry="0.515625" /><ellipse
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient8682);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
-         id="path8674"
-         transform="matrix(1.411772,0,0,0.969697,25.49504,-16.15152)"
-         cx="7.625"
-         cy="30.578125"
-         rx="0.53125"
-         ry="0.515625" /><path
-         style="opacity:0.4;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8716);stroke-width:0.3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 40.328109,30.261401 0.874999,0.430332"
-         id="path8700" /><path
-         style="display:inline;opacity:0.4;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient9605);stroke-width:0.3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 7.330186,30.695906 8.201031,30.257228"
-         id="path9603" /><path
-         style="display:inline;opacity:0.4;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient9649);stroke-width:0.3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 11.263531,13.446473 0.972937,-0.06482"
-         id="path9647" /><path
-         style="display:inline;opacity:0.4;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient9654);stroke-width:0.3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 36.124038,13.147874 0.314427,0.688634"
-         id="path9652" /><rect
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.12;fill:url(#linearGradient2992);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.681836;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
-         id="rect2984"
-         width="32.03125"
-         height="1"
-         x="8"
-         y="38" /><path
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.12;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2910);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
-         d="M 10.460155,15.082355 6.8513979,27.675762 C 8.2982685,28.375511 10.625,29.167061 10.429825,31.533131 H 37.299883 C 37.869398,29.640915 39.875,28.375 41.34614,28.25 L 37.498106,15.082355 32.350135,12.523347 H 14.318912 Z"
-         id="path1997"
-         sodipodi:nodetypes="ccccccccc" /><path
-         sodipodi:nodetypes="ccccc"
-         id="path2912"
-         d="m 7.9763979,27.050762 c 1.4468706,0.699749 3.1789321,1.433241 3.4256991,3.357369 H 36.857941 C 37.427456,28.515915 38.875,27.5 40.34614,27.375 Z"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.834286;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2922);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /></g></g></svg>

cockatrice/resources/countries/cn.svg

@@ -52,7 +52,8 @@
      id="defs8">
     <polygon
        id="s"
-       points="-0.587785,0.809017 0,-1 0.587785,0.809017 -0.951057,-0.309017 0.951057,-0.309017 "
+       points="-301930,415571 0,-513674 301930,415571 -488533,-158734 488533,-158734 "
+       transform="scale(1.94676e-6,1.94676e-6)"
        style="fill:#ffde00" />
     <clipPath
        clipPathUnits="userSpaceOnUse"

cockatrice/resources/countries/ss.svg

@@ -16,6 +16,6 @@
   <rect id="rect10" height="2.88" width="12.8" y="4.278e-9" x="0"/>
   <rect id="rect12" height="2.88" width="12.8" y="3.36" x="0" fill="#da121a"/>
   <polygon id="polygon14" points="0 0 8.6603 5 0 10" fill="#0f47af" transform="scale(.96)"/>
-  <polygon id="polygon16" points="4.01394 3.897169 1.23532 4.8 4.01394 5.702831 2.296666 3.3392 2.296666 6.2608" fill="#fcdd09"/>
+  <polygon id="polygon16" points="4.1557e5 -3.0193e5 -5.1367e5 0 4.1557e5 3.0193e5 -1.5873e5 -4.8853e5 -1.5873e5 4.8853e5" fill="#fcdd09" transform="matrix(.0000029902 0 0 .0000029902 2.7713 4.8)"/>
  </g>
 </svg>

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,21 +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&lt;8ED](#e<8ED) <small>(Cards that appear before 8th edition)</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/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/mana/C.svg

@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="169.33115mm"
-   height="169.59981mm"
-   viewBox="0 0 169.33115 169.59981"
-   version="1.1"
-   id="svg1"
-   inkscape:export-filename="C.svg"
-   inkscape:export-xdpi="96.000015"
-   inkscape:export-ydpi="96.000015"
-   inkscape:version="1.4.3 (0d15f75042, 2025-12-25)"
-   sodipodi:docname="colorless.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview1"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="mm"
-     inkscape:zoom="0.71535494"
-     inkscape:cx="397.00572"
-     inkscape:cy="536.09751"
-     inkscape:window-width="1853"
-     inkscape:window-height="1011"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1">
-    <inkscape:page
-       x="0"
-       y="0"
-       width="169.33115"
-       height="169.59981"
-       id="page2"
-       margin="0"
-       bleed="0" />
-  </sodipodi:namedview>
-  <defs
-     id="defs1" />
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-20.334425,-63.700102)">
-    <ellipse
-       style="fill:#cccccc;stroke:#000000;stroke-width:0.165333;stroke-linecap:round"
-       id="path1"
-       cx="-30.617094"
-       cy="179.22736"
-       transform="matrix(0.70654605,-0.70766707,0.70654608,0.70766704,0,0)"
-       rx="84.650612"
-       ry="84.65062" />
-    <rect
-       style="fill:none;stroke:#000000;stroke-width:14.5003;stroke-linecap:round;stroke-linejoin:bevel;stroke-dasharray:none"
-       id="rect1"
-       width="84.683701"
-       height="84.683769"
-       x="-221.60611"
-       y="-73.174698"
-       ry="0.084683768"
-       transform="matrix(-0.7073973,-0.70681615,0.7073973,-0.70681615,0,0)" />
-  </g>
-</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_dev_double.svg

@@ -1,343 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-  width="100"
-  height="100"
-  id="svg5322"
-  version="1.1"
-  inkscape:version="1.4.2 (ebf0e940, 2025-05-08)"
-  sodipodi:docname="pawn_dev_double.svg"
-  xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-  xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-  xmlns:xlink="http://www.w3.org/1999/xlink"
-  xmlns="http://www.w3.org/2000/svg"
-  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-  xmlns:cc="http://creativecommons.org/ns#"
-  xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <defs
-    id="defs3">
-    <inkscape:perspective
-      sodipodi:type="inkscape:persp3d"
-      inkscape:vp_x="0 : 526.18109 : 1"
-      inkscape:vp_y="0 : 1000 : 0"
-      inkscape:vp_z="744.09448 : 526.18109 : 1"
-      inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-      id="perspective5328"/>
-    <inkscape:perspective
-      id="perspective5305"
-      inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-      inkscape:vp_z="1 : 0.5 : 1"
-      inkscape:vp_y="0 : 1000 : 0"
-      inkscape:vp_x="0 : 0.5 : 1"
-      sodipodi:type="inkscape:persp3d"/>
-    <linearGradient
-      id="linearGradient5181">
-      <stop
-        style="stop-color:#0fbb00;stop-opacity:1;"
-        offset="0"
-        id="stop5183"/>
-      <stop
-        style="stop-color:#064400;stop-opacity:1;"
-        offset="1"
-        id="stop5185"/>
-    </linearGradient>
-    <radialGradient
-      inkscape:collect="always"
-      xlink:href="#linearGradient3600-2"
-      id="radialGradient3606-7"
-      cx="324.32715"
-      cy="131.40274"
-      fx="324.32715"
-      fy="131.40274"
-      r="25.501276"
-      gradientUnits="userSpaceOnUse"
-      gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"/>
-    <linearGradient
-      id="linearGradient3600-2">
-      <stop
-        style="stop-color:#ffc33d;stop-opacity:1;"
-        offset="0"
-        id="stop3602-4"/>
-      <stop
-        style="stop-color:#e09900;stop-opacity:1;"
-        offset="1"
-        id="stop3604-9"/>
-    </linearGradient>
-    <inkscape:perspective
-      id="perspective5478"
-      inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-      inkscape:vp_z="1 : 0.5 : 1"
-      inkscape:vp_y="0 : 1000 : 0"
-      inkscape:vp_x="0 : 0.5 : 1"
-      sodipodi:type="inkscape:persp3d"/>
-    <linearGradient
-      id="linearGradient5189">
-      <stop
-        style="stop-color:#000ec9;stop-opacity:1;"
-        offset="0"
-        id="stop5191"/>
-      <stop
-        style="stop-color:#000657;stop-opacity:1;"
-        offset="1"
-        id="stop5193"/>
-    </linearGradient>
-    <radialGradient
-      inkscape:collect="always"
-      xlink:href="#linearGradient3600-4"
-      id="radialGradient3606-1"
-      cx="324.32715"
-      cy="131.40274"
-      fx="324.32715"
-      fy="131.40274"
-      r="25.501276"
-      gradientUnits="userSpaceOnUse"
-      gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"/>
-    <linearGradient
-      id="linearGradient3600-4">
-      <stop
-        style="stop-color:#ffc33d;stop-opacity:1;"
-        offset="0"
-        id="stop3602-3"/>
-      <stop
-        style="stop-color:#e09900;stop-opacity:1;"
-        offset="1"
-        id="stop3604-5"/>
-    </linearGradient>
-    <inkscape:perspective
-      id="perspective5559"
-      inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-      inkscape:vp_z="1 : 0.5 : 1"
-      inkscape:vp_y="0 : 1000 : 0"
-      inkscape:vp_x="0 : 0.5 : 1"
-      sodipodi:type="inkscape:persp3d"/>
-    <linearGradient
-      inkscape:collect="always"
-      xlink:href="#linearGradient5173"
-      id="linearGradient5179"
-      x1="167.33386"
-      y1="178.83276"
-      x2="244.78181"
-      y2="178.83276"
-      gradientUnits="userSpaceOnUse"/>
-    <linearGradient
-      id="linearGradient5173">
-      <stop
-        style="stop-color:#f50000;stop-opacity:1;"
-        offset="0"
-        id="stop5175"/>
-      <stop
-        style="stop-color:#950000;stop-opacity:1;"
-        offset="1"
-        id="stop5177"/>
-    </linearGradient>
-    <radialGradient
-      inkscape:collect="always"
-      xlink:href="#linearGradient3600"
-      id="radialGradient5169"
-      gradientUnits="userSpaceOnUse"
-      gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
-      cx="324.32715"
-      cy="131.40274"
-      fx="324.32715"
-      fy="131.40274"
-      r="25.501276"/>
-    <linearGradient
-      id="linearGradient3600">
-      <stop
-        style="stop-color:#ffc13d;stop-opacity:1;"
-        offset="0"
-        id="stop3602"/>
-      <stop
-        style="stop-color:#e09900;stop-opacity:1;"
-        offset="1"
-        id="stop3604"/>
-    </linearGradient>
-    <radialGradient
-      r="25.501276"
-      fy="131.40274"
-      fx="324.32715"
-      cy="131.40274"
-      cx="324.32715"
-      gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
-      gradientUnits="userSpaceOnUse"
-      id="radialGradient5574"
-      xlink:href="#linearGradient3600"
-      inkscape:collect="always"/>
-    <inkscape:perspective
-      id="perspective5663"
-      inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-      inkscape:vp_z="1 : 0.5 : 1"
-      inkscape:vp_y="0 : 1000 : 0"
-      inkscape:vp_x="0 : 0.5 : 1"
-      sodipodi:type="inkscape:persp3d"/>
-    <radialGradient
-      inkscape:collect="always"
-      xlink:href="#linearGradient3600-7"
-      id="radialGradient3606-8"
-      cx="324.32715"
-      cy="131.40274"
-      fx="324.32715"
-      fy="131.40274"
-      r="25.501276"
-      gradientUnits="userSpaceOnUse"
-      gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"/>
-    <linearGradient
-      id="linearGradient3600-7">
-      <stop
-        style="stop-color:#ffc13d;stop-opacity:1;"
-        offset="0"
-        id="stop3602-7"/>
-      <stop
-        style="stop-color:#e09900;stop-opacity:1;"
-        offset="1"
-        id="stop3604-6"/>
-    </linearGradient>
-    <radialGradient
-      inkscape:collect="always"
-      xlink:href="#linearGradient3600-7"
-      id="radialGradient5254"
-      gradientUnits="userSpaceOnUse"
-      gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
-      cx="324.32715"
-      cy="131.40274"
-      fx="324.32715"
-      fy="131.40274"
-      r="25.501276"/>
-    <linearGradient
-      inkscape:collect="always"
-      xlink:href="#linearGradient5189-1"
-      id="linearGradient5394"
-      gradientUnits="userSpaceOnUse"
-      x1="385.03503"
-      y1="180.09546"
-      x2="462.48297"
-      y2="180.09546"
-      gradientTransform="matrix(0.96839241,0,0,0.96839241,-360.365,847.52359)"/>
-    <linearGradient
-      id="linearGradient5189-1">
-      <stop
-        style="stop-color:#000ec9;stop-opacity:1;"
-        offset="0"
-        id="stop5191-0"/>
-      <stop
-        style="stop-color:#000657;stop-opacity:1;"
-        offset="1"
-        id="stop5193-4"/>
-    </linearGradient>
-    <linearGradient
-      inkscape:collect="always"
-      xlink:href="#linearGradient5173-1"
-      id="linearGradient5581"
-      gradientUnits="userSpaceOnUse"
-      x1="167.33386"
-      y1="178.83276"
-      x2="244.78181"
-      y2="178.83276"
-      gradientTransform="matrix(0.96839241,0,0,0.96839241,-149.54484,848.74636)"/>
-    <linearGradient
-      id="linearGradient5173-1">
-      <stop
-        style="stop-color:#f50000;stop-opacity:1;"
-        offset="0"
-        id="stop5175-5"/>
-      <stop
-        style="stop-color:#950000;stop-opacity:1;"
-        offset="1"
-        id="stop5177-3"/>
-    </linearGradient>
-    <linearGradient
-      inkscape:collect="always"
-      xlink:href="#linearGradient5181-9"
-      id="linearGradient5782"
-      gradientUnits="userSpaceOnUse"
-      x1="282.50455"
-      y1="181.61069"
-      x2="359.95248"
-      y2="181.61069"
-      gradientTransform="matrix(0.96839241,0,0,0.96839241,-261.07526,846.05625)"/>
-    <linearGradient
-      id="linearGradient5181-9">
-      <stop
-        style="stop-color:#80d600;stop-opacity:1;"
-        offset="0"
-        id="stop5183-3"/>
-      <stop
-        style="stop-color:#80d600;stop-opacity:1;"
-        offset="1"
-        id="stop5185-0"/>
-    </linearGradient>
-    <linearGradient
-      y2="181.61069"
-      x2="359.95248"
-      y1="181.61069"
-      x1="282.50455"
-      gradientTransform="matrix(0.96839241,0,0,0.96839241,-175.71812,893.2775)"
-      gradientUnits="userSpaceOnUse"
-      id="linearGradient5799"
-      xlink:href="#linearGradient5181-9"
-      inkscape:collect="always"/>
-  </defs>
-  <sodipodi:namedview
-    inkscape:document-units="mm"
-    id="base"
-    pagecolor="#ffffff"
-    bordercolor="#666666"
-    borderopacity="1.0"
-    inkscape:pageopacity="0.0"
-    inkscape:pageshadow="2"
-    inkscape:zoom="6.0735294"
-    inkscape:cx="53.757869"
-    inkscape:cy="53.840194"
-    inkscape:current-layer="layer1"
-    showgrid="false"
-    inkscape:window-width="1696"
-    inkscape:window-height="1051"
-    inkscape:window-x="98"
-    inkscape:window-y="1118"
-    inkscape:window-maximized="1"
-    inkscape:showpageshadow="2"
-    inkscape:pagecheckerboard="0"
-    inkscape:deskcolor="#d1d1d1"
-    showguides="true">
-    <sodipodi:guide
-      position="49.829627,61.114263"
-      orientation="1,0"
-      id="guide1"
-      inkscape:locked="false"/>
-  </sodipodi:namedview>
-  <metadata
-    id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-        rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-          rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-    inkscape:label="Layer 1"
-    inkscape:groupmode="layer"
-    id="layer1"
-    transform="translate(0,-952.36218)">
-    <path
-      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"/>
-    <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"
-      inkscape:connector-curvature="0"/>
-    <path
-      d="m 478.409,116.617 c -0.368,-4.271 -3.181,-7.94 -7.2,-9.403 -4.029,-1.472 -8.539,-0.47 -11.57,2.556 l -62.015,62.011 -68.749,-21.768 -21.768,-68.748 62.016,-62.016 c 3.035,-3.032 4.025,-7.543 2.563,-11.565 -1.477,-4.03 -5.137,-6.837 -9.417,-7.207 -37.663,-3.245 -74.566,10.202 -101.247,36.887 -36.542,36.545 -46.219,89.911 -29.083,135.399 -1.873,1.578 -3.721,3.25 -5.544,5.053 L 19.386,373.152 c -0.073,0.071 -0.145,0.149 -0.224,0.219 -24.345,24.346 -24.345,63.959 0,88.309 24.349,24.344 63.672,24.048 88.013,-0.298 0.105,-0.098 0.201,-0.196 0.297,-0.305 L 301.104,252.456 c 1.765,-1.773 3.404,-3.628 4.949,-5.532 45.5,17.167 98.9,7.513 135.474,-29.056 26.675,-26.687 40.131,-63.593 36.882,-101.251 z M 75.98,435.38 c -8.971,8.969 -23.5,8.963 -32.47,0 -8.967,-8.961 -8.967,-23.502 0,-32.466 8.97,-8.963 23.499,-8.963 32.47,0 8.967,8.964 8.967,23.505 0,32.466 z"
-      id="path1"
-      style="display:inline;fill:#A1A1A1;stroke-width:9.87059588;stroke-dasharray:none;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-      transform="matrix(0.19145387,0,0,0.19145387,4.0816072,956.99677)"
-      inkscape:label="wrench" />
-  </g>
-</svg>

cockatrice/resources/usericons/pawn_dev_single.svg

@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-  width="100"
-  height="100"
-  id="svg5322"
-  version="1.1"
-  inkscape:version="1.4.2 (ebf0e940, 2025-05-08)"
-  sodipodi:docname="pawn_dev_single.svg"
-  xml:space="preserve"
-  xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-  xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-  xmlns:xlink="http://www.w3.org/1999/xlink"
-  xmlns="http://www.w3.org/2000/svg"
-  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-  xmlns:cc="http://creativecommons.org/ns#"
-  xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
-     id="defs3"><inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective5328" /><inkscape:perspective
-       id="perspective5305"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" /><linearGradient
-       id="linearGradient5181"><stop
-         style="stop-color:#0fbb00;stop-opacity:1;"
-         offset="0"
-         id="stop5183" /><stop
-         style="stop-color:#064400;stop-opacity:1;"
-         offset="1"
-         id="stop5185" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3600-2"
-       id="radialGradient3606-7"
-       cx="324.32715"
-       cy="131.40274"
-       fx="324.32715"
-       fy="131.40274"
-       r="25.501276"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" /><linearGradient
-       id="linearGradient3600-2"><stop
-         style="stop-color:#ffc33d;stop-opacity:1;"
-         offset="0"
-         id="stop3602-4" /><stop
-         style="stop-color:#e09900;stop-opacity:1;"
-         offset="1"
-         id="stop3604-9" /></linearGradient><inkscape:perspective
-       id="perspective5478"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" /><linearGradient
-       id="linearGradient5189"><stop
-         style="stop-color:#000ec9;stop-opacity:1;"
-         offset="0"
-         id="stop5191" /><stop
-         style="stop-color:#000657;stop-opacity:1;"
-         offset="1"
-         id="stop5193" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3600-4"
-       id="radialGradient3606-1"
-       cx="324.32715"
-       cy="131.40274"
-       fx="324.32715"
-       fy="131.40274"
-       r="25.501276"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" /><linearGradient
-       id="linearGradient3600-4"><stop
-         style="stop-color:#ffc33d;stop-opacity:1;"
-         offset="0"
-         id="stop3602-3" /><stop
-         style="stop-color:#e09900;stop-opacity:1;"
-         offset="1"
-         id="stop3604-5" /></linearGradient><inkscape:perspective
-       id="perspective5559"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" /><linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5173"
-       id="linearGradient5179"
-       x1="167.33386"
-       y1="178.83276"
-       x2="244.78181"
-       y2="178.83276"
-       gradientUnits="userSpaceOnUse" /><linearGradient
-       id="linearGradient5173"><stop
-         style="stop-color:#f50000;stop-opacity:1;"
-         offset="0"
-         id="stop5175" /><stop
-         style="stop-color:#950000;stop-opacity:1;"
-         offset="1"
-         id="stop5177" /></linearGradient><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3600"
-       id="radialGradient5169"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
-       cx="324.32715"
-       cy="131.40274"
-       fx="324.32715"
-       fy="131.40274"
-       r="25.501276" /><linearGradient
-       id="linearGradient3600"><stop
-         style="stop-color:#ffc13d;stop-opacity:1;"
-         offset="0"
-         id="stop3602" /><stop
-         style="stop-color:#e09900;stop-opacity:1;"
-         offset="1"
-         id="stop3604" /></linearGradient><radialGradient
-       r="25.501276"
-       fy="131.40274"
-       fx="324.32715"
-       cy="131.40274"
-       cx="324.32715"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5574"
-       xlink:href="#linearGradient3600"
-       inkscape:collect="always" /><inkscape:perspective
-       id="perspective5663"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" /><radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3600-7"
-       id="radialGradient3606-8"
-       cx="324.32715"
-       cy="131.40274"
-       fx="324.32715"
-       fy="131.40274"
-       r="25.501276"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" /><linearGradient
-       id="linearGradient3600-7"><stop
-         style="stop-color:#ffc13d;stop-opacity:1;"
-         offset="0"
-         id="stop3602-7" /><stop
-         style="stop-color:#e09900;stop-opacity:1;"
-         offset="1"
-         id="stop3604-6" /></linearGradient><radialGradient
-       r="25.501276"
-       fy="131.40274"
-       fx="324.32715"
-       cy="131.40274"
-       cx="324.32715"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5676"
-       xlink:href="#linearGradient3600-7"
-       inkscape:collect="always" /></defs><sodipodi:namedview
-     inkscape:document-units="mm"
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.1582091"
-     inkscape:cx="104.64791"
-     inkscape:cy="56.04442"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1027"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showguides="true"><sodipodi:guide
-       position="50.002551,111.99556"
-       orientation="1,0"
-       id="guide3"
-       inkscape:locked="false" /></sodipodi:namedview><metadata
-     id="metadata4"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-952.36218)"
-     style="display:inline">
-    <path
-   style="display:inline;opacity:1;fill-opacity:1;stroke:#000000;stroke-width:2.7822;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-   d="M 49.84375,1.71875 C 36.719738,1.71875 26.0625,12.375988 26.0625,25.5 c 0,7.477454 3.475825,14.112734 8.875,18.46875 -10.497549,5.974948 -17.018351,18.227376 -20.625,31.6875 -5.2744126,19.6844 15.911513,22.5625 35.53125,22.5625 19.619736,0 40.705577,-3.2516 35.53125,-22.5625 C 81.693381,61.916246 75.224585,49.827177 64.8125,43.9375 70.181573,39.580662 73.59375,32.953205 73.59375,25.5 c 0,-13.124012 -10.625988,-23.78125 -23.75,-23.78125 z"
-   id="left"
-   sodipodi:insensitive="true"
-   transform="translate(0,952.36218)" />
-    <path
-   d="m 478.409,116.617 c -0.368,-4.271 -3.181,-7.94 -7.2,-9.403 -4.029,-1.472 -8.539,-0.47 -11.57,2.556 l -62.015,62.011 -68.749,-21.768 -21.768,-68.748 62.016,-62.016 c 3.035,-3.032 4.025,-7.543 2.563,-11.565 -1.477,-4.03 -5.137,-6.837 -9.417,-7.207 -37.663,-3.245 -74.566,10.202 -101.247,36.887 -36.542,36.545 -46.219,89.911 -29.083,135.399 -1.873,1.578 -3.721,3.25 -5.544,5.053 L 19.386,373.152 c -0.073,0.071 -0.145,0.149 -0.224,0.219 -24.345,24.346 -24.345,63.959 0,88.309 24.349,24.344 63.672,24.048 88.013,-0.298 0.105,-0.098 0.201,-0.196 0.297,-0.305 L 301.104,252.456 c 1.765,-1.773 3.404,-3.628 4.949,-5.532 45.5,17.167 98.9,7.513 135.474,-29.056 26.675,-26.687 40.131,-63.593 36.882,-101.251 z M 75.98,435.38 c -8.971,8.969 -23.5,8.963 -32.47,0 -8.967,-8.961 -8.967,-23.502 0,-32.466 8.97,-8.963 23.499,-8.963 32.47,0 8.967,8.964 8.967,23.505 0,32.466 z"
-   id="path1"
-   style="display:inline;fill:#A1A1A1;stroke-width:9.87059588;stroke-dasharray:none;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-   transform="matrix(0.19145387,0,0,0.19145387,4.0816072,956.99677)"
-   inkscape:label="wrench" /></g></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/lag_monitor.cpp

@@ -1,66 +0,0 @@
-#include "lag_monitor.h"
-
-#include <QApplication>
-#include <QCoreApplication>
-#include <QDateTime>
-#include <QEvent>
-#include <QMessageLogger>
-#include <QTimer>
-
-LagMonitor::LagMonitor(QObject *parent) : QObject(parent)
-{
-    qApp->installEventFilter(this);
-
-    timer = new QTimer(this);
-    timer->setInterval(TICK_INTERVAL_MS);
-    connect(timer, &QTimer::timeout, this, &LagMonitor::checkTick);
-    tickClock.start();
-    timer->start();
-}
-
-QList<LagMonitor::StallRecord> LagMonitor::recentStalls() const
-{
-    return stalls;
-}
-
-void LagMonitor::clearStalls()
-{
-    stalls.clear();
-}
-
-bool LagMonitor::eventFilter(QObject *obj, QEvent *event)
-{
-    if (event->type() == QEvent::ApplicationStateChange) {
-        // The transition may span a suspend or an arbitrary unfocused period;
-        // discard the gap so it cannot be mistaken for a stall.
-        tickClock.restart();
-    }
-    return QObject::eventFilter(obj, event);
-}
-
-void LagMonitor::checkTick()
-{
-    recordGap(tickClock.restart());
-}
-
-void LagMonitor::recordGap(qint64 gapMs)
-{
-    if (gapMs <= STALL_THRESHOLD_MS) {
-        return;
-    }
-
-    if (gapMs > MAX_PLAUSIBLE_STALL_MS) {
-        qCDebug(LagMonitorLog, "Ignoring implausible %lld ms gap (likely suspend)", static_cast<long long>(gapMs));
-        return;
-    }
-
-    const StallRecord record{.timestampMsSinceEpoch = QDateTime::currentMSecsSinceEpoch(), .durationMs = gapMs};
-
-    stalls.append(record);
-    while (stalls.size() > MAX_RECORDED_STALLS) {
-        stalls.removeFirst();
-    }
-
-    qCWarning(LagMonitorLog, "Event loop stalled for %lld ms (threshold: %d ms)", static_cast<long long>(gapMs),
-              STALL_THRESHOLD_MS);
-}

cockatrice/src/client/lag_monitor.h

@@ -1,87 +0,0 @@
-/**
- * @file lag_monitor.h
- * @ingroup Client
- */
-
-#ifndef LAG_MONITOR_H
-#define LAG_MONITOR_H
-
-#include <QElapsedTimer>
-#include <QList>
-#include <QLoggingCategory>
-#include <QObject>
-#include <QtGlobal>
-#include <qtmetamacros.h>
-
-inline Q_LOGGING_CATEGORY(LagMonitorLog, "lag_monitor");
-
-class QTimer;
-
-/**
- * @brief Detects main-thread event loop stalls ("UI freezes") from the inside.
- *
- * A timer is expected to fire every TICK_INTERVAL_MS of wall time. When the
- * observed gap greatly exceeds that interval, some other task blocked the
- * event loop for roughly the overshooting duration. This is what separates
- * "my client froze" from "the network is lagging" in user reports.
- *
- * Gaps that span an application state change (suspend, minimize, focus
- * loss) are discarded, and implausibly huge gaps are dropped, so operating
- * system power events do not fabricate stalls. This handling is load-bearing
- * on Windows, where the monotonic clock used by Qt counts sleep time.
- *
- * Healthy operation costs one timer wakeup per tick and two integer
- * comparisons. Allocations happen only when a stall is actually recorded.
- */
-class LagMonitor : public QObject
-{
-    Q_OBJECT
-
-public:
-    struct StallRecord
-    {
-        qint64 timestampMsSinceEpoch = 0; ///< when the stalled period ended
-        qint64 durationMs = 0; ///< approximate length of the freeze; measured tick to tick, so it can exceed the true
-                               ///< stall by up to TICK_INTERVAL_MS
-    };
-
-    static constexpr int TICK_INTERVAL_MS = 500;
-    static constexpr int STALL_THRESHOLD_MS = 2000;
-    static constexpr int MAX_RECORDED_STALLS = 32;
-
-    /// Gaps beyond this are treated as suspend artifacts rather than stalls.
-    static constexpr qint64 MAX_PLAUSIBLE_STALL_MS = 600000;
-
-    explicit LagMonitor(QObject *parent = nullptr);
-
-    /**
-     * @brief Stalls recorded during this session, oldest first.
-     *
-     * Intended consumers are log output and the diagnostics export. The list
-     * holds at most MAX_RECORDED_STALLS entries.
-     */
-    QList<StallRecord> recentStalls() const;
-
-    void clearStalls();
-
-    /**
-     * @brief Feeds a measured tick-to-tick gap through the detection logic.
-     *
-     * Split out of checkTick so threshold, plausibility, and trim behavior
-     * stay unit-testable without real timing.
-     */
-    void recordGap(qint64 gapMs);
-
-protected:
-    bool eventFilter(QObject *obj, QEvent *event) override;
-
-private slots:
-    void checkTick();
-
-private:
-    QTimer *timer;
-    QElapsedTimer tickClock; ///< monotonic clock, so wall clock steps do not fabricate stalls
-    QList<StallRecord> stalls;
-};
-
-#endif

cockatrice/src/client/latency_graph_widget.cpp

@@ -1,55 +0,0 @@
-/**
- * @file latency_graph_widget.cpp
- * @ingroup Client
- */
-
-#include "latency_graph_widget.h"
-
-#include <QColor>
-#include <QPainter>
-#include <QRectF>
-#include <QtGlobal>
-#include <qnumeric.h>
-
-LatencyGraphWidget::LatencyGraphWidget(QWidget *parent) : QWidget(parent)
-{
-}
-
-void LatencyGraphWidget::setSamples(const QList<int> &samplesMs)
-{
-    samples = samplesMs;
-    update();
-}
-
-void LatencyGraphWidget::paintEvent(QPaintEvent * /* event */)
-{
-    if (samples.isEmpty()) {
-        return;
-    }
-
-    QPainter painter(this);
-
-    // Heights are relative to the window's own worst sample (floored at
-    // MinScaleMs) so the shape of the variance stays readable even when every
-    // value is small.
-    qint64 heightScaleMs = MinScaleMs;
-    for (int sample : samples) {
-        heightScaleMs = qMax(heightScaleMs, static_cast<qint64>(sample));
-    }
-
-    const qreal widthPerBar = static_cast<qreal>(width()) / samples.size();
-    for (int i = 0; i < samples.size(); ++i) {
-        const qreal heightRatio = qBound(0.0, static_cast<double>(samples.at(i)) / heightScaleMs, 1.0);
-        const qreal barHeight = heightRatio * height();
-
-        // Colors follow an absolute quality ramp: a steady good ping stays
-        // green no matter how uniform the window is.
-        const qreal colorRatio = qBound(0.0, static_cast<double>(samples.at(i)) / ColorScaleMs, 1.0);
-        QColor color;
-        color.setHsv(qRound(120.0 * (1.0 - colorRatio)), 255, 255);
-
-        const QRectF bar(static_cast<qreal>(i) * widthPerBar + 1.0, static_cast<qreal>(height()) - barHeight,
-                         qMax(1.0, widthPerBar - 2.0), barHeight);
-        painter.fillRect(bar, color);
-    }
-}

cockatrice/src/client/latency_graph_widget.h

@@ -1,45 +0,0 @@
-/**
- * @file latency_graph_widget.h
- * @ingroup Client
- */
-
-#ifndef LATENCY_GRAPH_WIDGET_H
-#define LATENCY_GRAPH_WIDGET_H
-
-#include <QList>
-#include <QWidget>
-#include <QtGlobal>
-#include <qtmetamacros.h>
-
-/**
- * @brief Bar graph of recent network round-trip samples.
- *
- * Draws one bar per sample, oldest on the left. Bar height is relative to the
- * window's own scale so the shape of the variance stays readable, while bar
- * color maps each sample onto an absolute quality ramp (green at rest through
- * red at ColorScaleMs) so a steady good ping never looks alarming. Size
- * agnostic: the status bar embeds a small instance while the latency detail
- * popup shows a large one.
- */
-class LatencyGraphWidget : public QWidget
-{
-    Q_OBJECT
-public:
-    explicit LatencyGraphWidget(QWidget *parent = nullptr);
-
-    /// Sample in milliseconds that maps to a fully red bar.
-    static constexpr qint64 ColorScaleMs = 500;
-
-    void setSamples(const QList<int> &samplesMs);
-
-protected:
-    void paintEvent(QPaintEvent *event) override;
-
-private:
-    /// Floor of the vertical scale in milliseconds. Keeps small windows readable.
-    static constexpr qint64 MinScaleMs = 100;
-
-    QList<int> samples;
-};
-
-#endif

cockatrice/src/client/latency_status_widget.cpp

@@ -1,115 +0,0 @@
-/**
- * @file latency_status_widget.cpp
- * @ingroup Client
- */
-
-#include "latency_status_widget.h"
-
-#include "latency_graph_widget.h"
-#include "latency_tracker.h"
-
-#include <QEvent>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QObject>
-#include <QPoint>
-#include <QVBoxLayout>
-#include <qnamespace.h>
-
-LatencyStatusWidget::LatencyStatusWidget(QWidget *parent) : QWidget(parent)
-{
-    pingLabel = new QLabel(this);
-    pingLabel->setAccessibleName(tr("Ping"));
-
-    latencyGraph = new LatencyGraphWidget(this);
-    latencyGraph->setFixedSize(90, 14);
-
-    auto *layout = new QHBoxLayout(this);
-    layout->setContentsMargins(0, 0, 0, 0);
-    layout->setSpacing(4);
-    layout->addWidget(latencyGraph);
-    layout->addWidget(pingLabel);
-
-    // Clicking anywhere in the area opens the detail view.
-    for (QObject *child : QList<QObject *>{pingLabel, latencyGraph}) {
-        child->installEventFilter(this);
-    }
-    setCursor(Qt::PointingHandCursor);
-
-    hide();
-}
-
-void LatencyStatusWidget::updateData(const LatencyTracker::Stats &stats, const QList<int> &samplesMs)
-{
-    latestSamples = samplesMs;
-    latencyGraph->setSamples(samplesMs);
-    if (popup && popup->isVisible() && detailGraph) {
-        detailGraph->setSamples(samplesMs);
-    }
-
-    if (stats.sampleCount == 0) {
-        hide();
-        return;
-    }
-
-    const QString statsStr = statsText(stats);
-
-    pingLabel->setText(tr("Ping: %1 ms").arg(stats.lastMs));
-    pingLabel->setToolTip(statsStr);
-    pingLabel->setAccessibleDescription(statsStr);
-    if (popup && popup->isVisible() && detailLabel) {
-        detailLabel->setText(statsStr);
-    }
-    show();
-}
-
-bool LatencyStatusWidget::eventFilter(QObject *watched, QEvent *event)
-{
-    if ((watched == pingLabel || watched == latencyGraph) && event->type() == QEvent::MouseButtonPress) {
-        togglePopup();
-        return true;
-    }
-    return QWidget::eventFilter(watched, event);
-}
-
-void LatencyStatusWidget::togglePopup()
-{
-    if (!popup) {
-        popup = new QWidget(this, Qt::Popup | Qt::FramelessWindowHint);
-        auto *layout = new QVBoxLayout(popup);
-        layout->setContentsMargins(8, 8, 8, 8);
-
-        detailLabel = new QLabel(popup);
-        detailLabel->setAccessibleName(tr("Connection latency details"));
-        detailLabel->setTextInteractionFlags(Qt::TextSelectableByMouse);
-
-        detailGraph = new LatencyGraphWidget(popup);
-        detailGraph->setFixedSize(280, 80);
-
-        layout->addWidget(detailLabel, 0, Qt::AlignLeft);
-        layout->addWidget(detailGraph, 0, Qt::AlignHCenter);
-    }
-
-    if (popup->isVisible()) {
-        popup->hide();
-        return;
-    }
-
-    // Qt::Popup closes itself on any outside click, so just position and show.
-    if (latestSamples.isEmpty()) {
-        return;
-    }
-    detailGraph->setSamples(latestSamples);
-    detailLabel->setText(pingLabel->toolTip());
-    popup->adjustSize();
-    const QPoint anchor = mapToGlobal(QPoint(width() / 2, 0));
-    popup->move(anchor.x() - popup->width() / 2, anchor.y() - popup->height() - 6);
-    popup->show();
-}
-
-QString LatencyStatusWidget::statsText(const LatencyTracker::Stats &stats) const
-{
-    return tr("Connection quality over the last %n sample(s):", "", stats.sampleCount) + "\n" +
-           tr("Last: %1 ms").arg(stats.lastMs) + "\n" + tr("Median: %1 ms").arg(stats.medianMs) + "\n" +
-           tr("95th percentile: %1 ms").arg(stats.p95Ms) + "\n" + tr("Maximum: %1 ms").arg(stats.maxMs);
-}

cockatrice/src/client/latency_status_widget.h

@@ -1,52 +0,0 @@
-/**
- * @file latency_status_widget.h
- * @ingroup Client
- */
-
-#ifndef LATENCY_STATUS_WIDGET_H
-#define LATENCY_STATUS_WIDGET_H
-
-#include <QList>
-#include <QString>
-#include <QWidget>
-#include <libcockatrice/network/client/abstract/latency_tracker.h>
-#include <qtmetamacros.h>
-
-class QLabel;
-class LatencyGraphWidget;
-
-/**
- * @brief Status bar presentation of server round-trip health.
- *
- * Combines the textual "Ping" readout with a small LatencyGraphWidget
- * sparkline of the rolling sample window. Clicking anywhere in the area opens
- * a popup with a larger graph and the numeric statistics. It closes on any
- * outside click. Stays hidden while disconnected or before any samples exist.
- * Owns all latency display state so MainWindow only needs to forward one
- * signal here.
- */
-class LatencyStatusWidget : public QWidget
-{
-    Q_OBJECT
-public:
-    explicit LatencyStatusWidget(QWidget *parent = nullptr);
-
-public slots:
-    void updateData(const LatencyTracker::Stats &stats, const QList<int> &samplesMs);
-
-protected:
-    bool eventFilter(QObject *watched, QEvent *event) override;
-
-private:
-    void togglePopup();
-    QString statsText(const LatencyTracker::Stats &stats) const;
-
-    QLabel *pingLabel = nullptr;
-    LatencyGraphWidget *latencyGraph = nullptr;
-    QWidget *popup = nullptr;
-    LatencyGraphWidget *detailGraph = nullptr;
-    QLabel *detailLabel = nullptr;
-    QList<int> latestSamples;
-};
-
-#endif

cockatrice/src/client/network/connection_controller/remote_connection_controller.cpp

@@ -1,611 +0,0 @@
-#include "remote_connection_controller.h"
-
-#include "../../../interface/pixel_map_generator.h"
-#include "../../settings/cache_settings.h"
-#include "../interface/widgets/dialogs/dlg_connect.h"
-#include "../interface/widgets/dialogs/dlg_forgot_password_challenge.h"
-#include "../interface/widgets/dialogs/dlg_forgot_password_request.h"
-#include "../interface/widgets/dialogs/dlg_forgot_password_reset.h"
-#include "../interface/widgets/dialogs/dlg_register.h"
-#include "../interface/widgets/utility/get_text_with_max.h"
-#include "libcockatrice/protocol/pb/event_connection_closed.pb.h"
-#include "libcockatrice/protocol/pb/event_server_shutdown.pb.h"
-
-#include <QChar>
-#include <QDateTime>
-#include <QDebug>
-#include <QLineEdit>
-#include <QList>
-#include <QMessageBox>
-#include <QPixmap>
-#include <QStringList>
-#include <QStringLiteral>
-#include <QThread>
-#include <libcockatrice/network/client/remote/remote_client.h>
-#include <libcockatrice/protocol/pb/response.pb.h>
-#include <libcockatrice/settings/servers_settings.h>
-#include <qnamespace.h>
-
-class QWidget;
-
-ConnectionController::ConnectionController(QWidget *dialogParent, QObject *parent)
-    : QObject(parent), dialogParent(dialogParent)
-{
-    remoteClient = new RemoteClient(nullptr, &SettingsCache::instance());
-
-    clientThread = new QThread(this);
-    remoteClient->moveToThread(clientThread);
-    clientThread->start();
-
-    wireClientSignals();
-}
-
-ConnectionController::~ConnectionController()
-{
-    remoteClient->deleteLater();
-    clientThread->wait();
-}
-
-void ConnectionController::wireClientSignals()
-{
-    connect(remoteClient, &RemoteClient::connectionClosedEventReceived, this,
-            &ConnectionController::onConnectionClosedEvent);
-
-    connect(remoteClient, &RemoteClient::serverShutdownEventReceived, this,
-            &ConnectionController::onServerShutdownEvent);
-
-    connect(remoteClient, &RemoteClient::statusChanged, this, &ConnectionController::onStatusChanged);
-
-    connect(remoteClient, &AbstractClient::pingStatsUpdated, this, &ConnectionController::pingStatsUpdated);
-
-    connect(remoteClient, &RemoteClient::userInfoChanged, this, &ConnectionController::onUserInfoReceived,
-            Qt::BlockingQueuedConnection);
-
-    connect(remoteClient, &RemoteClient::loginError, this,
-            [this](Response::ResponseCode r, QString rs, quint32 et, QList<QString> mf) {
-                onLoginError(static_cast<int>(r), rs, et, mf);
-            });
-
-    connect(remoteClient, &RemoteClient::registerError, this,
-            [this](Response::ResponseCode r, QString rs, quint32 et) { onRegisterError(static_cast<int>(r), rs, et); });
-
-    connect(remoteClient, &RemoteClient::activateError, this, &ConnectionController::onActivateError);
-    connect(remoteClient, &RemoteClient::socketError, this, &ConnectionController::onSocketError);
-    connect(remoteClient, &RemoteClient::serverTimeout, this, &ConnectionController::onServerTimeout);
-
-    connect(remoteClient, &RemoteClient::protocolVersionMismatch, this,
-            &ConnectionController::onProtocolVersionMismatch);
-
-    connect(remoteClient, &RemoteClient::registerAccepted, this, &ConnectionController::onRegisterAccepted);
-
-    connect(remoteClient, &RemoteClient::registerAcceptedNeedsActivate, this,
-            &ConnectionController::onRegisterAcceptedNeedsActivate);
-
-    connect(remoteClient, &RemoteClient::activateAccepted, this, &ConnectionController::onActivateAccepted);
-
-    connect(remoteClient, &RemoteClient::notifyUserAboutUpdate, this, &ConnectionController::onNotifyUserAboutUpdate);
-
-    connect(remoteClient, &RemoteClient::sigForgotPasswordSuccess, this,
-            &ConnectionController::onForgotPasswordSuccess);
-
-    connect(remoteClient, &RemoteClient::sigForgotPasswordError, this, &ConnectionController::onForgotPasswordError);
-
-    connect(remoteClient, &RemoteClient::sigPromptForForgotPasswordReset, this,
-            &ConnectionController::onPromptForgotPasswordReset);
-
-    connect(remoteClient, &RemoteClient::sigPromptForForgotPasswordChallenge, this,
-            &ConnectionController::onPromptForgotPasswordChallenge);
-}
-
-void ConnectionController::connectToServer()
-{
-    dlgConnect = new DlgConnect(dialogParent);
-    connect(dlgConnect, &DlgConnect::sigStartForgotPasswordRequest, this, &ConnectionController::forgotPasswordRequest);
-
-    if (dlgConnect->exec()) {
-        remoteClient->connectToServer(dlgConnect->getHost(), static_cast<unsigned int>(dlgConnect->getPort()),
-                                      dlgConnect->getPlayerName(), dlgConnect->getPassword());
-    }
-}
-
-void ConnectionController::connectToServerDirect(const QString &host,
-                                                 unsigned int port,
-                                                 const QString &playerName,
-                                                 const QString &password)
-{
-    remoteClient->connectToServer(host, port, playerName, password);
-}
-
-void ConnectionController::disconnectFromServer()
-{
-    remoteClient->disconnectFromServer();
-}
-
-void ConnectionController::registerToServer()
-{
-    DlgRegister dlg(dialogParent);
-    if (dlg.exec()) {
-        remoteClient->registerToServer(dlg.getHost(), static_cast<unsigned int>(dlg.getPort()), dlg.getPlayerName(),
-                                       dlg.getPassword(), dlg.getEmail(), dlg.getCountry(), dlg.getRealName());
-    }
-}
-
-void ConnectionController::forgotPasswordRequest()
-{
-    DlgForgotPasswordRequest dlg(dialogParent);
-    if (dlg.exec()) {
-        remoteClient->requestForgotPasswordToServer(dlg.getHost(), static_cast<unsigned int>(dlg.getPort()),
-                                                    dlg.getPlayerName());
-    }
-}
-
-void ConnectionController::onConnectionClosedEvent(const Event_ConnectionClosed &event)
-{
-    remoteClient->disconnectFromServer();
-
-    QString reasonStr;
-    switch (event.reason()) {
-        case Event_ConnectionClosed::USER_LIMIT_REACHED: {
-            reasonStr = tr("The server has reached its maximum user capacity, please check back later.");
-            break;
-        }
-        case Event_ConnectionClosed::TOO_MANY_CONNECTIONS: {
-            reasonStr = tr("There are too many concurrent connections from your address.");
-            break;
-        }
-        case Event_ConnectionClosed::BANNED: {
-            reasonStr = tr("Banned by moderator");
-            if (event.has_end_time()) {
-                reasonStr.append(
-                    "\n" + tr("Expected end time: %1").arg(QDateTime::fromSecsSinceEpoch(event.end_time()).toString()));
-            } else {
-                reasonStr.append("\n" + tr("This ban lasts indefinitely."));
-            }
-            if (event.has_reason_str()) {
-                reasonStr.append("\n\n" + QString::fromStdString(event.reason_str()));
-            }
-            break;
-        }
-        case Event_ConnectionClosed::SERVER_SHUTDOWN: {
-            reasonStr = tr("Scheduled server shutdown.");
-            break;
-        }
-        case Event_ConnectionClosed::USERNAMEINVALID: {
-            reasonStr = tr("Invalid username.");
-            break;
-        }
-        case Event_ConnectionClosed::LOGGEDINELSEWERE: {
-            reasonStr = tr("You have been logged out due to logging in at another location.");
-            break;
-        }
-        default:
-            reasonStr = QString::fromStdString(event.reason_str());
-    }
-
-    QMessageBox::critical(dialogParent, tr("Connection closed"),
-                          tr("The server has terminated your connection.\nReason: %1").arg(reasonStr));
-}
-
-void ConnectionController::onServerShutdownEvent(const Event_ServerShutdown &event)
-{
-    serverShutdownMessageBox.setInformativeText(tr("The server is going to be restarted in %n minute(s).\nAll running "
-                                                   "games will be lost.\nReason for shutdown: %1",
-                                                   "", event.minutes())
-                                                    .arg(QString::fromStdString(event.reason())));
-    serverShutdownMessageBox.setIconPixmap(themePixmap(QStringLiteral("cockatrice")).scaled(64, 64));
-    serverShutdownMessageBox.setText(tr("Scheduled server shutdown"));
-    serverShutdownMessageBox.setWindowModality(Qt::ApplicationModal);
-    serverShutdownMessageBox.setVisible(true);
-}
-
-void ConnectionController::onStatusChanged(ClientStatus status)
-{
-    // Update the window title first, then let MainWindow handle its own UI
-    // state via the forwarded signal
-    updateWindowTitle();
-    emit statusChanged(status);
-
-    // TabSupervisor::stop() needs calling on disconnect; start() is driven by
-    // onUserInfoReceived → tabSupervisorStartRequested.
-    if (status == StatusDisconnected) {
-        emit tabSupervisorStopRequested();
-    }
-}
-
-void ConnectionController::onUserInfoReceived(const ServerInfo_User &info)
-{
-    emit tabSupervisorStartRequested(info);
-}
-
-void ConnectionController::onLoginError(int r,
-                                        QString reasonStr,
-                                        quint32 endTime,
-                                        const QList<QString> &missingFeatures)
-{
-    switch (static_cast<Response::ResponseCode>(r)) {
-        case Response::RespClientUpdateRequired: {
-            QString formatted = "Missing Features: ";
-            for (int i = 0; i < missingFeatures.size(); ++i) {
-                formatted.append(QString("\n     %1").arg(QChar(0x2022)) + " " + missingFeatures.value(i));
-            }
-
-            QMessageBox msgBox(dialogParent);
-            msgBox.setIcon(QMessageBox::Critical);
-            msgBox.setWindowTitle(tr("Failed Login"));
-            msgBox.setText(tr("Your client seems to be missing features this server requires for connection.") +
-                           "\n\n" + tr("To update your client, go to 'Help -> Check for Client Updates'."));
-            msgBox.setDetailedText(formatted);
-            msgBox.exec();
-            break;
-        }
-
-        case Response::RespWrongPassword: {
-            QMessageBox::critical(dialogParent, tr("Error"),
-                                  tr("Incorrect username or password. "
-                                     "Please check your authentication information and try again."));
-            break;
-        }
-
-        case Response::RespWouldOverwriteOldSession: {
-            QMessageBox::critical(dialogParent, tr("Error"),
-                                  tr("There is already an active session using this user name.\n"
-                                     "Please close that session first and re-login."));
-            break;
-        }
-
-        case Response::RespUserIsBanned: {
-            QString bannedStr =
-                endTime ? tr("You are banned until %1.").arg(QDateTime::fromSecsSinceEpoch(endTime).toString())
-                        : tr("You are banned indefinitely.");
-            if (!reasonStr.isEmpty()) {
-                bannedStr.append("\n\n" + reasonStr);
-            }
-            QMessageBox::critical(dialogParent, tr("Error"), bannedStr);
-            break;
-        }
-
-        case Response::RespUsernameInvalid: {
-            QMessageBox::critical(dialogParent, tr("Error"), extractInvalidUsernameMessage(reasonStr));
-            break;
-        }
-
-        case Response::RespRegistrationRequired: {
-            if (QMessageBox::question(dialogParent, tr("Error"),
-                                      tr("This server requires user registration. Do you want to register now?"),
-                                      QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
-                registerToServer();
-            }
-            return; // don't re-prompt connect
-        }
-
-        case Response::RespClientIdRequired: {
-            QMessageBox::critical(dialogParent, tr("Error"),
-                                  tr("This server requires client IDs. Your client is either failing to generate an "
-                                     "ID or you are running a modified client.\n"
-                                     "Please close and reopen your client to try again."));
-            break;
-        }
-
-        case Response::RespContextError: {
-            QMessageBox::critical(dialogParent, tr("Error"),
-                                  tr("An internal error has occurred, please close and reopen Cockatrice before "
-                                     "trying again.\nIf the error persists, ensure you are running the latest "
-                                     "version of the software and if needed contact the software developers."));
-            break;
-        }
-
-        case Response::RespAccountNotActivated: {
-            bool ok = false;
-            QString token =
-                getTextWithMax(dialogParent, tr("Account activation"),
-                               tr("Your account has not been activated yet.\n"
-                                  "You need to provide the activation token received in the activation email."),
-                               QLineEdit::Normal, QString(), &ok);
-
-            if (ok && !token.isEmpty()) {
-                remoteClient->activateToServer(token);
-                return;
-            }
-            remoteClient->disconnectFromServer();
-            return;
-        }
-
-        case Response::RespPasswordChangeRequired: {
-            QMessageBox::information(
-                dialogParent, tr("Password Change Required"),
-                tr("An administrator has reset your password. Please contact your server administrator to obtain "
-                   "your temporary password, then log in and change it via Account -> Change Password."));
-            remoteClient->disconnectFromServer();
-            return;
-        }
-
-        case Response::RespServerFull: {
-            QMessageBox::critical(dialogParent, tr("Server Full"),
-                                  tr("The server has reached its maximum user capacity, please check back later."));
-            break;
-        }
-
-        default: {
-            QMessageBox::critical(dialogParent, tr("Error"),
-                                  tr("Unknown login error: %1").arg(r) +
-                                      tr("\nThis usually means that your client version is out of date, and the server "
-                                         "sent a reply your client doesn't understand."));
-            break;
-        }
-    }
-
-    // Re-open the connect dialog after any handled error
-    connectToServer();
-}
-
-void ConnectionController::onRegisterError(int r, QString reasonStr, quint32 endTime)
-{
-    switch (static_cast<Response::ResponseCode>(r)) {
-        case Response::RespRegistrationDisabled: {
-            QMessageBox::critical(dialogParent, tr("Registration denied"),
-                                  tr("Registration is currently disabled on this server"));
-            break;
-        }
-        case Response::RespUserAlreadyExists: {
-            QMessageBox::critical(dialogParent, tr("Registration denied"),
-                                  tr("There is already an existing account with the same user name."));
-            break;
-        }
-        case Response::RespEmailRequiredToRegister: {
-            QMessageBox::critical(dialogParent, tr("Registration denied"),
-                                  tr("It's mandatory to specify a valid email address when registering."));
-            break;
-        }
-        case Response::RespEmailBlackListed: {
-            if (reasonStr.isEmpty()) {
-                reasonStr =
-                    "The email address provider used during registration has been blocked from use on this server.";
-            }
-            QMessageBox::critical(dialogParent, tr("Registration denied"), reasonStr);
-            break;
-        }
-        case Response::RespTooManyRequests: {
-            QMessageBox::critical(dialogParent, tr("Registration denied"),
-                                  tr("It appears you are attempting to register a new account on this server yet you "
-                                     "already have an account registered with the email provided. This server "
-                                     "restricts the number of accounts a user can register per address. Please "
-                                     "contact the server operator for further assistance or to obtain your "
-                                     "credential information."));
-            break;
-        }
-        case Response::RespPasswordTooShort: {
-            QMessageBox::critical(dialogParent, tr("Registration denied"), tr("Password too short."));
-            break;
-        }
-        case Response::RespUserIsBanned: {
-            QString bannedStr =
-                endTime ? tr("You are banned until %1.").arg(QDateTime::fromSecsSinceEpoch(endTime).toString())
-                        : tr("You are banned indefinitely.");
-            if (!reasonStr.isEmpty()) {
-                bannedStr.append("\n\n" + reasonStr);
-            }
-            QMessageBox::critical(dialogParent, tr("Error"), bannedStr);
-            break;
-        }
-        case Response::RespUsernameInvalid: {
-            QMessageBox::critical(dialogParent, tr("Error"), extractInvalidUsernameMessage(reasonStr));
-            break;
-        }
-        case Response::RespRegistrationFailed: {
-            QMessageBox::critical(dialogParent, tr("Error"),
-                                  tr("Registration failed for a technical problem on the server."));
-            break;
-        }
-        case Response::RespNotConnected: {
-            QMessageBox::critical(dialogParent, tr("Error"), tr("The connection to the server has been lost."));
-            break;
-        }
-        default: {
-            QMessageBox::critical(dialogParent, tr("Error"),
-                                  tr("Unknown registration error: %1").arg(r) +
-                                      tr("\nThis usually means that your client version is out of date, and the server "
-                                         "sent a reply your client doesn't understand."));
-            break;
-        }
-    }
-
-    registerToServer();
-}
-
-void ConnectionController::onActivateError()
-{
-    QMessageBox::critical(dialogParent, tr("Error"), tr("Account activation failed"));
-    remoteClient->disconnectFromServer();
-    connectToServer();
-}
-
-void ConnectionController::onSocketError(const QString &errorStr)
-{
-    QMessageBox::critical(dialogParent, tr("Error"), tr("Socket error: %1").arg(errorStr));
-    connectToServer();
-}
-
-void ConnectionController::onServerTimeout()
-{
-    QMessageBox::critical(dialogParent, tr("Error"), tr("Server timeout"));
-    connectToServer();
-}
-
-void ConnectionController::onProtocolVersionMismatch(int localVersion, int remoteVersion)
-{
-    if (localVersion > remoteVersion) {
-        QMessageBox::critical(dialogParent, tr("Error"),
-                              tr("You are trying to connect to an obsolete server. Please downgrade your Cockatrice "
-                                 "version or connect to a suitable server.\n"
-                                 "Local version is %1, remote version is %2.")
-                                  .arg(localVersion)
-                                  .arg(remoteVersion));
-    } else {
-        QMessageBox::critical(dialogParent, tr("Error"),
-                              tr("Your Cockatrice client is obsolete. Please update your Cockatrice version.\n"
-                                 "Local version is %1, remote version is %2.")
-                                  .arg(localVersion)
-                                  .arg(remoteVersion));
-    }
-}
-
-void ConnectionController::onRegisterAccepted()
-{
-    QMessageBox::information(dialogParent, tr("Success"), tr("Registration accepted.\nWill now login."));
-}
-
-void ConnectionController::onRegisterAcceptedNeedsActivate()
-{
-    // Server will send activation email; nothing to display here.
-}
-
-void ConnectionController::onActivateAccepted()
-{
-    QMessageBox::information(dialogParent, tr("Success"), tr("Account activation accepted.\nWill now login."));
-}
-
-void ConnectionController::onNotifyUserAboutUpdate()
-{
-    QMessageBox::information(
-        dialogParent, tr("Information"),
-        tr("This server supports additional features that your client doesn't have.\n"
-           "This is most likely not a problem, but this message might mean there is a new version of "
-           "Cockatrice available or this server is running a custom or pre-release version.\n\n"
-           "To update your client, go to Help -> Check for Updates."));
-}
-
-void ConnectionController::onForgotPasswordSuccess()
-{
-    QMessageBox::information(
-        dialogParent, tr("Reset Password"),
-        tr("Your password has been reset successfully, you can now log in using the new credentials."));
-    SettingsCache::instance().servers().setFPHostName("");
-    SettingsCache::instance().servers().setFPPort("");
-    SettingsCache::instance().servers().setFPPlayerName("");
-}
-
-void ConnectionController::onForgotPasswordError()
-{
-    QMessageBox::warning(
-        dialogParent, tr("Reset Password"),
-        tr("Failed to reset user account password, please contact the server operator to reset your password."));
-    SettingsCache::instance().servers().setFPHostName("");
-    SettingsCache::instance().servers().setFPPort("");
-    SettingsCache::instance().servers().setFPPlayerName("");
-}
-
-void ConnectionController::onPromptForgotPasswordReset()
-{
-    QMessageBox::information(dialogParent, tr("Reset Password"),
-                             tr("Activation request received, please check your email for an activation token."));
-    DlgForgotPasswordReset dlg(dialogParent);
-    if (dlg.exec()) {
-        remoteClient->submitForgotPasswordResetToServer(dlg.getHost(), static_cast<unsigned int>(dlg.getPort()),
-                                                        dlg.getPlayerName(), dlg.getToken(), dlg.getPassword());
-    }
-}
-
-void ConnectionController::onPromptForgotPasswordChallenge()
-{
-    DlgForgotPasswordChallenge dlg(dialogParent);
-    if (dlg.exec()) {
-        remoteClient->submitForgotPasswordChallengeToServer(dlg.getHost(), static_cast<unsigned int>(dlg.getPort()),
-                                                            dlg.getPlayerName(), dlg.getEmail());
-    }
-}
-
-void ConnectionController::updateWindowTitle()
-{
-    const QString appName = QStringLiteral("Cockatrice");
-    QString title;
-
-    switch (remoteClient->getStatus()) {
-        case StatusConnecting: {
-            title = appName + " - " + tr("Connecting to %1...").arg(remoteClient->peerName());
-            break;
-        }
-        case StatusRegistering: {
-            title = appName + " - " +
-                    tr("Registering to %1 as %2...").arg(remoteClient->peerName()).arg(remoteClient->getUserName());
-            break;
-        }
-        case StatusDisconnected: {
-            title = appName + " - " + tr("Disconnected");
-            break;
-        }
-        case StatusLoggingIn: {
-            title = appName + " - " + tr("Connected, logging in at %1").arg(remoteClient->peerName());
-            break;
-        }
-        case StatusLoggedIn: {
-            title = remoteClient->getUserName() + "@" + remoteClient->peerName();
-            break;
-        }
-        case StatusRequestingForgotPassword:
-        case StatusSubmitForgotPasswordChallenge:
-        case StatusSubmitForgotPasswordReset:
-            title = appName + " - " +
-                    tr("Requesting forgotten password to %1 as %2...")
-                        .arg(remoteClient->peerName())
-                        .arg(remoteClient->getUserName());
-            break;
-        default:
-            title = appName;
-    }
-
-    emit windowTitleChanged(title);
-}
-
-// static
-QString ConnectionController::extractInvalidUsernameMessage(QString &in)
-{
-    QString out = tr("Invalid username.") + "<br/>";
-    QStringList rules = in.split(QChar('|'));
-
-    if (rules.size() == 7 || rules.size() == 9) {
-        out += tr("Your username must respect these rules:") + "<ul>";
-
-        out += "<li>" + tr("is %1 - %2 characters long").arg(rules.at(0)).arg(rules.at(1)) + "</li>";
-        out += "<li>" + tr("can %1 contain lowercase characters").arg((rules.at(2).toInt() > 0) ? "" : tr("NOT")) +
-               "</li>";
-        out += "<li>" + tr("can %1 contain uppercase characters").arg((rules.at(3).toInt() > 0) ? "" : tr("NOT")) +
-               "</li>";
-        out +=
-            "<li>" + tr("can %1 contain numeric characters").arg((rules.at(4).toInt() > 0) ? "" : tr("NOT")) + "</li>";
-
-        if (rules.at(6).size() > 0) {
-            out += "<li>" + tr("can contain the following punctuation: %1").arg(rules.at(6).toHtmlEscaped()) + "</li>";
-        }
-
-        out += "<li>" +
-               tr("first character can %1 be a punctuation mark").arg((rules.at(5).toInt() > 0) ? "" : tr("NOT")) +
-               "</li>";
-
-        if (rules.size() == 9) {
-            if (rules.at(7).size() > 0) {
-                QString words = rules.at(7).toHtmlEscaped();
-                if (words.startsWith("\n")) {
-                    out += tr("no unacceptable language as specified by these server rules:",
-                              "note that the following lines will not be translated");
-                    for (QString &line : words.split("\n", Qt::SkipEmptyParts)) {
-                        out += "<li>" + line + "</li>";
-                    }
-                } else {
-                    out += "<li>" + tr("can not contain any of the following words: %1").arg(words) + "</li>";
-                }
-            }
-
-            if (rules.at(8).size() > 0) {
-                out += "<li>" +
-                       tr("can not match any of the following expressions: %1").arg(rules.at(8).toHtmlEscaped()) +
-                       "</li>";
-            }
-        }
-
-        out += "</ul>";
-    } else {
-        out += tr("You may only use A-Z, a-z, 0-9, _, ., and - in your username.");
-    }
-
-    return out;
-}

cockatrice/src/client/network/connection_controller/remote_connection_controller.h

@@ -1,107 +0,0 @@
-#ifndef COCKATRICE_REMOTE_CONNECTION_CONTROLLER_H
-#define COCKATRICE_REMOTE_CONNECTION_CONTROLLER_H
-
-#include "abstract_client.h"
-#include "latency_tracker.h"
-
-#include <QMessageBox>
-#include <QObject>
-#include <QString>
-#include <QtGlobal>
-#include <qtmetamacros.h>
-
-class RemoteClient;
-class ServerInfo_User;
-class DlgConnect;
-class Event_ConnectionClosed;
-class Event_ServerShutdown;
-class QThread;
-class QWidget;
-template <typename T> class QList;
-
-/**
- * Owns the RemoteClient and its worker thread.
- * Encapsulates all connection, authentication, and registration logic so that
- * MainWindow only needs to react to high-level signals.
- */
-class ConnectionController : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit ConnectionController(QWidget *dialogParent, QObject *parent = nullptr);
-    ~ConnectionController() override;
-
-    RemoteClient *client() const
-    {
-        return remoteClient;
-    }
-
-    void registerToServer();
-    void forgotPasswordRequest();
-    void connectToServer();
-    void
-    connectToServerDirect(const QString &host, unsigned int port, const QString &playerName, const QString &password);
-    void disconnectFromServer();
-
-    void refreshWindowTitle()
-    {
-        updateWindowTitle();
-    }
-
-signals:
-    void windowTitleChanged(const QString &title);
-
-    void tabSupervisorStartRequested(const ServerInfo_User &info);
-    void tabSupervisorStopRequested();
-
-    // Passes the raw ClientStatus through so MainWindow can drive its own
-    // action enable/disable logic
-    void statusChanged(ClientStatus status);
-
-    // Forwarded from AbstractClient::pingStatsUpdated. See that signal for the
-    // meaning of the parameters.
-    void pingStatsUpdated(const LatencyTracker::Stats &stats, const QList<int> &samplesMs);
-
-private slots:
-    // Slots wired directly to RemoteClient signals
-    void onStatusChanged(ClientStatus status);
-    void onUserInfoReceived(const ServerInfo_User &info);
-    void onLoginError(int r, QString reasonStr, quint32 endTime, const QList<QString> &missingFeatures);
-    void onRegisterAccepted();
-    void onRegisterAcceptedNeedsActivate();
-    void onRegisterError(int r, QString reasonStr, quint32 endTime);
-    void onActivateAccepted();
-    void onActivateError();
-    void onProtocolVersionMismatch(int localVersion, int remoteVersion);
-    void onNotifyUserAboutUpdate();
-    void onConnectionClosedEvent(const Event_ConnectionClosed &event);
-    void onServerShutdownEvent(const Event_ServerShutdown &event);
-    void onSocketError(const QString &errorStr);
-    void onServerTimeout();
-
-    // Forgot-password flow
-    void onForgotPasswordSuccess();
-    void onForgotPasswordError();
-    void onPromptForgotPasswordReset();
-    void onPromptForgotPasswordChallenge();
-
-private:
-    void wireClientSignals();
-    void updateWindowTitle();
-
-    /** Parse the server's pipe-delimited username-rule string into HTML. */
-    static QString extractInvalidUsernameMessage(QString &in);
-
-    RemoteClient *remoteClient{nullptr};
-    QThread *clientThread{nullptr};
-    QWidget *dialogParent{nullptr}; // used as parent for QMessageBox / dialog calls
-
-    // Persistent so it can be updated in-place by onServerShutdownEvent
-    QMessageBox serverShutdownMessageBox;
-
-    // Kept as a member so the forgot-password signal can be wired to it
-    DlgConnect *dlgConnect{nullptr};
-};
-
-#endif // COCKATRICE_REMOTE_CONNECTION_CONTROLLER_H

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

@@ -1,28 +1,16 @@
 #include "deck_stats_interface.h"
 
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
-
-#include <QByteArray>
 #include <QDesktopServices>
 #include <QMessageBox>
-#include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QRegularExpression>
-#include <QRegularExpressionMatch>
-#include <QSharedPointer>
-#include <QString>
-#include <QUrl>
 #include <QUrlQuery>
-#include <functional>
-#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/deck_list/tree/deck_list_card_node.h>
-#include <version_string.h>
 
-DeckStatsInterface::DeckStatsInterface(QObject *parent) : QObject(parent)
+DeckStatsInterface::DeckStatsInterface(CardDatabase &_cardDatabase, QObject *parent)
+    : QObject(parent), cardDatabase(_cardDatabase)
 {
     manager = new QNetworkAccessManager(this);
     connect(manager, &QNetworkAccessManager::finished, this, &DeckStatsInterface::queryFinished);
@@ -54,36 +42,35 @@ 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 = [&destination](const auto node, const auto card) {
-        CardInfoPtr dbCard = CardDatabaseManager::query()->getCardInfo(card->getName());
-        if (dbCard && !dbCard->getIsToken() && node->getName() != DECK_ZONE_MAYBEBOARD) {
+    auto copyIfNotAToken = [this, &destination](const auto node, const auto card) {
+        CardInfoPtr dbCard = cardDatabase.query()->getCardInfo(card->getName());
+        if (dbCard && !dbCard->getIsToken()) {
             DecklistCardNode *addedCard = destination.addCard(card->getName(), node->getName(), -1);
             addedCard->setNumber(card->getNumber());
         }

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

@@ -1,14 +1,14 @@
 /**
  * @file deck_stats_interface.h
  * @ingroup ApiInterfaces
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef DECKSTATS_INTERFACE_H
 #define DECKSTATS_INTERFACE_H
 
-#include <QObject>
-#include <qtmetamacros.h>
+#include <libcockatrice/card/database/card_database.h>
+#include <libcockatrice/deck_list/deck_list.h>
 
 class QByteArray;
 class QNetworkAccessManager;
@@ -21,20 +21,22 @@ class DeckStatsInterface : public QObject
 private:
     QNetworkAccessManager *manager;
 
+    CardDatabase &cardDatabase;
+
     /**
      * Deckstats doesn't recognize token cards, and instead tries to find the
      * 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(QObject *parent = nullptr);
-    void analyzeDeck(const DeckList &deck);
+    explicit DeckStatsInterface(CardDatabase &_cardDatabase, QObject *parent = nullptr);
+    void analyzeDeck(DeckList *deck);
 };
 
 #endif

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

@@ -1,34 +1,16 @@
 #include "tapped_out_interface.h"
 
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
-
-#include <QByteArray>
-#include <QDebug>
 #include <QDesktopServices>
-#include <QList>
 #include <QMessageBox>
-#include <QMessageLogger>
-#include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QRegularExpression>
-#include <QRegularExpressionMatch>
-#include <QRegularExpressionMatchIterator>
-#include <QSharedPointer>
-#include <QString>
-#include <QStringList>
-#include <QUrl>
 #include <QUrlQuery>
-#include <QVariant>
-#include <functional>
-#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/deck_list/tree/deck_list_card_node.h>
-#include <version_string.h>
 
-TappedOutInterface::TappedOutInterface(QObject *parent) : QObject(parent)
+TappedOutInterface::TappedOutInterface(CardDatabase &_cardDatabase, QObject *parent)
+    : QObject(parent), cardDatabase(_cardDatabase)
 {
     manager = new QNetworkAccessManager(this);
     connect(manager, &QNetworkAccessManager::finished, this, &TappedOutInterface::queryFinished);
@@ -84,48 +66,43 @@ 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 = [&mainboard, &sideboard](const auto node, const auto card) {
-        CardInfoPtr dbCard = CardDatabaseManager::query()->getCardInfo(card->getName());
-        if (!dbCard || dbCard->getIsToken() || node->getName() == DECK_ZONE_MAYBEBOARD) {
+    auto copyMainOrSide = [this, &mainboard, &sideboard](const auto node, const auto card) {
+        CardInfoPtr dbCard = cardDatabase.query()->getCardInfo(card->getName());
+        if (!dbCard || dbCard->getIsToken())
             return;
-        }
 
         DecklistCardNode *addedCard;
-        if (node->getName() == DECK_ZONE_SIDE) {
+        if (node->getName() == DECK_ZONE_SIDE)
             addedCard = sideboard.addCard(card->getName(), node->getName(), -1);
-        } else {
+        else
             addedCard = mainboard.addCard(card->getName(), node->getName(), -1);
-        }
         addedCard->setNumber(card->getNumber());
     };
 

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

@@ -1,15 +1,14 @@
 /**
  * @file tapped_out_interface.h
  * @ingroup ApiInterfaces
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef TAPPEDOUT_INTERFACE_H
 #define TAPPEDOUT_INTERFACE_H
 
-#include <QLoggingCategory>
-#include <QObject>
-#include <qtmetamacros.h>
+#include <libcockatrice/card/database/card_database.h>
+#include <libcockatrice/deck_list/deck_list.h>
 
 inline Q_LOGGING_CATEGORY(TappedOutInterfaceLog, "tapped_out_interface");
 
@@ -30,14 +29,15 @@ class TappedOutInterface : public QObject
 private:
     QNetworkAccessManager *manager;
 
-    void copyDeckSplitMainAndSide(const DeckList &source, DeckList &mainboard, DeckList &sideboard);
+    CardDatabase &cardDatabase;
+    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(QObject *parent = nullptr);
-    void analyzeDeck(const DeckList &deck);
+    explicit TappedOutInterface(CardDatabase &_cardDatabase, QObject *parent = nullptr);
+    void analyzeDeck(DeckList *deck);
 };
 
 #endif

cockatrice/src/client/network/parsers/deck_link_to_api_transformer.cpp

@@ -1,7 +1,6 @@
 #include "deck_link_to_api_transformer.h"
 
 #include <QRegularExpression>
-#include <QRegularExpressionMatch>
 
 namespace DeckLinkToApiTransformer
 {

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

@@ -1,8 +1,8 @@
 /**
  * @file deck_link_to_api_transformer.h
  * @ingroup ApiInterfaces
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #ifndef DECK_LINK_TO_API_TRANSFORMER_H
 #define DECK_LINK_TO_API_TRANSFORMER_H

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

@@ -1,39 +1,36 @@
 /**
  * @file interface_json_deck_parser.h
  * @ingroup ApiInterfaces
+ * @brief TODO: Document this.
  */
-//! \todo Document this file.
 
 #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);
+        DeckLoader::resolveSetNameAndNumberToProviderID(loader->getDeckList());
 
-        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);
+        DeckLoader::resolveSetNameAndNumberToProviderID(loader->getDeckList());
 
         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;
     }
 };