Add doxygen-awesome-css theme

* [DeckListModel] Refactor: Don't access underlying decklist for iteration

* add docs

* extract method

.ci/Fedora43/Dockerfile

@@ -1,4 +1,4 @@
-FROM fedora:41
+FROM fedora:43
 
 RUN dnf install -y \
         ccache \

.ci/Servatrice_Debian11/Dockerfile

@@ -0,0 +1,21 @@
+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 \
+        libmariadb-dev-compat \
+        libprotobuf-dev \
+        libqt5sql5-mysql \
+        libqt5websockets5-dev \
+        ninja-build \
+        protobuf-compiler \
+        qttools5-dev \
+        qttools5-dev-tools \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*

.ci/compile.sh

@@ -11,7 +11,8 @@
 # --debug or --release sets the build type ie CMAKE_BUILD_TYPE
 # --ccache [<size>] uses ccache and shows stats, optionally provide size
 # --dir <dir> sets the name of the build dir, default is "build"
-# uses env: BUILDTYPE MAKE_INSTALL MAKE_PACKAGE PACKAGE_TYPE PACKAGE_SUFFIX MAKE_SERVER MAKE_TEST USE_CCACHE CCACHE_SIZE BUILD_DIR CMAKE_GENERATOR
+# --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 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
 
@@ -46,6 +47,10 @@ while [[ $# != 0 ]]; do
       MAKE_SERVER=1
       shift
       ;;
+    '--no-client')
+      MAKE_NO_CLIENT=1
+      shift
+      ;;
     '--test')
       MAKE_TEST=1
       shift
@@ -66,6 +71,10 @@ while [[ $# != 0 ]]; do
         shift
       fi
       ;;
+    '--vcpkg')
+      USE_VCPKG=1
+      shift
+      ;;
     '--dir')
       shift
       if [[ $# == 0 ]]; then
@@ -75,6 +84,15 @@ while [[ $# != 0 ]]; do
       BUILD_DIR="$1"
       shift
       ;;
+    '--target-macos-version')
+      shift
+      if [[ $# == 0 ]]; then
+        echo "::error file=$0::--target-macos-version expects an argument"
+        exit 3
+      fi
+      TARGET_MACOS_VERSION="$1"
+      shift
+      ;;
     *)
       echo "::error file=$0::unrecognized option: $1"
       exit 3
@@ -103,6 +121,9 @@ flags=("-DCMAKE_BUILD_TYPE=$BUILDTYPE")
 if [[ $MAKE_SERVER ]]; then
   flags+=("-DWITH_SERVER=1")
 fi
+if [[ $MAKE_NO_CLIENT ]]; then
+  flags+=("-DWITH_CLIENT=0" "-DWITH_ORACLE=0" "-DWITH_DBCONVERTER=0")
+fi
 if [[ $MAKE_TEST ]]; then
   flags+=("-DTEST=1")
 fi
@@ -116,6 +137,9 @@ fi
 if [[ $PACKAGE_TYPE ]]; then
   flags+=("-DCPACK_GENERATOR=$PACKAGE_TYPE")
 fi
+if [[ $USE_VCPKG ]]; then
+  flags+=("-DUSE_VCPKG=1")
+fi
 
 # Add cmake --build flags
 buildflags=(--config "$BUILDTYPE")
@@ -132,9 +156,35 @@ function ccachestatsverbose() {
 
 # Compile
 if [[ $RUNNER_OS == macOS ]]; then
+
+  if [[ $TARGET_MACOS_VERSION ]]; then
+    # CMAKE_OSX_DEPLOYMENT_TARGET is a vanilla cmake flag needed to compile to target macOS version
+    flags+=("-DCMAKE_OSX_DEPLOYMENT_TARGET=$TARGET_MACOS_VERSION")
+
+    # vcpkg dependencies need a vcpkg triplet file to compile to the target macOS version
+    # an easy way is to copy the x64-osx.cmake file and modify it
+    triplets_dir="/tmp/cmake/triplets"
+    triplet_version="custom-triplet"
+    triplet_file="$triplets_dir/$triplet_version.cmake"
+    arch=$(uname -m)
+    if [[ $arch == x86_64 ]]; then
+      arch="x64"
+    fi
+    mkdir -p "$triplets_dir"
+    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")
+    flags+=("-DVCPKG_HOST_TRIPLET=$triplet_version")
+    flags+=("-DVCPKG_TARGET_TRIPLET=$triplet_version")
+    echo "::group::Generated triplet $triplet_file"
+    cat "$triplet_file"
+    echo "::endgroup::"
+  fi
+
   echo "::group::Signing Certificate"
   if [[ -n "$MACOS_CERTIFICATE_NAME" ]]; then
-    echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
+    echo "$MACOS_CERTIFICATE" | base64 --decode >"certificate.p12"
     security create-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
     security default-keychain -s build.keychain
     security set-keychain-settings -t 3600 -l build.keychain
@@ -146,6 +196,29 @@ if [[ $RUNNER_OS == macOS ]]; then
     echo "No signing certificate configured. Skipping set up of keychain in macOS environment."
   fi
   echo "::endgroup::"
+
+  if [[ $MAKE_PACKAGE ]]; then
+    # Workaround https://github.com/actions/runner-images/issues/7522
+    # have hdiutil repeat the command 10 times in hope of success
+    hdiutil_script="/tmp/hdiutil.sh"
+    # shellcheck disable=SC2016
+    echo '#!/bin/bash
+    i=0
+    while ! hdiutil "$@"; do
+      if (( ++i >= 10 )); then
+        echo "Error: hdiutil failed $i times!" >&2
+        break
+      fi
+      sleep 1
+    done' >"$hdiutil_script"
+    chmod +x "$hdiutil_script"
+    flags+=(-DCPACK_COMMAND_HDIUTIL="$hdiutil_script")
+  fi
+
+elif [[ $RUNNER_OS == Windows ]]; then
+  # Enable MTT, see https://devblogs.microsoft.com/cppblog/improved-parallelism-in-msbuild/
+  # and https://devblogs.microsoft.com/cppblog/cpp-build-throughput-investigation-and-tune-up/#multitooltask-mtt
+  buildflags+=(-- -p:UseMultiToolTask=true -p:EnableClServerMode=true)
 fi
 
 if [[ $USE_CCACHE ]]; then
@@ -156,17 +229,13 @@ fi
 
 echo "::group::Configure cmake"
 cmake --version
+echo "Running cmake with flags: ${flags[*]}"
 cmake .. "${flags[@]}"
 echo "::endgroup::"
 
 echo "::group::Build project"
-if [[ $RUNNER_OS == Windows ]]; then
-  # Enable MTT, see https://devblogs.microsoft.com/cppblog/improved-parallelism-in-msbuild/
-  # and https://devblogs.microsoft.com/cppblog/cpp-build-throughput-investigation-and-tune-up/#multitooltask-mtt
-  cmake --build . "${buildflags[@]}" -- -p:UseMultiToolTask=true -p:EnableClServerMode=true
-else
-  cmake --build . "${buildflags[@]}"
-fi
+echo "Running cmake --build with flags: ${buildflags[*]}"
+cmake --build . "${buildflags[@]}"
 echo "::endgroup::"
 
 if [[ $USE_CCACHE ]]; then
@@ -175,6 +244,19 @@ if [[ $USE_CCACHE ]]; then
   echo "::endgroup::"
 fi
 
+if [[ $RUNNER_OS == macOS ]]; then
+  echo "::group::Inspect Mach-O binaries"
+  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"
+    file "$binary"
+    lipo -info "$binary"
+    echo ""
+  done
+  echo "::endgroup::"
+fi
+
 if [[ $MAKE_TEST ]]; then
   echo "::group::Run tests"
   ctest -C "$BUILDTYPE" --output-on-failure
@@ -189,12 +271,6 @@ fi
 
 if [[ $MAKE_PACKAGE ]]; then
   echo "::group::Create package"
-  
-  if [[ $RUNNER_OS == macOS ]]; then
-    # Workaround https://github.com/actions/runner-images/issues/7522
-    echo "killing XProtectBehaviorService"; sudo pkill -9 XProtect >/dev/null || true;
-    echo "waiting for XProtectBehaviorService kill"; while pgrep "XProtect"; do sleep 3; done;
-  fi
   cmake --build . --target package --config "$BUILDTYPE"
   echo "::endgroup::"
 

.ci/docker.sh

@@ -137,10 +137,11 @@ if [[ $SAVE ]]; then
 fi
 
 # Set compile function, runs the compile script on the image, passes arguments to the script
+# shellcheck disable=2120
 function RUN ()
 {
   echo "running image:"
-  if [[ $(docker images) =~ "$IMAGE_NAME" ]]; then
+  if [[ $(docker images) =~ $IMAGE_NAME ]]; then
     local args=(--mount "type=bind,source=$PWD,target=/src")
     args+=(--workdir "/src")
     args+=(--user "$(id -u):$(id -g)")
@@ -151,6 +152,7 @@ function RUN ()
     if [[ -n "$CMAKE_GENERATOR" ]]; then
       args+=(--env "CMAKE_GENERATOR=$CMAKE_GENERATOR")
     fi
+  # shellcheck disable=2086
     docker run "${args[@]}" $RUN_ARGS "$IMAGE_NAME" bash "$BUILD_SCRIPT" $RUN_OPTS "$@"
     return $?
   else
@@ -164,5 +166,6 @@ function RUN ()
 if [[ $INTERACTIVE ]]; then
   export BUILD_SCRIPT="-i"
   export RUN_ARGS="$RUN_ARGS -it"
+  # shellcheck disable=2119
   RUN
 fi

.ci/lint_cpp.sh

@@ -11,11 +11,19 @@ if ! git merge-base origin/master HEAD; then
 fi
 
 # Check formatting using format.sh
-echo "Checking your code using clang-format/cmake-format..."
+echo "Checking your code using format.sh..."
 
-diff="$(./format.sh --diff --cmake --cf-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
@@ -33,14 +41,13 @@ case $err in
 ***********************************************************
 
 Used version:
-${diff%%
-----------
-*}
+$used_version
+
+Affected files:
+$files_to_edit
 
 The following changes should be made:
-${diff#*
-----------
-}
+$changes_to_make
 
 Exiting...
 EOM
@@ -58,6 +65,9 @@ EOM
 ***                                                     ***
 ***********************************************************
 
+Used version:
+$used_version
+
 Exiting...
 EOM
     exit 0

.ci/release_template.md

@@ -23,8 +23,8 @@ Available pre-compiled binaries for installation:
    • <kbd>Debian 13</kbd> <sub><i>Trixie</i></sub>
    • <kbd>Debian 12</kbd> <sub><i>Bookworm</i></sub>
    • <kbd>Debian 11</kbd> <sub><i>Bullseye</i></sub>
+   • <kbd>Fedora 43</kbd>
    • <kbd>Fedora 42</kbd>
-   • <kbd>Fedora 41</kbd>
 
 <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>

.clang-format

@@ -25,6 +25,9 @@ IndentCaseLabels: true
 PointerAlignment: Right
 SortIncludes: true
 IncludeBlocks: Regroup
+StatementAttributeLikeMacros: [emit]
+# requires clang-format 16
+# RemoveSemicolon: true
 ---
 Language: Proto
 AllowShortFunctionsOnASingleLine: None

.github/CONTRIBUTING.md

@@ -1,4 +1,4 @@
-@page contributing Contributing
+<!--! @page contributing Contributing -->
 
 &nbsp; [Introduction](#contributing-to-cockatrice) | [Code Style Guide](
 #code-style-guide) | [Translations](#translations) | [Release Management](

.github/workflows/desktop-build.yml

@@ -4,25 +4,39 @@ permissions:
   contents: write
   id-token: write
   attestations: write
+  actions: write # needed for ccache action to be able to delete gha caches
 
 on:
   push:
     branches:
       - master
-    paths-ignore:
-      - '**.md'
-      - 'webclient/**'
-      - '.github/workflows/web-*.yml'
-      - '.github/workflows/translations-*.yml'
-      - '.github/workflows/docker-release.yml'
+    paths:
+      - '*/**'    # matches all files not in root
+      - '!**.md'
+      - '!.github/**'
+      - '!.husky/**'
+      - '!.tx/**'
+      - '!doc/**'
+      - '!webclient/**'
+      - '.github/workflows/desktop-build.yml'
+      - 'CMakeLists.txt'
+      - 'vcpkg.json'
+      - 'vcpkg'
     tags:
       - '*'
   pull_request:
-    paths-ignore:
-      - '**.md'
-      - 'webclient/**'
-      - '.github/workflows/web-*.yml'
-      - '.github/workflows/translations-*.yml'
+    paths:
+      - '*/**'    # matches all files not in root
+      - '!**.md'
+      - '!.github/**'
+      - '!.husky/**'
+      - '!.tx/**'
+      - '!doc/**'
+      - '!webclient/**'
+      - '.github/workflows/desktop-build.yml'
+      - 'CMakeLists.txt'
+      - 'vcpkg.json'
+      - 'vcpkg'
 
 # Cancel earlier, unfinished runs of this workflow on the same branch (unless on master)
 concurrency:
@@ -56,7 +70,7 @@ jobs:
 
       - name: Checkout
         if: steps.configure.outputs.tag != null
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
@@ -100,7 +114,12 @@ jobs:
           - distro: Debian
             version: 11
             package: DEB
-            test: skip    # Running tests on all distros is superfluous
+
+          - distro: Servatrice_Debian
+            version: 11
+            package: DEB
+            test: skip
+            server_only: yes
 
           - distro: Debian
             version: 12
@@ -112,12 +131,12 @@ jobs:
             package: DEB
 
           - distro: Fedora
-            version: 41
+            version: 42
             package: RPM
             test: skip    # Running tests on all distros is superfluous
 
           - distro: Fedora
-            version: 42
+            version: 43
             package: RPM
 
           - distro: Ubuntu
@@ -143,11 +162,11 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Restore compiler cache (ccache)
         id: ccache_restore
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v5
         env:
           BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
         with:
@@ -177,15 +196,16 @@ jobs:
           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
           RUN --server --release --package "$package" --dir "$BUILD_DIR" \
-                  --ccache "$CCACHE_SIZE"
+                  --ccache "$CCACHE_SIZE" $NO_CLIENT
           .ci/name_build.sh
 
       - name: Save compiler cache (ccache)
         if: github.ref == 'refs/heads/master'
-        uses: actions/cache/save@v4
+        uses: actions/cache/save@v5
         with:
           path: ${{env.CACHE}}
           key: ${{ steps.ccache_restore.outputs.cache-primary-key }}
@@ -193,7 +213,7 @@ jobs:
       - name: Upload artifact
         id: upload_artifact
         if: matrix.package != 'skip'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: ${{matrix.distro}}${{matrix.version}}-package
           path: ${{steps.build.outputs.path}}
@@ -225,78 +245,135 @@ jobs:
           GH_TOKEN: ${{github.token}}
         run: gh attestation verify ${{steps.build.outputs.path}} -R Cockatrice/Cockatrice
 
-  build-macos:
+  build-vcpkg:
     strategy:
       fail-fast: false
       matrix:
         include:
-          - target: 13
+          - os: macOS
+            target: 13
+            runner: macos-15-intel
             soc: Intel
-            os: macos-13
-            xcode: "14.3.1"
+            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
 
-          - target: 14
+          - os: macOS
+            target: 14
+            runner: macos-14
             soc: Apple
-            os: macos-14
             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
 
-          - target: 15
+          - os: macOS
+            target: 15
+            runner: macos-15
             soc: Apple
-            os: macos-15
-            xcode: "16.2"
+            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
 
-          - target: 15
+          - os: macOS
+            target: 15
+            runner: macos-15
             soc: Apple
-            os: macos-15
-            xcode: "16.2"
+            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
 
-    name: macOS ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }}
+          - 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-2022
+            type: Release
+            make_package: 1
+            package_suffix: "-Win10"
+            artifact_name: Windows10-installer
+            qt_version: 6.6.*
+            qt_arch: win64_msvc2019_64
+            qt_modules: qtimageformats qtmultimedia qtwebsockets
+            cache_qt: true
+            cmake_generator: "Visual Studio 17 2022"
+            cmake_generator_platform: x64
+
+    name: ${{matrix.os}} ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }}
     needs: configure
-    runs-on: ${{matrix.os}}
-    continue-on-error: ${{matrix.allow-failure == 'yes'}}
-    env:
-      # Common parameters for all macOS builds
-      QT_VERSION: 6.6.*
-      QT_ARCH: clang_64
-      QT_MODULES: "qtimageformats qtmultimedia qtwebsockets"
-      # Build-specific environment variables
-      CCACHE_DIR: ${{github.workspace}}/.ccache/${{matrix.os}}-${{matrix.type}}
-      CCACHE_SIZE: 500M
-      DEVELOPER_DIR:
-        /Applications/Xcode_${{matrix.xcode}}.app/Contents/Developer
-      CMAKE_GENERATOR: 'Ninja'
+    runs-on: ${{matrix.runner}}
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           submodules: recursive
 
+      - name: Add msbuild to PATH
+        if: matrix.os == 'Windows'
+        id: add-msbuild
+        uses: microsoft/setup-msbuild@v2
+        with:
+          msbuild-architecture: x64
+
       # Using jianmingyong/ccache-action to setup ccache without using brew
       # It tries to download a binary of ccache from GitHub Release and falls back to building from source if it fails
       - name: Setup ccache
+        if: matrix.use_ccache == 1
         uses: jianmingyong/ccache-action@v1
         with:
           install-type: "binary"
-          ccache-key-prefix: ccache-${{matrix.os}}-${{matrix.soc}}-${{matrix.type}}
+          ccache-key-prefix: ccache-${{matrix.runner}}-${{matrix.soc}}-${{matrix.type}}
+          max-size: 500M
           gh-token: ${{ secrets.GITHUB_TOKEN }}
 
-      # Using jurplel/install-qt-action to install Qt without using brew
-      # qt build using vcpkg either just fails or takes too long to build
-      - name: Install Qt ${{env.QT_VERSION}}
+      - name: Install Qt ${{matrix.qt_version}}
         uses: jurplel/install-qt-action@v4
         with:
-          cache: false # qt caches take too much space for macOS (1.1Gi)
-          version: ${{env.QT_VERSION}}
-          arch: ${{env.QT_ARCH}}
-          modules: ${{env.QT_MODULES}}
+          version: ${{matrix.qt_version}}
+          arch: ${{matrix.qt_arch}}
+          modules: ${{matrix.qt_modules}}
+          cache: ${{matrix.cache_qt}}
 
       - name: Setup vcpkg cache
         id: vcpkg-cache
@@ -304,24 +381,30 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build on Xcode ${{matrix.xcode}}
-        shell: bash
+      # uses environment variables, see compile.sh for more details
+      - name: Build Cockatrice
         id: build
+        shell: bash
         env:
           BUILDTYPE: '${{matrix.type}}'
           MAKE_PACKAGE: '${{matrix.make_package}}'
-          PACKAGE_SUFFIX: '-macOS${{matrix.target}}_${{matrix.soc}}'
+          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_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 }}
-          CMAKE_GENERATOR: '${{env.CMAKE_GENERATOR}}'
-          VCPKG_DISABLE_METRICS: 1
-          VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite'
-        run: .ci/compile.sh --server --test --ccache "$CCACHE_SIZE"
+          DEVELOPER_DIR: '/Applications/Xcode_${{matrix.xcode}}.app/Contents/Developer'
+          TARGET_MACOS_VERSION: ${{ matrix.override_target }}
+        run: .ci/compile.sh --server --test --vcpkg
 
       - name: Sign app bundle
-        if: matrix.make_package && (github.ref == 'refs/heads/master' || needs.configure.outputs.tag != null)
+        if: matrix.os == 'macOS' && matrix.make_package && (github.ref == 'refs/heads/master' || needs.configure.outputs.tag != null)
         env:
           MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }}
           MACOS_CI_KEYCHAIN_PWD: ${{ secrets.PROD_MACOS_CI_KEYCHAIN_PWD }}
@@ -333,7 +416,7 @@ jobs:
           fi
 
       - name: Notarize app bundle
-        if: matrix.make_package && (github.ref == 'refs/heads/master' || needs.configure.outputs.tag != null)
+        if: matrix.os == 'macOS' && matrix.make_package && (github.ref == 'refs/heads/master' || needs.configure.outputs.tag != null)
         env:
           MACOS_NOTARIZATION_APPLE_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_APPLE_ID }}
           MACOS_NOTARIZATION_TEAM_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_TEAM_ID }}
@@ -344,20 +427,20 @@ jobs:
             # Store the notarization credentials so that we can prevent a UI password dialog from blocking the CI
             echo "Create keychain profile"
             xcrun notarytool store-credentials "notarytool-profile" --apple-id "$MACOS_NOTARIZATION_APPLE_ID" --team-id "$MACOS_NOTARIZATION_TEAM_ID" --password "$MACOS_NOTARIZATION_PWD"
-  
+
             # We can't notarize an app bundle directly, but we need to compress it as an archive.
             # 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 ${{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
             # characteristics. Visit the Notarization docs for more information and strategies on how to optimize it if
             # you're curious
             echo "Notarize app"
             xcrun notarytool submit "notarization.zip" --keychain-profile "notarytool-profile" --wait
-  
+
             # 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"
@@ -367,109 +450,15 @@ jobs:
       - name: Upload artifact
         id: upload_artifact
         if: matrix.make_package
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
-          name: macOS${{matrix.target}}${{ matrix.soc == 'Intel' && '_Intel' || '' }}${{ matrix.type == 'Debug' && '_Debug' || '' }}-package
-          path: ${{steps.build.outputs.path}}
-          if-no-files-found: error
-
-      - name: Upload to release
-        id: upload_release
-        if: matrix.make_package && needs.configure.outputs.tag != null
-        shell: bash
-        env:
-          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
-        id: attestation
-        if: steps.upload_release.outcome == 'success'
-        uses: actions/attest-build-provenance@v3
-        with:
-          subject-name: ${{steps.build.outputs.name}}
-          subject-digest: sha256:${{ steps.upload_artifact.outputs.artifact-digest }}
-
-      - name: Verify binary attestation
-        if: steps.attestation.outcome == 'success'
-        shell: bash
-        env:
-          GH_TOKEN: ${{github.token}}
-        run: gh attestation verify ${{steps.build.outputs.path}} -R Cockatrice/Cockatrice
-
-  build-windows:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - target: 7
-            qt_version: 5.15.*
-            qt_arch: msvc2019_64
-
-          - target: 10
-            qt_version: 6.6.*
-            qt_arch: msvc2019_64
-            qt_modules: "qtimageformats qtmultimedia qtwebsockets"
-
-    name: Windows ${{matrix.target}}
-    needs: configure
-    runs-on: windows-2022
-    env:
-      CMAKE_GENERATOR: 'Visual Studio 17 2022'
-
-    steps:
-      - name: Add msbuild to PATH
-        id: add-msbuild
-        uses: microsoft/setup-msbuild@v2
-        with:
-          msbuild-architecture: x64
-
-      - name: Checkout
-        uses: actions/checkout@v5
-        with:
-          submodules: recursive
-
-      - name: Install Qt ${{matrix.qt_version}}
-        uses: jurplel/install-qt-action@v4
-        with:
-          cache: true
-          setup-python: true
-          version: ${{matrix.qt_version}}
-          arch: win64_${{matrix.qt_arch}}
-          modules: ${{matrix.qt_modules}}
-
-      - name: Setup vcpkg cache
-        id: vcpkg-cache
-        uses: TAServers/vcpkg-cache@v3
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build Cockatrice
-        id: build
-        shell: bash
-        env:
-          PACKAGE_SUFFIX: '-Win${{matrix.target}}'
-          CMAKE_GENERATOR: '${{env.CMAKE_GENERATOR}}'
-          CMAKE_GENERATOR_PLATFORM: 'x64'
-          QTDIR: '${{github.workspace}}\Qt\${{matrix.qt_version}}\win64_${{matrix.qt_arch}}'
-          VCPKG_DISABLE_METRICS: 1
-          VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite'
-        # No need for --parallel flag, MTT is added in the compile script to let cmake/msbuild manage core count,
-        # project and process parallelism: https://devblogs.microsoft.com/cppblog/improved-parallelism-in-msbuild/
-        run: .ci/compile.sh --server --release --test --package
-
-      - name: Upload artifact
-        id: upload_artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: Windows${{matrix.target}}-installer
+          name: ${{matrix.artifact_name}}
           path: ${{steps.build.outputs.path}}
           if-no-files-found: error
 
       - name: Upload pdb database
-        uses: actions/upload-artifact@v4
+        if: matrix.os == 'Windows'
+        uses: actions/upload-artifact@v5
         with:
           name: Windows${{matrix.target}}-debug-pdbs
           path: |

.github/workflows/desktop-lint.yml

@@ -1,13 +1,22 @@
 name: Code Style (C++) 
 
 on:
+  # push trigger not needed for linting, we do not allow direct pushes to master
   pull_request:
-    paths-ignore:
-      - '**.md'
-      - 'webclient/**'
-      - '.github/workflows/web-*.yml'
-      - '.github/workflows/translations-*.yml'
-      - '.github/workflows/docker-release.yml'
+    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'
+      - '.cmake-format.json'
+      - 'format.sh'
 
 jobs:
   format:
@@ -15,7 +24,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
         fetch-depth: 20 # should be enough to find merge base
 
@@ -23,7 +32,7 @@ jobs:
       shell: bash
       run: |
         sudo apt-get update
-        sudo apt-get install -y --no-install-recommends clang-format cmake-format
+        sudo apt-get install -y --no-install-recommends clang-format cmake-format shellcheck
 
     - name: Check code formatting
       shell: bash

.github/workflows/docker-release.yml

@@ -11,6 +11,7 @@ on:
       - master
     paths:
       - '.github/workflows/docker-release.yml'
+      - 'Dockerfile'
 
 jobs:
   docker:
@@ -22,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Docker metadata
         id: metadata

.github/workflows/documentation-build.yml

@@ -6,8 +6,7 @@ on:
       - '*'   # Only re-generate docs when a new tagged version is pushed
   pull_request:
     paths:
-      - '**.h'
-      - '/doc/doxygen/**'
+      - 'doc/doxygen/**'
       - '.github/workflows/documentation-build.yml'
       - 'Doxyfile'
   workflow_dispatch:
@@ -21,35 +20,42 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v5
+      - name: Checkout code
+        uses: actions/checkout@v6
 
-      - name: Install Doxygen and Graphviz
-        shell: bash
-        run: sudo apt-get install -y doxygen graphviz
+      - name: Install Graphviz
+        run: |
+          sudo apt-get install -y graphviz
+          dot -V
+
+      - name: Install Doxygen
+        uses: ssciwr/doxygen-install@v1
+        with:
+          version: "1.14.0"
+
+      - name: Update Doxygen Configuration
+        run: |
+          git diff Doxyfile
+          doxygen -u Doxyfile
+          if git diff --quiet Doxyfile; then
+            echo "::notice::No config changes in Doxyfile detected."
+          else
+            echo "::error::Config changes in Doxyfile detected! Please update the file by running 'doxygen -u Doxyfile'."
+            echo ""
+            git diff --color=always Doxyfile
+            exit 1
+          fi
 
       - name: Generate Documentation
-        shell: bash
+        if: always()
         run: doxygen Doxyfile
 
-      - name: Upload Documentation
-        uses: actions/upload-artifact@v4
-        with:
-          name: Cockatrice_Docs
-          path: ./docs/html    # Main output folder + subfolder defined in Doxygen config 
-          if-no-files-found: error
-
-      - name: Deploy to cockatrice.github.io/docs
+      - 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 }}
           external_repository: Cockatrice/cockatrice.github.io
           publish_branch: master
-          publish_dir: ./docs/html    # Main output folder + subfolder defined in Doxygen config 
-          destination_dir: docs    # Subfolder of the GitHub Pages URL where the docs live
-
-      - name: Link to Documentation Page
-        if: github.event_name != 'pull_request'
-        shell: bash
-        run: echo "::notice title=New documentation published ::Shortly available at https://cockatrice.github.io/docs/"
+          publish_dir: ./docs/html
+          destination_dir: docs   # Docs will live under https://cockatrice.github.io/docs/

.github/workflows/translations-pull.yml

@@ -7,6 +7,7 @@ on:
     - cron: '0 0 15 1,4,7,10 *'
   pull_request:
     paths:
+      - '.tx/**'
       - '.github/workflows/translations-pull.yml'
 
 jobs:
@@ -19,7 +20,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Pull translated strings from Transifex
         uses: transifex/cli-action@v2
@@ -32,7 +33,7 @@ jobs:
       - name: Create pull request
         if: github.event_name != 'pull_request'
         id: create_pr
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v8
         with:
           add-paths: |
             cockatrice/translations/*.ts

.github/workflows/translations-push.yml

@@ -7,6 +7,7 @@ on:
     - cron: '0 0 1 1,4,7,10 *'
   pull_request:
     paths:
+      - '.ci/update_translation_source_strings.sh'
       - '.github/workflows/translations-push.yml'
 
 jobs:
@@ -19,7 +20,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Install lupdate
         shell: bash
@@ -30,10 +31,10 @@ jobs:
       - name: Update Cockatrice translation source
         id: cockatrice
         shell: bash
-        env:
-          FILE: 'cockatrice/cockatrice_en@source.ts'
-          DIRS: 'cockatrice/src common'
-        run: .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
         id: oracle
@@ -56,7 +57,7 @@ jobs:
       - name: Create pull request
         if: github.event_name != 'pull_request'
         id: create_pr
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v8
         with:
           add-paths: |
             cockatrice/cockatrice_en@source.ts

.github/workflows/web-build.yml

@@ -5,14 +5,16 @@ on:
     branches:
       - master
     paths:
-      - '.github/workflows/web-*.yml'
+      - '.husky/**'
       - 'webclient/**'
       - '!**.md'
+      - '.github/workflows/web-build.yml'
   pull_request:
     paths:
-      - '.github/workflows/web-*.yml'
+      - '.husky/**'
       - 'webclient/**'
       - '!**.md'
+      - '.github/workflows/web-build.yml'
 
 jobs:
   build-web:
@@ -33,10 +35,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup Node.js
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version: ${{matrix.node_version}}
           cache: 'npm'

.github/workflows/web-lint.yml

@@ -1,11 +1,12 @@
 name: Code Style (TypeScript) 
 
 on:
+  # push trigger not needed for linting, we do not allow direct pushes to master
   pull_request:
     paths:
-      - '.github/workflows/web-*.yml'
       - 'webclient/**'
       - '!**.md'
+      - '.github/workflows/web-lint.yml'
 
 jobs:
   ESLint:
@@ -17,10 +18,10 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     - name: Setup Node.js
-      uses: actions/setup-node@v5
+      uses: actions/setup-node@v6
       with:
         cache: 'npm'
         cache-dependency-path: 'webclient/package-lock.json'

.gitignore

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

.gitmodules

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

CMakeLists.txt

@@ -24,6 +24,8 @@ option(WITH_ORACLE "build oracle" ON)
 option(WITH_DBCONVERTER "build dbconverter" ON)
 # Compile tests
 option(TEST "build tests" OFF)
+# Use vcpkg regardless of OS
+option(USE_VCPKG "Use vcpkg regardless of OS" OFF)
 
 # Default to "Release" build type
 # User-provided value for CMAKE_BUILD_TYPE must be checked before the PROJECT() call
@@ -48,8 +50,8 @@ if(USE_CCACHE)
   endif()
 endif()
 
-if(WIN32 OR APPLE)
-  # Use vcpkg toolchain on Windows and macOS
+if(WIN32 OR USE_VCPKG)
+  # Use vcpkg toolchain on Windows (and on macOS in CI)
   set(CMAKE_TOOLCHAIN_FILE
       ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake
       CACHE STRING "Vcpkg toolchain file"
@@ -326,7 +328,19 @@ endif()
 
 include(CPack)
 
-add_subdirectory(common)
+add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_interfaces ${CMAKE_BINARY_DIR}/libcockatrice_interfaces)
+add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_protocol ${CMAKE_BINARY_DIR}/libcockatrice_protocol)
+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)
+add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_utility ${CMAKE_BINARY_DIR}/libcockatrice_utility)
+if(WITH_ORACLE OR WITH_CLIENT)
+  add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_settings ${CMAKE_BINARY_DIR}/libcockatrice_settings)
+  add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_models ${CMAKE_BINARY_DIR}/libcockatrice_models)
+  add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_filters ${CMAKE_BINARY_DIR}/libcockatrice_filters)
+endif()
+
 if(WITH_SERVER)
   add_subdirectory(servatrice)
   set(CPACK_INSTALL_CMAKE_PROJECTS "Servatrice;Servatrice;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS})

Dockerfile

@@ -1,8 +1,9 @@
-FROM ubuntu:24.04
+# -------- Build Stage --------
+FROM ubuntu:24.04 AS build
 
 ARG DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update && apt-get install -y\
+RUN apt-get update && apt-get install -y --no-install-recommends \
   build-essential \
   cmake \
   file \
@@ -16,20 +17,28 @@ RUN apt-get update && apt-get install -y\
   qt6-tools-dev \
   qt6-tools-dev-tools
 
-COPY ./CMakeLists.txt ./LICENSE ./README.md /home/servatrice/code/
-COPY ./cmake /home/servatrice/code/cmake
-COPY ./common /home/servatrice/code/common
-COPY ./servatrice /home/servatrice/code/servatrice
+WORKDIR /src
+COPY . .
+RUN mkdir build && cd build && \
+    cmake .. -DWITH_SERVER=1 -DWITH_CLIENT=0 -DWITH_ORACLE=0 -DWITH_DBCONVERTER=0 && \
+    make -j$(nproc) && \
+    make install
 
-WORKDIR /home/servatrice/code
 
-WORKDIR build
-RUN cmake .. -DWITH_SERVER=1 -DWITH_CLIENT=0 -DWITH_ORACLE=0 -DWITH_DBCONVERTER=0 &&\
-  make &&\
-  make install
+# -------- Runtime Stage (clean) --------
+FROM ubuntu:24.04
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+  libprotobuf32t64 \
+  libqt6sql6-mysql \
+  libqt6websockets6 \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Only copy installed binaries, not source
+COPY --from=build /usr/local /usr/local
 
 WORKDIR /home/servatrice
 
 EXPOSE 4748
-
 ENTRYPOINT [ "servatrice", "--log-to-console" ]

Doxyfile

@@ -1,5 +1,4 @@
 # Doxyfile 1.14.0
-# Docs: https://www.doxygen.nl/manual
 
 # This file describes the settings to be used by the documentation system
 # Doxygen (www.doxygen.org) for a project.
@@ -43,7 +42,7 @@ DOXYFILE_ENCODING      = UTF-8
 # title of most generated pages and in a few other places.
 # The default value is: My Project.
 
-PROJECT_NAME           = "Cockatrice"
+PROJECT_NAME           = Cockatrice
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
 # could be handy for archiving the generated documentation or if some version
@@ -55,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 cross-platform 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
@@ -380,7 +379,7 @@ TOC_INCLUDE_HEADINGS   = 6
 # The default value is: DOXYGEN.
 # This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
 
-MARKDOWN_ID_STYLE      = DOXYGEN
+MARKDOWN_ID_STYLE      = GITHUB
 
 # When enabled Doxygen tries to link words that correspond to documented
 # classes, or namespaces to their corresponding documentation. Such a link can
@@ -992,7 +991,7 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = cockatrice common doc/doxygen/extra-pages doc/doxygen/groups .github/CONTRIBUTING.md
+INPUT                  = .
 
 # This tag can be used to specify the character encoding of the source files
 # that Doxygen parses. Internally Doxygen uses the UTF-8 encoding. Doxygen uses
@@ -1032,8 +1031,7 @@ 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          = *.c \
-                         *.cc \
+FILE_PATTERNS          = *.cc \
                          *.cxx \
                          *.cxxm \
                          *.cpp \
@@ -1041,47 +1039,19 @@ FILE_PATTERNS          = *.c \
                          *.ccm \
                          *.c++ \
                          *.c++m \
-                         *.java \
                          *.ii \
                          *.ixx \
                          *.ipp \
                          *.i++ \
                          *.inl \
-                         *.idl \
-                         *.ddl \
-                         *.odl \
                          *.h \
                          *.hh \
                          *.hxx \
                          *.hpp \
                          *.h++ \
-                         *.l \
-                         *.cs \
-                         *.d \
-                         *.php \
-                         *.php4 \
-                         *.php5 \
-                         *.phtml \
-                         *.inc \
-                         *.m \
                          *.markdown \
                          *.md \
-                         *.mm \
-                         *.dox \
-                         *.py \
-                         *.pyw \
-                         *.f90 \
-                         *.f95 \
-                         *.f03 \
-                         *.f08 \
-                         *.f18 \
-                         *.f \
-                         *.for \
-                         *.vhd \
-                         *.vhdl \
-                         *.ucf \
-                         *.qsf \
-                         *.ice
+                         *.dox
 
 # The RECURSIVE tag can be used to specify whether or not subdirectories should
 # be searched for input files as well.
@@ -1096,7 +1066,12 @@ RECURSIVE              = YES
 # Note that relative paths are relative to the directory from which Doxygen is
 # run.
 
-EXCLUDE                = common/lib
+EXCLUDE                = build/ \
+                         cmake/ \
+                         doc/doxygen/theme/docs/ \
+                         doc/doxygen/theme/include/ \
+                         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
@@ -1112,7 +1087,8 @@ EXCLUDE_SYMLINKS       = NO
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       =
+EXCLUDE_PATTERNS       = .* \
+                         .*/
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the
@@ -1146,7 +1122,7 @@ EXAMPLE_RECURSIVE      = NO
 # that contain images that are to be included in the documentation (see the
 # \image command).
 
-IMAGE_PATH             =
+IMAGE_PATH             = doc/doxygen/images
 
 # The INPUT_FILTER tag can be used to specify a program that Doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program
@@ -1314,6 +1290,46 @@ USE_HTAGS              = NO
 
 VERBATIM_HEADERS       = YES
 
+# If the CLANG_ASSISTED_PARSING tag is set to YES then Doxygen will use the
+# clang parser (see:
+# http://clang.llvm.org/) for more accurate parsing at the cost of reduced
+# performance. This can be particularly helpful with template rich C++ code for
+# which Doxygen's built-in parser lacks the necessary type information.
+# Note: The availability of this option depends on whether or not Doxygen was
+# generated with the -Duse_libclang=ON option for CMake.
+# The default value is: NO.
+
+CLANG_ASSISTED_PARSING = NO
+
+# If the CLANG_ASSISTED_PARSING tag is set to YES and the CLANG_ADD_INC_PATHS
+# tag is set to YES then Doxygen will add the directory of each input to the
+# include path.
+# The default value is: YES.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_ADD_INC_PATHS    = YES
+
+# If clang assisted parsing is enabled you can provide the compiler with command
+# line options that you would normally use when invoking the compiler. Note that
+# the include paths will already be set by Doxygen for the files and directories
+# specified with INPUT and INCLUDE_PATH.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_OPTIONS          =
+
+# If clang assisted parsing is enabled you can provide the clang parser with the
+# path to the directory containing a file called compile_commands.json. This
+# file is the compilation database (see:
+# http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html) containing the
+# options used when the source files were built. This is equivalent to
+# specifying the -p option to a clang tool, such as clang-check. These options
+# will then be passed to the parser. Any options specified with CLANG_OPTIONS
+# will be added as well.
+# Note: The availability of this option depends on whether or not Doxygen was
+# generated with the -Duse_libclang=ON option for CMake.
+
+CLANG_DATABASE_PATH    =
+
 #---------------------------------------------------------------------------
 # Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
@@ -1416,7 +1432,8 @@ HTML_STYLESHEET        =
 # documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_EXTRA_STYLESHEET  = doc/doxygen/css/doxygen_style.css
+HTML_EXTRA_STYLESHEET  = doc/doxygen/css/doxygen_style.css \
+                         doc/doxygen/theme/doxygen-awesome.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
@@ -1439,7 +1456,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        = AUTO_DARK
+HTML_COLORSTYLE        = LIGHT    # required with doxygen-awesome-css theme, Auto Dark Mode will still work
 
 # 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
@@ -1750,7 +1767,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          = YES
+DISABLE_INDEX          = NO    # YES is bugged in the theme, see jothepro/doxygen-awesome-css/issues/201
 
 # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
 # structure should be generated to display hierarchical information. If the tag
@@ -2608,7 +2625,7 @@ DOT_COMMON_ATTR        = "fontname=Helvetica,fontsize=10"
 # The default value is: labelfontname=Helvetica,labelfontsize=10.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_EDGE_ATTR  = "labelfontname=Helvetica,labelfontsize=10,arrowhead=open, arrowtail=open, arrowsize=0.5"
+DOT_EDGE_ATTR          = "labelfontname=Helvetica,labelfontsize=10,arrowhead=open, arrowtail=open, arrowsize=0.5"
 
 # DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes
 # around nodes set 'shape=plain' or 'shape=plaintext' <a
@@ -2616,7 +2633,7 @@ DOT_EDGE_ATTR  = "labelfontname=Helvetica,labelfontsize=10,arrowhead=open, arrow
 # The default value is: shape=box,height=0.2,width=0.4.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_NODE_ATTR  = "shape=box,height=0.2,width=0.4"
+DOT_NODE_ATTR          = "shape=box,height=0.2,width=0.4"
 
 # You can set the path where dot can find font specified with fontname in
 # DOT_COMMON_ATTR and others dot attributes.

README.md

@@ -46,7 +46,8 @@ Latest <kbd>beta</kbd> version:
 
 - [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
+- [cockatrice.github.io](https://github.com/Cockatrice/cockatrice.github.io): Code of the official Cockatrice webpage
+- [Cockatrice @Flathub](https://github.com/flathub/io.github.Cockatrice.cockatrice): Configuration for our Linux `flatpak` package
 
 
 # Community Resources [![Discord](https://img.shields.io/discord/314987288398659595?label=Discord&logo=discord&logoColor=white)](https://discord.gg/3Z9yzmA)
@@ -54,6 +55,7 @@ Latest <kbd>beta</kbd> version:
 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 Code Documentation](https://cockatrice.github.io/docs)
 - [Official Discord](https://discord.gg/3Z9yzmA)
 - [reddit r/Cockatrice](https://reddit.com/r/cockatrice)
 
@@ -75,10 +77,15 @@ 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).
+
 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.
 
+#### Repository Activity
+![Cockatrice Repo Analytics](https://repobeats.axiom.co/api/embed/c7cec938789a5bbaeb4182a028b4dbb96db8f181.svg "Cockatrice Repo Analytics by Repobeats")
+
 <details>
-<summary><b>Kudos to our amazing contributors ❤️</b></summary>
+<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" />

cmake/FindQtRuntime.cmake

@@ -115,4 +115,7 @@ string(REGEX REPLACE "([^;]+)" "${COCKATRICE_QT_VERSION_NAME}::\\1" ORACLE_QT_MO
 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)
+set(QT_CORE_MODULE "${COCKATRICE_QT_VERSION_NAME}::Core")
+
 message(STATUS "Found Qt ${${COCKATRICE_QT_VERSION_NAME}_VERSION} at: ${${COCKATRICE_QT_VERSION_NAME}_DIR}")

cockatrice/CMakeLists.txt

@@ -7,78 +7,55 @@ 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/card/card_info.cpp
-    src/card/card_relation.cpp
-    src/card/card_set.cpp
-    src/card/card_set_list.cpp
-    src/card/exact_card.cpp
-    src/card/printing_info.cpp
-    src/client/deck_editor_menu.cpp
-    src/client/get_text_with_max.cpp
-    src/client/network/client_update_checker.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
     src/client/network/parsers/deck_link_to_api_transformer.cpp
-    src/client/network/release_channel.cpp
-    src/client/network/replay_timeline_widget.cpp
-    src/client/network/sets_model.cpp
-    src/client/network/spoiler_background_updater.cpp
-    src/client/replay_manager.cpp
+    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/sound_engine.cpp
-    src/client/tapped_out_interface.cpp
-    src/client/update_downloader.cpp
-    src/database/card_database.cpp
-    src/database/card_database_loader.cpp
-    src/database/card_database_manager.cpp
-    src/database/card_database_querier.cpp
-    src/database/model/card_database_model.cpp
-    src/database/model/card_database_display_model.cpp
-    src/database/model/card/card_completer_proxy_model.cpp
-    src/database/model/card/card_search_model.cpp
-    src/database/model/token/token_display_model.cpp
-    src/database/model/token/token_edit_model.cpp
-    src/database/parser/card_database_parser.cpp
-    src/database/parser/cockatrice_xml_3.cpp
-    src/database/parser/cockatrice_xml_4.cpp
-    src/deck/custom_line_edit.cpp
-    src/deck/deck_list_model.cpp
-    src/deck/deck_loader.cpp
-    src/deck/deck_stats_interface.cpp
-    src/dialogs/dlg_connect.cpp
-    src/dialogs/dlg_convert_deck_to_cod_format.cpp
-    src/dialogs/dlg_create_game.cpp
-    src/dialogs/dlg_default_tags_editor.cpp
-    src/dialogs/dlg_edit_avatar.cpp
-    src/dialogs/dlg_edit_password.cpp
-    src/dialogs/dlg_edit_tokens.cpp
-    src/dialogs/dlg_edit_user.cpp
-    src/dialogs/dlg_filter_games.cpp
-    src/dialogs/dlg_forgot_password_challenge.cpp
-    src/dialogs/dlg_forgot_password_request.cpp
-    src/dialogs/dlg_forgot_password_reset.cpp
-    src/dialogs/dlg_load_deck.cpp
-    src/dialogs/dlg_load_deck_from_clipboard.cpp
-    src/dialogs/dlg_load_deck_from_website.cpp
-    src/dialogs/dlg_load_remote_deck.cpp
-    src/dialogs/dlg_manage_sets.cpp
-    src/dialogs/dlg_register.cpp
-    src/dialogs/dlg_select_set_for_cards.cpp
-    src/dialogs/dlg_settings.cpp
-    src/dialogs/dlg_startup_card_check.cpp
-    src/dialogs/dlg_tip_of_the_day.cpp
-    src/dialogs/dlg_update.cpp
-    src/dialogs/dlg_view_log.cpp
-    src/dialogs/tip_of_the_day.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
+    src/interface/widgets/dialogs/dlg_default_tags_editor.cpp
+    src/interface/widgets/dialogs/dlg_edit_avatar.cpp
+    src/interface/widgets/dialogs/dlg_edit_password.cpp
+    src/interface/widgets/dialogs/dlg_edit_tokens.cpp
+    src/interface/widgets/dialogs/dlg_edit_user.cpp
+    src/interface/widgets/dialogs/dlg_filter_games.cpp
+    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_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_manage_sets.cpp
+    src/interface/widgets/dialogs/dlg_register.cpp
+    src/interface/widgets/dialogs/dlg_select_set_for_cards.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/tip_of_the_day.cpp
     src/filters/deck_filter_string.cpp
     src/filters/filter_builder.cpp
-    src/filters/filter_card.cpp
-    src/filters/filter_string.cpp
-    src/filters/filter_tree.cpp
     src/filters/filter_tree_model.cpp
     src/filters/syntax_help.cpp
     src/game/abstract_game.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/abstract_graphics_item.cpp
     src/game/board/arrow_item.cpp
     src/game/board/arrow_target.cpp
     src/game/board/card_drag_item.cpp
@@ -138,9 +115,17 @@ set(cockatrice_SOURCES
     src/game/zones/table_zone.cpp
     src/game/zones/view_zone.cpp
     src/game/zones/view_zone_widget.cpp
+    src/game_graphics/board/abstract_graphics_item.cpp
+    src/interface/card_picture_loader/card_picture_loader.cpp
+    src/interface/card_picture_loader/card_picture_loader_local.cpp
+    src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.cpp
+    src/interface/card_picture_loader/card_picture_loader_status_bar.cpp
+    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/layouts/flow_layout.cpp
     src/interface/layouts/overlap_layout.cpp
-    src/interface/line_edit_completer.cpp
+    src/interface/widgets/utility/line_edit_completer.cpp
     src/interface/pixel_map_generator.cpp
     src/interface/theme_manager.cpp
     src/interface/widgets/cards/additional_info/color_identity_widget.cpp
@@ -160,17 +145,22 @@ set(cockatrice_SOURCES
     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/deck_analytics_widget.cpp
+    src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.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_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/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
@@ -181,6 +171,7 @@ set(cockatrice_SOURCES
     src/interface/widgets/general/layout_containers/flow_widget.cpp
     src/interface/widgets/general/layout_containers/overlap_control_widget.cpp
     src/interface/widgets/general/layout_containers/overlap_widget.cpp
+    src/interface/widgets/menus/deck_editor_menu.cpp
     src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp
     src/interface/widgets/printing_selector/card_amount_widget.cpp
     src/interface/widgets/printing_selector/printing_selector.cpp
@@ -192,14 +183,33 @@ set(cockatrice_SOURCES
     src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.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_timeline_widget.cpp
+    src/interface/widgets/server/chat_view/chat_view.cpp
+    src/interface/widgets/server/game_selector.cpp
+    src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp
+    src/interface/widgets/server/games_model.cpp
+    src/interface/widgets/server/handle_public_servers.cpp
+    src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp
+    src/interface/widgets/server/remote/remote_replay_list_tree_widget.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_manager.cpp
+    src/interface/widgets/server/user/user_list_widget.cpp
+    src/interface/widgets/utility/custom_line_edit.cpp
+    src/interface/widgets/utility/get_text_with_max.cpp
+    src/interface/widgets/utility/sequence_edit.cpp
     src/interface/widgets/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_format_legality_filter_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_display_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp
+    src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp
     src/interface/widgets/visual_deck_editor/visual_deck_editor_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
@@ -217,94 +227,66 @@ set(cockatrice_SOURCES
     src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
     src/interface/window_main.cpp
     src/main.cpp
-    src/picture_loader/picture_loader.cpp
-    src/picture_loader/picture_loader_local.cpp
-    src/picture_loader/picture_loader_request_status_display_widget.cpp
-    src/picture_loader/picture_loader_status_bar.cpp
-    src/picture_loader/picture_loader_worker.cpp
-    src/picture_loader/picture_loader_worker_work.cpp
-    src/picture_loader/picture_to_load.cpp
-    src/server/abstract_client.cpp
-    src/server/chat_view/chat_view.cpp
-    src/server/game_selector.cpp
-    src/server/games_model.cpp
-    src/server/handle_public_servers.cpp
-    src/server/local_client.cpp
-    src/server/local_server.cpp
-    src/server/local_server_interface.cpp
-    src/server/pending_command.cpp
-    src/server/remote/remote_client.cpp
-    src/server/remote/remote_decklist_tree_widget.cpp
-    src/server/remote/remote_replay_list_tree_widget.cpp
-    src/server/user/user_context_menu.cpp
-    src/server/user/user_info_box.cpp
-    src/server/user/user_info_connection.cpp
-    src/server/user/user_list_manager.cpp
-    src/server/user/user_list_widget.cpp
-    src/settings/cache_settings.cpp
-    src/settings/card_counter_settings.cpp
-    src/settings/card_database_settings.cpp
-    src/settings/card_override_settings.cpp
-    src/settings/debug_settings.cpp
-    src/settings/download_settings.cpp
-    src/settings/game_filters_settings.cpp
-    src/settings/layouts_settings.cpp
-    src/settings/message_settings.cpp
-    src/settings/recents_settings.cpp
-    src/settings/servers_settings.cpp
-    src/settings/settings_manager.cpp
-    src/settings/shortcut_treeview.cpp
-    src/settings/shortcuts_settings.cpp
-    src/tabs/abstract_tab_deck_editor.cpp
-    src/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp
-    src/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp
-    src/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp
-    src/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp
-    src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp
-    src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp
-    src/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp
-    src/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp
-    src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp
-    src/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp
-    src/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp
-    src/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp
-    src/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp
-    src/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp
-    src/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp
-    src/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp
-    src/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp
-    src/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp
-    src/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp
-    src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp
-    src/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp
-    src/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp
-    src/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp
-    src/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp
-    src/tabs/api/edhrec/tab_edhrec.cpp
-    src/tabs/api/edhrec/tab_edhrec_main.cpp
-    src/tabs/tab.cpp
-    src/tabs/tab_account.cpp
-    src/tabs/tab_admin.cpp
-    src/tabs/tab_deck_editor.cpp
-    src/tabs/tab_deck_storage.cpp
-    src/tabs/tab_game.cpp
-    src/tabs/tab_home.cpp
-    src/tabs/tab_logs.cpp
-    src/tabs/tab_message.cpp
-    src/tabs/tab_replays.cpp
-    src/tabs/tab_room.cpp
-    src/tabs/tab_server.cpp
-    src/tabs/tab_supervisor.cpp
-    src/tabs/tab_visual_database_display.cpp
-    src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
-    src/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp
-    src/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
-    src/utility/card_info_comparator.cpp
-    src/utility/deck_list_sort_filter_proxy_model.cpp
-    src/utility/key_signals.cpp
-    src/utility/levenshtein.cpp
-    src/utility/logger.cpp
-    src/utility/sequence_edit.cpp
+    src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
+    src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp
+    src/interface/widgets/tabs/api/archidekt/api_response/archidekt_deck_listing_api_response.cpp
+    src/interface/widgets/tabs/api/archidekt/api_response/archidekt_formats.h
+    src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.cpp
+    src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card_entry.cpp
+    src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_edition.cpp
+    src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck.cpp
+    src/interface/widgets/tabs/api/archidekt/api_response/deck/archidekt_api_response_deck_category.cpp
+    src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_listing_container.cpp
+    src/interface/widgets/tabs/api/archidekt/api_response/deck_listings/archidekt_api_response_deck_owner.cpp
+    src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp
+    src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.cpp
+    src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_listings_display_widget.cpp
+    src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.cpp
+    src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp
+    src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp
+    src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp
+    src/interface/widgets/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.cpp
+    src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.cpp
+    src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.cpp
+    src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_list.cpp
+    src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.cpp
+    src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response.cpp
+    src/interface/widgets/tabs/api/edhrec/api_response/commander/edhrec_commander_api_response_average_deck_statistics.cpp
+    src/interface/widgets/tabs/api/edhrec/api_response/top_cards/edhrec_top_cards_api_response.cpp
+    src/interface/widgets/tabs/api/edhrec/api_response/top_commanders/edhrec_top_commanders_api_response.cpp
+    src/interface/widgets/tabs/api/edhrec/api_response/top_tags/edhrec_top_tags_api_response.cpp
+    src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp
+    src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp
+    src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp
+    src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_list_display_widget.cpp
+    src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp
+    src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp
+    src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_display_widget.cpp
+    src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp
+    src/interface/widgets/tabs/api/edhrec/display/top_cards/edhrec_top_cards_api_response_display_widget.cpp
+    src/interface/widgets/tabs/api/edhrec/display/top_commander/edhrec_top_commanders_api_response_display_widget.cpp
+    src/interface/widgets/tabs/api/edhrec/display/top_tags/edhrec_top_tags_api_response_display_widget.cpp
+    src/interface/widgets/tabs/api/edhrec/tab_edhrec.cpp
+    src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp
+    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_deck_editor.cpp
+    src/interface/widgets/tabs/tab_deck_storage.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_replays.cpp
+    src/interface/widgets/tabs/tab_room.cpp
+    src/interface/widgets/tabs/tab_server.cpp
+    src/interface/widgets/tabs/tab_supervisor.cpp
+    src/interface/widgets/tabs/tab_visual_database_display.cpp
+    src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
+    src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp
+    src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
+    src/interface/key_signals.cpp
+    src/interface/logger.cpp
 )
 
 add_subdirectory(sounds)
@@ -316,15 +298,23 @@ configure_file(
 set(cockatrice_RESOURCES cockatrice.qrc)
 
 if(UPDATE_TRANSLATIONS)
+  # Cockatrice main sources
   file(GLOB_RECURSE translate_cockatrice_SRCS ${CMAKE_SOURCE_DIR}/cockatrice/src/*.cpp
        ${CMAKE_SOURCE_DIR}/cockatrice/src/*.h
   )
-  file(GLOB_RECURSE translate_common_SRCS ${CMAKE_SOURCE_DIR}/common/*.cpp ${CMAKE_SOURCE_DIR}/common/*.h)
-  set(translate_SRCS ${translate_cockatrice_SRCS} ${translate_common_SRCS})
+
+  # All libcockatrice_* libraries (recursively)
+  file(GLOB_RECURSE translate_lib_SRCS ${CMAKE_SOURCE_DIR}/libcockatrice_*/**/*.cpp
+       ${CMAKE_SOURCE_DIR}/libcockatrice_*/**/*.h
+  )
+
+  # Combine all sources for translation
+  set(translate_SRCS ${translate_cockatrice_SRCS} ${translate_lib_SRCS})
+
   set(cockatrice_TS "${CMAKE_CURRENT_SOURCE_DIR}/cockatrice_en@source.ts")
 else()
   file(GLOB cockatrice_TS "${CMAKE_CURRENT_SOURCE_DIR}/translations/*.ts")
-endif(UPDATE_TRANSLATIONS)
+endif()
 
 if(WIN32)
   set(cockatrice_SOURCES ${cockatrice_SOURCES} cockatrice.rc)
@@ -354,12 +344,6 @@ set(DESKTOPDIR
     CACHE STRING "desktop file destination"
 )
 
-# Include directories
-include_directories(../common)
-include_directories(${PROTOBUF_INCLUDE_DIR})
-include_directories(${CMAKE_BINARY_DIR}/common)
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
 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")
@@ -399,9 +383,31 @@ elseif(Qt5_FOUND)
 endif()
 
 if(Qt5_FOUND)
-  target_link_libraries(cockatrice cockatrice_common ${COCKATRICE_QT_MODULES})
+  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 cockatrice_common ${COCKATRICE_QT_MODULES})
+  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)

cockatrice/cockatrice.qrc

@@ -7,11 +7,14 @@
 
         <file>resources/icons/arrow_bottom_green.svg</file>
         <file>resources/icons/arrow_down_green.svg</file>
+        <file>resources/icons/arrow_history.svg</file>
         <file>resources/icons/arrow_left_green.svg</file>
+        <file>resources/icons/arrow_redo.svg</file>
         <file>resources/icons/arrow_right_blue.svg</file>
         <file>resources/icons/arrow_right_green.svg</file>
         <file>resources/icons/arrow_top_green.svg</file>
         <file>resources/icons/arrow_up_green.svg</file>
+        <file>resources/icons/arrow_undo.svg</file>
         <file>resources/icons/clearsearch.svg</file>
         <file>resources/icons/cogwheel.svg</file>
         <file>resources/icons/conceded.svg</file>
@@ -25,6 +28,7 @@
         <file>resources/icons/lock.svg</file>
         <file>resources/icons/not_ready_start.svg</file>
         <file>resources/icons/pencil.svg</file>
+        <file>resources/icons/pin.svg</file>
         <file>resources/icons/player.svg</file>
         <file>resources/icons/ready_start.svg</file>
         <file>resources/icons/reload.svg</file>

cockatrice/resources/config/qtlogging.ini

@@ -1,6 +1,10 @@
 [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
@@ -37,12 +41,14 @@
 #card_zone = true
 #view_zone = true
 
+#game_event_handler = true
+
 #user_info_connection = true
 
-#picture_loader = true
-#picture_loader.worker = true
-#picture_loader.card_back_cache_fail = true
-#picture_loader.picture_to_load = true
+#card_picture_loader = true
+#card_picture_loader.worker = true
+#card_picture_loader.card_back_cache_fail = true
+#card_picture_loader.picture_to_load = true
 #deck_loader = true
 #card_database = true
 #card_database.loading = true

cockatrice/resources/help/deck_search.md

@@ -15,15 +15,18 @@ 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 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><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>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>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>

cockatrice/resources/icons/arrow_history.svg

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

cockatrice/resources/icons/arrow_redo.svg

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

cockatrice/resources/icons/arrow_undo.svg

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

cockatrice/resources/icons/pin.svg

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" width="64" height="64">
+  <g transform="matrix(0 1 -1 0 99.465813 0)" opacity="0.7">
+    <path fill="#000000" fill-rule="evenodd" clip-rule="evenodd"
+    stroke="#ffffff"
+          stroke-width="4"
+          stroke-linejoin="round"
+          stroke-linecap="round"
+          d="M65.5 62
+             L78 49
+             C73.5 44.5 69.5 42 63 44
+             L45 31 C47 25 46 22 41.5 18
+             L19 41.5
+             C23 45.5 25 46.5 31 45
+             L44 62.5
+             C42.3 69 45 73.5 49 78
+             L61.5 65.5
+             L84 87
+             L87 87
+             L87.5 86.5
+             L87.5 83.5 Z" />
+  </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="right" />
+       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="left"
+       id="right"
        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="right" />
+       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="left"
+       id="right"
        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="right" />
+       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="left"
+       id="right"
        inkscape:connector-curvature="0" />
     <path
        sodipodi:type="star"
@@ -363,6 +363,6 @@
        d="m 38.011063,984.77381 -10.143601,-5.23583 -10.063711,5.38779 1.845023,-11.2651 -8.233948,-7.90624 11.283888,-1.72639 4.974851,-10.27411 5.128803,10.19813 11.308575,1.55649 -8.114112,8.02918 z"
        inkscape:transform-center-x="0.094945927"
        inkscape:transform-center-y="-3.9764964"
-       transform="matrix(2.3768784,0,0,2.4799382,-15.920285,-1400.1716)" />
+       transform="matrix(-2.3768784,0,0,2.4799382,115.920285,-1400.1716)" />
   </g>
 </svg>

cockatrice/src/card/card_relation.h

@@ -1,73 +0,0 @@
-#ifndef COCKATRICE_CARD_RELATION_H
-#define COCKATRICE_CARD_RELATION_H
-
-#include "card_relation_type.h"
-
-#include <QObject>
-#include <QString>
-
-class CardRelation : public QObject
-{
-    Q_OBJECT
-
-private:
-    QString name;
-    CardRelationType attachType;
-    bool isCreateAllExclusion;
-    bool isVariableCount;
-    int defaultCount;
-    bool isPersistent;
-
-public:
-    explicit CardRelation(const QString &_name = QString(),
-                          CardRelationType _attachType = CardRelationType::DoesNotAttach,
-                          bool _isCreateAllExclusion = false,
-                          bool _isVariableCount = false,
-                          int _defaultCount = 1,
-                          bool _isPersistent = false);
-
-    const QString &getName() const
-    {
-        return name;
-    }
-    CardRelationType getAttachType() const
-    {
-        return attachType;
-    }
-    bool getDoesAttach() const
-    {
-        return attachType != CardRelationType::DoesNotAttach;
-    }
-    bool getDoesTransform() const
-    {
-        return attachType == CardRelationType::TransformInto;
-    }
-
-    QString getAttachTypeAsString() const
-    {
-        return cardAttachTypeToString(attachType);
-    }
-
-    bool getCanCreateAnother() const
-    {
-        return !getDoesAttach();
-    }
-    bool getIsCreateAllExclusion() const
-    {
-        return isCreateAllExclusion;
-    }
-    bool getIsVariable() const
-    {
-        return isVariableCount;
-    }
-    int getDefaultCount() const
-    {
-        return defaultCount;
-    }
-    bool getIsPersistent() const
-    {
-        return isPersistent;
-    }
-};
-
-#endif // COCKATRICE_CARD_RELATION_H

cockatrice/src/card/card_set.h

@@ -1,116 +0,0 @@
-#ifndef COCKATRICE_CARD_SET_H
-#define COCKATRICE_CARD_SET_H
-
-#include <QDate>
-#include <QList>
-#include <QSharedPointer>
-#include <QString>
-
-class CardInfo;
-using CardInfoPtr = QSharedPointer<CardInfo>;
-
-class CardSet;
-using CardSetPtr = QSharedPointer<CardSet>;
-
-class CardSet : public QList<CardInfoPtr>
-{
-public:
-    enum Priority
-    {
-        PriorityFallback = 0,
-        PriorityPrimary = 10,
-        PrioritySecondary = 20,
-        PriorityReprint = 30,
-        PriorityOther = 40,
-        PriorityLowest = 100,
-    };
-
-    static const char *TOKENS_SETNAME;
-
-private:
-    QString shortName, longName;
-    unsigned int sortKey;
-    QDate releaseDate;
-    QString setType;
-    Priority priority;
-    bool enabled, isknown;
-
-public:
-    explicit CardSet(const QString &_shortName = QString(),
-                     const QString &_longName = QString(),
-                     const QString &_setType = QString(),
-                     const QDate &_releaseDate = QDate(),
-                     const Priority _priority = PriorityFallback);
-
-    static CardSetPtr newInstance(const QString &_shortName = QString(),
-                                  const QString &_longName = QString(),
-                                  const QString &_setType = QString(),
-                                  const QDate &_releaseDate = QDate(),
-                                  const Priority _priority = PriorityFallback);
-
-    QString getCorrectedShortName() const;
-
-    QString getShortName() const
-    {
-        return shortName;
-    }
-    QString getLongName() const
-    {
-        return longName;
-    }
-    QString getSetType() const
-    {
-        return setType;
-    }
-    QDate getReleaseDate() const
-    {
-        return releaseDate;
-    }
-    Priority getPriority() const
-    {
-        return priority;
-    }
-
-    void setLongName(const QString &_longName)
-    {
-        longName = _longName;
-    }
-    void setSetType(const QString &_setType)
-    {
-        setType = _setType;
-    }
-    void setReleaseDate(const QDate &_releaseDate)
-    {
-        releaseDate = _releaseDate;
-    }
-    void setPriority(const Priority _priority)
-    {
-        priority = _priority;
-    }
-
-    void loadSetOptions();
-    int getSortKey() const
-    {
-        return sortKey;
-    }
-    void setSortKey(unsigned int _sortKey);
-
-    bool getEnabled() const
-    {
-        return enabled;
-    }
-    void setEnabled(bool _enabled);
-
-    bool getIsKnown() const
-    {
-        return isknown;
-    }
-    void setIsKnown(bool _isknown);
-
-    bool getIsKnownIgnored() const
-    {
-        return longName.length() + setType.length() + releaseDate.toString().length() == 0;
-    }
-};
-
-#endif // COCKATRICE_CARD_SET_H

cockatrice/src/card/card_set_list.h

@@ -1,26 +0,0 @@
-#ifndef COCKATRICE_CARD_SET_LIST_H
-#define COCKATRICE_CARD_SET_LIST_H
-
-#include "card_set.h"
-
-#include <QList>
-#include <QStringList>
-
-class CardSetList : public QList<CardSetPtr>
-{
-private:
-    class KeyCompareFunctor;
-
-public:
-    void sortByKey();
-    void guessSortKeys();
-    void enableAllUnknown();
-    void enableAll();
-    void markAllAsKnown();
-    int getEnabledSetsNum();
-    int getUnknownSetsNum();
-    QStringList getUnknownSetsNames();
-    void defaultSort();
-};
-
-#endif // COCKATRICE_CARD_SET_LIST_H

cockatrice/src/card/exact_card.h

@@ -1,48 +0,0 @@
-#ifndef EXACT_CARD_H
-#define EXACT_CARD_H
-
-#include "card_info.h"
-
-/**
- * @class ExactCard
- * @ingroup Cards
- * @brief Identifies the card by its CardInfoPtr along with its exact printing by its PrintingInfo.
- */
-class ExactCard
-{
-    CardInfoPtr card;
-    PrintingInfo printing;
-
-public:
-    ExactCard();
-    explicit ExactCard(const CardInfoPtr &_card, const PrintingInfo &_printing = PrintingInfo());
-
-    /**
-     * Gets the CardInfoPtr. Can be null.
-     */
-    CardInfoPtr getCardPtr() const
-    {
-        return card;
-    }
-
-    /**
-     * Gets the PrintingInfo. Can be empty.
-     */
-    PrintingInfo getPrinting() const
-    {
-        return printing;
-    }
-
-    bool operator==(const ExactCard &other) const;
-
-    QString getName() const;
-    const CardInfo &getInfo() const;
-    QString getPixmapCacheKey() const;
-
-    bool isEmpty() const;
-    explicit operator bool() const;
-
-    void emitPixmapUpdated() const;
-};
-
-#endif // EXACT_CARD_H

cockatrice/src/card/printing_info.h

@@ -1,56 +0,0 @@
-#ifndef COCKATRICE_PRINTING_INFO_H
-#define COCKATRICE_PRINTING_INFO_H
-
-#include "card_set.h"
-
-#include <QList>
-#include <QMap>
-#include <QStringList>
-#include <QVariant>
-
-class PrintingInfo;
-
-using SetToPrintingsMap = QMap<QString, QList<PrintingInfo>>;
-
-/**
- * Info relating to a specific printing for a card.
- */
-class PrintingInfo
-{
-public:
-    explicit PrintingInfo(const CardSetPtr &_set = nullptr);
-    ~PrintingInfo() = default;
-
-    bool operator==(const PrintingInfo &other) const
-    {
-        return this->set == other.set && this->properties == other.properties;
-    }
-
-private:
-    CardSetPtr set;
-    // per-printing card properties;
-    QVariantHash properties;
-
-public:
-    CardSetPtr getSet() const
-    {
-        return set;
-    }
-
-    QStringList getProperties() const
-    {
-        return properties.keys();
-    }
-    QString getProperty(const QString &propertyName) const
-    {
-        return properties.value(propertyName).toString();
-    }
-    void setProperty(const QString &_name, const QString &_value)
-    {
-        properties.insert(_name, _value);
-    }
-
-    QString getUuid() const;
-};
-
-#endif // COCKATRICE_PRINTING_INFO_H

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

@@ -1,15 +1,14 @@
 #include "deck_stats_interface.h"
 
-#include "deck_list.h"
-#include "deck_list_card_node.h"
-
 #include <QDesktopServices>
 #include <QMessageBox>
-#include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QRegularExpression>
 #include <QUrlQuery>
+#include <libcockatrice/deck_list/deck_list.h>
+#include <libcockatrice/deck_list/tree/deck_list_card_node.h>
+#include <version_string.h>
 
 DeckStatsInterface::DeckStatsInterface(CardDatabase &_cardDatabase, QObject *parent)
     : QObject(parent), cardDatabase(_cardDatabase)
@@ -64,6 +63,7 @@ void DeckStatsInterface::analyzeDeck(DeckList *deck)
 
     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);
 }

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

@@ -7,10 +7,8 @@
 #ifndef DECKSTATS_INTERFACE_H
 #define DECKSTATS_INTERFACE_H
 
-#include "../database/card_database.h"
-#include "deck_list.h"
-
-#include <QObject>
+#include <libcockatrice/card/database/card_database.h>
+#include <libcockatrice/deck_list/deck_list.h>
 
 class QByteArray;
 class QNetworkAccessManager;

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

@@ -1,15 +1,14 @@
 #include "tapped_out_interface.h"
 
-#include "deck_list.h"
-#include "deck_list_card_node.h"
-
 #include <QDesktopServices>
 #include <QMessageBox>
-#include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QRegularExpression>
 #include <QUrlQuery>
+#include <libcockatrice/deck_list/deck_list.h>
+#include <libcockatrice/deck_list/tree/deck_list_card_node.h>
+#include <version_string.h>
 
 TappedOutInterface::TappedOutInterface(CardDatabase &_cardDatabase, QObject *parent)
     : QObject(parent), cardDatabase(_cardDatabase)
@@ -89,6 +88,7 @@ void TappedOutInterface::analyzeDeck(DeckList *deck)
 
     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));
 
     manager->post(request, data);
 }

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

@@ -7,11 +7,8 @@
 #ifndef TAPPEDOUT_INTERFACE_H
 #define TAPPEDOUT_INTERFACE_H
 
-#include "../database/card_database.h"
-#include "deck_list.h"
-
-#include <QLoggingCategory>
-#include <QObject>
+#include <libcockatrice/card/database/card_database.h>
+#include <libcockatrice/deck_list/deck_list.h>
 
 inline Q_LOGGING_CATEGORY(TappedOutInterfaceLog, "tapped_out_interface");
 

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

@@ -6,7 +6,9 @@
 
 #ifndef INTERFACE_JSON_DECK_PARSER_H
 #define INTERFACE_JSON_DECK_PARSER_H
-#include "../../../deck/deck_loader.h"
+
+#include "../../../interface/deck_loader/card_node_function.h"
+#include "../../../interface/deck_loader/deck_loader.h"
 
 #include <QJsonArray>
 #include <QJsonObject>
@@ -16,21 +18,21 @@ class IJsonDeckParser
 public:
     virtual ~IJsonDeckParser() = default;
 
-    virtual DeckLoader *parse(const QJsonObject &obj) = 0;
+    virtual DeckList parse(const QJsonObject &obj) = 0;
 };
 
 class ArchidektJsonParser : public IJsonDeckParser
 {
 public:
-    DeckLoader *parse(const QJsonObject &obj) override
+    DeckList parse(const QJsonObject &obj) override
     {
-        DeckLoader *list = new DeckLoader();
+        DeckList deckList;
 
         QString deckName = obj.value("name").toString();
         QString deckDescription = obj.value("description").toString();
 
-        list->setName(deckName);
-        list->setComments(deckDescription);
+        deckList.setName(deckName);
+        deckList.setComments(deckDescription);
 
         QString outputText;
         QTextStream outStream(&outputText);
@@ -47,25 +49,25 @@ public:
             outStream << quantity << ' ' << cardName << " (" << setName << ") " << collectorNumber << '\n';
         }
 
-        list->loadFromStream_Plain(outStream, false);
-        list->resolveSetNameAndNumberToProviderID();
+        deckList.loadFromStream_Plain(outStream, false);
+        deckList.forEachCard(CardNodeFunction::ResolveProviderId());
 
-        return list;
+        return deckList;
     }
 };
 
 class MoxfieldJsonParser : public IJsonDeckParser
 {
 public:
-    DeckLoader *parse(const QJsonObject &obj) override
+    DeckList parse(const QJsonObject &obj) override
     {
-        DeckLoader *list = new DeckLoader();
+        DeckList deckList;
 
         QString deckName = obj.value("name").toString();
         QString deckDescription = obj.value("description").toString();
 
-        list->setName(deckName);
-        list->setComments(deckDescription);
+        deckList.setName(deckName);
+        deckList.setComments(deckDescription);
 
         QString outputText;
         QTextStream outStream(&outputText);
@@ -94,8 +96,8 @@ public:
             outStream << quantity << ' ' << cardName << " (" << setName << ") " << collectorNumber << '\n';
         }
 
-        list->loadFromStream_Plain(outStream, false);
-        list->resolveSetNameAndNumberToProviderID();
+        deckList.loadFromStream_Plain(outStream, false);
+        deckList.forEachCard(CardNodeFunction::ResolveProviderId());
 
         QJsonObject commandersObj = obj.value("commanders").toObject();
         if (!commandersObj.isEmpty()) {
@@ -106,12 +108,12 @@ public:
                 QString collectorNumber = cardData.value("cn").toString();
                 QString providerId = cardData.value("scryfall_id").toString();
 
-                list->setBannerCard({commanderName, providerId});
-                list->addCard(commanderName, DECK_ZONE_MAIN, -1, setName, collectorNumber, providerId);
+                deckList.setBannerCard({commanderName, providerId});
+                deckList.addCard(commanderName, DECK_ZONE_MAIN, -1, setName, collectorNumber, providerId);
             }
         }
 
-        return list;
+        return deckList;
     }
 };
 

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

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

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

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

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

@@ -1,6 +1,6 @@
 #include "client_update_checker.h"
 
-#include "../../settings/cache_settings.h"
+#include "../../../settings/cache_settings.h"
 #include "release_channel.h"
 
 ClientUpdateChecker::ClientUpdateChecker(QObject *parent) : QObject(parent)

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

@@ -57,27 +57,27 @@ protected:
     }
 
 public:
-    QString getName() const
+    [[nodiscard]] QString getName() const
     {
         return name;
     }
-    QString getDescriptionUrl() const
+    [[nodiscard]] QString getDescriptionUrl() const
     {
         return descriptionUrl;
     }
-    QString getDownloadUrl() const
+    [[nodiscard]] QString getDownloadUrl() const
     {
         return downloadUrl;
     }
-    QString getCommitHash() const
+    [[nodiscard]] QString getCommitHash() const
     {
         return commitHash;
     }
-    QDate getPublishDate() const
+    [[nodiscard]] QDate getPublishDate() const
     {
         return publishDate;
     }
-    bool isCompatibleVersionFound() const
+    [[nodiscard]] bool isCompatibleVersionFound() const
     {
         return compatibleVersionFound;
     }
@@ -97,15 +97,15 @@ protected:
 
 protected:
     static bool downloadMatchesCurrentOS(const QString &fileName);
-    virtual QString getReleaseChannelUrl() const = 0;
+    [[nodiscard]] virtual QString getReleaseChannelUrl() const = 0;
 
 public:
     Release *getLastRelease()
     {
         return lastRelease;
     }
-    virtual QString getManualDownloadUrl() const = 0;
-    virtual QString getName() const = 0;
+    [[nodiscard]] virtual QString getManualDownloadUrl() const = 0;
+    [[nodiscard]] virtual QString getName() const = 0;
     void checkForUpdates();
 signals:
     void finishedCheck(bool needToUpdate, bool isCompatible, Release *release);
@@ -122,12 +122,12 @@ public:
     explicit StableReleaseChannel() = default;
     ~StableReleaseChannel() override = default;
 
-    QString getManualDownloadUrl() const override;
+    [[nodiscard]] QString getManualDownloadUrl() const override;
 
-    QString getName() const override;
+    [[nodiscard]] QString getName() const override;
 
 protected:
-    QString getReleaseChannelUrl() const override;
+    [[nodiscard]] QString getReleaseChannelUrl() const override;
 protected slots:
 
     void releaseListFinished() override;
@@ -143,12 +143,12 @@ public:
     BetaReleaseChannel() = default;
     ~BetaReleaseChannel() override = default;
 
-    QString getManualDownloadUrl() const override;
+    [[nodiscard]] QString getManualDownloadUrl() const override;
 
-    QString getName() const override;
+    [[nodiscard]] QString getName() const override;
 
 protected:
-    QString getReleaseChannelUrl() const override;
+    [[nodiscard]] QString getReleaseChannelUrl() const override;
 protected slots:
 
     void releaseListFinished() override;

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

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

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

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

cockatrice/src/client/settings/cache_settings.cpp

@@ -1,8 +1,7 @@
 #include "cache_settings.h"
 
-#include "../client/network/release_channel.h"
+#include "../network/update/client/release_channel.h"
 #include "card_counter_settings.h"
-#include "card_override_settings.h"
 
 #include <QAbstractListModel>
 #include <QApplication>
@@ -12,9 +11,15 @@
 #include <QGlobalStatic>
 #include <QSettings>
 #include <QStandardPaths>
+#include <libcockatrice/settings/card_override_settings.h>
 #include <utility>
 
-Q_GLOBAL_STATIC(SettingsCache, settingsCache);
+Q_GLOBAL_STATIC(SettingsCache, settingsCache)
+
+SettingsCache &SettingsCache::instance()
+{
+    return *settingsCache; // returns a QT managed singleton reference
+}
 
 QString SettingsCache::getDataPath()
 {
@@ -61,9 +66,9 @@ void SettingsCache::translateLegacySettings()
     QStringList setsGroups = legacySetting.childGroups();
     for (int i = 0; i < setsGroups.size(); i++) {
         legacySetting.beginGroup(setsGroups.at(i));
-        cardDatabase().setEnabled(setsGroups.at(i), legacySetting.value("enabled").toBool());
-        cardDatabase().setIsKnown(setsGroups.at(i), legacySetting.value("isknown").toBool());
-        cardDatabase().setSortKey(setsGroups.at(i), legacySetting.value("sortkey").toUInt());
+        cardDatabase()->setEnabled(setsGroups.at(i), legacySetting.value("enabled").toBool());
+        cardDatabase()->setIsKnown(setsGroups.at(i), legacySetting.value("isknown").toBool());
+        cardDatabase()->setSortKey(setsGroups.at(i), legacySetting.value("sortkey").toUInt());
         legacySetting.endGroup();
     }
     QStringList setsKeys = legacySetting.allKeys();
@@ -256,6 +261,7 @@ SettingsCache::SettingsCache()
     doubleClickToPlay = settings->value("interface/doubleclicktoplay", true).toBool();
     clickPlaysAllSelected = settings->value("interface/clickPlaysAllSelected", true).toBool();
     playToStack = settings->value("interface/playtostack", true).toBool();
+    doNotDeleteArrowsInSubPhases = settings->value("interface/doNotDeleteArrowsInSubPhases", true).toBool();
     startingHandSize = settings->value("interface/startinghandsize", 7).toInt();
     annotateTokens = settings->value("interface/annotatetokens", false).toBool();
     tabGameSplitterSizes = settings->value("interface/tabgame_splittersizes").toByteArray();
@@ -304,10 +310,15 @@ SettingsCache::SettingsCache()
         settings->value("interface/visualdeckstorageselectionanimation", true).toBool();
     defaultDeckEditorType = settings->value("interface/defaultDeckEditorType", 1).toInt();
     visualDatabaseDisplayFilterToMostRecentSetsEnabled =
-        settings->value("interface/visualdatabasedisplayfiltertomostrecentsetsenabled", true).toBool();
+        settings->value("interface/visualdatabasedisplayfiltertomostrecentsetsenabled", false).toBool();
     visualDatabaseDisplayFilterToMostRecentSetsAmount =
         settings->value("interface/visualdatabasedisplayfiltertomostrecentsetsamount", 10).toInt();
     visualDeckEditorSampleHandSize = settings->value("interface/visualdeckeditorsamplehandsize", 7).toInt();
+    visualDeckEditorCardSize = settings->value("interface/visualdeckeditorcardsize", 100).toInt();
+    visualDatabaseDisplayCardSize = settings->value("interface/visualdatabasedisplaycardsize", 100).toInt();
+    edhrecCardSize = settings->value("interface/edhreccardsize", 100).toInt();
+    archidektPreviewSize = settings->value("interface/archidektpreviewsize", 100).toInt();
+
     horizontalHand = settings->value("hand/horizontal", true).toBool();
     invertVerticalCoordinate = settings->value("table/invert_vertical", false).toBool();
     minPlayersForMultiColumnLayout = settings->value("interface/min_players_multicolumn", 4).toInt();
@@ -659,6 +670,12 @@ void SettingsCache::setPlayToStack(QT_STATE_CHANGED_T _playToStack)
     settings->setValue("interface/playtostack", playToStack);
 }
 
+void SettingsCache::setDoNotDeleteArrowsInSubPhases(QT_STATE_CHANGED_T _doNotDeleteArrowsInSubPhases)
+{
+    doNotDeleteArrowsInSubPhases = static_cast<bool>(_doNotDeleteArrowsInSubPhases);
+    settings->setValue("interface/doNotDeleteArrowsInSubPhases", doNotDeleteArrowsInSubPhases);
+}
+
 void SettingsCache::setStartingHandSize(int _startingHandSize)
 {
     startingHandSize = _startingHandSize;
@@ -851,6 +868,34 @@ void SettingsCache::setVisualDeckStorageSelectionAnimation(QT_STATE_CHANGED_T va
     emit visualDeckStorageSelectionAnimationChanged(visualDeckStorageSelectionAnimation);
 }
 
+void SettingsCache::setVisualDeckEditorCardSize(int _visualDeckEditorCardSize)
+{
+    visualDeckEditorCardSize = _visualDeckEditorCardSize;
+    settings->setValue("interface/visualdeckeditorcardsize", visualDeckEditorCardSize);
+    emit visualDeckEditorCardSizeChanged();
+}
+
+void SettingsCache::setVisualDatabaseDisplayCardSize(int _visualDatabaseDisplayCardSize)
+{
+    visualDatabaseDisplayCardSize = _visualDatabaseDisplayCardSize;
+    settings->setValue("interface/visualdatabasedisplaycardsize", visualDatabaseDisplayCardSize);
+    emit visualDatabaseDisplayCardSizeChanged();
+}
+
+void SettingsCache::setEDHRecCardSize(int _edhrecCardSize)
+{
+    edhrecCardSize = _edhrecCardSize;
+    settings->setValue("interface/edhreccardsize", edhrecCardSize);
+    emit edhRecCardSizeChanged();
+}
+
+void SettingsCache::setArchidektPreviewCardSize(int _archidektPreviewCardSize)
+{
+    archidektPreviewSize = _archidektPreviewCardSize;
+    settings->setValue("interface/archidektpreviewsize", archidektPreviewSize);
+    emit archidektPreviewSizeChanged();
+}
+
 void SettingsCache::setDefaultDeckEditorType(int value)
 {
     defaultDeckEditorType = value;
@@ -1500,11 +1545,6 @@ void SettingsCache::resetPaths()
     }
 }
 
-SettingsCache &SettingsCache::instance()
-{
-    return *settingsCache;
-}
-
 CardCounterSettings &SettingsCache::cardCounters() const
 {
     return *cardCounterSettings;

cockatrice/src/client/settings/cache_settings.h

@@ -7,23 +7,24 @@
 #ifndef SETTINGSCACHE_H
 #define SETTINGSCACHE_H
 
-#include "../utility/macros.h"
-#include "card_database_settings.h"
-#include "card_override_settings.h"
-#include "debug_settings.h"
-#include "download_settings.h"
-#include "game_filters_settings.h"
-#include "layouts_settings.h"
-#include "message_settings.h"
-#include "recents_settings.h"
-#include "servers_settings.h"
 #include "shortcuts_settings.h"
 
 #include <QDate>
 #include <QLoggingCategory>
-#include <QObject>
 #include <QSize>
 #include <QStringList>
+#include <libcockatrice/interfaces/interface_card_database_path_provider.h>
+#include <libcockatrice/interfaces/interface_network_settings_provider.h>
+#include <libcockatrice/settings/card_database_settings.h>
+#include <libcockatrice/settings/card_override_settings.h>
+#include <libcockatrice/settings/debug_settings.h>
+#include <libcockatrice/settings/download_settings.h>
+#include <libcockatrice/settings/game_filters_settings.h>
+#include <libcockatrice/settings/layouts_settings.h>
+#include <libcockatrice/settings/message_settings.h>
+#include <libcockatrice/settings/recents_settings.h>
+#include <libcockatrice/settings/servers_settings.h>
+#include <libcockatrice/utility/macros.h>
 
 inline Q_LOGGING_CATEGORY(SettingsCacheLog, "settings_cache");
 
@@ -132,14 +133,13 @@ inline QStringList defaultTags = {
 class QSettings;
 class CardCounterSettings;
 
-class SettingsCache : public QObject
+class SettingsCache : public ICardDatabasePathProvider, public INetworkSettingsProvider
 {
     Q_OBJECT
 
 signals:
     void langChanged();
     void picsPathChanged();
-    void cardDatabasePathChanged();
     void themeChanged();
     void homeTabBackgroundSourceChanged();
     void homeTabBackgroundShuffleFrequencyChanged();
@@ -166,6 +166,10 @@ signals:
     void visualDatabaseDisplayFilterToMostRecentSetsEnabledChanged(bool enabled);
     void visualDatabaseDisplayFilterToMostRecentSetsAmountChanged(int amount);
     void visualDeckEditorSampleHandSizeAmountChanged(int amount);
+    void visualDeckEditorCardSizeChanged();
+    void visualDatabaseDisplayCardSizeChanged();
+    void edhRecCardSizeChanged();
+    void archidektPreviewSizeChanged();
     void horizontalHandChanged();
     void handJustificationChanged();
     void invertVerticalCoordinateChanged();
@@ -227,6 +231,7 @@ private:
     bool doubleClickToPlay;
     bool clickPlaysAllSelected;
     bool playToStack;
+    bool doNotDeleteArrowsInSubPhases;
     int startingHandSize;
     bool annotateTokens;
     QByteArray tabGameSplitterSizes;
@@ -248,6 +253,10 @@ private:
     QStringList visualDeckStorageDefaultTagsList;
     bool visualDeckStorageSearchFolderNames;
     int visualDeckStorageCardSize;
+    int visualDeckEditorCardSize;
+    int visualDatabaseDisplayCardSize;
+    int edhrecCardSize;
+    int archidektPreviewSize;
     bool visualDeckStorageDrawUnusedColorIdentities;
     int visualDeckStorageUnusedColorIdentitiesOpacity;
     int visualDeckStorageTooltipType;
@@ -315,8 +324,8 @@ private:
     int keepalive;
     int timeout;
     void translateLegacySettings();
-    QString getSafeConfigPath(QString configEntry, QString defaultPath) const;
-    QString getSafeConfigFilePath(QString configEntry, QString defaultPath) const;
+    [[nodiscard]] QString getSafeConfigPath(QString configEntry, QString defaultPath) const;
+    [[nodiscard]] QString getSafeConfigFilePath(QString configEntry, QString defaultPath) const;
     void loadPaths();
     bool rememberGameSettings;
     QList<ReleaseChannel *> releaseChannels;
@@ -328,137 +337,137 @@ public:
     SettingsCache();
     QString getDataPath();
     QString getSettingsPath();
-    QString getCachePath() const;
-    QString getNetworkCachePath() const;
-    const QByteArray &getMainWindowGeometry() const
+    [[nodiscard]] QString getCachePath() const;
+    [[nodiscard]] QString getNetworkCachePath() const;
+    [[nodiscard]] const QByteArray &getMainWindowGeometry() const
     {
         return mainWindowGeometry;
     }
-    const QByteArray &getTokenDialogGeometry() const
+    [[nodiscard]] const QByteArray &getTokenDialogGeometry() const
     {
         return tokenDialogGeometry;
     }
-    const QByteArray &getSetsDialogGeometry() const
+    [[nodiscard]] const QByteArray &getSetsDialogGeometry() const
     {
         return setsDialogGeometry;
     }
-    QString getLang() const
+    [[nodiscard]] QString getLang() const
     {
         return lang;
     }
-    QString getDeckPath() const
+    [[nodiscard]] QString getDeckPath() const
     {
         return deckPath;
     }
-    QString getFiltersPath() const
+    [[nodiscard]] QString getFiltersPath() const
     {
         return filtersPath;
     }
-    QString getReplaysPath() const
+    [[nodiscard]] QString getReplaysPath() const
     {
         return replaysPath;
     }
-    QString getThemesPath() const
+    [[nodiscard]] QString getThemesPath() const
     {
         return themesPath;
     }
-    QString getPicsPath() const
+    [[nodiscard]] QString getPicsPath() const
     {
         return picsPath;
     }
-    QString getRedirectCachePath() const
+    [[nodiscard]] QString getRedirectCachePath() const
     {
         return redirectCachePath;
     }
-    QString getCustomPicsPath() const
+    [[nodiscard]] QString getCustomPicsPath() const
     {
         return customPicsPath;
     }
-    QString getCustomCardDatabasePath() const
+    [[nodiscard]] QString getCustomCardDatabasePath() const override
     {
         return customCardDatabasePath;
     }
-    QString getCardDatabasePath() const
+    [[nodiscard]] QString getCardDatabasePath() const override
     {
         return cardDatabasePath;
     }
-    QString getSpoilerCardDatabasePath() const
+    [[nodiscard]] QString getSpoilerCardDatabasePath() const override
     {
         return spoilerDatabasePath;
     }
-    QString getTokenDatabasePath() const
+    [[nodiscard]] QString getTokenDatabasePath() const override
     {
         return tokenDatabasePath;
     }
-    QString getThemeName() const
+    [[nodiscard]] QString getThemeName() const
     {
         return themeName;
     }
-    QString getHomeTabBackgroundSource() const
+    [[nodiscard]] QString getHomeTabBackgroundSource() const
     {
         return homeTabBackgroundSource;
     }
-    int getHomeTabBackgroundShuffleFrequency() const
+    [[nodiscard]] int getHomeTabBackgroundShuffleFrequency() const
     {
         return homeTabBackgroundShuffleFrequency;
     }
-    bool getTabVisualDeckStorageOpen() const
+    [[nodiscard]] bool getTabVisualDeckStorageOpen() const
     {
         return tabVisualDeckStorageOpen;
     }
-    bool getTabServerOpen() const
+    [[nodiscard]] bool getTabServerOpen() const
     {
         return tabServerOpen;
     }
-    bool getTabAccountOpen() const
+    [[nodiscard]] bool getTabAccountOpen() const
     {
         return tabAccountOpen;
     }
-    bool getTabDeckStorageOpen() const
+    [[nodiscard]] bool getTabDeckStorageOpen() const
     {
         return tabDeckStorageOpen;
     }
-    bool getTabReplaysOpen() const
+    [[nodiscard]] bool getTabReplaysOpen() const
     {
         return tabReplaysOpen;
     }
-    bool getTabAdminOpen() const
+    [[nodiscard]] bool getTabAdminOpen() const
     {
         return tabAdminOpen;
     }
-    bool getTabLogOpen() const
+    [[nodiscard]] bool getTabLogOpen() const
     {
         return tabLogOpen;
     }
-    QString getChatMentionColor() const
+    [[nodiscard]] QString getChatMentionColor() const
     {
         return chatMentionColor;
     }
-    QString getChatHighlightColor() const
+    [[nodiscard]] QString getChatHighlightColor() const
     {
         return chatHighlightColor;
     }
-    bool getPicDownload() const
+    [[nodiscard]] bool getPicDownload() const
     {
         return picDownload;
     }
-    bool getShowStatusBar() const
+    [[nodiscard]] bool getShowStatusBar() const
     {
         return showStatusBar;
     }
-    bool getNotificationsEnabled() const
+    [[nodiscard]] bool getNotificationsEnabled() const
     {
         return notificationsEnabled;
     }
-    bool getSpectatorNotificationsEnabled() const
+    [[nodiscard]] bool getSpectatorNotificationsEnabled() const
     {
         return spectatorNotificationsEnabled;
     }
-    bool getBuddyConnectNotificationsEnabled() const
+    [[nodiscard]] bool getBuddyConnectNotificationsEnabled() const
     {
         return buddyConnectNotificationsEnabled;
     }
-    bool getCheckUpdatesOnStartup() const
+    [[nodiscard]] bool getCheckUpdatesOnStartup() const
     {
         return checkUpdatesOnStartup;
     }
@@ -470,243 +479,263 @@ public:
     {
         return startupCardUpdateCheckAlwaysUpdate;
     }
-    int getCardUpdateCheckInterval() const
+    [[nodiscard]] int getCardUpdateCheckInterval() const
     {
         return cardUpdateCheckInterval;
     }
-    QDate getLastCardUpdateCheck() const
+    [[nodiscard]] QDate getLastCardUpdateCheck() const
     {
         return lastCardUpdateCheck;
     }
-    bool getCardUpdateCheckRequired() const
+    [[nodiscard]] bool getCardUpdateCheckRequired() const
     {
         return getLastCardUpdateCheck().daysTo(QDateTime::currentDateTime().date()) >= getCardUpdateCheckInterval() &&
                getLastCardUpdateCheck() != QDateTime::currentDateTime().date();
     }
-    bool getNotifyAboutUpdates() const
+    [[nodiscard]] bool getNotifyAboutUpdates() const override
     {
         return notifyAboutUpdates;
     }
-    bool getNotifyAboutNewVersion() const
+    [[nodiscard]] bool getNotifyAboutNewVersion() const
     {
         return notifyAboutNewVersion;
     }
-    bool getShowTipsOnStartup() const
+    [[nodiscard]] bool getShowTipsOnStartup() const
     {
         return showTipsOnStartup;
     }
-    QList<int> getSeenTips() const
+    [[nodiscard]] QList<int> getSeenTips() const
     {
         return seenTips;
     }
-    int getUpdateReleaseChannelIndex() const
+    [[nodiscard]] int getUpdateReleaseChannelIndex() const
     {
         return updateReleaseChannel;
     }
-    ReleaseChannel *getUpdateReleaseChannel() const
+    [[nodiscard]] ReleaseChannel *getUpdateReleaseChannel() const
     {
         return releaseChannels.at(qMax(0, updateReleaseChannel));
     }
-    QList<ReleaseChannel *> getUpdateReleaseChannels() const
+    [[nodiscard]] QList<ReleaseChannel *> getUpdateReleaseChannels() const
     {
         return releaseChannels;
     }
 
-    bool getDoubleClickToPlay() const
+    [[nodiscard]] bool getDoubleClickToPlay() const
     {
         return doubleClickToPlay;
     }
-    bool getClickPlaysAllSelected() const
+    [[nodiscard]] bool getClickPlaysAllSelected() const
     {
         return clickPlaysAllSelected;
     }
-    bool getPlayToStack() const
+    [[nodiscard]] bool getPlayToStack() const
     {
         return playToStack;
     }
-    int getStartingHandSize() const
+    [[nodiscard]] bool getDoNotDeleteArrowsInSubPhases() const
+    {
+        return doNotDeleteArrowsInSubPhases;
+    }
+    [[nodiscard]] int getStartingHandSize() const
     {
         return startingHandSize;
     }
-    bool getAnnotateTokens() const
+    [[nodiscard]] bool getAnnotateTokens() const
     {
         return annotateTokens;
     }
-    QByteArray getTabGameSplitterSizes() const
+    [[nodiscard]] QByteArray getTabGameSplitterSizes() const
     {
         return tabGameSplitterSizes;
     }
-    bool getShowShortcuts() const
+    [[nodiscard]] bool getShowShortcuts() const
     {
         return showShortcuts;
     }
-    bool getDisplayCardNames() const
+    [[nodiscard]] bool getDisplayCardNames() const
     {
         return displayCardNames;
     }
-    bool getOverrideAllCardArtWithPersonalPreference() const
+    [[nodiscard]] bool getOverrideAllCardArtWithPersonalPreference() const
     {
         return overrideAllCardArtWithPersonalPreference;
     }
-    bool getBumpSetsWithCardsInDeckToTop() const
+    [[nodiscard]] bool getBumpSetsWithCardsInDeckToTop() const
     {
         return bumpSetsWithCardsInDeckToTop;
     }
-    int getPrintingSelectorSortOrder() const
+    [[nodiscard]] int getPrintingSelectorSortOrder() const
     {
         return printingSelectorSortOrder;
     }
-    int getPrintingSelectorCardSize() const
+    [[nodiscard]] int getPrintingSelectorCardSize() const
     {
         return printingSelectorCardSize;
     }
-    bool getIncludeRebalancedCards() const
+    [[nodiscard]] bool getIncludeRebalancedCards() const
     {
         return includeRebalancedCards;
     }
-    bool getPrintingSelectorNavigationButtonsVisible() const
+    [[nodiscard]] bool getPrintingSelectorNavigationButtonsVisible() const
     {
         return printingSelectorNavigationButtonsVisible;
     }
-    bool getDeckEditorBannerCardComboBoxVisible() const
+    [[nodiscard]] bool getDeckEditorBannerCardComboBoxVisible() const
     {
         return deckEditorBannerCardComboBoxVisible;
     }
-    bool getDeckEditorTagsWidgetVisible() const
+    [[nodiscard]] bool getDeckEditorTagsWidgetVisible() const
     {
         return deckEditorTagsWidgetVisible;
     }
-    int getVisualDeckStorageSortingOrder() const
+    [[nodiscard]] int getVisualDeckStorageSortingOrder() const
     {
         return visualDeckStorageSortingOrder;
     }
-    bool getVisualDeckStorageShowFolders() const
+    [[nodiscard]] bool getVisualDeckStorageShowFolders() const
     {
         return visualDeckStorageShowFolders;
     }
-    bool getVisualDeckStorageShowTagFilter() const
+    [[nodiscard]] bool getVisualDeckStorageShowTagFilter() const
     {
         return visualDeckStorageShowTagFilter;
     }
-    QStringList getVisualDeckStorageDefaultTagsList() const
+    [[nodiscard]] QStringList getVisualDeckStorageDefaultTagsList() const
     {
         return visualDeckStorageDefaultTagsList;
     }
-    bool getVisualDeckStorageSearchFolderNames() const
+    [[nodiscard]] bool getVisualDeckStorageSearchFolderNames() const
     {
         return visualDeckStorageSearchFolderNames;
     }
-    bool getVisualDeckStorageShowBannerCardComboBox() const
+    [[nodiscard]] bool getVisualDeckStorageShowBannerCardComboBox() const
     {
         return visualDeckStorageShowBannerCardComboBox;
     }
-    bool getVisualDeckStorageShowTagsOnDeckPreviews() const
+    [[nodiscard]] bool getVisualDeckStorageShowTagsOnDeckPreviews() const
     {
         return visualDeckStorageShowTagsOnDeckPreviews;
     }
-    int getVisualDeckStorageCardSize() const
+    [[nodiscard]] int getVisualDeckStorageCardSize() const
     {
         return visualDeckStorageCardSize;
     }
-    bool getVisualDeckStorageDrawUnusedColorIdentities() const
+    [[nodiscard]] bool getVisualDeckStorageDrawUnusedColorIdentities() const
     {
         return visualDeckStorageDrawUnusedColorIdentities;
     }
-    int getVisualDeckStorageUnusedColorIdentitiesOpacity() const
+    [[nodiscard]] int getVisualDeckStorageUnusedColorIdentitiesOpacity() const
     {
         return visualDeckStorageUnusedColorIdentitiesOpacity;
     }
-    int getVisualDeckStorageTooltipType() const
+    [[nodiscard]] int getVisualDeckStorageTooltipType() const
     {
         return visualDeckStorageTooltipType;
     }
-    bool getVisualDeckStoragePromptForConversion() const
+    [[nodiscard]] bool getVisualDeckStoragePromptForConversion() const
     {
         return visualDeckStoragePromptForConversion;
     }
-    bool getVisualDeckStorageAlwaysConvert() const
+    [[nodiscard]] bool getVisualDeckStorageAlwaysConvert() const
     {
         return visualDeckStorageAlwaysConvert;
     }
-    bool getVisualDeckStorageInGame() const
+    [[nodiscard]] bool getVisualDeckStorageInGame() const
     {
         return visualDeckStorageInGame;
     }
-    bool getVisualDeckStorageSelectionAnimation() const
+    [[nodiscard]] bool getVisualDeckStorageSelectionAnimation() const
     {
         return visualDeckStorageSelectionAnimation;
     }
-    int getDefaultDeckEditorType() const
+    [[nodiscard]] int getVisualDeckEditorCardSize() const
+    {
+        return visualDeckEditorCardSize;
+    }
+    [[nodiscard]] int getVisualDatabaseDisplayCardSize() const
+    {
+        return visualDatabaseDisplayCardSize;
+    }
+    [[nodiscard]] int getEDHRecCardSize() const
+    {
+        return edhrecCardSize;
+    }
+    [[nodiscard]] int getArchidektPreviewSize() const
+    {
+        return archidektPreviewSize;
+    }
+    [[nodiscard]] int getDefaultDeckEditorType() const
     {
         return defaultDeckEditorType;
     }
-    bool getVisualDatabaseDisplayFilterToMostRecentSetsEnabled() const
+    [[nodiscard]] bool getVisualDatabaseDisplayFilterToMostRecentSetsEnabled() const
     {
         return visualDatabaseDisplayFilterToMostRecentSetsEnabled;
     }
-    int getVisualDatabaseDisplayFilterToMostRecentSetsAmount() const
+    [[nodiscard]] int getVisualDatabaseDisplayFilterToMostRecentSetsAmount() const
     {
         return visualDatabaseDisplayFilterToMostRecentSetsAmount;
     }
-    int getVisualDeckEditorSampleHandSize() const
+    [[nodiscard]] int getVisualDeckEditorSampleHandSize() const
     {
         return visualDeckEditorSampleHandSize;
     }
-    bool getHorizontalHand() const
+    [[nodiscard]] bool getHorizontalHand() const
     {
         return horizontalHand;
     }
-    bool getInvertVerticalCoordinate() const
+    [[nodiscard]] bool getInvertVerticalCoordinate() const
     {
         return invertVerticalCoordinate;
     }
-    int getMinPlayersForMultiColumnLayout() const
+    [[nodiscard]] int getMinPlayersForMultiColumnLayout() const
     {
         return minPlayersForMultiColumnLayout;
     }
-    bool getTapAnimation() const
+    [[nodiscard]] bool getTapAnimation() const
     {
         return tapAnimation;
     }
-    bool getAutoRotateSidewaysLayoutCards() const
+    [[nodiscard]] bool getAutoRotateSidewaysLayoutCards() const
     {
         return autoRotateSidewaysLayoutCards;
     }
-    bool getOpenDeckInNewTab() const
+    [[nodiscard]] bool getOpenDeckInNewTab() const
     {
         return openDeckInNewTab;
     }
-    int getRewindBufferingMs() const
+    [[nodiscard]] int getRewindBufferingMs() const
     {
         return rewindBufferingMs;
     }
-    bool getChatMention() const
+    [[nodiscard]] bool getChatMention() const
     {
         return chatMention;
     }
-    bool getChatMentionCompleter() const
+    [[nodiscard]] bool getChatMentionCompleter() const
     {
         return chatMentionCompleter;
     }
-    bool getChatMentionForeground() const
+    [[nodiscard]] bool getChatMentionForeground() const
     {
         return chatMentionForeground;
     }
-    bool getChatHighlightForeground() const
+    [[nodiscard]] bool getChatHighlightForeground() const
     {
         return chatHighlightForeground;
     }
     /**
      * Currently selected index for the `Group by X` QComboBox
      */
-    int getZoneViewGroupByIndex() const
+    [[nodiscard]] int getZoneViewGroupByIndex() const
     {
         return zoneViewGroupByIndex;
     }
     /**
      * Currently selected index for the `Sort by X` QComboBox
      */
-    int getZoneViewSortByIndex() const
+    [[nodiscard]] int getZoneViewSortByIndex() const
     {
         return zoneViewSortByIndex;
     }
@@ -714,148 +743,148 @@ public:
        Returns if the view should be sorted into pile view.
        @return zoneViewPileView if the view should be sorted into pile view.
      */
-    bool getZoneViewPileView() const
+    [[nodiscard]] bool getZoneViewPileView() const
     {
         return zoneViewPileView;
     }
-    bool getSoundEnabled() const
+    [[nodiscard]] bool getSoundEnabled() const
     {
         return soundEnabled;
     }
-    QString getSoundThemeName() const
+    [[nodiscard]] QString getSoundThemeName() const
     {
         return soundThemeName;
     }
-    bool getIgnoreUnregisteredUsers() const
+    [[nodiscard]] bool getIgnoreUnregisteredUsers() const
     {
         return ignoreUnregisteredUsers;
     }
-    bool getIgnoreUnregisteredUserMessages() const
+    [[nodiscard]] bool getIgnoreUnregisteredUserMessages() const
     {
         return ignoreUnregisteredUserMessages;
     }
-    int getPixmapCacheSize() const
+    [[nodiscard]] int getPixmapCacheSize() const
     {
         return pixmapCacheSize;
     }
-    int getNetworkCacheSizeInMB() const
+    [[nodiscard]] int getNetworkCacheSizeInMB() const
     {
         return networkCacheSize;
     }
-    int getRedirectCacheTtl() const
+    [[nodiscard]] int getRedirectCacheTtl() const
     {
         return redirectCacheTtl;
     }
-    bool getScaleCards() const
+    [[nodiscard]] bool getScaleCards() const
     {
         return scaleCards;
     }
-    int getStackCardOverlapPercent() const
+    [[nodiscard]] int getStackCardOverlapPercent() const
     {
         return verticalCardOverlapPercent;
     }
-    bool getShowMessagePopup() const
+    [[nodiscard]] bool getShowMessagePopup() const
     {
         return showMessagePopups;
     }
-    bool getShowMentionPopup() const
+    [[nodiscard]] bool getShowMentionPopup() const
     {
         return showMentionPopups;
     }
-    bool getRoomHistory() const
+    [[nodiscard]] bool getRoomHistory() const
     {
         return roomHistory;
     }
-    bool getLeftJustified() const
+    [[nodiscard]] bool getLeftJustified() const
     {
         return leftJustified;
     }
-    int getMasterVolume() const
+    [[nodiscard]] int getMasterVolume() const
     {
         return masterVolume;
     }
-    int getCardInfoViewMode() const
+    [[nodiscard]] int getCardInfoViewMode() const
     {
         return cardInfoViewMode;
     }
-    QStringList getCountries() const;
-    QString getHighlightWords() const
+    [[nodiscard]] QStringList getCountries() const;
+    [[nodiscard]] QString getHighlightWords() const
     {
         return highlightWords;
     }
-    QString getGameDescription() const
+    [[nodiscard]] QString getGameDescription() const
     {
         return gameDescription;
     }
-    int getMaxPlayers() const
+    [[nodiscard]] int getMaxPlayers() const
     {
         return maxPlayers;
     }
-    QString getGameTypes() const
+    [[nodiscard]] QString getGameTypes() const
     {
         return gameTypes;
     }
-    bool getOnlyBuddies() const
+    [[nodiscard]] bool getOnlyBuddies() const
     {
         return onlyBuddies;
     }
-    bool getOnlyRegistered() const
+    [[nodiscard]] bool getOnlyRegistered() const
     {
         return onlyRegistered;
     }
-    bool getSpectatorsAllowed() const
+    [[nodiscard]] bool getSpectatorsAllowed() const
     {
         return spectatorsAllowed;
     }
-    bool getSpectatorsNeedPassword() const
+    [[nodiscard]] bool getSpectatorsNeedPassword() const
     {
         return spectatorsNeedPassword;
     }
-    bool getSpectatorsCanTalk() const
+    [[nodiscard]] bool getSpectatorsCanTalk() const
     {
         return spectatorsCanTalk;
     }
-    bool getSpectatorsCanSeeEverything() const
+    [[nodiscard]] bool getSpectatorsCanSeeEverything() const
     {
         return spectatorsCanSeeEverything;
     }
-    int getDefaultStartingLifeTotal() const
+    [[nodiscard]] int getDefaultStartingLifeTotal() const
     {
         return defaultStartingLifeTotal;
     }
-    bool getShareDecklistsOnLoad() const
+    [[nodiscard]] bool getShareDecklistsOnLoad() const
     {
         return shareDecklistsOnLoad;
     }
-    bool getCreateGameAsSpectator() const
+    [[nodiscard]] bool getCreateGameAsSpectator() const
     {
         return createGameAsSpectator;
     }
-    bool getRememberGameSettings() const
+    [[nodiscard]] bool getRememberGameSettings() const
     {
         return rememberGameSettings;
     }
-    int getKeepAlive() const
+    [[nodiscard]] int getKeepAlive() const override
     {
         return keepalive;
     }
-    int getTimeOut() const
+    [[nodiscard]] int getTimeOut() const override
     {
         return timeout;
     }
-    int getMaxFontSize() const
+    [[nodiscard]] int getMaxFontSize() const
     {
         return maxFontSize;
     }
     void setClientID(const QString &clientID);
     void setClientVersion(const QString &clientVersion);
-    void setKnownMissingFeatures(const QString &_knownMissingFeatures);
+    void setKnownMissingFeatures(const QString &_knownMissingFeatures) override;
     void setUseTearOffMenus(bool _useTearOffMenus);
     void setCardViewInitialRowsMax(int _cardViewInitialRowsMax);
     void setCardViewExpandedRowsMax(int value);
     void setCloseEmptyCardView(QT_STATE_CHANGED_T value);
     void setFocusCardViewSearchBar(QT_STATE_CHANGED_T value);
-    QString getClientID()
+    QString getClientID() override
     {
         return clientID;
     }
@@ -863,7 +892,7 @@ public:
     {
         return clientVersion;
     }
-    QString getKnownMissingFeatures()
+    QString getKnownMissingFeatures() override
     {
         return knownMissingFeatures;
     }
@@ -871,73 +900,73 @@ public:
     {
         return useTearOffMenus;
     }
-    int getCardViewInitialRowsMax() const
+    [[nodiscard]] int getCardViewInitialRowsMax() const
     {
         return cardViewInitialRowsMax;
     }
-    int getCardViewExpandedRowsMax() const
+    [[nodiscard]] int getCardViewExpandedRowsMax() const
     {
         return cardViewExpandedRowsMax;
     }
-    bool getCloseEmptyCardView() const
+    [[nodiscard]] bool getCloseEmptyCardView() const
     {
         return closeEmptyCardView;
     }
-    bool getFocusCardViewSearchBar() const
+    [[nodiscard]] bool getFocusCardViewSearchBar() const
     {
         return focusCardViewSearchBar;
     }
-    ShortcutsSettings &shortcuts() const
+    [[nodiscard]] ShortcutsSettings &shortcuts() const
     {
         return *shortcutsSettings;
     }
-    CardDatabaseSettings &cardDatabase() const
+    [[nodiscard]] CardDatabaseSettings *cardDatabase() const
     {
-        return *cardDatabaseSettings;
+        return cardDatabaseSettings;
     }
-    ServersSettings &servers() const
+    [[nodiscard]] ServersSettings &servers() const
     {
         return *serversSettings;
     }
-    MessageSettings &messages() const
+    [[nodiscard]] MessageSettings &messages() const
     {
         return *messageSettings;
     }
-    GameFiltersSettings &gameFilters() const
+    [[nodiscard]] GameFiltersSettings &gameFilters() const
     {
         return *gameFiltersSettings;
     }
-    LayoutsSettings &layouts() const
+    [[nodiscard]] LayoutsSettings &layouts() const
     {
         return *layoutsSettings;
     }
-    DownloadSettings &downloads() const
+    [[nodiscard]] DownloadSettings &downloads() const
     {
         return *downloadSettings;
     }
-    RecentsSettings &recents() const
+    [[nodiscard]] RecentsSettings &recents() const
     {
         return *recentsSettings;
     }
-    CardOverrideSettings &cardOverrides() const
+    [[nodiscard]] CardOverrideSettings &cardOverrides() const
     {
         return *cardOverrideSettings;
     }
-    DebugSettings &debug() const
+    [[nodiscard]] DebugSettings &debug() const
     {
         return *debugSettings;
     }
-    CardCounterSettings &cardCounters() const;
+    [[nodiscard]] CardCounterSettings &cardCounters() const;
 
-    bool getIsPortableBuild() const
+    [[nodiscard]] bool getIsPortableBuild() const
     {
         return isPortableBuild;
     }
-    bool getDownloadSpoilersStatus() const
+    [[nodiscard]] bool getDownloadSpoilersStatus() const
     {
         return mbDownloadSpoilers;
     }
-    bool getRoundCardCorners() const
+    [[nodiscard]] bool getRoundCardCorners() const
     {
         return roundCardCorners;
     }
@@ -983,6 +1012,7 @@ public slots:
     void setDoubleClickToPlay(QT_STATE_CHANGED_T _doubleClickToPlay);
     void setClickPlaysAllSelected(QT_STATE_CHANGED_T _clickPlaysAllSelected);
     void setPlayToStack(QT_STATE_CHANGED_T _playToStack);
+    void setDoNotDeleteArrowsInSubPhases(QT_STATE_CHANGED_T _doNotDeleteArrowsInSubPhases);
     void setStartingHandSize(int _startingHandSize);
     void setAnnotateTokens(QT_STATE_CHANGED_T _annotateTokens);
     void setTabGameSplitterSizes(const QByteArray &_tabGameSplitterSizes);
@@ -1011,6 +1041,10 @@ public slots:
     void setVisualDeckStorageAlwaysConvert(bool _visualDeckStorageAlwaysConvert);
     void setVisualDeckStorageInGame(QT_STATE_CHANGED_T value);
     void setVisualDeckStorageSelectionAnimation(QT_STATE_CHANGED_T value);
+    void setVisualDeckEditorCardSize(int _visualDeckEditorCardSize);
+    void setVisualDatabaseDisplayCardSize(int _visualDatabaseDisplayCardSize);
+    void setEDHRecCardSize(int _EDHRecCardSize);
+    void setArchidektPreviewCardSize(int _archidektPreviewCardSize);
     void setDefaultDeckEditorType(int value);
     void setVisualDatabaseDisplayFilterToMostRecentSetsEnabled(QT_STATE_CHANGED_T _enabled);
     void setVisualDatabaseDisplayFilterToMostRecentSetsAmount(int _amount);

cockatrice/src/client/settings/card_counter_settings.cpp

@@ -5,7 +5,7 @@
 #include <QtMath>
 
 CardCounterSettings::CardCounterSettings(const QString &settingsPath, QObject *parent)
-    : SettingsManager(settingsPath + "global.ini", parent)
+    : SettingsManager(settingsPath + "global.ini", "cards", "counters", parent)
 {
 }
 

cockatrice/src/client/settings/card_counter_settings.h

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

cockatrice/src/client/settings/shortcut_treeview.h

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

cockatrice/src/client/settings/shortcuts_settings.h

@@ -33,6 +33,7 @@ public:
         Move_bottom,
         Gameplay,
         Drawing,
+        Hand,
         Chat_room,
         Game_window,
         Load_deck,
@@ -71,6 +72,8 @@ public:
                 return QApplication::translate("shortcutsTab", "Gameplay");
             case Drawing:
                 return QApplication::translate("shortcutsTab", "Drawing");
+            case Hand:
+                return QApplication::translate("shortcutsTab", "Hand");
             case Chat_room:
                 return QApplication::translate("shortcutsTab", "Chat Room");
             case Game_window:
@@ -96,15 +99,15 @@ public:
     void setSequence(const QList &_sequence)
     {
         QList::operator=(_sequence);
-    };
-    QString getName() const
+    }
+    [[nodiscard]] QString getName() const
     {
         return QApplication::translate("shortcutsTab", name.toUtf8().data());
-    };
-    QString getGroupName() const
+    }
+    [[nodiscard]] QString getGroupName() const
     {
         return ShortcutGroup::getGroupName(group);
-    };
+    }
 
 private:
     QString name;
@@ -117,24 +120,24 @@ class ShortcutsSettings : public QObject
 public:
     explicit ShortcutsSettings(const QString &settingsFilePath, QObject *parent = nullptr);
 
-    ShortcutKey getDefaultShortcut(const QString &name) const;
-    ShortcutKey getShortcut(const QString &name) const;
-    QKeySequence getSingleShortcut(const QString &name) const;
-    QString getDefaultShortcutString(const QString &name) const;
-    QString getShortcutString(const QString &name) const;
-    QString getShortcutFriendlyName(const QString &shortcutName) const;
-    QList<QString> getAllShortcutKeys() const
+    [[nodiscard]] ShortcutKey getDefaultShortcut(const QString &name) const;
+    [[nodiscard]] ShortcutKey getShortcut(const QString &name) const;
+    [[nodiscard]] QKeySequence getSingleShortcut(const QString &name) const;
+    [[nodiscard]] QString getDefaultShortcutString(const QString &name) const;
+    [[nodiscard]] QString getShortcutString(const QString &name) const;
+    [[nodiscard]] QString getShortcutFriendlyName(const QString &shortcutName) const;
+    [[nodiscard]] QList<QString> getAllShortcutKeys() const
     {
         return shortCuts.keys();
-    };
+    }
 
     void setShortcuts(const QString &name, const QList<QKeySequence> &Sequence);
     void setShortcuts(const QString &name, const QKeySequence &Sequence);
     void setShortcuts(const QString &name, const QString &sequences);
 
-    bool isKeyAllowed(const QString &name, const QString &sequences) const;
-    bool isValid(const QString &name, const QString &sequences) const;
-    QStringList findOverlaps(const QString &name, const QString &sequences) const;
+    [[nodiscard]] bool isKeyAllowed(const QString &name, const QString &sequences) const;
+    [[nodiscard]] bool isValid(const QString &name, const QString &sequences) const;
+    [[nodiscard]] QStringList findOverlaps(const QString &name, const QString &sequences) const;
 
     void resetAllShortcuts();
     void clearAllShortcuts();
@@ -149,8 +152,8 @@ private:
     QString settingsFilePath;
     QHash<QString, ShortcutKey> shortCuts;
 
-    QString stringifySequence(const QList<QKeySequence> &Sequence) const;
-    QList<QKeySequence> parseSequenceString(const QString &stringSequence) const;
+    [[nodiscard]] QString stringifySequence(const QList<QKeySequence> &Sequence) const;
+    [[nodiscard]] QList<QKeySequence> parseSequenceString(const QString &stringSequence) const;
 
     const QHash<QString, ShortcutKey> defaultShortCuts = {
         {"MainWindow/aCheckCardUpdates", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Check for Card Updates..."),
@@ -540,6 +543,9 @@ private:
         {"Player/aSelectColumn", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Select All Cards in Column"),
                                              parseSequenceString("Ctrl+Shift+C"),
                                              ShortcutGroup::Playing_Area)},
+        {"Player/aRevealToAll", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Reveal Selected Cards to All Players"),
+                                            parseSequenceString(""),
+                                            ShortcutGroup::Playing_Area)},
         {"Player/aMoveToBottomLibrary", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Bottom of Library"),
                                                     parseSequenceString("Ctrl+B"),
                                                     ShortcutGroup::Move_selected)},
@@ -562,9 +568,6 @@ private:
                                      ShortcutGroup::Move_selected)},
         {"Player/aViewHand",
          ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Hand"), parseSequenceString(""), ShortcutGroup::View)},
-        {"Player/aSortHand", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Sort Hand"),
-                                         parseSequenceString("Ctrl+Shift+H"),
-                                         ShortcutGroup::View)},
         {"Player/aViewGraveyard",
          ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Graveyard"), parseSequenceString("F4"), ShortcutGroup::View)},
         {"Player/aViewLibrary",
@@ -672,6 +675,22 @@ private:
         {"Player/aAlwaysLookAtTopCard", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Always Look At Top Card"),
                                                     parseSequenceString("Ctrl+Shift+N"),
                                                     ShortcutGroup::Drawing)},
+        {"Player/aSortHandByName", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Sort Hand by Name"),
+                                               parseSequenceString(""),
+                                               ShortcutGroup::Hand)},
+        {"Player/aSortHandByType", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Sort Hand by Type"),
+                                               parseSequenceString("Ctrl+Shift+H"),
+                                               ShortcutGroup::Hand)},
+        {"Player/aSortHandByManaValue", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Sort Hand by Mana Value"),
+                                                    parseSequenceString(""),
+                                                    ShortcutGroup::Hand)},
+        {"Player/aRevealHandToAll", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Reveal Hand to All Players"),
+                                                parseSequenceString(""),
+                                                ShortcutGroup::Hand)},
+        {"Player/aRevealRandomHandCardToAll",
+         ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Reveal Random Card to All Players"),
+                     parseSequenceString(""),
+                     ShortcutGroup::Hand)},
         {"Player/aRotateViewCW", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Rotate View Clockwise"),
                                              parseSequenceString(""),
                                              ShortcutGroup::Gameplay)},

cockatrice/src/client/sound_engine.cpp

@@ -1,6 +1,6 @@
 #include "sound_engine.h"
 
-#include "../settings/cache_settings.h"
+#include "settings/cache_settings.h"
 
 #include <QDir>
 #include <QMediaPlayer>

cockatrice/src/database/card_database.h

@@ -1,103 +0,0 @@
-/**
- * @file card_database.h
- * @ingroup CardDatabase
- * @brief The CardDatabase is responsible for holding the card and set maps.
- */
-
-#ifndef CARDDATABASE_H
-#define CARDDATABASE_H
-
-#include "../card/card_set_list.h"
-#include "../card/exact_card.h"
-#include "../common/card_ref.h"
-#include "card_database_loader.h"
-#include "card_database_querier.h"
-
-#include <QBasicMutex>
-#include <QDate>
-#include <QHash>
-#include <QList>
-#include <QLoggingCategory>
-#include <QStringList>
-#include <QVector>
-#include <utility>
-
-inline Q_LOGGING_CATEGORY(CardDatabaseLog, "card_database");
-
-class CardDatabase : public QObject
-{
-    Q_OBJECT
-protected:
-    /*
-     * The cards, indexed by name.
-     */
-    CardNameMap cards;
-
-    /**
-     * The cards, indexed by their simple name.
-     */
-    CardNameMap simpleNameCards;
-
-    /*
-     * The sets, indexed by short name.
-     */
-    SetNameMap sets;
-
-    // loader responsible for file discovery & parsing
-    CardDatabaseLoader *loader;
-
-    LoadStatus loadStatus;
-
-    CardDatabaseQuerier *querier;
-
-private:
-    void checkUnknownSets();
-    void refreshCachedReverseRelatedCards();
-
-    QBasicMutex *clearDatabaseMutex = new QBasicMutex(), *addCardMutex = new QBasicMutex(),
-                *removeCardMutex = new QBasicMutex();
-
-public:
-    explicit CardDatabase(QObject *parent = nullptr);
-    ~CardDatabase() override;
-
-    void removeCard(CardInfoPtr card);
-    void clear();
-
-    const CardNameMap &getCardList() const
-    {
-        return cards;
-    }
-    CardSetPtr getSet(const QString &setName);
-    CardSetList getSetList() const;
-    LoadStatus getLoadStatus() const
-    {
-        return loadStatus;
-    }
-    CardDatabaseQuerier *query() const
-    {
-        return querier;
-    }
-    void enableAllUnknownSets();
-    void markAllSetsAsKnown();
-    void notifyEnabledSetsChanged();
-
-public slots:
-    void addCard(CardInfoPtr card);
-    void addSet(CardSetPtr set);
-    void loadCardDatabases();
-    bool saveCustomTokensToFile();
-signals:
-    void cardDatabaseLoadingFinished();
-    void cardDatabaseLoadingFailed();
-    void cardDatabaseNewSetsFound(int numUnknownSets, QStringList unknownSetsNames);
-    void cardDatabaseAllNewSetsEnabled();
-    void cardDatabaseEnabledSetsChanged();
-    void cardAdded(CardInfoPtr card);
-    void cardRemoved(CardInfoPtr card);
-
-    friend class CardDatabaseLoader;
-    friend class CardDatabaseQuerier;
-};
-
-#endif

cockatrice/src/database/card_database_loader.h

@@ -1,63 +0,0 @@
-/**
- * @file card_database_loader.h
- * @ingroup CardDatabase
- * @brief The CardDatabaseLoader is responsible for populating the card database from files on disk.
- */
-
-#ifndef COCKATRICE_CARD_DATABASE_LOADER_H
-#define COCKATRICE_CARD_DATABASE_LOADER_H
-
-#include <QBasicMutex>
-#include <QList>
-#include <QLoggingCategory>
-#include <QObject>
-
-inline Q_LOGGING_CATEGORY(CardDatabaseLoadingLog, "card_database.loading");
-inline Q_LOGGING_CATEGORY(CardDatabaseLoadingSuccessOrFailureLog, "card_database.loading.success_or_failure");
-
-class CardDatabase;
-class ICardDatabaseParser;
-
-enum LoadStatus
-{
-    Ok,
-    VersionTooOld,
-    Invalid,
-    NotLoaded,
-    FileError,
-    NoCards
-};
-
-class CardDatabaseLoader : public QObject
-{
-    Q_OBJECT
-public:
-    explicit CardDatabaseLoader(QObject *parent, CardDatabase *db);
-    ~CardDatabaseLoader() override;
-
-public slots:
-    LoadStatus loadCardDatabases();                   // discover & load the configured databases
-    LoadStatus loadCardDatabase(const QString &path); // load a single file
-    bool saveCustomTokensToFile();                    // write tokens to custom DB path
-
-signals:
-    void loadingStarted();
-    void loadingFinished();
-    void loadingFailed();
-    void newSetsFound(int numSets, const QStringList &setNames);
-    void allNewSetsEnabled();
-
-private:
-    LoadStatus loadFromFile(const QString &fileName); // internal helper
-    QStringList collectCustomDatabasePaths() const;
-
-    CardDatabase *database; // non-owning pointer to the container
-
-    // parsers
-    QList<ICardDatabaseParser *> availableParsers;
-
-    QBasicMutex *loadFromFileMutex = new QBasicMutex();
-    QBasicMutex *reloadDatabaseMutex = new QBasicMutex();
-};
-
-#endif // COCKATRICE_CARD_DATABASE_LOADER_H

cockatrice/src/database/card_database_manager.cpp

@@ -1,12 +0,0 @@
-#include "card_database_manager.h"
-
-CardDatabase *CardDatabaseManager::getInstance()
-{
-    static CardDatabase instance; // Created only once, on first access
-    return &instance;
-}
-
-CardDatabaseQuerier *CardDatabaseManager::query()
-{
-    return getInstance()->query();
-}

cockatrice/src/database/card_database_manager.h

@@ -1,29 +0,0 @@
-/**
- * @file card_database_manager.h
- * @ingroup CardDatabase
- * @brief The CardDatabaseManager is responsible for managing the global database singleton.
- */
-
-#ifndef CARD_DATABASE_ACCESSOR_H
-#define CARD_DATABASE_ACCESSOR_H
-
-#pragma once
-#include "card_database.h"
-
-class CardDatabaseManager
-{
-public:
-    // Delete copy constructor and assignment operator to enforce singleton
-    CardDatabaseManager(const CardDatabaseManager &) = delete;
-    CardDatabaseManager &operator=(const CardDatabaseManager &) = delete;
-
-    // Static method to access the singleton instance
-    static CardDatabase *getInstance();
-    static CardDatabaseQuerier *query();
-
-private:
-    CardDatabaseManager() = default; // Private constructor
-    ~CardDatabaseManager() = default;
-};
-
-#endif // CARD_DATABASE_ACCESSOR_H

cockatrice/src/database/card_database_querier.h

@@ -1,60 +0,0 @@
-/**
- * @file card_database_querier.h
- * @ingroup CardDatabase
- * @brief The CardDatabaseQuerier is responsible for querying the database and returning data.
- */
-
-#ifndef COCKATRICE_CARD_DATABASE_QUERIER_H
-#define COCKATRICE_CARD_DATABASE_QUERIER_H
-
-#include "../card/exact_card.h"
-#include "../common/card_ref.h"
-
-#include <QObject>
-
-class CardDatabase;
-class CardDatabaseQuerier : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit CardDatabaseQuerier(QObject *parent, const CardDatabase *db);
-
-    [[nodiscard]] CardInfoPtr getCardInfo(const QString &cardName) const;
-    [[nodiscard]] QList<CardInfoPtr> getCardInfos(const QStringList &cardNames) const;
-
-    /*
-     * Get a card by its simple name. The name will be simplified in this
-     * function, so you don't need to simplify it beforehand.
-     */
-    [[nodiscard]] CardInfoPtr getCardBySimpleName(const QString &cardName) const;
-
-    [[nodiscard]] ExactCard guessCard(const CardRef &cardRef) const;
-    [[nodiscard]] ExactCard getCard(const CardRef &cardRef) const;
-    [[nodiscard]] QList<ExactCard> getCards(const QList<CardRef> &cardRefs) const;
-
-    [[nodiscard]] ExactCard getRandomCard() const;
-    [[nodiscard]] ExactCard getCardFromSameSet(const QString &cardName, const PrintingInfo &otherPrinting) const;
-
-    [[nodiscard]] ExactCard getPreferredCard(const CardInfoPtr &card) const;
-    [[nodiscard]] bool isPreferredPrinting(const CardRef &cardRef) const;
-    [[nodiscard]] PrintingInfo getPreferredPrinting(const CardInfoPtr &card) const;
-    [[nodiscard]] PrintingInfo getPreferredPrinting(const QString &cardName) const;
-    [[nodiscard]] QString getPreferredPrintingProviderId(const QString &cardName) const;
-
-    [[nodiscard]] PrintingInfo getSpecificPrinting(const CardRef &cardRef) const;
-    [[nodiscard]] PrintingInfo
-    getSpecificPrinting(const QString &cardName, const QString &setCode, const QString &collectorNumber) const;
-    [[nodiscard]] PrintingInfo findPrintingWithId(const CardInfoPtr &card, const QString &providerId) const;
-
-    [[nodiscard]] QStringList getAllMainCardTypes() const;
-    [[nodiscard]] QMap<QString, int> getAllMainCardTypesWithCount() const;
-    [[nodiscard]] QMap<QString, int> getAllSubCardTypesWithCount() const;
-
-private:
-    const CardDatabase *db;
-
-    CardInfoPtr lookupCardByName(const QString &name) const;
-};
-
-#endif // COCKATRICE_CARD_DATABASE_QUERIER_H

cockatrice/src/database/interface/settings_card_preference_provider.h

@@ -0,0 +1,21 @@
+#ifndef COCKATRICE_SETTINGS_CARD_PREFERENCE_PROVIDER_H
+#define COCKATRICE_SETTINGS_CARD_PREFERENCE_PROVIDER_H
+#include "../../client/settings/cache_settings.h"
+
+#include <libcockatrice/interfaces/interface_card_preference_provider.h>
+
+class SettingsCardPreferenceProvider : public ICardPreferenceProvider
+{
+public:
+    [[nodiscard]] QString getCardPreferenceOverride(const QString &cardName) const override
+    {
+        return SettingsCache::instance().cardOverrides().getCardPreferenceOverride(cardName);
+    }
+
+    [[nodiscard]] bool getIncludeRebalancedCards() const override
+    {
+        return SettingsCache::instance().getIncludeRebalancedCards();
+    }
+};
+
+#endif // COCKATRICE_SETTINGS_CARD_PREFERENCE_PROVIDER_H

cockatrice/src/database/parser/card_database_parser.h

@@ -1,51 +0,0 @@
-/**
- * @file card_database_parser.h
- * @ingroup CardDatabaseParsers
- * @brief The ICardDatabaseParser defines the base interface for parser sub-classes.
- */
-
-#ifndef CARDDATABASE_PARSER_H
-#define CARDDATABASE_PARSER_H
-
-#include "../../card/card_info.h"
-
-#include <QIODevice>
-#include <QString>
-
-#define COCKATRICE_XML_XSI_NAMESPACE "http://www.w3.org/2001/XMLSchema-instance"
-
-class ICardDatabaseParser : public QObject
-{
-    Q_OBJECT
-public:
-    ~ICardDatabaseParser() override = default;
-
-    virtual bool getCanParseFile(const QString &name, QIODevice &device) = 0;
-    virtual void parseFile(QIODevice &device) = 0;
-    virtual bool saveToFile(SetNameMap sets,
-                            CardNameMap cards,
-                            const QString &fileName,
-                            const QString &sourceUrl = "unknown",
-                            const QString &sourceVersion = "unknown") = 0;
-    static void clearSetlist();
-
-protected:
-    /*
-     * A cached list of the available sets, needed to cross-reference sets from cards.
-     * Shared between all parsers
-     */
-    static SetNameMap sets;
-
-    CardSetPtr internalAddSet(const QString &setName,
-                              const QString &longName = "",
-                              const QString &setType = "",
-                              const QDate &releaseDate = QDate(),
-                              const CardSet::Priority priority = CardSet::PriorityFallback);
-signals:
-    void addCard(CardInfoPtr card);
-    void addSet(CardSetPtr set);
-};
-
-Q_DECLARE_INTERFACE(ICardDatabaseParser, "ICardDatabaseParser")
-
-#endif

cockatrice/src/database/parser/cockatrice_xml_3.h

@@ -1,38 +0,0 @@
-/**
- * @file cockatrice_xml_3.h
- * @ingroup CardDatabaseParsers
- * @brief The CockatriceXml3Parser is capable of parsing version 3 of the Cockatrice XML Schema.
- */
-
-#ifndef COCKATRICE_XML3_H
-#define COCKATRICE_XML3_H
-
-#include "card_database_parser.h"
-
-#include <QLoggingCategory>
-#include <QXmlStreamReader>
-
-inline Q_LOGGING_CATEGORY(CockatriceXml3Log, "cockatrice_xml.xml_3_parser");
-
-class CockatriceXml3Parser : public ICardDatabaseParser
-{
-    Q_OBJECT
-    Q_INTERFACES(ICardDatabaseParser)
-public:
-    CockatriceXml3Parser() = default;
-    ~CockatriceXml3Parser() override = default;
-    bool getCanParseFile(const QString &name, QIODevice &device) override;
-    void parseFile(QIODevice &device) override;
-    bool saveToFile(SetNameMap _sets,
-                    CardNameMap cards,
-                    const QString &fileName,
-                    const QString &sourceUrl = "unknown",
-                    const QString &sourceVersion = "unknown") override;
-
-private:
-    void loadCardsFromXml(QXmlStreamReader &xml);
-    void loadSetsFromXml(QXmlStreamReader &xml);
-    QString getMainCardType(QString &type);
-};
-
-#endif

cockatrice/src/database/parser/cockatrice_xml_4.h

@@ -1,38 +0,0 @@
-/**
- * @file cockatrice_xml_4.h
- * @ingroup CardDatabaseParsers
- * @brief The CockatriceXml4Parser is capable of parsing version 4 of the Cockatrice XML Schema.
- */
-
-#ifndef COCKATRICE_XML4_H
-#define COCKATRICE_XML4_H
-
-#include "card_database_parser.h"
-
-#include <QLoggingCategory>
-#include <QXmlStreamReader>
-
-inline Q_LOGGING_CATEGORY(CockatriceXml4Log, "cockatrice_xml.xml_4_parser");
-
-class CockatriceXml4Parser : public ICardDatabaseParser
-{
-    Q_OBJECT
-    Q_INTERFACES(ICardDatabaseParser)
-public:
-    CockatriceXml4Parser() = default;
-    ~CockatriceXml4Parser() override = default;
-    bool getCanParseFile(const QString &name, QIODevice &device) override;
-    void parseFile(QIODevice &device) override;
-    bool saveToFile(SetNameMap _sets,
-                    CardNameMap cards,
-                    const QString &fileName,
-                    const QString &sourceUrl = "unknown",
-                    const QString &sourceVersion = "unknown") override;
-
-private:
-    QVariantHash loadCardPropertiesFromXml(QXmlStreamReader &xml);
-    void loadCardsFromXml(QXmlStreamReader &xml);
-    void loadSetsFromXml(QXmlStreamReader &xml);
-};
-
-#endif

cockatrice/src/deck/deck_loader.h

@@ -1,112 +0,0 @@
-/**
- * @file deck_loader.h
- * @ingroup ImportExport
- * @brief TODO: Document this.
- */
-
-#ifndef DECK_LOADER_H
-#define DECK_LOADER_H
-
-#include "deck_list.h"
-
-#include <QLoggingCategory>
-
-inline Q_LOGGING_CATEGORY(DeckLoaderLog, "deck_loader")
-
-    class DeckLoader : public DeckList
-{
-    Q_OBJECT
-signals:
-    void deckLoaded();
-    void loadFinished(bool success);
-
-public:
-    enum FileFormat
-    {
-        PlainTextFormat,
-        CockatriceFormat
-    };
-
-    /**
-     * Supported file extensions for decklist files
-     */
-    static const QStringList ACCEPTED_FILE_EXTENSIONS;
-
-    /**
-     * For use with `QFileDialog::setNameFilters`
-     */
-    static const QStringList FILE_NAME_FILTERS;
-
-    enum DecklistWebsite
-    {
-        DecklistOrg,
-        DecklistXyz
-    };
-
-private:
-    QString lastFileName;
-    FileFormat lastFileFormat;
-    int lastRemoteDeckId;
-
-public:
-    DeckLoader();
-    explicit DeckLoader(const QString &nativeString);
-    explicit DeckLoader(const DeckList &other);
-    DeckLoader(const DeckLoader &other);
-    const QString &getLastFileName() const
-    {
-        return lastFileName;
-    }
-    void setLastFileName(const QString &_lastFileName)
-    {
-        lastFileName = _lastFileName;
-    }
-    FileFormat getLastFileFormat() const
-    {
-        return lastFileFormat;
-    }
-    int getLastRemoteDeckId() const
-    {
-        return lastRemoteDeckId;
-    }
-
-    bool hasNotBeenLoaded() const
-    {
-        return getLastFileName().isEmpty() && getLastRemoteDeckId() == -1;
-    }
-
-    void clearSetNamesAndNumbers();
-    static FileFormat getFormatFromName(const QString &fileName);
-
-    bool loadFromFile(const QString &fileName, FileFormat fmt, bool userRequest = false);
-    bool loadFromFileAsync(const QString &fileName, FileFormat fmt, bool userRequest);
-    bool loadFromRemote(const QString &nativeString, int remoteDeckId);
-    bool saveToFile(const QString &fileName, FileFormat fmt);
-    bool updateLastLoadedTimestamp(const QString &fileName, FileFormat fmt);
-    QString exportDeckToDecklist(DecklistWebsite website);
-    void setProviderIdToPreferredPrinting();
-
-    void resolveSetNameAndNumberToProviderID();
-
-    void saveToClipboard(bool addComments = true, bool addSetNameAndNumber = true) const;
-
-    // overload
-    bool saveToStream_Plain(QTextStream &out, bool addComments = true, bool addSetNameAndNumber = true) const;
-    bool convertToCockatriceFormat(QString fileName);
-
-protected:
-    void saveToStream_DeckHeader(QTextStream &out) const;
-    void saveToStream_DeckZone(QTextStream &out,
-                               const InnerDecklistNode *zoneNode,
-                               bool addComments = true,
-                               bool addSetNameAndNumber = true) const;
-    void saveToStream_DeckZoneCards(QTextStream &out,
-                                    const InnerDecklistNode *zoneNode,
-                                    QList<DecklistCardNode *> cards,
-                                    bool addComments = true,
-                                    bool addSetNameAndNumber = true) const;
-    [[nodiscard]] QString getCardZoneFromName(QString cardName, QString currentZoneName) override;
-    [[nodiscard]] QString getCompleteCardName(const QString &cardName) const override;
-};
-
-#endif

cockatrice/src/filters/deck_filter_string.cpp

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

cockatrice/src/filters/deck_filter_string.h

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

cockatrice/src/filters/filter_builder.cpp

@@ -1,11 +1,11 @@
 #include "filter_builder.h"
 
-#include "../deck/custom_line_edit.h"
-#include "filter_card.h"
+#include "../interface/widgets/utility/custom_line_edit.h"
 
 #include <QComboBox>
 #include <QGridLayout>
 #include <QPushButton>
+#include <libcockatrice/filters/filter_card.h>
 
 FilterBuilder::FilterBuilder(QWidget *parent) : QWidget(parent)
 {

cockatrice/src/filters/filter_tree_model.cpp

@@ -1,9 +1,8 @@
 #include "filter_tree_model.h"
 
-#include "filter_card.h"
-#include "filter_tree.h"
-
 #include <QFont>
+#include <libcockatrice/filters/filter_card.h>
+#include <libcockatrice/filters/filter_tree.h>
 
 FilterTreeModel::FilterTreeModel(QObject *parent) : QAbstractItemModel(parent)
 {

cockatrice/src/filters/filter_tree_model.h

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

cockatrice/src/game/abstract_game.h

@@ -7,13 +7,13 @@
 #ifndef COCKATRICE_ABSTRACT_GAME_H
 #define COCKATRICE_ABSTRACT_GAME_H
 
-#include "../../../common/pb/game_replay.pb.h"
 #include "game_event_handler.h"
 #include "game_meta_info.h"
 #include "game_state.h"
 #include "player/player_manager.h"
 
 #include <QObject>
+#include <libcockatrice/protocol/pb/game_replay.pb.h>
 
 class CardItem;
 class TabGame;

cockatrice/src/game/board/abstract_card_drag_item.cpp

@@ -1,6 +1,6 @@
 #include "abstract_card_drag_item.h"
 
-#include "../../settings/cache_settings.h"
+#include "../../client/settings/cache_settings.h"
 
 #include <QCursor>
 #include <QDebug>

cockatrice/src/game/board/abstract_card_drag_item.h

@@ -27,22 +27,22 @@ public:
     {
         Type = typeCardDrag
     };
-    int type() const override
+    [[nodiscard]] int type() const override
     {
         return Type;
     }
     AbstractCardDragItem(AbstractCardItem *_item, const QPointF &_hotSpot, AbstractCardDragItem *parentDrag = 0);
-    QRectF boundingRect() const override
+    [[nodiscard]] QRectF boundingRect() const override
     {
         return QRectF(0, 0, CARD_WIDTH, CARD_HEIGHT);
     }
-    QPainterPath shape() const override;
+    [[nodiscard]] QPainterPath shape() const override;
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
-    AbstractCardItem *getItem() const
+    [[nodiscard]] AbstractCardItem *getItem() const
     {
         return item;
     }
-    QPointF getHotSpot() const
+    [[nodiscard]] QPointF getHotSpot() const
     {
         return hotSpot;
     }

cockatrice/src/game/board/abstract_card_item.cpp

@@ -1,9 +1,7 @@
 #include "abstract_card_item.h"
 
-#include "../../database/card_database.h"
-#include "../../database/card_database_manager.h"
-#include "../../picture_loader/picture_loader.h"
-#include "../../settings/cache_settings.h"
+#include "../../client/settings/cache_settings.h"
+#include "../../interface/card_picture_loader/card_picture_loader.h"
 #include "../game_scene.h"
 
 #include <QCursor>
@@ -11,6 +9,8 @@
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
 #include <algorithm>
+#include <libcockatrice/card/database/card_database.h>
+#include <libcockatrice/card/database/card_database_manager.h>
 
 AbstractCardItem::AbstractCardItem(QGraphicsItem *parent, const CardRef &cardRef, Player *_owner, int _id)
     : ArrowTarget(_owner, parent), id(_id), cardRef(cardRef), tapped(false), facedown(false), tapAngle(0),
@@ -60,7 +60,8 @@ void AbstractCardItem::refreshCardInfo()
     exactCard = CardDatabaseManager::query()->getCard(cardRef);
 
     if (!exactCard && !cardRef.name.isEmpty()) {
-        auto info = CardInfo::newInstance(cardRef.name, "", true, {}, {}, {}, {}, false, false, -1, false);
+        CardInfo::UiAttributes attributes = {.tableRow = -1};
+        auto info = CardInfo::newInstance(cardRef.name, "", true, {}, {}, {}, {}, attributes);
         exactCard = ExactCard(info);
     }
     if (exactCard) {
@@ -119,11 +120,11 @@ void AbstractCardItem::paintPicture(QPainter *painter, const QSizeF &translatedS
 
     if (facedown || cardRef.name.isEmpty()) {
         // never reveal card color, always paint the card back
-        PictureLoader::getCardBackPixmap(translatedPixmap, translatedSize.toSize());
+        CardPictureLoader::getCardBackPixmap(translatedPixmap, translatedSize.toSize());
     } else {
         // don't even spend time trying to load the picture if our size is too small
         if (translatedSize.width() > 10) {
-            PictureLoader::getPixmap(translatedPixmap, exactCard, translatedSize.toSize());
+            CardPictureLoader::getPixmap(translatedPixmap, exactCard, translatedSize.toSize());
             if (translatedPixmap.isNull())
                 paintImage = false;
         } else {

cockatrice/src/game/board/abstract_card_item.h

@@ -7,10 +7,11 @@
 #ifndef ABSTRACTCARDITEM_H
 #define ABSTRACTCARDITEM_H
 
-#include "../../card/exact_card.h"
+#include "../../game_graphics/board/graphics_item_type.h"
 #include "arrow_target.h"
-#include "card_ref.h"
-#include "graphics_item_type.h"
+
+#include <libcockatrice/card/printing/exact_card.h>
+#include <libcockatrice/utility/card_ref.h>
 
 class Player;
 

cockatrice/src/game/board/abstract_counter.cpp

@@ -1,21 +1,20 @@
 #include "abstract_counter.h"
 
-#include "../../settings/cache_settings.h"
-#include "../../tabs/tab_game.h"
+#include "../../client/settings/cache_settings.h"
+#include "../../interface/widgets/tabs/tab_game.h"
 #include "../player/player.h"
-#include "expression.h"
-#include "pb/command_inc_counter.pb.h"
-#include "pb/command_set_counter.pb.h"
+#include "../player/player_actions.h"
 #include "translate_counter_name.h"
 
 #include <QAction>
 #include <QApplication>
-#include <QGraphicsSceneHoverEvent>
 #include <QGraphicsSceneMouseEvent>
 #include <QKeyEvent>
 #include <QMenu>
-#include <QPainter>
 #include <QString>
+#include <libcockatrice/protocol/pb/command_inc_counter.pb.h>
+#include <libcockatrice/protocol/pb/command_set_counter.pb.h>
+#include <libcockatrice/utility/expression.h>
 
 AbstractCounter::AbstractCounter(Player *_player,
                                  int _id,
@@ -85,9 +84,13 @@ void AbstractCounter::retranslateUi()
 
 void AbstractCounter::setShortcutsActive()
 {
+    if (!menu) {
+        return;
+    }
     if (!player->getPlayerInfo()->getLocal()) {
         return;
     }
+
     ShortcutsSettings &shortcuts = SettingsCache::instance().shortcuts();
     if (name == "life") {
         shortcutActive = true;
@@ -104,6 +107,10 @@ void AbstractCounter::setShortcutsActive()
 
 void AbstractCounter::setShortcutsInactive()
 {
+    if (!menu) {
+        return;
+    }
+
     shortcutActive = false;
     if (name == "life" || useNameForShortcut) {
         aSet->setShortcut(QKeySequence());

cockatrice/src/game/board/abstract_counter.h

@@ -7,7 +7,7 @@
 #ifndef COUNTER_H
 #define COUNTER_H
 
-#include "../../interface/tearoff_menu.h"
+#include "../../interface/widgets/menus/tearoff_menu.h"
 
 #include <QGraphicsItem>
 #include <QInputDialog>

cockatrice/src/game/board/arrow_item.cpp

@@ -1,22 +1,23 @@
 #define _USE_MATH_DEFINES
 #include "arrow_item.h"
 
-#include "../../card/card_info.h"
-#include "../../settings/cache_settings.h"
+#include "../../client/settings/cache_settings.h"
 #include "../player/player.h"
+#include "../player/player_actions.h"
 #include "../player/player_target.h"
 #include "../zones/card_zone.h"
 #include "card_item.h"
-#include "color.h"
-#include "pb/command_attach_card.pb.h"
-#include "pb/command_create_arrow.pb.h"
-#include "pb/command_delete_arrow.pb.h"
 
 #include <QDebug>
 #include <QGraphicsScene>
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
 #include <QtMath>
+#include <libcockatrice/card/card_info.h>
+#include <libcockatrice/protocol/pb/command_attach_card.pb.h>
+#include <libcockatrice/protocol/pb/command_create_arrow.pb.h>
+#include <libcockatrice/protocol/pb/command_delete_arrow.pb.h>
+#include <libcockatrice/utility/color.h>
 
 ArrowItem::ArrowItem(Player *_player, int _id, ArrowTarget *_startItem, ArrowTarget *_targetItem, const QColor &_color)
     : QGraphicsItem(), player(_player), id(_id), startItem(_startItem), targetItem(_targetItem), targetLocked(false),
@@ -151,8 +152,8 @@ void ArrowItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
     }
 }
 
-ArrowDragItem::ArrowDragItem(Player *_owner, ArrowTarget *_startItem, const QColor &_color)
-    : ArrowItem(_owner, -1, _startItem, 0, _color)
+ArrowDragItem::ArrowDragItem(Player *_owner, ArrowTarget *_startItem, const QColor &_color, int _deleteInPhase)
+    : ArrowItem(_owner, -1, _startItem, 0, _color), deleteInPhase(_deleteInPhase)
 {
 }
 
@@ -231,20 +232,28 @@ void ArrowDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
             cmd.set_target_player_id(targetZone->getPlayer()->getPlayerInfo()->getId());
             cmd.set_target_zone(targetZone->getName().toStdString());
             cmd.set_target_card_id(targetCard->getId());
-        } else {
+        } else { // failed to cast target to card, this means it's a player
             PlayerTarget *targetPlayer = qgraphicsitem_cast<PlayerTarget *>(targetItem);
             cmd.set_target_player_id(targetPlayer->getOwner()->getPlayerInfo()->getId());
         }
-        if (startZone->getName().compare("hand") == 0) {
+
+        // if the card is in hand then we will move the card to stack or table as part of drawing the arrow
+        if (startZone->getName() == "hand") {
             startCard->playCard(false);
             CardInfoPtr ci = startCard->getCard().getCardPtr();
-            if (ci && ((!SettingsCache::instance().getPlayToStack() && ci->getTableRow() == 3) ||
-                       (SettingsCache::instance().getPlayToStack() && ci->getTableRow() != 0 &&
-                        startCard->getZone()->getName().toStdString() != "stack")))
+            bool playToStack = SettingsCache::instance().getPlayToStack();
+            if (ci &&
+                ((!playToStack && ci->getUiAttributes().tableRow == 3) ||
+                 (playToStack && ci->getUiAttributes().tableRow != 0 && startCard->getZone()->getName() != "stack")))
                 cmd.set_start_zone("stack");
             else
-                cmd.set_start_zone(SettingsCache::instance().getPlayToStack() ? "stack" : "table");
+                cmd.set_start_zone(playToStack ? "stack" : "table");
         }
+
+        if (deleteInPhase != 0) {
+            cmd.set_delete_in_phase(deleteInPhase);
+        }
+
         player->getPlayerActions()->sendGameCommand(cmd);
     }
     delArrow();

cockatrice/src/game/board/arrow_item.h

@@ -36,22 +36,22 @@ public:
     ArrowItem(Player *_player, int _id, ArrowTarget *_startItem, ArrowTarget *_targetItem, const QColor &color);
     ~ArrowItem() override;
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
-    QRectF boundingRect() const override
+    [[nodiscard]] QRectF boundingRect() const override
     {
         return path.boundingRect();
     }
-    QPainterPath shape() const override
+    [[nodiscard]] QPainterPath shape() const override
     {
         return path;
     }
     void updatePath();
     void updatePath(const QPointF &endPoint);
 
-    int getId() const
+    [[nodiscard]] int getId() const
     {
         return id;
     }
-    Player *getPlayer() const
+    [[nodiscard]] Player *getPlayer() const
     {
         return player;
     }
@@ -63,11 +63,11 @@ public:
     {
         targetItem = _item;
     }
-    ArrowTarget *getStartItem() const
+    [[nodiscard]] ArrowTarget *getStartItem() const
     {
         return startItem;
     }
-    ArrowTarget *getTargetItem() const
+    [[nodiscard]] ArrowTarget *getTargetItem() const
     {
         return targetItem;
     }
@@ -82,10 +82,11 @@ class ArrowDragItem : public ArrowItem
 {
     Q_OBJECT
 private:
+    int deleteInPhase;
     QList<ArrowDragItem *> childArrows;
 
 public:
-    ArrowDragItem(Player *_owner, ArrowTarget *_startItem, const QColor &_color);
+    ArrowDragItem(Player *_owner, ArrowTarget *_startItem, const QColor &_color, int _deleteInPhase);
     void addChildArrow(ArrowDragItem *childArrow);
 
 protected:

cockatrice/src/game/board/arrow_target.h

@@ -7,7 +7,7 @@
 #ifndef ARROWTARGET_H
 #define ARROWTARGET_H
 
-#include "abstract_graphics_item.h"
+#include "../../game_graphics/board/abstract_graphics_item.h"
 
 #include <QList>
 
@@ -28,18 +28,18 @@ public:
     explicit ArrowTarget(Player *_owner, QGraphicsItem *parent = nullptr);
     ~ArrowTarget() override;
 
-    Player *getOwner() const
+    [[nodiscard]] Player *getOwner() const
     {
         return owner;
     }
 
     void setBeingPointedAt(bool _beingPointedAt);
-    bool getBeingPointedAt() const
+    [[nodiscard]] bool getBeingPointedAt() const
     {
         return beingPointedAt;
     }
 
-    const QList<ArrowItem *> &getArrowsFrom() const
+    [[nodiscard]] const QList<ArrowItem *> &getArrowsFrom() const
     {
         return arrowsFrom;
     }
@@ -51,7 +51,7 @@ public:
     {
         arrowsFrom.removeOne(arrow);
     }
-    const QList<ArrowItem *> &getArrowsTo() const
+    [[nodiscard]] const QList<ArrowItem *> &getArrowsTo() const
     {
         return arrowsTo;
     }

cockatrice/src/game/board/card_item.cpp

@@ -1,23 +1,24 @@
 #include "card_item.h"
 
-#include "../../card/card_info.h"
-#include "../../settings/cache_settings.h"
-#include "../../settings/card_counter_settings.h"
-#include "../../tabs/tab_game.h"
+#include "../../client/settings/cache_settings.h"
+#include "../../interface/widgets/tabs/tab_game.h"
 #include "../game_scene.h"
+#include "../phase.h"
 #include "../player/player.h"
-#include "../zones/card_zone.h"
+#include "../player/player_actions.h"
 #include "../zones/logic/view_zone_logic.h"
 #include "../zones/table_zone.h"
 #include "../zones/view_zone.h"
 #include "arrow_item.h"
 #include "card_drag_item.h"
-#include "pb/serverinfo_card.pb.h"
 
+#include <../../client/settings/card_counter_settings.h>
 #include <QApplication>
 #include <QGraphicsSceneMouseEvent>
 #include <QMenu>
 #include <QPainter>
+#include <libcockatrice/card/card_info.h>
+#include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
 
 CardItem::CardItem(Player *_owner, QGraphicsItem *parent, const CardRef &cardRef, int _cardid, CardZoneLogic *_zone)
     : AbstractCardItem(parent, cardRef, _owner, _cardid), zone(_zone), attacking(false), destroyOnZoneChange(false),
@@ -275,9 +276,14 @@ void CardItem::drawArrow(const QColor &arrowColor)
     if (owner->getGame()->getPlayerManager()->isSpectator())
         return;
 
-    Player *arrowOwner =
-        owner->getGame()->getPlayerManager()->getActiveLocalPlayer(owner->getGame()->getGameState()->getActivePlayer());
-    ArrowDragItem *arrow = new ArrowDragItem(arrowOwner, this, arrowColor);
+    auto *game = owner->getGame();
+    Player *arrowOwner = game->getPlayerManager()->getActiveLocalPlayer(game->getGameState()->getActivePlayer());
+    int phase = 0; // 0 means to not set the phase
+    if (SettingsCache::instance().getDoNotDeleteArrowsInSubPhases()) {
+        int currentPhase = game->getGameState()->getCurrentPhase();
+        phase = Phases::getLastSubphase(currentPhase) + 1;
+    }
+    ArrowDragItem *arrow = new ArrowDragItem(arrowOwner, this, arrowColor, phase);
     scene()->addItem(arrow);
     arrow->grabMouse();
 
@@ -288,7 +294,7 @@ void CardItem::drawArrow(const QColor &arrowColor)
         if (card->getZone() != zone)
             continue;
 
-        ArrowDragItem *childArrow = new ArrowDragItem(arrowOwner, card, arrowColor);
+        ArrowDragItem *childArrow = new ArrowDragItem(arrowOwner, card, arrowColor, phase);
         scene()->addItem(childArrow);
         arrow->addChildArrow(childArrow);
     }

cockatrice/src/game/board/card_item.h

@@ -9,7 +9,8 @@
 
 #include "../zones/logic/card_zone_logic.h"
 #include "abstract_card_item.h"
-#include "server/game/server_card.h"
+
+#include <libcockatrice/network/server/remote/game/server_card.h>
 
 class CardDatabase;
 class CardDragItem;
@@ -50,7 +51,7 @@ public:
     {
         Type = typeCard
     };
-    int type() const override
+    [[nodiscard]] int type() const override
     {
         return Type;
     }
@@ -61,13 +62,13 @@ public:
                       CardZoneLogic *_zone = nullptr);
 
     void retranslateUi();
-    CardZoneLogic *getZone() const
+    [[nodiscard]] CardZoneLogic *getZone() const
     {
         return zone;
     }
     void setZone(CardZoneLogic *_zone);
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
-    QPoint getGridPoint() const
+    [[nodiscard]] QPoint getGridPoint() const
     {
         return gridPoint;
     }
@@ -75,11 +76,11 @@ public:
     {
         gridPoint = _gridPoint;
     }
-    QPoint getGridPos() const
+    [[nodiscard]] QPoint getGridPos() const
     {
         return gridPoint;
     }
-    Player *getOwner() const
+    [[nodiscard]] Player *getOwner() const
     {
         return owner;
     }
@@ -87,32 +88,32 @@ public:
     {
         owner = _owner;
     }
-    bool getAttacking() const
+    [[nodiscard]] bool getAttacking() const
     {
         return attacking;
     }
     void setAttacking(bool _attacking);
-    const QMap<int, int> &getCounters() const
+    [[nodiscard]] const QMap<int, int> &getCounters() const
     {
         return counters;
     }
     void setCounter(int _id, int _value);
-    QString getAnnotation() const
+    [[nodiscard]] QString getAnnotation() const
     {
         return annotation;
     }
     void setAnnotation(const QString &_annotation);
-    bool getDoesntUntap() const
+    [[nodiscard]] bool getDoesntUntap() const
     {
         return doesntUntap;
     }
     void setDoesntUntap(bool _doesntUntap);
-    QString getPT() const
+    [[nodiscard]] QString getPT() const
     {
         return pt;
     }
     void setPT(const QString &_pt);
-    bool getDestroyOnZoneChange() const
+    [[nodiscard]] bool getDestroyOnZoneChange() const
     {
         return destroyOnZoneChange;
     }
@@ -120,7 +121,7 @@ public:
     {
         destroyOnZoneChange = _destroy;
     }
-    CardItem *getAttachedTo() const
+    [[nodiscard]] CardItem *getAttachedTo() const
     {
         return attachedTo;
     }
@@ -133,7 +134,7 @@ public:
     {
         attachedCards.removeOne(card);
     }
-    const QList<CardItem *> &getAttachedCards() const
+    [[nodiscard]] const QList<CardItem *> &getAttachedCards() const
     {
         return attachedCards;
     }

cockatrice/src/game/board/card_list.cpp

@@ -1,10 +1,10 @@
 #include "card_list.h"
 
-#include "../../card/card_info.h"
 #include "card_item.h"
 
 #include <QDebug>
 #include <algorithm>
+#include <libcockatrice/card/card_info.h>
 
 CardList::CardList(bool _contentsKnown) : QList<CardItem *>(), contentsKnown(_contentsKnown)
 {

cockatrice/src/game/board/counter_general.cpp

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

cockatrice/src/game/deckview/deck_view.cpp

@@ -1,16 +1,16 @@
 #include "deck_view.h"
 
-#include "../../card/card_info.h"
+#include "../../client/settings/cache_settings.h"
 #include "../../interface/theme_manager.h"
-#include "../../settings/cache_settings.h"
-#include "deck_list.h"
-#include "deck_list_card_node.h"
 
 #include <QApplication>
 #include <QGraphicsSceneMouseEvent>
 #include <QMouseEvent>
 #include <QtMath>
 #include <algorithm>
+#include <libcockatrice/card/card_info.h>
+#include <libcockatrice/deck_list/deck_list.h>
+#include <libcockatrice/deck_list/tree/deck_list_card_node.h>
 
 DeckViewCardDragItem::DeckViewCardDragItem(DeckViewCard *_item,
                                            const QPointF &_hotSpot,
@@ -41,8 +41,8 @@ void DeckViewCardDragItem::updatePosition(const QPointF &cursorScenePos)
 
 void DeckViewCardDragItem::handleDrop(DeckViewCardContainer *target)
 {
-    DeckViewCard *card = static_cast<DeckViewCard *>(item);
-    DeckViewCardContainer *start = static_cast<DeckViewCardContainer *>(item->parentItem());
+    auto *card = static_cast<DeckViewCard *>(item);
+    auto *start = static_cast<DeckViewCardContainer *>(item->parentItem());
     start->removeCard(card);
     target->addCard(card);
     card->setParentItem(target);
@@ -51,13 +51,13 @@ void DeckViewCardDragItem::handleDrop(DeckViewCardContainer *target)
 void DeckViewCardDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
     setCursor(Qt::OpenHandCursor);
-    DeckViewScene *sc = static_cast<DeckViewScene *>(scene());
+    auto *sc = static_cast<DeckViewScene *>(scene());
     sc->removeItem(this);
 
     if (currentZone) {
         handleDrop(currentZone);
         for (int i = 0; i < childDrags.size(); i++) {
-            DeckViewCardDragItem *c = static_cast<DeckViewCardDragItem *>(childDrags[i]);
+            auto *c = static_cast<DeckViewCardDragItem *>(childDrags[i]);
             c->handleDrop(currentZone);
             sc->removeItem(c);
         }
@@ -118,12 +118,12 @@ void DeckViewCard::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
     QList<QGraphicsItem *> sel = scene()->selectedItems();
     int j = 0;
     for (int i = 0; i < sel.size(); i++) {
-        DeckViewCard *c = static_cast<DeckViewCard *>(sel.at(i));
+        auto *c = static_cast<DeckViewCard *>(sel.at(i));
         if (c == this)
             continue;
         ++j;
-        QPointF childPos = QPointF(j * CARD_WIDTH / 2, 0);
-        DeckViewCardDragItem *drag = new DeckViewCardDragItem(c, childPos, dragItem);
+        auto childPos = QPointF(j * CARD_WIDTH / 2, 0);
+        auto *drag = new DeckViewCardDragItem(c, childPos, dragItem);
         drag->setPos(dragItem->pos() + childPos);
         scene()->addItem(drag);
     }
@@ -140,8 +140,8 @@ void DeckView::mouseDoubleClickEvent(QMouseEvent *event)
         QList<QGraphicsItem *> sel = scene()->selectedItems();
 
         for (int i = 0; i < sel.size(); i++) {
-            DeckViewCard *c = static_cast<DeckViewCard *>(sel.at(i));
-            DeckViewCardContainer *zone = static_cast<DeckViewCardContainer *>(c->parentItem());
+            auto *c = static_cast<DeckViewCard *>(sel.at(i));
+            auto *zone = static_cast<DeckViewCardContainer *>(c->parentItem());
             MoveCard_ToZone m;
             m.set_card_name(c->getName().toStdString());
             m.set_start_zone(zone->getName().toStdString());
@@ -330,7 +330,7 @@ void DeckViewScene::setDeck(const DeckList &_deck)
     if (deck)
         delete deck;
 
-    deck = new DeckList(_deck);
+    deck = new DeckList(_deck.writeToString_Native());
     rebuildTree();
     applySideboardPlan(deck->getCurrentSideboardPlan());
     rearrangeItems();
@@ -343,10 +343,7 @@ void DeckViewScene::rebuildTree()
     if (!deck)
         return;
 
-    InnerDecklistNode *listRoot = deck->getRoot();
-    for (int i = 0; i < listRoot->size(); i++) {
-        InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
-
+    for (auto *currentZone : deck->getZoneNodes()) {
         DeckViewCardContainer *container = cardContainers.value(currentZone->getName(), 0);
         if (!container) {
             container = new DeckViewCardContainer(currentZone->getName());
@@ -355,12 +352,12 @@ void DeckViewScene::rebuildTree()
         }
 
         for (int j = 0; j < currentZone->size(); j++) {
-            DecklistCardNode *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
+            auto *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
             if (!currentCard)
                 continue;
 
             for (int k = 0; k < currentCard->getNumber(); ++k) {
-                DeckViewCard *newCard = new DeckViewCard(container, currentCard->toCardRef(), currentZone->getName());
+                auto *newCard = new DeckViewCard(container, currentCard->toCardRef(), currentZone->getName());
                 container->addCard(newCard);
                 emit newCardAdded(newCard);
             }

cockatrice/src/game/deckview/deck_view.h

@@ -8,13 +8,10 @@
 #define DECKVIEW_H
 
 #include "../board/abstract_card_drag_item.h"
-#include "pb/move_card_to_zone.pb.h"
 
-#include <QGraphicsScene>
 #include <QGraphicsView>
 #include <QMap>
-#include <QMultiMap>
-#include <QPixmap>
+#include <libcockatrice/protocol/pb/move_card_to_zone.pb.h>
 
 class DeckList;
 class InnerDecklistNode;
@@ -35,7 +32,7 @@ public:
                           const QString &_originZone = QString());
     ~DeckViewCard() override;
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
-    const QString &getOriginZone() const
+    [[nodiscard]] const QString &getOriginZone() const
     {
         return originZone;
     }
@@ -71,34 +68,34 @@ private:
     QMultiMap<QString, DeckViewCard *> cardsByType;
     QList<QPair<int, int>> currentRowsAndCols;
     qreal width, height;
-    int getCardTypeTextWidth() const;
+    [[nodiscard]] int getCardTypeTextWidth() const;
 
 public:
     enum
     {
         Type = typeDeckViewCardContainer
     };
-    int type() const override
+    [[nodiscard]] int type() const override
     {
         return Type;
     }
     explicit DeckViewCardContainer(const QString &_name);
-    QRectF boundingRect() const override;
+    [[nodiscard]] QRectF boundingRect() const override;
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
     void addCard(DeckViewCard *card);
     void removeCard(DeckViewCard *card);
-    const QList<DeckViewCard *> &getCards() const
+    [[nodiscard]] const QList<DeckViewCard *> &getCards() const
     {
         return cards;
     }
-    const QString &getName() const
+    [[nodiscard]] const QString &getName() const
     {
         return name;
     }
     void setWidth(qreal _width);
 
-    QList<QPair<int, int>> getRowsAndCols() const;
-    QSizeF calculateBoundingRect(const QList<QPair<int, int>> &rowsAndCols) const;
+    [[nodiscard]] QList<QPair<int, int>> getRowsAndCols() const;
+    [[nodiscard]] QSizeF calculateBoundingRect(const QList<QPair<int, int>> &rowsAndCols) const;
     void rearrangeItems(const QList<QPair<int, int>> &rowsAndCols);
 };
 
@@ -123,7 +120,7 @@ public:
     {
         locked = _locked;
     }
-    bool getLocked() const
+    [[nodiscard]] bool getLocked() const
     {
         return locked;
     }
@@ -135,7 +132,7 @@ public:
     }
     void rearrangeItems();
     void updateContents();
-    QList<MoveCard_ToZone> getSideboardPlan() const;
+    [[nodiscard]] QList<MoveCard_ToZone> getSideboardPlan() const;
     void resetSideboardPlan();
     void applySideboardPlan(const QList<MoveCard_ToZone> &plan);
 };
@@ -162,7 +159,7 @@ public:
     {
         deckViewScene->setLocked(_locked);
     }
-    QList<MoveCard_ToZone> getSideboardPlan() const
+    [[nodiscard]] QList<MoveCard_ToZone> getSideboardPlan() const
     {
         return deckViewScene->getSideboardPlan();
     }

cockatrice/src/game/deckview/deck_view_container.cpp

@@ -1,29 +1,25 @@
 #include "deck_view_container.h"
 
-#include "../../database/card_database.h"
-#include "../../database/card_database_manager.h"
-#include "../../deck/deck_loader.h"
-#include "../../dialogs/dlg_load_deck.h"
-#include "../../dialogs/dlg_load_deck_from_clipboard.h"
-#include "../../dialogs/dlg_load_deck_from_website.h"
-#include "../../dialogs/dlg_load_remote_deck.h"
-#include "../../picture_loader/picture_loader.h"
-#include "../../server/pending_command.h"
-#include "../../settings/cache_settings.h"
-#include "../../tabs/tab_game.h"
-#include "../game_scene.h"
+#include "../../client/settings/cache_settings.h"
+#include "../../interface/card_picture_loader/card_picture_loader.h"
+#include "../../interface/deck_loader/deck_loader.h"
+#include "../../interface/widgets/dialogs/dlg_load_deck.h"
+#include "../../interface/widgets/dialogs/dlg_load_deck_from_clipboard.h"
+#include "../../interface/widgets/dialogs/dlg_load_deck_from_website.h"
+#include "../../interface/widgets/dialogs/dlg_load_remote_deck.h"
+#include "../../interface/widgets/tabs/tab_game.h"
 #include "deck_view.h"
-#include "pb/command_deck_select.pb.h"
-#include "pb/command_ready_start.pb.h"
-#include "pb/command_set_sideboard_lock.pb.h"
-#include "pb/command_set_sideboard_plan.pb.h"
-#include "pb/response_deck_download.pb.h"
-#include "trice_limits.h"
 
 #include <QMessageBox>
-#include <QMouseEvent>
-#include <QToolButton>
-#include <google/protobuf/descriptor.h>
+#include <libcockatrice/card/database/card_database.h>
+#include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/protocol/pb/command_deck_select.pb.h>
+#include <libcockatrice/protocol/pb/command_ready_start.pb.h>
+#include <libcockatrice/protocol/pb/command_set_sideboard_lock.pb.h>
+#include <libcockatrice/protocol/pb/command_set_sideboard_plan.pb.h>
+#include <libcockatrice/protocol/pb/response_deck_download.pb.h>
+#include <libcockatrice/protocol/pending_command.h>
+#include <libcockatrice/utility/trice_limits.h>
 
 ToggleButton::ToggleButton(QWidget *parent) : QPushButton(parent), state(false)
 {
@@ -263,8 +259,8 @@ void DeckViewContainer::loadLocalDeck()
 
 void DeckViewContainer::loadDeckFromFile(const QString &filePath)
 {
-    DeckLoader::FileFormat fmt = DeckLoader::getFormatFromName(filePath);
-    DeckLoader deck;
+    DeckFileFormat::Format fmt = DeckFileFormat::getFormatFromName(filePath);
+    DeckLoader deck(this);
 
     bool success = deck.loadFromFile(filePath, fmt, true);
 
@@ -273,12 +269,12 @@ void DeckViewContainer::loadDeckFromFile(const QString &filePath)
         return;
     }
 
-    loadDeckFromDeckLoader(&deck);
+    loadDeckFromDeckList(deck.getDeck().deckList);
 }
 
-void DeckViewContainer::loadDeckFromDeckLoader(const DeckLoader *deck)
+void DeckViewContainer::loadDeckFromDeckList(const DeckList &deck)
 {
-    QString deckString = deck->writeToString_Native();
+    QString deckString = deck.writeToString_Native();
 
     if (deckString.length() > MAX_FILE_LENGTH) {
         QMessageBox::critical(this, tr("Error"), tr("Deck is greater than maximum file size."));
@@ -312,8 +308,8 @@ void DeckViewContainer::loadFromClipboard()
         return;
     }
 
-    DeckLoader *deck = dlg.getDeckList();
-    loadDeckFromDeckLoader(deck);
+    DeckList deck = dlg.getDeckList();
+    loadDeckFromDeckList(deck);
 }
 
 void DeckViewContainer::loadFromWebsite()
@@ -324,15 +320,15 @@ void DeckViewContainer::loadFromWebsite()
         return;
     }
 
-    DeckLoader *deck = dlg.getDeck();
-    loadDeckFromDeckLoader(deck);
+    DeckList deck = dlg.getDeck();
+    loadDeckFromDeckList(deck);
 }
 
 void DeckViewContainer::deckSelectFinished(const Response &r)
 {
     const Response_DeckDownload &resp = r.GetExtension(Response_DeckDownload::ext);
-    DeckLoader newDeck(QString::fromStdString(resp.deck()));
-    PictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(newDeck.getCardRefList()));
+    DeckList newDeck = DeckList(QString::fromStdString(resp.deck()));
+    CardPictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(newDeck.getCardRefList()));
     setDeck(newDeck);
     switchToDeckLoadedView();
 }
@@ -413,7 +409,7 @@ void DeckViewContainer::setSideboardLocked(bool locked)
         deckView->resetSideboardPlan();
 }
 
-void DeckViewContainer::setDeck(const DeckLoader &deck)
+void DeckViewContainer::setDeck(const DeckList &deck)
 {
     deckView->setDeck(deck);
     switchToDeckLoadedView();

cockatrice/src/game/deckview/deck_view_container.h

@@ -7,7 +7,7 @@
 #ifndef DECK_VIEW_CONTAINER_H
 #define DECK_VIEW_CONTAINER_H
 
-#include "../../deck/deck_loader.h"
+#include "../../interface/deck_loader/deck_loader.h"
 
 #include <QPushButton>
 
@@ -32,7 +32,7 @@ signals:
 
 public:
     explicit ToggleButton(QWidget *parent = nullptr);
-    bool getState() const
+    [[nodiscard]] bool getState() const
     {
         return state;
     }
@@ -85,12 +85,12 @@ public:
     void setReadyStart(bool ready);
     void readyAndUpdate();
     void setSideboardLocked(bool locked);
-    void setDeck(const DeckLoader &deck);
+    void setDeck(const DeckList &deck);
     void setVisualDeckStorageExists(bool exists);
 
 public slots:
     void loadDeckFromFile(const QString &filePath);
-    void loadDeckFromDeckLoader(const DeckLoader *deck);
+    void loadDeckFromDeckList(const DeckList &deck);
 };
 
 #endif // DECK_VIEW_CONTAINER_H

cockatrice/src/game/deckview/tabbed_deck_view_container.cpp

@@ -1,6 +1,6 @@
 #include "tabbed_deck_view_container.h"
 
-#include "../../tabs/tab_game.h"
+#include "../../interface/widgets/tabs/tab_game.h"
 #include "deck_view.h"
 
 TabbedDeckViewContainer::TabbedDeckViewContainer(int _playerId, TabGame *parent)
@@ -21,6 +21,8 @@ void TabbedDeckViewContainer::addOpponentDeckView(const DeckList &opponentDeck,
         opponentDeckViews[opponentId]->setDeck(opponentDeck);
     } else {
         auto *opponentDeckView = new DeckView(this);
+        connect(opponentDeckView, &DeckView::newCardAdded, playerDeckView, &DeckViewContainer::newCardAdded);
+
         opponentDeckView->setDeck(opponentDeck);
 
         addTab(opponentDeckView, QString("%1's Deck").arg(opponentName));

cockatrice/src/game/dialogs/dlg_create_token.cpp

@@ -1,13 +1,8 @@
 #include "dlg_create_token.h"
 
-#include "../../database/card_database_manager.h"
-#include "../../database/model/card_database_model.h"
-#include "../../database/model/token/token_display_model.h"
+#include "../../client/settings/cache_settings.h"
 #include "../../interface/widgets/cards/card_info_picture_widget.h"
 #include "../../main.h"
-#include "../../settings/cache_settings.h"
-#include "deck_list.h"
-#include "trice_limits.h"
 
 #include <QCheckBox>
 #include <QCloseEvent>
@@ -21,7 +16,11 @@
 #include <QLineEdit>
 #include <QRadioButton>
 #include <QTreeView>
-#include <QVBoxLayout>
+#include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/deck_list/deck_list.h>
+#include <libcockatrice/models/database/card_database_model.h>
+#include <libcockatrice/models/database/token/token_display_model.h>
+#include <libcockatrice/utility/trice_limits.h>
 
 DlgCreateToken::DlgCreateToken(const QStringList &_predefinedTokens, QWidget *parent)
     : QDialog(parent), predefinedTokens(_predefinedTokens)
@@ -67,7 +66,7 @@ DlgCreateToken::DlgCreateToken(const QStringList &_predefinedTokens, QWidget *pa
     faceDownCheckBox = new QCheckBox(tr("Create face-down (Only hides name)"));
     connect(faceDownCheckBox, &QCheckBox::toggled, this, &DlgCreateToken::faceDownCheckBoxToggled);
 
-    QGridLayout *grid = new QGridLayout;
+    auto *grid = new QGridLayout;
     grid->addWidget(nameLabel, 0, 0);
     grid->addWidget(nameEdit, 0, 1);
     grid->addWidget(colorLabel, 1, 0);
@@ -79,7 +78,7 @@ DlgCreateToken::DlgCreateToken(const QStringList &_predefinedTokens, QWidget *pa
     grid->addWidget(destroyCheckBox, 4, 0, 1, 2);
     grid->addWidget(faceDownCheckBox, 5, 0, 1, 2);
 
-    QGroupBox *tokenDataGroupBox = new QGroupBox(tr("Token data"));
+    auto *tokenDataGroupBox = new QGroupBox(tr("Token data"));
     tokenDataGroupBox->setLayout(grid);
 
     cardDatabaseModel = new CardDatabaseModel(CardDatabaseManager::getInstance(), false, this);
@@ -125,25 +124,25 @@ DlgCreateToken::DlgCreateToken(const QStringList &_predefinedTokens, QWidget *pa
 #endif
     }
 
-    QVBoxLayout *tokenChooseLayout = new QVBoxLayout;
+    auto *tokenChooseLayout = new QVBoxLayout;
     tokenChooseLayout->addWidget(chooseTokenFromAllRadioButton);
     tokenChooseLayout->addWidget(chooseTokenFromDeckRadioButton);
     tokenChooseLayout->addWidget(chooseTokenView);
 
-    QGroupBox *tokenChooseGroupBox = new QGroupBox(tr("Choose token from list"));
+    auto *tokenChooseGroupBox = new QGroupBox(tr("Choose token from list"));
     tokenChooseGroupBox->setLayout(tokenChooseLayout);
 
-    QGridLayout *hbox = new QGridLayout;
+    auto *hbox = new QGridLayout;
     hbox->addWidget(pic, 0, 0, 1, 1);
     hbox->addWidget(tokenDataGroupBox, 1, 0, 1, 1);
     hbox->addWidget(tokenChooseGroupBox, 0, 1, 2, 1);
     hbox->setColumnStretch(1, 1);
 
-    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+    auto *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
     connect(buttonBox, &QDialogButtonBox::accepted, this, &DlgCreateToken::actOk);
     connect(buttonBox, &QDialogButtonBox::rejected, this, &DlgCreateToken::actReject);
 
-    QVBoxLayout *mainLayout = new QVBoxLayout;
+    auto *mainLayout = new QVBoxLayout;
     mainLayout->addLayout(hbox);
     mainLayout->addWidget(buttonBox);
     setLayout(mainLayout);
@@ -199,16 +198,7 @@ void DlgCreateToken::tokenSelectionChanged(const QModelIndex &current, const QMo
         annotationEdit->setText("");
     }
 
-    const auto &cardProviderId =
-        SettingsCache::instance().cardOverrides().getCardPreferenceOverride(cardInfo->getName());
-    if (!cardProviderId.isEmpty()) {
-        CardRef ref;
-        ref.name = cardInfo->getName();
-        ref.providerId = cardProviderId;
-        pic->setCard(CardDatabaseManager::query()->getCard(ref));
-    } else {
-        pic->setCard(CardDatabaseManager::query()->getPreferredCard(cardInfo));
-    }
+    pic->setCard(CardDatabaseManager::query()->getPreferredCard(cardInfo));
 }
 
 void DlgCreateToken::updateSearchFieldWithoutUpdatingFilter(const QString &newValue) const

cockatrice/src/game/dialogs/dlg_create_token.h

@@ -8,7 +8,6 @@
 #define DLG_CREATETOKEN_H
 
 #include <QDialog>
-#include <QModelIndex>
 
 class QLabel;
 class QLineEdit;
@@ -39,7 +38,7 @@ class DlgCreateToken : public QDialog
     Q_OBJECT
 public:
     explicit DlgCreateToken(const QStringList &_predefinedTokens, QWidget *parent = nullptr);
-    TokenInfo getTokenInfo() const;
+    [[nodiscard]] TokenInfo getTokenInfo() const;
 
 protected:
     void closeEvent(QCloseEvent *event) override;

cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp

@@ -1,9 +1,5 @@
 #include "dlg_move_top_cards_until.h"
 
-#include "../../database/card_database.h"
-#include "../../database/card_database_manager.h"
-#include "../../filters/filter_string.h"
-
 #include <QDialogButtonBox>
 #include <QLabel>
 #include <QLineEdit>
@@ -12,6 +8,9 @@
 #include <QString>
 #include <QVBoxLayout>
 #include <QWidget>
+#include <libcockatrice/card/database/card_database.h>
+#include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/filters/filter_string.h>
 
 DlgMoveTopCardsUntil::DlgMoveTopCardsUntil(QWidget *parent, QStringList exprs, uint _numberOfHits, bool autoPlay)
     : QDialog(parent)

cockatrice/src/game/dialogs/dlg_move_top_cards_until.h

@@ -34,10 +34,10 @@ public:
                                   QStringList exprs = QStringList(),
                                   uint numberOfHits = 1,
                                   bool autoPlay = false);
-    QString getExpr() const;
-    QStringList getExprs() const;
-    uint getNumberOfHits() const;
-    bool isAutoPlay() const;
+    [[nodiscard]] QString getExpr() const;
+    [[nodiscard]] QStringList getExprs() const;
+    [[nodiscard]] uint getNumberOfHits() const;
+    [[nodiscard]] bool isAutoPlay() const;
 };
 
 #endif // DLG_MOVE_TOP_CARDS_UNTIL_H