Support logging config on install

* fix flag bounding box on linux

* use the non-deprecated macro

.ci/Arch/Dockerfile

@@ -9,6 +9,7 @@ RUN pacman --sync --refresh --sysupgrade --needed --noconfirm \
         mariadb-libs \
         protobuf \
         qt6-base \
+        qt6-imageformats \
         qt6-multimedia \
         qt6-svg \
         qt6-tools \

.ci/Debian10/Dockerfile

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

.ci/Debian11/Dockerfile

@@ -17,6 +17,7 @@ RUN apt-get update && \
         libqt5svg5-dev \
         libqt5websockets5-dev \
         protobuf-compiler \
+        qt5-image-formats-plugins \
         qtmultimedia5-dev \
         qttools5-dev \
         qttools5-dev-tools \

.ci/Debian12/Dockerfile

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

.ci/Fedora35/Dockerfile

@@ -1,21 +0,0 @@
-FROM fedora:35
-
-RUN dnf install -y \
-        @development-tools \
-        ccache \
-        cmake \
-        desktop-file-utils \
-        file \
-        gcc-c++ \
-        git \
-        hicolor-icon-theme \
-        libappstream-glib \
-        mariadb-devel \
-        protobuf-devel \
-        qt5-{qttools,qtsvg,qtmultimedia,qtwebsockets}-devel \
-        rpm-build \
-        sqlite-devel \
-        wget \
-        xz-devel \
-        zlib-devel \
-    && dnf clean all

.ci/Fedora40/Dockerfile

@@ -1,4 +1,4 @@
-FROM fedora:36
+FROM fedora:40
 
 RUN dnf install -y \
         ccache \
@@ -8,6 +8,7 @@ RUN dnf install -y \
         mariadb-devel \
         protobuf-devel \
         qt6-{qttools,qtsvg,qtmultimedia,qtwebsockets}-devel \
+        qt6-qtimageformats \
         rpm-build \
         xz-devel \
         zlib-devel \

.ci/Fedora41/Dockerfile

@@ -0,0 +1,15 @@
+FROM fedora:41
+
+RUN dnf install -y \
+        ccache \
+        cmake \
+        gcc-c++ \
+        git \
+        mariadb-devel \
+        protobuf-devel \
+        qt6-{qttools,qtsvg,qtmultimedia,qtwebsockets}-devel \
+        qt6-qtimageformats \
+        rpm-build \
+        xz-devel \
+        zlib-devel \
+    && dnf clean all

.ci/Ubuntu20.04/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:focal
+FROM ubuntu:20.04
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -18,6 +18,7 @@ RUN apt-get update && \
         libqt5websockets5-dev \
         protobuf-compiler \
         qt5-default \
+        qt5-image-formats-plugins \
         qtmultimedia5-dev \
         qttools5-dev \
         qttools5-dev-tools \

.ci/Ubuntu22.04/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:jammy
+FROM ubuntu:22.04
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -18,6 +18,7 @@ RUN apt-get update && \
         libqt6svg6-dev \
         libqt6websockets6-dev \
         protobuf-compiler \
+        qt6-image-formats-plugins \
         qt6-l10n-tools \
         qt6-multimedia-dev \
         qt6-tools-dev \

.ci/Ubuntu24.04/Dockerfile

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

.ci/UbuntuBionic/Dockerfile

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

.ci/compile.sh

@@ -127,7 +127,7 @@ fi
 # Add cmake --build flags
 buildflags=(--config "$BUILDTYPE")
 if [[ $PARALLEL_COUNT ]]; then
-  if [[ $(cmake --build /not_a_dir --parallel |& head -1) =~ parallel ]]; then
+  if [[ $(cmake --build /not_a_dir --parallel 2>&1 | head -1) =~ parallel ]]; then
     # workaround for bionic having an old cmake
     echo "this version of cmake does not support --parallel, using native build tool -j instead"
     buildflags+=(-- -j "$PARALLEL_COUNT")
@@ -160,7 +160,13 @@ cmake .. "${flags[@]}"
 echo "::endgroup::"
 
 echo "::group::Build project"
-cmake --build . "${buildflags[@]}"
+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 "::endgroup::"
 
 if [[ $USE_CCACHE ]]; then
@@ -171,7 +177,7 @@ fi
 
 if [[ $MAKE_TEST ]]; then
   echo "::group::Run tests"
-  ctest -C "$BUILDTYPE"
+  ctest -C "$BUILDTYPE" --output-on-failure
   echo "::endgroup::"
 fi
 
@@ -183,6 +189,12 @@ 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/macos.entitlements

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>com.apple.security.app-sandbox</key>
+    <false/>
+
+    <key>com.apple.security.cs.disable-library-validation</key>
+    <true/>
+
+    <key>com.apple.security.cs.disable-executable-page-protection</key>
+    <true/>
+
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+</dict>
+</plist>

.ci/release_template.md

@@ -4,25 +4,24 @@
 git push -d origin --REPLACE-WITH-BETA-LIST--
  -->
 
-<!-- This list of binaries should be updated every time the ci is changed to
+<!-- This list of binaries should be updated every time the CI is changed to
 include different targets -->
 <pre>
 <b>Pre-compiled binaries we serve:</b>
- - <kbd>Windows 7/8/10/11 (32-bit)</kbd>
- - <kbd>Windows 7/8 (64-bit)</kbd>
- - <kbd>Windows 10/11 (64-bit)</kbd>
- - <kbd>macOS 10.14</kbd> ("Mojave")
- - <kbd>macOS 10.15</kbd> ("Catalina")
- - <kbd>macOS 11.0+</kbd> ("Big Sur")
- - <kbd>Ubuntu 18.04</kbd> ("Bionic Beaver")
- - <kbd>Ubuntu 20.04</kbd> ("Focal Fossa")
- - <kbd>Ubuntu 22.04</kbd> ("Jammy Jellyfish")
- - <kbd>Debian 10</kbd> ("Buster")
+ - <kbd>Windows 10+</kbd>
+ - <kbd>Windows 7+</kbd>
+ - <kbd>macOS 14+</kbd> ("Sonoma") / Apple M
+ - <kbd>macOS 13+</kbd> ("Ventura") / Intel
+ - <kbd>Ubuntu 24.04 LTS</kbd> ("Noble Numbat")
+ - <kbd>Ubuntu 22.04 LTS</kbd> ("Jammy Jellyfish")
+ - <kbd>Ubuntu 20.04 LTS</kbd> ("Focal Fossa")
+ - <kbd>Debian 12</kbd> ("Bookworm")
  - <kbd>Debian 11</kbd> ("Bullseye")
- - <kbd>Fedora 35</kbd>
- - <kbd>Fedora 36</kbd>
-<kbd>We are also packaged in Arch Linux's official community repository, courtesy of @FFY00</kbd></i>
-<kbd>General linux support is available via a flatpak package (Flathub)</kbd></i>
+ - <kbd>Fedora 41</kbd>
+ - <kbd>Fedora 40</kbd>
+ 
+<i>We are also packaged in <kbd>Arch Linux</kbd>'s official "extra" repository, courtesy of @FFY00</i>
+<i>General Linux support is available via a <kbd>flatpak</kbd> package (Flathub)</i>
 </pre>
 
 
@@ -30,22 +29,24 @@ include different targets -->
 
 We're pleased to announce the newest official release: <kbd>--REPLACE-WITH-RELEASE-TITLE--</kbd>
 
-We hope you enjoy the changes made and we have listed all changes, with their corresponding tickets, since the last version of Cockatrice was released for your convenience.
+We hope you enjoy the changes made! All improvements with their corresponding tickets since the last version of Cockatrice are listed in the changelog below.
 
-If you ever encounter a bug, have a suggestion or idea, or feel a need for a developer to look into something, please feel free to [open a ticket](https://github.com/Cockatrice/Cockatrice/issues). ([How to create a GitHub Ticket for Cockatrice](https://github.com/Cockatrice/Cockatrice/wiki/How-to-Create-a-GitHub-Ticket-Regarding-Cockatrice))
+If you ever encounter a bug, have a suggestion or idea, or feel a need for a developer to look into something, please feel free to [open a ticket](https://github.com/Cockatrice/Cockatrice/issues). ([How to create a Ticket for Cockatrice](https://github.com/Cockatrice/Cockatrice/wiki/How-to-Create-a-GitHub-Ticket-Regarding-Cockatrice))
 
-For any information relating to Cockatrice, please take a look at our official site: **https://cockatrice.github.io**
+For basic information related to the app and getting started, please take a look at our official site: **https://cockatrice.github.io**
 
-If you'd like to help contribute to Cockatrice in any way, check out our [README](https://github.com/Cockatrice/Cockatrice#get-involved-). We're always available to answer questions you may have on how the program works and how you can provide a meaningful contribution.
+If you'd like to help and contribute to Cockatrice in any way, check out our [README](https://github.com/Cockatrice/Cockatrice#get-involved-).  
+We're always available to answer questions you may have on how the program works and how you can provide a meaningful contribution.
 
 
 ## Upgrading Cockatrice
 <!-- this optional section puts a warning banner for problems with updating
-> ⚠️ **With this release, we no longer provide a ready-to-install binary for:**
+> [!IMPORTANT]  
+> **With this release, we no longer provide a ready-to-install binary for:**  
 > --DEPRECATED-OS-HERE--
  -->
 
-- Run the internal software updater: <kbd>Help → Check for Client Updates</kbd>
+Run the internal software updater: <kbd>Help → Check for Client Updates</kbd>
 
 Don't forget to update your card database right after! (<kbd>Help → Check for Card Updates...</kbd>)
 
@@ -62,14 +63,14 @@ Remove empty headers when done.
  -->
 
 <!-- Highlights of the release -->
-### ⚠️ Important:
+### 🔖 Highlights:
 ### ✨ New Features:
-### 🐛 Fixed Bugs / Resolved issues:
+### 🐛 Fixed Bugs / Resolved Issues:
 
 <!-- Complete list of changes (foldable) -->
 <details>
 <summary>
-📘 <b>Show all changes</b> (--REPLACE-WITH-COMMIT-COUNT-- commits)
+<b>Show all changes</b> (--REPLACE-WITH-COMMIT-COUNT-- commits)
 </summary>
 
 ### User Interface
@@ -90,5 +91,6 @@ Remove empty headers when done.
 
 ## Special Thanks
 <!-- Personalise this a bit! -->
-We continue to find it amazing that so many people contribute their time, knowledge, code, testing and more to the project. We'd like to thank the entire Cockatrice community for their efforts.
+It's amazing that so many people contribute their time, knowledge, code, testing and more to the project.  
+We'd like to thank the entire Cockatrice community for their efforts! 🙏
 <!-- We'd like to especially recognize @ZeldaZach, --ADD-CONTRIBUTORS-HERE-- for their help in preparing so many amazing new features for the user base. -->

.ci/update_translation_source_strings.sh

@@ -0,0 +1,58 @@
+#!/bin/bash
+
+# ci script to update translation files
+# usage:
+# $0 cockatrice/cockatrice_en@source.ts cockatrice/src common
+# or
+# FILE="cockatrice/cockatrice_en@source.ts"
+# DIRS="cockatrice/src common"
+# $0
+# note: directories can't contain spaces
+
+# check parameters
+if [[ ! $FILE ]]; then
+  FILE="$1"
+  shift
+fi
+if [[ ! $FILE ]]; then
+  echo "no output file selected" >&2
+  exit 2;
+fi
+if [[ ! $DIRS ]]; then
+  DIRS="$*"
+fi
+if [[ ! $DIRS ]]; then
+  echo "no source directories selected to translate" >&2
+  exit 2;
+fi
+if [[ ! -e $FILE ]]; then
+  echo "output file does not exist at: $FILE" >&2
+  exit 3;
+fi
+
+# print version
+if ! lupdate -version; then
+  echo "failed to run lupdate" >&2
+  exit 4;
+fi
+
+# run lupdate, duplicating the output in stderr and saving it
+# for convenience we ignore that $DIRS will be split on spaces 
+# shellcheck disable=SC2086
+if ! got="$(lupdate $DIRS -ts "$FILE" | tee /dev/stderr)"; then
+  echo "failed to update $FILE with $DIRS" >&2
+  exit 4;
+fi
+
+# trim output
+# the line we are interested in is:
+# Found xxx source text(s) (x new and xxx already existing)
+output="${got##* source text(s) (}" # get stuff in between brackets
+output="${output%%)*}" # trim everything after first )
+if [[ $output == "$got" ]]; then
+  echo "could not parse generated output" >&2
+  exit 4;
+fi
+
+# write output to ci environment file
+echo "output=$output" >> "$GITHUB_OUTPUT"

.ci/update_translation_source_strings_template.md

@@ -0,0 +1,14 @@
+Updated source strings for translations:
+- {{ .cockatrice_output }} (Cockatrice)
+- {{ .oracle_output }} (Oracle)
+
+<br>
+
+Last changes are based on commit {{ .commit }}.
+
+---
+*This PR is automatically generated and updated by the workflow at `.github/workflows/translations-push.yml`. Review [action runs][2].*<br>
+*After merging, all changes to the source language are available for translation at [Transifex][1] shortly.*
+
+[1]: https://app.transifex.com/cockatrice/cockatrice/
+[2]: https://github.com/Cockatrice/Cockatrice/actions/workflows/translations-push.yml?query=branch%3Amaster

.github/CONTRIBUTING.md

@@ -290,20 +290,21 @@ be included in the next release 👍
 
 Basic workflow for translations:
  1. Developer adds a `tr("foo")` string in the code;
- 2. Every few days, a maintainer updates the `*_en@source.ts files` with the new strings;
- 3. Transifex picks up the new files from GitHub every 24 hours;
- 4. Translators translate the new untranslated strings on Transifex;
- 5. Before a release, a maintainer fetches the updated translations from Transifex.
+ 2. CI updates the `*_en@source.ts files` regularly and creates a PR automatically;
+ 3. Maintainer verifies and merges the change;
+ 4. Transifex picks up the new files from GitHub automatically;
+ 5. Translators translate the new untranslated strings on Transifex;
+ 6. Before a release, a maintainer fetches the updated translations from Transifex.
 
 ### Using Translations (for developers) ###
 
-All the user-interface strings inside Cockatrice's source code must be written
-in English(US).
+All user interface strings inside Cockatrice's source code must be written
+in English (US).
 Translations to other languages are managed using [Transifex](
 https://www.transifex.com/projects/p/cockatrice/).
 
 Adding a new string to translate is as easy as adding the string in the
-'tr("")' function, the string will be picked up as translatable automatically
+`tr("")` function, the string will be picked up as translatable automatically
 and translated as needed.
 For example, setting the text of a label in the way that the string
 `"My name is:"` can be translated:
@@ -312,7 +313,7 @@ nameLabel.setText(tr("My name is:"));
 ```
 
 To translate a string that would have plural forms you can add the amount to
-the tr call, also you can add an extra string as a hint for translators:
+the tr() call, also you can add an extra string as a hint for translators:
 ```c++
 QString message = tr("Everyone draws %n cards", "pop up message", amount);
 ```
@@ -321,20 +322,46 @@ https://doc.qt.io/qt-5/i18n-source-translation.html#handling-plurals)
 
 If you're about to propose a change that adds or modifies any translatable
 string in the code, you don't need to take care of adding the new strings to
-the translation files.
-Every few days, or when a lot of new strings have been added, someone from the
-development team will take care of extracting all the new strings and adding
-them to the english translation files and making them available to translators
-on Transifex.
+the translation files.<br>
+We have an automated process to update our language source files on a schedule
+and provide the translators on Transifex with the new contents.<br>
+Maintainers can also manually trigger this on demand.
 
 ### Maintaining Translations (for maintainers) ###
 
-When new translatable strings have been added to the code, a maintainer should
-make them available to translators on Transifex. Every few days, or when a lot
-of new strings have been added, a maintainer should take care of extracting all
-the new strings and add them to the english translation files.
+When new translatable strings have been added to the code, a maintainer has to
+make them available to translators on Transifex.
 
-To update the english translation files, re-run cmake enabling the appropriate
+To help with that, we have an automated CI workflow, that regularly looks at the
+code in the master branch, extracts all strings and updates dedicated source string
+files with any changes. These updates are not commited right away, the CI creates a
+PR for reviewing instead.<br>
+After approval, our translation tool automatically picks the changes up and deploys
+them to our translators. Be mindful when merging only a few changes!
+
+Once a release is planned, or when a lot of strings have been added or changed, a
+maintainer can manually trigger a CI run to extract all strings on demand.
+
+<details>
+<summary><b>Manually trigger CI run (Workflow Dispatch)</b></summary>
+
+Maintainers can always request the CI to run on demand if it's required.
+
+Go to the `Actions` tab and select our dedicated translation workflow:
+https://github.com/Cockatrice/Cockatrice/actions/workflows/translations.yml
+
+You see a "This workflow has a workflow_dispatch event trigger." hint at the top of
+the list.<br>
+Select `Run workflow` on the right and trigger a run from master branch.
+
+The CI will now check for changed strings and create a PR if there are any updates.
+
+</details>
+
+<details>
+<summary><b>Manually update source strings locally</b></summary>
+
+To update the english source files for translation, re-run cmake enabling the appropriate
 parameter and then run make:
 ```sh
 cd cockatrice/build
@@ -357,11 +384,13 @@ It is recommended to disable the parameter afterwards using:
 ```sh
 cmake .. -DUPDATE_TRANSLATIONS=OFF
 ```
-Now you are ready to propose your change.
+Now you are ready to commit your changes and open a PR.
 
-Once your change gets merged, Transifex will pick up the modified files
-automatically (checked every 24 hours) and update the interface where
-translators will be able to translate the new strings.
+</details>
+
+Once the changes get merged, Transifex will pick up the modified files
+automatically (checked every few hours) and update their online editor where
+translators will be able to translate the new strings right in the browser.
 
 ### Releasing Translations (for maintainers) ###
 

.github/dependabot.yml

@@ -0,0 +1,49 @@
+# Configuration options: https://docs.github.com/en/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+ # # Enable version updates for git submodules
+ # Not yet possible to bump only on tags or releases, see:
+ # https://github.com/dependabot/dependabot-core/issues/1639
+ # https://github.com/dependabot/dependabot-core/issues/2192
+ # Alternative: Action that updates submodule and can be manually run on demand (workflow_dispatch)
+ # - package-ecosystem: "gitsubmodule"
+ #   # Look for `.gitmodules` in the `root` directory
+ #   directory: "/"
+ #   # Check for updates once a month
+ #   schedule:
+ #     interval: "monthly"
+ #   # Limit the amout of open PR's (default = 5, disabled = 0, security updates are not impacted)
+ #   open-pull-requests-limit: 1
+
+ # # Enable version updates for Docker
+ # Not yet possible to bump from one LTS version to the next and skip others, see:
+ # https://github.com/dependabot/dependabot-core/issues/2247
+ # - package-ecosystem: "docker"
+ #   # Look for a `Dockerfile` in the `root` directory
+ #   directory: "/"
+ #   # Check for updates once a week
+ #   schedule:
+ #     interval: "weekly"
+ #   # Limit the amout of open PR's (default = 5, disabled = 0, security updates are not impacted)
+ #   open-pull-requests-limit: 1
+
+  # Enable version updates for GitHub Actions
+  - package-ecosystem: "github-actions"
+    # Directory must be set to "/" to check for workflow files in .github/workflows
+    directory: "/"
+    # Check for updates to GitHub Actions once a week
+    schedule:
+      interval: "weekly"
+    # Limit the amout of open PR's (default = 5, disabled = 0, security updates are not impacted)
+    open-pull-requests-limit: 2
+
+ # # Enable version updates for npm
+ # - package-ecosystem: "npm"
+ #   # Look for `package.json` and `lock` files in the `webclient` subdirectory
+ #   directory: "/webclient"
+ #   # Check the npm registry for updates once a week
+ #   schedule:
+ #     interval: "weekly"
+ #   # Limit the amout of open PR's (default = 5, disabled = 0, security updates are not impacted)
+ #   open-pull-requests-limit: 5

.github/workflows/desktop-build.yml

@@ -8,6 +8,7 @@ on:
       - '**.md'
       - 'webclient/**'
       - '.github/workflows/web-*.yml'
+      - '.github/workflows/translations-*.yml'
     tags:
       - '*'
   pull_request:
@@ -15,6 +16,12 @@ on:
       - '**.md'
       - 'webclient/**'
       - '.github/workflows/web-*.yml'
+      - '.github/workflows/translations-*.yml'
+
+# Cancel earlier, unfinished runs of this workflow on the same branch (unless on master)
+concurrency:
+  group: "${{ github.workflow }} @ ${{ github.ref_name }}"
+  cancel-in-progress: ${{ github.ref_name != 'master' }}
 
 jobs:
   configure:
@@ -23,33 +30,27 @@ jobs:
     outputs:
       tag: ${{steps.configure.outputs.tag}}
       sha: ${{steps.configure.outputs.sha}}
-      upload_url: ${{steps.create_release.outputs.upload_url}}
-
-    steps:
-      - name: Cancel previous runs
-        uses: styfle/cancel-workflow-action@0.11.0
-        with:
-          access_token: ${{github.token}} # needs other token https://github.com/styfle/cancel-workflow-action/issues/7
 
+    steps:  
       - name: Configure
         id: configure
         shell: bash
         run: |
           tag_regex='^refs/tags/'
-          if [[ $GITHUB_EVENT_NAME == pull-request ]]; then # pull request
+          if [[ $GITHUB_EVENT_NAME == pull-request ]]; then    # pull request
             sha="${{github.event.pull_request.head.sha}}"
-          elif [[ $GITHUB_REF =~ $tag_regex ]]; then # release
+          elif [[ $GITHUB_REF =~ $tag_regex ]]; then    # release
             sha="$GITHUB_SHA"
             tag="${GITHUB_REF/refs\/tags\//}"
             echo "tag=$tag" >>"$GITHUB_OUTPUT"
-          else # push to branch
+          else    # push to branch
             sha="$GITHUB_SHA"
           fi
           echo "sha=$sha" >>"$GITHUB_OUTPUT"
 
       - name: Checkout
         if: steps.configure.outputs.tag != null
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -64,172 +65,174 @@ jobs:
       - name: Create release
         if: steps.configure.outputs.tag != null
         id: create_release
-        uses: actions/create-release@v1
+        shell: bash
         env:
-          GITHUB_TOKEN: ${{github.token}}
-        with:
-          tag_name: ${{github.ref}}
+          GH_TOKEN: ${{github.token}}
+          tag_name: ${{steps.configure.outputs.tag}}
+          target: ${{steps.configure.outputs.sha}}
           release_name: ${{steps.prepare.outputs.title}}
           body_path: ${{steps.prepare.outputs.body_path}}
-          draft: true
-          prerelease: ${{steps.prepare.outputs.is_beta == 'yes'}}
+          prerelease: ${{steps.prepare.outputs.is_beta}}
+        run: |
+          if [[ $prerelease == yes ]]; then
+            args="--prerelease"
+          fi
+          gh release create "$tag_name" --draft --verify-tag $args \
+              --target "$target" --title "$release_name" \
+              --notes-file "$body_path"
 
   build-linux:
     strategy:
       fail-fast: false
       matrix:
-        # these names correspond to the files in .ci/$distro
+        # These names correspond to the files in ".ci/$distro$version"
         include:
-          - distro: ArchLinux
-            package: skip # we are packaged in arch already
+          - distro: Arch
+            package: skip    # We are packaged in Arch already
             allow-failure: yes
 
-          - distro: Debian10
+          - distro: Debian
+            version: 11
             package: DEB
-            test: skip # running tests on all distros is superfluous
+            test: skip    # Running tests on all distros is superfluous
 
-          - distro: Debian11
+          - distro: Debian
+            version: 12
             package: DEB
 
-          - distro: Fedora35
+          - distro: Fedora
+            version: 40
             package: RPM
-            test: skip
+            test: skip    # Running tests on all distros is superfluous
 
-          - distro: Fedora36
+          - distro: Fedora
+            version: 41
             package: RPM
 
-          - distro: UbuntuBionic
+          - distro: Ubuntu
+            version: 20.04
+            package: DEB
+            test: skip    # Ubuntu 20.04 has a broken Qt for debug builds
+
+          - distro: Ubuntu
+            version: 22.04
+            package: DEB
+            test: skip    # Running tests on all distros is superfluous
+
+          - distro: Ubuntu
+            version: 24.04
             package: DEB
 
-          - distro: UbuntuFocal
-            package: DEB
-            test: skip # UbuntuFocal has a broken qt for debug builds
-
-          - distro: UbuntuJammy
-            package: DEB
-
-    name: ${{matrix.distro}}
+    name: ${{matrix.distro}} ${{matrix.version}}
     needs: configure
     runs-on: ubuntu-latest
     continue-on-error: ${{matrix.allow-failure == 'yes'}}
     env:
-      NAME: ${{matrix.distro}}
-      CACHE: /tmp/${{matrix.distro}}-cache # ${{runner.temp}} does not work?
-      # cache size over the entire repo is 10Gi link:
+      NAME: ${{matrix.distro}}${{matrix.version}}
+      CACHE: /tmp/${{matrix.distro}}${{matrix.version}}-cache    # ${{runner.temp}} does not work?
+      # Cache size over the entire repo is 10Gi:
       # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
       CCACHE_SIZE: 200M
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - name: Get cache timestamp
+      - name: Generate cache timestamp
         id: cache_timestamp
         shell: bash
         run: echo "timestamp=$(date -u '+%Y%m%d%H%M%S')" >>"$GITHUB_OUTPUT"
 
       - name: Restore cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           timestamp: ${{steps.cache_timestamp.outputs.timestamp}}
         with:
           path: ${{env.CACHE}}
-          key: docker-${{matrix.distro}}-cache-${{env.timestamp}}
+          key: docker-${{matrix.distro}}${{matrix.version}}-cache-${{env.timestamp}}
           restore-keys: |
-            docker-${{matrix.distro}}-cache-
+            docker-${{matrix.distro}}${{matrix.version}}-cache-
 
-      - name: Build ${{matrix.distro}} Docker image
+      - name: Build ${{matrix.distro}} ${{matrix.version}} Docker image
         shell: bash
         run: source .ci/docker.sh --build
 
       - name: Build debug and test
         if: matrix.test != 'skip'
         shell: bash
-        env:
-          distro: '${{matrix.distro}}'
         run: |
           source .ci/docker.sh
-          RUN --server --debug --test --ccache "$CCACHE_SIZE" --parallel 2
+          RUN --server --debug --test --ccache "$CCACHE_SIZE" --parallel 4
 
       - name: Build release package
-        id: package
+        id: build
         if: matrix.package != 'skip'
         shell: bash
         env:
           BUILD_DIR: build
-          SUFFIX: '-${{matrix.distro}}'
-          distro: '${{matrix.distro}}'
+          SUFFIX: '-${{matrix.distro}}${{matrix.version}}'
           type: '${{matrix.package}}'
         run: |
           source .ci/docker.sh
           RUN --server --release --package "$type" --dir "$BUILD_DIR" \
-                  --ccache "$CCACHE_SIZE" --parallel 2
+                  --ccache "$CCACHE_SIZE" --parallel 4
           .ci/name_build.sh
 
       - name: Upload artifact
         if: matrix.package != 'skip'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: ${{matrix.distro}}-package
-          path: ${{steps.package.outputs.path}}
+          name: ${{matrix.distro}}${{matrix.version}}-package
+          path: ${{steps.build.outputs.path}}
           if-no-files-found: error
 
       - name: Upload to release
         if: matrix.package != 'skip' && needs.configure.outputs.tag != null
-        uses: actions/upload-release-asset@v1
+        shell: bash
         env:
-          GITHUB_TOKEN: ${{github.token}}
-        with:
-          upload_url: ${{needs.configure.outputs.upload_url}}
-          asset_path: ${{steps.package.outputs.path}}
-          asset_name: ${{steps.package.outputs.name}}
-          asset_content_type: application/octet-stream
+          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"
 
   build-macos:
     strategy:
       fail-fast: false
       matrix:
         include:
-          - target: Debug # tests only
-            os: macos-latest
-            xcode: 12.5.1
-            qt_version: 6
+          - target: 13
+            soc: Intel
+            os: macos-13
+            xcode: "14.3.1"
+            type: Release
+            core_count: 4
+            make_package: 1
+
+          - target: 14
+            soc: Apple
+            os: macos-14
+            xcode: "15.4"
+            type: Release
+            core_count: 3
+            make_package: 1
+
+          - target: 15
+            soc: Apple
+            os: macos-15
+            xcode: "16.2"
+            type: Release
+            core_count: 3
+            make_package: 1
+
+          - target: 15
+            soc: Apple
+            os: macos-15
+            xcode: "16.2"
             type: Debug
-            do_tests: 1
+            core_count: 3
 
-          - target: 10.14_Mojave
-            os: macos-10.15 # runs on Catalina
-            xcode: 10.3 # allows compatibility with macOS 10.14
-            qt_version: 5
-            type: Release
-            # do_tests: 1 # tests do not work on qt5?
-            make_package: 1
-
-          - target: 10.15_Catalina
-            os: macos-10.15
-            xcode: 12.4
-            qt_version: 6
-            type: Release
-            do_tests: 1
-            make_package: 1
-
-          - target: 11_Big_Sur
-            os: macos-11
-            xcode: 13.2
-            qt_version: 6
-            type: Release
-            do_tests: 1
-            make_package: 1
-
-#          - target: 12_Monterey
-#            os: macos-12
-#            xcode: 13.3
-#            qt_version: 6
-#            type: Release
-#            do_tests: 1
-#            make_package: 1
-
-    name: macOS ${{matrix.target}}
+    name: macOS ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }}
     needs: configure
     runs-on: ${{matrix.os}}
     continue-on-error: ${{matrix.allow-failure == 'yes'}}
@@ -239,140 +242,193 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - name: Install dependencies using homebrew
+      - name: Install dependencies using Homebrew
         shell: bash
-        # cmake cannot find the mysql connector
-        # neither of these works: mariadb-connector-c mysql-connector-c++
+        # CMake cannot find the MySQL connector
+        # Neither of these works: mariadb-connector-c mysql-connector-c++
         env:
-          qt_version: 'qt@${{matrix.qt_version}}'
+          HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
         run: |
           brew update
-          brew install protobuf
-          brew install "$qt_version" --force-bottle
+          brew install protobuf qt --force-bottle
 
-      - name: Build on Xcode ${{matrix.xcode}}
+      - name: Build & Sign on Xcode ${{matrix.xcode}}
         shell: bash
         id: build
         env:
           BUILDTYPE: '${{matrix.type}}'
-          MAKE_TEST: '${{matrix.do_tests}}'
+          MAKE_TEST: 1
           MAKE_PACKAGE: '${{matrix.make_package}}'
-          PACKAGE_SUFFIX: '-macOS-${{matrix.target}}'
-          # set QTDIR to find qt5, qt6 can be found without this
-          QTDIR: '/usr/local/opt/qt5'
-        # Mac machines actually have 3 cores
-        run: .ci/compile.sh --server --parallel 3
+          PACKAGE_SUFFIX: '-macOS${{matrix.target}}_${{matrix.soc}}'
+          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 }}
+        # macOS runner have 3 cores usually - only the macos-13 image has 4:
+        # https://docs.github.com/en/actions/using-github-hosted-runners/using-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
+        # https://github.com/actions/runner-images?tab=readme-ov-file#available-images
+        run: |
+          if [[ -n "$MACOS_CERTIFICATE_NAME" ]]
+          then
+            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
+            security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
+            security import certificate.p12 -k build.keychain -P "$MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign
+            security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$MACOS_CI_KEYCHAIN_PWD" build.keychain
+          fi
+          .ci/compile.sh --server --parallel ${{matrix.core_count}}
+
+      - name: Sign app bundle
+        if: matrix.make_package
+        env:
+          MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }}
+          MACOS_CI_KEYCHAIN_PWD: ${{ secrets.PROD_MACOS_CI_KEYCHAIN_PWD }}
+        run: |
+          if [[ -n "$MACOS_CERTIFICATE_NAME" ]]
+          then
+            security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
+            /usr/bin/codesign --sign="$MACOS_CERTIFICATE_NAME" --entitlements=".ci/macos.entitlements" --options=runtime --force --deep --timestamp --verbose ${{steps.build.outputs.path}}
+          fi
+
+      - name: Notarize app bundle
+        if: matrix.make_package
+        env:
+          MACOS_NOTARIZATION_APPLE_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_APPLE_ID }}
+          MACOS_NOTARIZATION_TEAM_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_TEAM_ID }}
+          MACOS_NOTARIZATION_PWD: ${{ secrets.PROD_MACOS_NOTARIZATION_PWD }}
+        run: |
+          if [[ -n "$MACOS_NOTARIZATION_APPLE_ID" ]]
+          then
+            # 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"
+            xcrun stapler staple ${{steps.build.outputs.path}}
+          fi
 
       - name: Upload artifact
         if: matrix.make_package
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: macOS-${{matrix.target}}-dmg
+          name: macOS${{matrix.target}}${{ matrix.soc == 'Intel' && '_Intel' || '' }}${{ matrix.type == 'Debug' && '_Debug' || '' }}-dmg
           path: ${{steps.build.outputs.path}}
           if-no-files-found: error
 
       - name: Upload to release
-        if: matrix.make_package && needs.configure.outputs.tag != null
-        uses: actions/upload-release-asset@v1
+        if: matrix.package != 'skip' && needs.configure.outputs.tag != null
+        shell: bash
         env:
-          GITHUB_TOKEN: ${{github.token}}
-        with:
-          upload_url: ${{needs.configure.outputs.upload_url}}
+          GH_TOKEN: ${{github.token}}
+          tag_name: ${{needs.configure.outputs.tag}}
           asset_path: ${{steps.build.outputs.path}}
           asset_name: ${{steps.build.outputs.name}}
-          asset_content_type: application/octet-stream
+        run: gh release upload "$tag_name" "$asset_path#$asset_name"
 
   build-windows:
     strategy:
       fail-fast: false
       matrix:
         include:
-          - target: Win-32bit
-            bit: 32
-            arch: x86
-            cmake_generator_platform: Win32
-            qt_version: 5.15.*
-            qt_arch: msvc2019
-            qt_tools: "tools_openssl_x86"
-
-          - target: Win7+-64bit
-            bit: 64
-            arch: x64
-            cmake_generator_platform: x64
+          - target: 7
             qt_version: 5.15.*
             qt_arch: msvc2019_64
-            qt_tools: "tools_openssl_x64"
 
-          - target: Win10+-64bit
-            bit: 64
-            arch: x64
-            cmake_generator_platform: x64
-            qt_version: 6.3.*
+          - target: 10
+            qt_version: 6.6.*
             qt_arch: msvc2019_64
-            qt_tools: "tools_openssl_x64"
-            qt_modules: "qtmultimedia qtwebsockets"
+            qt_modules: "qtimageformats qtmultimedia qtwebsockets"
 
-    name: ${{matrix.target}}
+    name: Windows ${{matrix.target}}
     needs: configure
-    runs-on: windows-2019
+    runs-on: windows-2022
     env:
-      CMAKE_GENERATOR: 'Visual Studio 16 2019'
+      CMAKE_GENERATOR: 'Visual Studio 17 2022'
 
     steps:
       - name: Add msbuild to PATH
         id: add-msbuild
-        uses: microsoft/setup-msbuild@v1.1
+        uses: microsoft/setup-msbuild@v2
+        with:
+          msbuild-architecture: x64
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
-      - name: Install Qt ${{matrix.qt_version}} for ${{matrix.target}}
-        uses: jurplel/install-qt-action@v3
+      - name: Install Qt ${{matrix.qt_version}}
+        uses: jurplel/install-qt-action@v4
         with:
           cache: true
           setup-python: false
           version: ${{matrix.qt_version}}
-          arch: win${{matrix.bit}}_${{matrix.qt_arch}}
+          arch: win64_${{matrix.qt_arch}}
           tools: ${{matrix.qt_tools}}
           modules: ${{matrix.qt_modules}}
 
       - name: Run vcpkg
-        uses: lukka/run-vcpkg@v10.6
+        uses: lukka/run-vcpkg@v11
         with:
           runVcpkgInstall: true
-          appendedCacheKey: ${{matrix.bit}}-bit
+          doNotCache: false
         env:
-          VCPKG_DEFAULT_TRIPLET: '${{matrix.arch}}-windows'
+          VCPKG_DEFAULT_TRIPLET: 'x64-windows'
           VCPKG_DISABLE_METRICS: 1
 
       - name: Build Cockatrice
         id: build
         shell: bash
         env:
-          PACKAGE_SUFFIX: '-${{matrix.target}}'
+          PACKAGE_SUFFIX: '-Win${{matrix.target}}'
           CMAKE_GENERATOR: '${{env.CMAKE_GENERATOR}}'
-          CMAKE_GENERATOR_PLATFORM: '${{matrix.cmake_generator_platform}}'
-          QTDIR: '${{github.workspace}}\Qt\${{matrix.qt_version}}\win${{matrix.bit}}_${{matrix.qt_arch}}'
-        run: .ci/compile.sh --server --release --test --package --parallel 2
+          CMAKE_GENERATOR_PLATFORM: 'x64'
+          QTDIR: '${{github.workspace}}\Qt\${{matrix.qt_version}}\win64_${{matrix.qt_arch}}'
+        # 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
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: ${{matrix.target}}-installer
+          name: Windows${{matrix.target}}-installer
           path: ${{steps.build.outputs.path}}
           if-no-files-found: error
 
-      - name: Upload to release
-        if: needs.configure.outputs.tag != null
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{github.token}}
+      - name: Upload pdb database
+        uses: actions/upload-artifact@v4
         with:
-          upload_url: ${{needs.configure.outputs.upload_url}}
+          name: Windows${{matrix.target}}-debug-pdbs
+          path: |
+            build/cockatrice/Release/*.pdb
+            build/servatrice/Release/*.pdb
+          if-no-files-found: error
+
+      - name: Upload to release
+        if: matrix.package != 'skip' && 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}}
-          asset_content_type: application/octet-stream
+        run: gh release upload "$tag_name" "$asset_path#$asset_name"

.github/workflows/desktop-lint.yml

@@ -6,6 +6,7 @@ on:
       - '**.md'
       - 'webclient/**'
       - '.github/workflows/web-*.yml'
+      - '.github/workflows/translations-*.yml'
 
 jobs:
   format:
@@ -13,7 +14,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 20 # should be enough to find merge base
 

.github/workflows/translations-pull.yml

@@ -0,0 +1,72 @@
+name: Update Translations
+
+on:
+  workflow_dispatch:
+  schedule:
+    # runs in the middle of each month starting a quarter (UTC) = two weeks after new strings are built
+    - cron: '0 0 15 1,4,7,10 *'
+  pull_request:
+    paths:
+      - '.github/workflows/translations-pull.yml'
+
+jobs:
+  translations:
+    # Do not run the scheduled workflow on forks
+    if: github.event_name != 'schedule' || github.repository_owner == 'Cockatrice'
+
+    name: Pull languages
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
+      - name: Pull translated strings from Transifex
+        uses: transifex/cli-action@v2
+        with:
+          # used config file: https://github.com/Cockatrice/Cockatrice/blob/master/.tx/config
+          # https://github.com/transifex/cli#pulling-files-from-transifex
+          token: ${{ secrets.TX_TOKEN }}
+          args: pull --force --all
+
+      - name: Create pull request
+        if: github.event_name != 'pull_request'
+        id: create_pr
+        uses: peter-evans/create-pull-request@v7
+        with:
+          add-paths: |
+            cockatrice/translations/*.ts
+            oracle/translations/*.ts
+            webclient/public/locales/*/translation.json
+          commit-message: Update translation files
+          # author is the owner of the commit
+          author: github-actions <github-actions@github.com>
+          branch: ci-update_translations
+          delete-branch: true
+          title: 'Update translations'
+          body: |
+            Pulled all translated strings from [Transifex][1].
+            
+            ---
+            *This PR is automatically generated and updated by the workflow at `.github/workflows/translations-pull.yml`. Review [action runs][2].*<br>
+            *After merging, all new languages and translations are available in the next build.*
+            
+            [1]: https://app.transifex.com/cockatrice/cockatrice/
+            [2]: https://github.com/Cockatrice/Cockatrice/actions/workflows/translations-pull.yml?query=branch%3Amaster
+          labels: |
+            CI
+            Translation
+          draft: false
+
+      - name: PR Status
+        if: github.event_name != 'pull_request'
+        shell: bash
+        env:
+          STATUS: ${{ steps.create_pr.outputs.pull-request-operation }}
+        run: |
+          if [[ "$STATUS" == "none" ]]; then
+            echo "PR #${{ steps.create_pr.outputs.pull-request-number }} unchanged!" >> $GITHUB_STEP_SUMMARY
+          else
+            echo "PR #${{ steps.create_pr.outputs.pull-request-number }} $STATUS!" >> $GITHUB_STEP_SUMMARY
+          fi
+          echo "URL: ${{ steps.create_pr.outputs.pull-request-url }}" >> $GITHUB_STEP_SUMMARY

.github/workflows/translations-push.yml

@@ -0,0 +1,87 @@
+name: Update Translation Source
+
+on:
+  workflow_dispatch:
+  schedule:
+    # runs at the start of each quarter (UTC)
+    - cron: '0 0 1 1,4,7,10 *'
+  pull_request:
+    paths:
+      - '.github/workflows/translations-push.yml'
+
+jobs:
+  translations:
+    # Do not run the scheduled workflow on forks
+    if: github.event_name != 'schedule' || github.repository_owner == 'Cockatrice'
+
+    name: Push strings
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
+      - name: Install lupdate
+        shell: bash
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y --no-install-recommends qttools5-dev-tools
+
+      - name: Update Cockatrice translation source
+        id: cockatrice
+        shell: bash
+        env:
+          FILE: 'cockatrice/cockatrice_en@source.ts'
+          DIRS: 'cockatrice/src common'
+        run: .ci/update_translation_source_strings.sh
+
+      - name: Update Oracle translation source
+        id: oracle
+        shell: bash
+        env:
+          FILE: 'oracle/oracle_en@source.ts'
+          DIRS: 'oracle/src'
+        run: .ci/update_translation_source_strings.sh
+
+      - name: Render template
+        id: template
+        uses: chuhlomin/render-template@v1
+        with:
+          template: .ci/update_translation_source_strings_template.md
+          vars: |
+            cockatrice_output: ${{ steps.cockatrice.outputs.output }}
+            oracle_output: ${{ steps.oracle.outputs.output }}
+            commit: ${{ github.sha }}
+
+      - name: Create pull request
+        if: github.event_name != 'pull_request'
+        id: create_pr
+        uses: peter-evans/create-pull-request@v7
+        with:
+          add-paths: |
+            cockatrice/cockatrice_en@source.ts
+            oracle/oracle_en@source.ts
+          commit-message: Update translation source strings
+          # author is the owner of the commit
+          author: github-actions <github-actions@github.com>
+          branch: ci-update_translation_source
+          delete-branch: true
+          title: 'Update source strings'
+          body: ${{ steps.template.outputs.result }}
+          labels: |
+            CI
+            Translation
+          draft: false
+
+      - name: PR Status
+        if: github.event_name != 'pull_request'
+        shell: bash
+        env:
+          STATUS: ${{ steps.create_pr.outputs.pull-request-operation }}
+        run: |
+          if [[ "$STATUS" == "none" ]]; then
+            echo "PR #${{ steps.create_pr.outputs.pull-request-number }} unchanged!" >> $GITHUB_STEP_SUMMARY
+          else
+            echo "PR #${{ steps.create_pr.outputs.pull-request-number }} $STATUS!" >> $GITHUB_STEP_SUMMARY
+          fi
+          echo "URL: ${{ steps.create_pr.outputs.pull-request-url }}" >> $GITHUB_STEP_SUMMARY

.github/workflows/translations.yml

@@ -1,66 +0,0 @@
-name: Update translation source
-
-on:
-  workflow_dispatch:
-  schedule:
-    # runs once per month
-    - cron: '0 0 1 * *'
-
-jobs:
-  translations:
-    # Do not run the scheduled workflow on forks
-    if: github.event_name != 'schedule' || github.repository_owner == 'Cockatrice'
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Install lupdate
-        shell: bash
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y --no-install-recommends qttools5-dev-tools
-
-      - name: Checkout repo
-        uses: actions/checkout@v3
-
-      - name: Update cockatrice translations
-        shell: bash
-        run: |
-          shopt -s globstar # globstar is needed for recursive **
-          lupdate -version
-          echo "reading the following source files:"
-          # note: there are three strings to translate in common right now
-          echo {cockatrice,common}/**/*.{cpp,h}
-          echo "$(echo {cockatrice,common}/**/*.{cpp,h} | wc -w) files total"
-          lupdate {cockatrice,common}/**/*.{cpp,h} -ts cockatrice/translations/cockatrice_en@source.ts
-
-      - name: Update oracle translations
-        shell: bash
-        run: |
-          shopt -s globstar # globstar is needed for recursive **
-          lupdate -version
-          echo "reading the following source files:"
-          echo oracle/**/*.{cpp,h}
-          echo "$(echo oracle/**/*.{cpp,h} | wc -w) files total"
-          lupdate oracle/**/*.{cpp,h} -ts oracle/translations/oracle_en@source.ts
-
-      - name: Check for updates
-        id: check
-        shell: bash
-        run: |
-          set +e # do not fail, just save the exit state
-          git diff --exit-code
-          echo "deploy=$?" >>"$GITHUB_OUTPUT"
-
-      - name: Commit changes
-        if: steps.check.outputs.deploy == '1'
-        shell: bash
-        working-directory: ${{env.OUTPUT_PATH}}
-        run: |
-          git config user.name github-actions
-          git config user.email github-actions@github.com
-          git add cockatrice/translations/cockatrice_en@source.ts oracle/translations/oracle_en@source.ts
-          git commit -m "Automated translation update ( $GITHUB_SHA )"
-          git push
-          deploy_commit=$(git rev-parse HEAD)
-          echo "Created commit: $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/commit/$deploy_commit"

.github/workflows/web-build.yml

@@ -33,10 +33,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: ${{matrix.node_version}}
           cache: 'npm'
@@ -50,4 +50,3 @@ jobs:
 
       - name: Test app
         run: npm run test
-        

.github/workflows/web-lint.yml

@@ -17,10 +17,10 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Setup Node.js
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v4
       with:
         cache: 'npm'
         cache-dependency-path: 'webclient/package-lock.json'

.gitignore

@@ -6,8 +6,11 @@ mysql.cnf
 .DS_Store
 .idea/
 *.aps
-cmake-build-debug*
+cmake-build*
 preferences
 compile_commands.json
 .vs/
 .vscode/
+.cache
+.gdb_history
+cockatrice/resources/config/qtlogging.ini

.tx/config

@@ -1,13 +1,26 @@
 [main]
-host = https://www.transifex.com
+host = https://app.transifex.com
 
-[cockatrice.cockatrice-translations-cockatrice-en-source-ts--master]
+[o:cockatrice:p:cockatrice:r:cockatrice-cockatrice-en-source-ts--master]
+resource_name = Cockatrice
+source_lang = en
+source_file = cockatrice/cockatrice_en@source.ts
 file_filter = cockatrice/translations/cockatrice_<lang>.ts
-source_file = cockatrice/translations/cockatrice_en@source.ts
-source_lang = en
+type = QT
+minimum_perc = 10
 
-[cockatrice.oracle-translations-oracle-en-source-ts--master]
+[o:cockatrice:p:cockatrice:r:oracle-oracle-en-source-ts--master]
+resource_name = Oracle
+source_lang = en
+source_file = oracle/oracle_en@source.ts
 file_filter = oracle/translations/oracle_<lang>.ts
-source_file = oracle/translations/oracle_en@source.ts
-source_lang = en
+type = QT
+minimum_perc = 10
 
+[o:cockatrice:p:cockatrice:r:webclient-src-i18n-default-json--master]
+resource_name = Webclient
+source_lang = en
+source_file = webclient/src/i18n-default.json
+file_filter = webclient/public/locales/<lang>/translation.json
+type = KEYVALUEJSON
+minimum_perc = 10

CMakeLists.txt

@@ -74,16 +74,16 @@ endif()
 
 # A project name is needed for CPack
 # Version can be overriden by git tags, see cmake/getversion.cmake
-project("Cockatrice" VERSION 2.8.1)
+project("Cockatrice" VERSION 2.10.0)
 
 # Set release name if not provided via env/cmake var
 if(NOT DEFINED GIT_TAG_RELEASENAME)
-  set(GIT_TAG_RELEASENAME "Prismatic Bridge")
+  set(GIT_TAG_RELEASENAME "Rings of the Wild")
 endif()
 
-# Use c++17 for all targets
+# Use c++20 for all targets
 set(CMAKE_CXX_STANDARD
-    17
+    20
     CACHE STRING "C++ ISO Standard"
 )
 set(CMAKE_CXX_STANDARD_REQUIRED True)
@@ -140,10 +140,17 @@ endif()
 
 # Define proper compilation flags
 if(MSVC)
-  # Visual Studio: Maximum optimization, disable warning C4251, establish C++17 compatibility
-  set(CMAKE_CXX_FLAGS_RELEASE "/Ox /MD /wd4251 /Zc:__cplusplus /std:c++17 /permissive-")
-  # Generate complete debugging information
-  #set(CMAKE_CXX_FLAGS_DEBUG "/Zi")
+  # Disable Warning C4251, C++20 compatibility, Multi-threaded Builds, Warn Detection, Unwind Semantics, Debug Symbols
+  set(CMAKE_CXX_FLAGS "/wd4251 /Zc:__cplusplus /std:c++20 /permissive- /W4 /MP /EHsc /Zi")
+  # Visual Studio: Maximum Optimization, Multi-threaded DLL
+  set(CMAKE_CXX_FLAGS_RELEASE "/Ox /MD")
+  # Visual Studio: No Optimization, Multi-threaded Debug DLL
+  set(CMAKE_CXX_FLAGS_DEBUG "/Od /MDd")
+
+  # Generate PDB, even when in release (So developers can better analyze crash logs)
+  set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
+
+  add_compile_definitions(_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING)
 elseif(CMAKE_COMPILER_IS_GNUCXX)
   # linux/gcc, bsd/gcc, windows/mingw
   include(CheckCXXCompilerFlag)
@@ -156,7 +163,7 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
   endif()
 
   if(APPLE)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++20")
   endif()
 
   set(ADDITIONAL_DEBUG_FLAGS
@@ -179,7 +186,7 @@ else()
   # other: osx/llvm, bsd/llvm
   set(CMAKE_CXX_FLAGS_RELEASE "-O2")
   if(WARNING_AS_ERROR)
-    set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall -Wextra -Werror")
+    set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall -Wextra -Werror -Wno-unused-parameter")
   else()
     set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall -Wextra")
   endif()
@@ -216,16 +223,26 @@ include(FindQtRuntime)
 set(CMAKE_AUTOMOC TRUE)
 
 # Find other needed libraries
-find_package(Protobuf REQUIRED)
-if(NOT EXISTS "${Protobuf_PROTOC_EXECUTABLE}")
+find_package(Protobuf CONFIG)
+if(NOT Protobuf_FOUND)
+  find_package(Protobuf REQUIRED)
+endif()
+
+if(${Protobuf_VERSION} VERSION_LESS "3.21.0.0" AND NOT EXISTS "${Protobuf_PROTOC_EXECUTABLE}")
   message(FATAL_ERROR "No protoc command found!")
-else()
-  message(STATUS "Found Protobuf ${Protobuf_VERSION} at: ${Protobuf_LIBRARIES}")
 endif()
 
 #Find OpenSSL
 if(WIN32)
-  find_package(Win32SslRuntime)
+  find_package(OpenSSL REQUIRED)
+  if(OPENSSL_FOUND)
+    include_directories(${OPENSSL_INCLUDE_DIRS})
+  else()
+    message(
+      WARNING
+        "Could not find OpenSSL runtime libraries. They are not required for compiling, but needs to be available at runtime."
+    )
+  endif()
 endif()
 
 #Find VCredist
@@ -252,13 +269,16 @@ if(UNIX)
     set(CPACK_DMG_VOLUME_NAME "${PROJECT_NAME}")
     set(CPACK_SYSTEM_NAME "OSX")
     set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/cockatrice/resources/appicon.icns")
+    set(CPACK_DMG_DS_STORE_SETUP_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/cmake/CMakeDMGSetup.script")
+    set(CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/cmake/dmgBackground.tif")
+    set(CPACK_PRE_BUILD_SCRIPTS "${CMAKE_CURRENT_SOURCE_DIR}/cmake/SignMacApplications.cmake")
   else()
     # linux
     if(CPACK_GENERATOR STREQUAL "RPM")
       set(CPACK_RPM_PACKAGE_LICENSE "GPLv2")
       set(CPACK_RPM_MAIN_COMPONENT "cockatrice")
       if(Qt6_FOUND)
-        set(CPACK_RPM_PACKAGE_REQUIRES "protobuf, qt6-qttools, qt6-qtsvg, qt6-qtmultimedia")
+        set(CPACK_RPM_PACKAGE_REQUIRES "protobuf, qt6-qttools, qt6-qtsvg, qt6-qtmultimedia, qt6-qtimageformats")
       elseif(Qt5_FOUND)
         set(CPACK_RPM_PACKAGE_REQUIRES "protobuf, qt5-qttools, qt5-qtsvg, qt5-qtmultimedia")
       endif()
@@ -280,7 +300,7 @@ if(UNIX)
       set(CPACK_DEBIAN_PACKAGE_SECTION "games")
       set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "http://github.com/Cockatrice/Cockatrice")
       if(Qt6_FOUND)
-        set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt6multimedia6, libqt6svg6, qt6-qpa-plugins")
+        set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt6multimedia6, libqt6svg6, qt6-qpa-plugins, qt6-image-formats-plugins")
       elseif(Qt5_FOUND)
         set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt5multimedia5-plugins, libqt5svg5")
       endif()

Dockerfile

@@ -1,19 +1,20 @@
-FROM ubuntu:bionic
-MAINTAINER Zach Halpern <zahalpern+github@gmail.com>
+FROM ubuntu:24.04
+
+ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install -y\
-  build-essential\
-  cmake\
-  git\
-  libprotobuf-dev\
-  libqt5sql5-mysql\
-  libmysqlclient-dev\
-  libqt5websockets5-dev\
-  protobuf-compiler\
-  qt5-default\
-  qtbase5-dev\
-  qttools5-dev-tools\
-  qttools5-dev
+  build-essential \
+  cmake \
+  file \
+  g++ \
+  git \
+  libmariadb-dev-compat \
+  libprotobuf-dev \
+  libqt6sql6-mysql \
+  qt6-websockets-dev \
+  protobuf-compiler \
+  qt6-tools-dev \
+  qt6-tools-dev-tools
 
 COPY . /home/servatrice/code/
 WORKDIR /home/servatrice/code
@@ -25,7 +26,6 @@ RUN cmake .. -DWITH_SERVER=1 -DWITH_CLIENT=0 -DWITH_ORACLE=0 -DWITH_DBCONVERTER=
 
 WORKDIR /home/servatrice
 
-EXPOSE 4747
+EXPOSE 4747 4748
 
 ENTRYPOINT [ "servatrice", "--log-to-console" ]
-

README.md

@@ -5,7 +5,7 @@
 <p align='center'>
    <a href="#cockatrice"><b>Cockatrice</b></a> <b>|</b>
    <a href="#download-">Download</a> <b>|</b>
-   <a href="#get-involved--">Get Involved</a> <b>|</b>
+   <a href="#get-involved-">Get Involved</a> <b>|</b>
    <a href="#community-resources">Community</a> <b>|</b>
    <a href="#translations-">Translations</a> <b>|</b>
    <a href="#build--">Build</a> <b>|</b>
@@ -18,7 +18,7 @@
 <br><pre>
 <b>To get started, &#8674; [view our webpage](https://cockatrice.github.io/)</b><br>
 <b>To get support or suggest changes &#8674; [file an issue](https://github.com/Cockatrice/Cockatrice/issues) ([How?](https://github.com/Cockatrice/Cockatrice/wiki/How-to-Create-a-GitHub-Ticket-Regarding-Cockatrice))</b>
-<b>To help with development, see how to [get involved](#get-involved--)</b>
+<b>To help with development, see how to [get involved](#get-involved-)</b>
 </pre><br>
 
 
@@ -40,9 +40,9 @@ Downloads are available for full releases and the current beta version in develo
    - To be a Cockatrice Beta Tester, use this version. Find more information [here](https://github.com/Cockatrice/Cockatrice/wiki/Release-Channels)!
    
 
-# Get Involved [![Discord](https://img.shields.io/discord/314987288398659595?label=Discord&logo=discord&logoColor=white)](https://discord.gg/3Z9yzmA) [![Gitter Chat](https://img.shields.io/gitter/room/Cockatrice/Cockatrice)](https://gitter.im/Cockatrice/Cockatrice)
+# Get Involved [![Discord](https://img.shields.io/discord/314987288398659595?label=Discord&logo=discord&logoColor=white)](https://discord.gg/3Z9yzmA)
 
-Join our [Discord community](https://discord.gg/3Z9yzmA) to connect with the project or fellow users of the app. The Cockatrice developers are also available on [Gitter](https://gitter.im/Cockatrice/Cockatrice). Come here to talk about the application, features, or just to hang out.<br>
+Join our [Discord community](https://discord.gg/3Z9yzmA) to connect with the project, contributors or fellow users of the app. Come here to talk about the application, features, or just to hang out.<br>
 For support regarding specific servers, please contact that server's admin or forum for support rather than asking here.<br>
 
 To contribute code to the project, please review [the guidelines](https://github.com/Cockatrice/Cockatrice/blob/master/.github/CONTRIBUTING.md).
@@ -65,13 +65,9 @@ Cockatrice uses the [Google Developer Documentation Style Guide](https://develop
 - [reddit r/Cockatrice](https://reddit.com/r/cockatrice)
 
 
-# Translations [![Transifex Project](https://img.shields.io/badge/translate-on%20transifex-brightgreen)](https://www.transifex.com/projects/p/cockatrice/)
+# Translations [![Transifex Project](https://img.shields.io/badge/translate-on%20transifex-brightgreen)](https://transifex.com/cockatrice/cockatrice/)
 
-Cockatrice uses Transifex for translations. You can help us bring Cockatrice and Oracle to your language or just edit single wordings right from within your browser by visiting our [Transifex project page](https://www.transifex.com/projects/p/cockatrice/).<br>
-
-| Cockatrice | Oracle |
-|:-:|:-:|
-| [![Cockatrice Translation Status](https://www.transifex.com/projects/p/cockatrice/resource/cockatrice/chart/image_png/)](https://www.transifex.com/projects/p/cockatrice/) | [![Oracle Translation Status](https://www.transifex.com/projects/p/cockatrice/resource/oracle/chart/image_png/)](https://www.transifex.com/projects/p/cockatrice/) |
+Cockatrice uses Transifex for translations. You can help us bring Cockatrice, Oracle and Webatrice to your language or just adjust single wordings right from within your browser by visiting our [Transifex project page](https://transifex.com/cockatrice/cockatrice/).<br>
 
 Check out our [Translator FAQ](https://github.com/Cockatrice/Cockatrice/wiki/Translation-FAQ) for more information about contributing!<br>
 

cmake/CMakeDMGSetup.script

@@ -0,0 +1,55 @@
+on run argv
+set image_name to item 1 of argv
+
+tell application "Finder"
+tell disk image_name
+
+  -- wait for the image to finish mounting
+  set open_attempts to 0
+  repeat while open_attempts < 4
+    try
+      open
+        delay 1
+        set open_attempts to 5
+      close
+      on error errStr number errorNumber
+        set open_attempts to open_attempts + 1
+        delay 10
+    end try
+  end repeat
+  delay 5
+
+  -- open the image the first time and save a DS_Store with just
+  -- background and icon setup
+  open
+    set current view of container window to icon view
+    set theViewOptions to the icon view options of container window
+    set background picture of theViewOptions to file ".background:background.tif"
+    set arrangement of theViewOptions to not arranged
+    set icon size of theViewOptions to 128
+    delay 5
+  close
+
+  -- next setup the position of the app and Applications symlink
+  -- plus hide all the window decoration
+  open
+    update without registering applications
+    tell container window
+      set sidebar width to 0
+      set statusbar visible to false
+      set toolbar visible to false
+      set the bounds to { 400, 100, 1400, 922 }
+      set position of item "Cockatrice.app" to { 139, 214 }
+      set position of item "Oracle.app" to { 139, 414 }
+      set position of item "Servatrice.app" to { 139, 614 }
+      set position of item "dbconverter.app" to { 1400, 1400 }
+      set position of item "Applications" to { 861, 414 }
+    end tell
+    update without registering applications
+    delay 5
+  close
+
+end tell
+delay 1
+end tell
+end run

cmake/FindQtRuntime.cmake

@@ -23,6 +23,7 @@ if(WITH_CLIENT)
       Svg
       WebSockets
       Widgets
+      Xml
   )
 endif()
 if(WITH_ORACLE)

cmake/FindVCredistRuntime.cmake

@@ -9,7 +9,8 @@ if(WIN32)
     set(REDIST_ARCH x86)
   endif()
 
-  set(REDIST_FILE vc_redist.${REDIST_ARCH}.exe)
+  # VS 2017 uses vcredist_ARCH.exe, VS 2022 uses vc_redist.ARCH.exe
+  set(REDIST_FILE_NAMES vcredist_${REDIST_ARCH}.exe vcredist.${REDIST_ARCH}.exe vc_redist.${REDIST_ARCH}.exe)
 
   set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
   include(InstallRequiredSystemLibraries)
@@ -22,18 +23,20 @@ if(WIN32)
     get_filename_component(_path ${_path} DIRECTORY)
     get_filename_component(_path ${_path}/../../ ABSOLUTE)
 
-    if(EXISTS "${_path}/${REDIST_FILE}") # VS 2017
-      set(VCREDISTRUNTIME_FOUND "YES")
-      set(VCREDISTRUNTIME_FILE ${_path}/${REDIST_FILE})
-    endif()
+    foreach(redist_file ${REDIST_FILE_NAMES})
+      if(EXISTS "${_path}/${redist_file}")
+        set(VCREDISTRUNTIME_FOUND "YES")
+        set(VCREDISTRUNTIME_FILE ${_path}/${redist_file})
+        break()
+      endif()
+    endforeach()
   endif()
 
   if(VCREDISTRUNTIME_FOUND)
     message(STATUS "Found VCredist ${VCREDISTRUNTIME_FILE}")
   else()
     message(
-      WARNING
-        "Could not find VCredist package in \"${_path}/${REDIST_FILE}\". It's not required for compiling, but needs to be available at runtime."
+      WARNING "Could not find VCredist package. It's not required for compiling, but needs to be available at runtime."
     )
   endif()
 endif()

cmake/FindWin32SslRuntime.cmake

@@ -1,81 +0,0 @@
-# Find the OpenSSL runtime libraries (.dll) for Windows that
-# will be needed by Qt in order to access https urls.
-if(NOT DEFINED WIN32 OR NOT ${WIN32})
-  message(STATUS "Non-Windows device trying to execute FindWin32SslRuntime, skipping")
-  return()
-endif()
-
-if("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "x64")
-  message(STATUS "Looking for OpenSSL for ${CMAKE_GENERATOR_PLATFORM}")
-  file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _programfiles)
-  set(_OPENSSL_ROOT_PATHS
-      "$ENV{VCPKG_PACKAGES_DIR}/x64-windows/bin"
-      "C:/OpenSSL-Win64/bin"
-      "C:/OpenSSL-Win64"
-      "C:/Tools/vcpkg/installed/x64-windows/bin"
-      "${_programfiles}/OpenSSL-Win64"
-      "D:/a/Cockatrice/Qt/Tools/OpenSSL/Win_x64/bin"
-      expanduser
-      ("~/Documents/Development/Qt/Tools/OpenSSL/Win_x64/bin")
-  )
-  unset(_programfiles)
-elseif("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "Win32")
-  message(STATUS "Looking for OpenSSL for ${CMAKE_GENERATOR_PLATFORM}")
-  file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _programfiles)
-  set(_OPENSSL_ROOT_PATHS
-      "$ENV{VCPKG_PACKAGES_DIR}/x86-windows/bin"
-      "C:/OpenSSL-Win32/bin"
-      "C:/OpenSSL-Win32"
-      "C:/OpenSSL"
-      "C:/Tools/vcpkg/installed/x86-windows/bin"
-      "${_programfiles}/OpenSSL"
-      "${_programfiles}/OpenSSL-Win32"
-      "D:/a/Cockatrice/Qt/Tools/OpenSSL/Win_x86/bin"
-      expanduser
-      ("~/Documents/Development/Qt/Tools/OpenSSL/Win_x86/bin")
-  )
-  unset(_programfiles)
-endif()
-
-message(STATUS "Looking for OpenSSL @ ${CMAKE_GENERATOR_PLATFORM} in ${_OPENSSL_ROOT_PATHS}")
-if("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "x64")
-  find_file(
-    WIN32SSLRUNTIME_LIBEAY
-    NAMES libcrypto-1_1-x64.dll libcrypto.dll
-    PATHS ${_OPENSSL_ROOT_PATHS}
-    NO_DEFAULT_PATH
-  )
-  find_file(
-    WIN32SSLRUNTIME_SSLEAY
-    NAMES libssl-1_1-x64.dll libssl.dll
-    PATHS ${_OPENSSL_ROOT_PATHS}
-    NO_DEFAULT_PATH
-  )
-elseif("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "Win32")
-  find_file(
-    WIN32SSLRUNTIME_LIBEAY
-    NAMES libcrypto-1_1.dll libcrypto.dll
-    PATHS ${_OPENSSL_ROOT_PATHS}
-    NO_DEFAULT_PATH
-  )
-  find_file(
-    WIN32SSLRUNTIME_SSLEAY
-    NAMES libssl-1_1.dll libssl.dll
-    PATHS ${_OPENSSL_ROOT_PATHS}
-    NO_DEFAULT_PATH
-  )
-endif()
-
-if(WIN32SSLRUNTIME_LIBEAY AND WIN32SSLRUNTIME_SSLEAY)
-  set(WIN32SSLRUNTIME_LIBRARIES "${WIN32SSLRUNTIME_LIBEAY}" "${WIN32SSLRUNTIME_SSLEAY}")
-  set(WIN32SSLRUNTIME_FOUND "YES")
-  message(STATUS "Found OpenSSL ${WIN32SSLRUNTIME_LIBRARIES}")
-else()
-  set(WIN32SSLRUNTIME_FOUND "NO")
-  message(
-    WARNING
-      "Could not find OpenSSL runtime libraries. They are not required for compiling, but needs to be available at runtime."
-  )
-endif()
-
-mark_as_advanced(WIN32SSLRUNTIME_LIBEAY WIN32SSLRUNTIME_SSLEAY)

cmake/NSIS.template.in

@@ -5,7 +5,7 @@ OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@"
 
 !define INST_DIR "@CPACK_TEMPORARY_DIRECTORY@"
 
-RequestExecutionlevel highest
+RequestExecutionlevel admin
 SetCompressor LZMA
 
 Var NormalDestDir
@@ -235,6 +235,13 @@ ${If} $PortableMode = 0
 	WriteUninstaller "$INSTDIR\uninstall.exe"
 	${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
 	IntFmt $0 "0x%08X" $0
+
+	; Enable Windows User-Mode Dumps
+	; https://learn.microsoft.com/en-us/windows/win32/wer/collecting-user-mode-dumps
+	WriteRegExpandStr HKLM "Software\Microsoft\Windows\Windows Error Reporting\LocalDumps\cockatrice.exe" "DumpFolder" "%LOCALAPPDATA%\CrashDumps\Cockatrice"
+	WriteRegDWORD HKLM "Software\Microsoft\Windows\Windows Error Reporting\LocalDumps\cockatrice.exe" "DumpCount" "5"
+	WriteRegDWORD HKLM "Software\Microsoft\Windows\Windows Error Reporting\LocalDumps\cockatrice.exe" "DumpType" "2"
+
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "DisplayIcon" "$INSTDIR\cockatrice.exe"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "DisplayName" "Cockatrice"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "DisplayVersion" "@CPACK_PACKAGE_VERSION_MAJOR@.@CPACK_PACKAGE_VERSION_MINOR@.@CPACK_PACKAGE_VERSION_PATCH@"
@@ -248,20 +255,20 @@ ${If} $PortableMode = 0
 	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "VersionMajor" "@CPACK_PACKAGE_VERSION_MAJOR@"
 	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "VersionMinor" "@CPACK_PACKAGE_VERSION_MINOR@"
 
-	IfFileExists "$INSTDIR\vcredist_x86.exe" VcRedist86Exists PastVcRedist86Check
+	IfFileExists "$INSTDIR\vc_redist.x86.exe" VcRedist86Exists PastVcRedist86Check
 	VcRedist86Exists:
-		ExecWait '"$INSTDIR\vcredist_x86.exe" /passive /norestart'
+		ExecWait '"$INSTDIR\vc_redist.x86.exe" /passive /norestart'
 		DetailPrint "Wait to ensure unlock of vc_redist file after installation..."
 		Sleep 3000
-		Delete "$INSTDIR\vcredist_x86.exe"
+		Delete "$INSTDIR\vc_redist.x86.exe"
 	PastVcRedist86Check:
 
-	IfFileExists "$INSTDIR\vcredist_x64.exe" VcRedist64Exists PastVcRedist64Check
+	IfFileExists "$INSTDIR\vc_redist.x64.exe" VcRedist64Exists PastVcRedist64Check
 	VcRedist64Exists:
-		ExecWait '"$INSTDIR\vcredist_x64.exe" /passive /norestart'
+		ExecWait '"$INSTDIR\vc_redist.x64.exe" /passive /norestart'
 		DetailPrint "Sleep to ensure unlock of vc_redist file after installation..."
 		Sleep 3000
-		Delete "$INSTDIR\vcredist_x64.exe"
+		Delete "$INSTDIR\vc_redist.x64.exe"
 	PastVcRedist64Check:
 
 ${Else}

cmake/SignMacApplications.cmake

@@ -0,0 +1,27 @@
+# This script re-signs all apps after CPack packages them. This is necessary because CPack modifies
+# the library references used by Cockatrice to App relative paths, invalidating the code signature.
+string(LENGTH "$ENV{MACOS_CERTIFICATE_NAME}" MACOS_CERTIFICATE_NAME_LEN)
+
+if(APPLE AND MACOS_CERTIFICATE_NAME_LEN GREATER 0)
+  set(APPLICATIONS "cockatrice" "servatrice" "oracle" "dbconverter")
+  foreach(app_name IN LISTS APPLICATIONS)
+    set(FULL_APP_PATH "${CPACK_TEMPORARY_INSTALL_DIRECTORY}/${app_name}.app")
+
+    message(STATUS "Signing Interior Dynamically Loaded Libraries for ${app_name}.app")
+    execute_process(COMMAND "find" "${FULL_APP_PATH}" "-name" "*.dylib" OUTPUT_VARIABLE INTERIOR_DLLS)
+    string(REPLACE "\n" ";" INTERIOR_DLLS_LIST ${INTERIOR_DLLS})
+
+    foreach(INTERIOR_DLL IN LISTS INTERIOR_DLLS_LIST)
+      execute_process(
+        COMMAND "codesign" "--sign" "$ENV{MACOS_CERTIFICATE_NAME}" "--entitlements" "../.ci/macos.entitlements"
+                "--options" "runtime" "--force" "--deep" "--timestamp" "--verbose" "${INTERIOR_DLL}"
+      )
+    endforeach()
+
+    message(STATUS "Signing Exterior Applications ${app_name}.app")
+    execute_process(
+      COMMAND "codesign" "--sign" "$ENV{MACOS_CERTIFICATE_NAME}" "--entitlements" "../.ci/macos.entitlements"
+              "--options" "runtime" "--force" "--deep" "--timestamp" "--verbose" "${FULL_APP_PATH}"
+    )
+  endforeach()
+endif()

cmake/expanduser.cmake

@@ -1,19 +0,0 @@
-# expands ~ to user home directory
-#
-# usage:
-# expanduser("~/code" x)
-
-function(expanduser in outvar)
-
-  if(CMAKE_VERSION VERSION_LESS 3.21)
-    get_filename_component(out ${in} ABSOLUTE)
-  else()
-    file(REAL_PATH ${in} out EXPAND_TILDE)
-  endif()
-
-  set(${outvar}
-      ${out}
-      PARENT_SCOPE
-  )
-
-endfunction(expanduser)

cmake/getversion.cmake

@@ -19,7 +19,7 @@ function(get_commit_id)
       PARENT_SCOPE
   )
   set(PROJECT_VERSION_LABEL
-      "custom(${GIT_COM_ID})"
+      "custom-${GIT_COM_ID}"
       PARENT_SCOPE
   )
 endfunction()

cockatrice/CMakeLists.txt

@@ -5,132 +5,201 @@
 project(Cockatrice VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 
 set(cockatrice_SOURCES
-    src/abstractcarddragitem.cpp
-    src/abstractcarditem.cpp
-    src/abstractclient.cpp
-    src/abstractcounter.cpp
-    src/abstractgraphicsitem.cpp
-    src/arrowitem.cpp
-    src/arrowtarget.cpp
-    src/carddatabase.cpp
-    src/carddatabasemodel.cpp
-    src/carddbparser/carddatabaseparser.cpp
-    src/carddbparser/cockatricexml3.cpp
-    src/carddbparser/cockatricexml4.cpp
-    src/carddragitem.cpp
-    src/cardfilter.cpp
-    src/cardframe.cpp
-    src/cardinfopicture.cpp
-    src/cardinfotext.cpp
-    src/cardinfowidget.cpp
-    src/carditem.cpp
-    src/cardlist.cpp
-    src/cardzone.cpp
-    src/chatview/chatview.cpp
-    src/counter_general.cpp
-    src/customlineedit.cpp
-    src/deck_loader.cpp
-    src/decklistmodel.cpp
-    src/deckstats_interface.cpp
-    src/deckview.cpp
-    src/dlg_connect.cpp
-    src/dlg_create_token.cpp
-    src/dlg_creategame.cpp
-    src/dlg_edit_avatar.cpp
-    src/dlg_edit_password.cpp
-    src/dlg_edit_tokens.cpp
-    src/dlg_edit_user.cpp
-    src/dlg_filter_games.cpp
-    src/dlg_forgotpasswordchallenge.cpp
-    src/dlg_forgotpasswordrequest.cpp
-    src/dlg_forgotpasswordreset.cpp
-    src/dlg_load_deck_from_clipboard.cpp
-    src/dlg_load_remote_deck.cpp
-    src/dlg_manage_sets.cpp
-    src/dlg_register.cpp
-    src/dlg_settings.cpp
-    src/dlg_tip_of_the_day.cpp
-    src/dlg_update.cpp
-    src/dlg_viewlog.cpp
-    src/filter_string.cpp
-    src/filterbuilder.cpp
-    src/filtertree.cpp
-    src/filtertreemodel.cpp
-    src/gamescene.cpp
-    src/gameselector.cpp
-    src/gamesmodel.cpp
-    src/gameview.cpp
-    src/gettextwithmax.cpp
-    src/handcounter.cpp
-    src/handle_public_servers.cpp
-    src/handzone.cpp
-    src/keysignals.cpp
-    src/lineeditcompleter.cpp
-    src/localclient.cpp
-    src/localserver.cpp
-    src/localserverinterface.cpp
-    src/logger.cpp
+    src/game/cards/abstract_card_drag_item.cpp
+    src/game/cards/abstract_card_item.cpp
+    src/client/game_logic/abstract_client.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/cards/card_database.cpp
+    src/game/cards/card_database_manager.cpp
+    src/game/cards/card_database_model.cpp
+    src/game/cards/card_database_parser/card_database_parser.cpp
+    src/game/cards/card_database_parser/cockatrice_xml_3.cpp
+    src/game/cards/card_database_parser/cockatrice_xml_4.cpp
+    src/game/cards/card_drag_item.cpp
+    src/game/filters/filter_card.cpp
+    src/client/ui/widgets/cards/card_info_frame_widget.cpp
+    src/client/ui/widgets/cards/card_info_picture_widget.cpp
+    src/client/ui/widgets/cards/card_info_text_widget.cpp
+    src/client/ui/widgets/cards/card_info_display_widget.cpp
+    src/client/ui/widgets/cards/card_size_widget.cpp
+    src/game/cards/card_item.cpp
+    src/game/cards/card_list.cpp
+    src/game/zones/card_zone.cpp
+    src/server/chat_view/chat_view.cpp
+    src/game/board/counter_general.cpp
+    src/deck/custom_line_edit.cpp
+    src/deck/deck_loader.cpp
+    src/deck/deck_list_model.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_token.cpp
+    src/dialogs/dlg_create_game.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_from_clipboard.cpp
+    src/dialogs/dlg_load_remote_deck.cpp
+    src/dialogs/dlg_manage_sets.cpp
+    src/dialogs/dlg_move_top_cards_until.cpp
+    src/dialogs/dlg_register.cpp
+    src/dialogs/dlg_roll_dice.cpp
+    src/dialogs/dlg_settings.cpp
+    src/dialogs/dlg_tip_of_the_day.cpp
+    src/dialogs/dlg_update.cpp
+    src/dialogs/dlg_view_log.cpp
+    src/dialogs/dlg_load_deck.cpp
+    src/game/deckview/deck_view.cpp
+    src/game/deckview/deck_view_container.cpp
+    src/game/filters/filter_string.cpp
+    src/game/filters/filter_builder.cpp
+    src/game/filters/filter_tree.cpp
+    src/game/filters/filter_tree_model.cpp
+    src/client/ui/layouts/flow_layout.cpp
+    src/client/ui/widgets/general/layout_containers/flow_widget.cpp
+    src/game/game_scene.cpp
+    src/game/game_selector.cpp
+    src/game/games_model.cpp
+    src/game/game_view.cpp
+    src/client/get_text_with_max.cpp
+    src/game/hand_counter.cpp
+    src/server/handle_public_servers.cpp
+    src/game/zones/hand_zone.cpp
+    src/client/game_logic/key_signals.cpp
+    src/client/ui/line_edit_completer.cpp
+    src/server/local_client.cpp
+    src/server/local_server.cpp
+    src/server/local_server_interface.cpp
+    src/utility/logger.cpp
+    src/client/ui/widgets/cards/card_info_picture_enlarged_widget.cpp
+    src/client/ui/widgets/cards/card_info_picture_with_text_overlay_widget.cpp
+    src/client/ui/widgets/general/display/banner_widget.cpp
+    src/client/ui/widgets/general/display/labeled_input.cpp
+    src/client/ui/widgets/general/display/dynamic_font_size_label.cpp
+    src/client/ui/widgets/general/display/dynamic_font_size_push_button.cpp
+    src/client/ui/widgets/general/display/shadow_background_label.cpp
     src/main.cpp
-    src/messagelogwidget.cpp
-    src/pending_command.cpp
-    src/phase.cpp
-    src/phasestoolbar.cpp
-    src/pictureloader.cpp
-    src/pilezone.cpp
-    src/pixmapgenerator.cpp
-    src/player.cpp
-    src/playerlistwidget.cpp
-    src/playertarget.cpp
-    src/releasechannel.cpp
-    src/remoteclient.cpp
-    src/remotedecklist_treewidget.cpp
-    src/remotereplaylist_treewidget.cpp
-    src/replay_timeline_widget.cpp
-    src/selectzone.cpp
-    src/sequenceEdit/sequenceedit.cpp
-    src/setsmodel.cpp
-    src/settings/carddatabasesettings.cpp
-    src/settings/downloadsettings.cpp
-    src/settings/gamefilterssettings.cpp
-    src/settings/layoutssettings.cpp
-    src/settings/messagesettings.cpp
-    src/settings/serverssettings.cpp
-    src/settings/settingsmanager.cpp
-    src/settingscache.cpp
-    src/shortcutssettings.cpp
-    src/soundengine.cpp
-    src/spoilerbackgroundupdater.cpp
-    src/stackzone.cpp
-    src/tab.cpp
-    src/tab_account.cpp
-    src/tab_admin.cpp
-    src/tab_deck_editor.cpp
-    src/tab_deck_storage.cpp
-    src/tab_game.cpp
-    src/tab_logs.cpp
-    src/tab_message.cpp
-    src/tab_replays.cpp
-    src/tab_room.cpp
-    src/tab_server.cpp
-    src/tab_supervisor.cpp
-    src/tablezone.cpp
-    src/tappedout_interface.cpp
-    src/thememanager.cpp
-    src/tip_of_the_day.cpp
-    src/translatecountername.cpp
-    src/update_downloader.cpp
-    src/user_context_menu.cpp
-    src/userconnection_information.cpp
-    src/userinfobox.cpp
-    src/userlist.cpp
-    src/window_main.cpp
-    src/zoneviewwidget.cpp
-    src/zoneviewzone.cpp
+    src/server/message_log_widget.cpp
+    src/client/ui/layouts/overlap_layout.cpp
+    src/client/ui/widgets/general/layout_containers/overlap_widget.cpp
+    src/client/ui/widgets/general/layout_containers/overlap_control_widget.cpp
+    src/server/pending_command.cpp
+    src/game/phase.cpp
+    src/client/ui/phases_toolbar.cpp
+    src/client/ui/picture_loader/picture_loader.cpp
+    src/client/ui/picture_loader/picture_loader_worker.cpp
+    src/client/ui/picture_loader/picture_to_load.cpp
+    src/game/zones/pile_zone.cpp
+    src/client/ui/pixel_map_generator.cpp
+    src/game/player/player.cpp
+    src/game/player/player_list_widget.cpp
+    src/game/player/player_target.cpp
+    src/client/ui/widgets/printing_selector/all_zones_card_amount_widget.cpp
+    src/client/ui/widgets/printing_selector/card_amount_widget.cpp
+    src/client/ui/widgets/printing_selector/printing_selector.cpp
+    src/client/ui/widgets/printing_selector/printing_selector_card_display_widget.cpp
+    src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp
+    src/client/ui/widgets/printing_selector/printing_selector_card_search_widget.cpp
+    src/client/ui/widgets/printing_selector/printing_selector_card_selection_widget.cpp
+    src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp
+    src/client/ui/widgets/printing_selector/printing_selector_view_options_toolbar_widget.cpp
+    src/client/ui/widgets/printing_selector/printing_selector_view_options_widget.cpp
+    src/client/ui/widgets/printing_selector/set_name_and_collectors_number_display_widget.cpp
+    src/client/network/release_channel.cpp
+    src/client/network/client_update_checker.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/client/network/replay_timeline_widget.cpp
+    src/game/zones/select_zone.cpp
+    src/utility/sequence_edit.cpp
+    src/client/network/sets_model.cpp
+    src/settings/card_database_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/cache_settings.cpp
+    src/settings/shortcuts_settings.cpp
+    src/settings/shortcut_treeview.cpp
+    src/settings/card_override_settings.cpp
+    src/settings/debug_settings.cpp
+    src/client/sound_engine.cpp
+    src/client/network/spoiler_background_updater.cpp
+    src/game/zones/stack_zone.cpp
+    src/client/tabs/tab.cpp
+    src/client/tabs/tab_account.cpp
+    src/client/tabs/tab_admin.cpp
+    src/client/tabs/tab_deck_editor.cpp
+    src/client/tabs/tab_deck_storage.cpp
+    src/client/tabs/tab_game.cpp
+    src/client/tabs/tab_logs.cpp
+    src/client/tabs/tab_message.cpp
+    src/client/tabs/tab_replays.cpp
+    src/client/tabs/tab_room.cpp
+    src/client/tabs/tab_server.cpp
+    src/client/tabs/tab_supervisor.cpp
+    src/client/tabs/api/edhrec/tab_edhrec.cpp
+    src/client/tabs/api/edhrec/edhrec_commander_api_response_display_widget.cpp
+    src/client/tabs/api/edhrec/edhrec_commander_api_response_card_details_display_widget.cpp
+    src/client/tabs/api/edhrec/edhrec_commander_api_response_card_list_display_widget.cpp
+    src/client/tabs/api/edhrec/edhrec_commander_api_response_commander_details_display_widget.cpp
+    src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_archidekt_links.cpp
+    src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_average_deck_statistics.cpp
+    src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_card_details.cpp
+    src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_card_list.cpp
+    src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_card_container.cpp
+    src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_card_prices.cpp
+    src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_commander_details.cpp
+    src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response.cpp
+    src/game/zones/table_zone.cpp
+    src/client/tapped_out_interface.cpp
+    src/client/ui/theme_manager.cpp
+    src/client/ui/tip_of_the_day.cpp
+    src/client/translate_counter_name.cpp
+    src/client/update_downloader.cpp
+    src/server/user/user_context_menu.cpp
+    src/server/user/user_info_connection.cpp
+    src/server/user/user_info_box.cpp
+    src/server/user/user_list_manager.cpp
+    src/server/user/user_list_widget.cpp
+    src/client/ui/window_main.cpp
+    src/game/zones/view_zone_widget.cpp
+    src/game/zones/view_zone.cpp
+    src/client/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
+    src/client/ui/widgets/cards/deck_preview_card_picture_widget.cpp
+    src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_widget.cpp
+    src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp
+    src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp
+    src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp
+    src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp
+    src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.cpp
+    src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp
+    src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp
+    src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
+    src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp
+    src/client/ui/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp
+    src/client/ui/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp
+    src/client/ui/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp
     ${VERSION_STRING_CPP}
 )
 
 add_subdirectory(sounds)
 add_subdirectory(themes)
+configure_file(
+  ${CMAKE_SOURCE_DIR}/cockatrice/resources/config/qtlogging.ini ${CMAKE_BINARY_DIR}/cockatrice/qtlogging.ini COPYONLY
+)
 
 set(cockatrice_RESOURCES cockatrice.qrc)
 
@@ -251,7 +320,7 @@ if(APPLE)
   set(plugin_dest_dir cockatrice.app/Contents/Plugins)
   set(qtconf_dest_dir cockatrice.app/Contents/Resources)
 
-  # Qt plugins: audio (Qt5), iconengines, imageformats, platforms, printsupport (Qt5), styles, tls (Qt6)
+  # Qt plugins: audio (Qt5), iconengines, imageformats, multimedia (Qt6), platforms, printsupport (Qt5), styles, tls (Qt6)
   install(
     DIRECTORY "${QT_PLUGINS_DIR}/"
     DESTINATION ${plugin_dest_dir}
@@ -262,6 +331,7 @@ if(APPLE)
     PATTERN "audio/*.dylib"
     PATTERN "iconengines/*.dylib"
     PATTERN "imageformats/*.dylib"
+    PATTERN "multimedia/*.dylib"
     PATTERN "platforms/*.dylib"
     PATTERN "printsupport/*.dylib"
     PATTERN "styles/*.dylib"
@@ -302,7 +372,14 @@ if(WIN32)
     PATTERN "*.dll"
   )
 
-  # Qt plugins: audio (Qt5), iconengines, imageformats, platforms, printsupport (Qt5), styles, tls (Qt6)
+  install(
+      DIRECTORY "${CMAKE_BINARY_DIR}/cockatrice/"
+      DESTINATION ./
+      FILES_MATCHING
+      PATTERN "*.ini"
+  )
+
+  # Qt plugins: audio (Qt5), iconengines, imageformats, multimedia (Qt6) platforms, printsupport (Qt5), styles, tls (Qt6)
   install(
     DIRECTORY "${QT_PLUGINS_DIR}/"
     DESTINATION ${plugin_dest_dir}
@@ -311,15 +388,10 @@ if(WIN32)
     PATTERN "audio/qtaudio_wasapi.dll"
     PATTERN "audio/qtaudio_windows.dll"
     PATTERN "iconengines/qsvgicon.dll"
-    PATTERN "imageformats/qgif.dll"
-    PATTERN "imageformats/qicns.dll"
-    PATTERN "imageformats/qico.dll"
-    PATTERN "imageformats/qjpeg.dll"
-    PATTERN "imageformats/qsvg.dll"
-    PATTERN "imageformats/qtga.dll"
-    PATTERN "imageformats/qtiff.dll"
-    PATTERN "imageformats/qwbmp.dll"
-    PATTERN "imageformats/qwebp.dll"
+    PATTERN "imageformats/*.dll"
+    PATTERN "mediaservice/dsengine.dll"
+    PATTERN "mediaservice/wmfengine.dll"
+    PATTERN "multimedia/*.dll"
     PATTERN "platforms/qdirect2d.dll"
     PATTERN "platforms/qminimal.dll"
     PATTERN "platforms/qoffscreen.dll"
@@ -355,8 +427,8 @@ Data = Resources\")
     COMPONENT Runtime
   )
 
-  if(WIN32SSLRUNTIME_FOUND)
-    install(FILES ${WIN32SSLRUNTIME_LIBRARIES} DESTINATION ./)
+  if(OPENSSL_FOUND)
+    install(FILES ${OPENSSL_INCLUDE_DIRS} DESTINATION ./)
   endif()
 endif()
 

cockatrice/cockatrice.qrc

@@ -29,6 +29,7 @@
         <file>resources/icons/search.svg</file>
         <file>resources/icons/settings.svg</file>
         <file>resources/icons/spectator.svg</file>
+        <file>resources/icons/swap.svg</file>
         <file>resources/icons/sync.svg</file>
         <file>resources/icons/tab_changed.svg</file>
         <file>resources/icons/update.png</file>
@@ -41,6 +42,8 @@
         <file>resources/config/deckeditor.svg</file>
         <file>resources/config/shorcuts.svg</file>
         <file>resources/config/sound.svg</file>
+        <file>resources/config/debug.ini</file>
+        <file>resources/config/qtlogging.ini</file>
 
         <file>resources/counters/w.svg</file>
         <file>resources/counters/w_highlight.svg</file>
@@ -326,23 +329,16 @@
         <file>resources/replay/fastforward.svg</file>
         <file>resources/replay/pause.svg</file>
 
-        <file>resources/userlevels/normal.svg</file>
-        <file>resources/userlevels/registered.svg</file>
-        <file>resources/userlevels/registered_buddy.svg</file>
-        <file>resources/userlevels/registered_vip.svg</file>
-        <file>resources/userlevels/registered_vip_buddy.svg</file>
-        <file>resources/userlevels/registered_donator.svg</file>
-        <file>resources/userlevels/registered_donator_buddy.svg</file>
-
-        <file>resources/userlevels/moderator.svg</file>
-        <file>resources/userlevels/moderator_buddy.svg</file>
-        <file>resources/userlevels/moderator_vip.svg</file>
-        <file>resources/userlevels/moderator_vip_buddy.svg</file>
-
-        <file>resources/userlevels/admin.svg</file>
-        <file>resources/userlevels/admin_buddy.svg</file>
-        <file>resources/userlevels/admin_vip.svg</file>
-        <file>resources/userlevels/admin_vip_buddy.svg</file>
+        <file>resources/usericons/pawn_single.svg</file>
+        <file>resources/usericons/pawn_double.svg</file>
+        <file>resources/usericons/pawn_donator_single.svg</file>
+        <file>resources/usericons/pawn_donator_double.svg</file>
+        <file>resources/usericons/pawn_judge_single.svg</file>
+        <file>resources/usericons/pawn_judge_double.svg</file>
+        <file>resources/usericons/pawn_vip_single.svg</file>
+        <file>resources/usericons/pawn_vip_double.svg</file>
+        <file>resources/usericons/star_single.svg</file>
+        <file>resources/usericons/star_double.svg</file>
 
         <!-- ADD TIP OF THE DAY IMAGES HERE -->
         <file>resources/tips/images/accounts_tab.png</file>
@@ -351,10 +347,10 @@
         <file>resources/tips/images/cockatrice_wiki.png</file>
         <file>resources/tips/images/coin_flip.png</file>
         <file>resources/tips/images/counter_expression.png</file>
+        <file>resources/tips/images/discord.png</file>
         <file>resources/tips/images/face_down.png</file>
         <file>resources/tips/images/filter_games.png</file>
         <file>resources/tips/images/github_logo.png</file>
-        <file>resources/tips/images/gitter.png</file>
         <file>resources/tips/images/setpt.png</file>
         <file>resources/tips/images/shortcuts.png</file>
         <file>resources/tips/images/themes.png</file>

cockatrice/resources/config/debug.ini

@@ -0,0 +1,11 @@
+[debug]
+showCardId=false
+
+[localgame]
+onStartup=false
+playerCount=1
+;deck\Player 1=path/to/deck
+;deck\Player 2=path/to/deck
+
+; Fun Fact: You can assign a deck to your username and it will auto load and ready when you join a server game
+;deck\Your Username Here=path/to/deck

cockatrice/resources/config/qtlogging.ini

@@ -0,0 +1,55 @@
+[Rules]
+# Uncomment a rule to disable logging for that category
+
+# main = false
+# qt_translator = false
+# window_main.* = false
+# release_channel = false
+# spoiler_background_updater = false
+# theme_manager = false
+# sound_engine = false
+# tapped_out_interface = false
+
+# tab_game = false
+# tab_message = false
+# tab_supervisor = false
+
+# dlg_edit_avatar = false
+# dlg_settings = false
+# dlg_tip_of_the_day = false
+# dlg_update = false
+
+# settings_cache = false
+# servers_settings = false
+# shortcuts_settings = false
+
+# remote_client = false
+
+# player = false
+# game_scene = false
+# game_scene.player_addition_removal = false
+# card_zone = false
+# view_zone = false
+
+# user_info_connection = false
+
+# picture_loader = false
+# picture_loader.worker = false
+# picture_loader.card_back_cache_fail = false
+# picture_loader.picture_to_load = false
+# deck_loader = false
+# card_database = false
+# card_database.loading = false
+# card_database.loading.success_or_failure = false
+# cockatrice_xml.* = false
+# cockatrice_xml.xml_3_parser = false
+# cockatrice_xml.xml_4_parser = false
+# card_list = false
+
+flow_layout.debug = false
+flow_widget.debug = false
+flow_widget.size.debug = false
+
+# pixel_map_generator = false
+
+# filter_string = false

cockatrice/resources/help/search.md

@@ -1,6 +1,7 @@
-## Syntax Help
+## Search Syntax Help
 -----
-The search bar recognizes a set of special commands similar to some other card databases. Here is a list with examples. Each entry can be clicked to test the query and has a small explanation. Note that all searches are case insensitive.
+The search bar recognizes a set of special commands similar to some other card databases.<br>
+In this list of examples below, each entry has an explanation and can be clicked to test the query. Note that all searches are case insensitive.
 <dl>
 <dt>Name:</dt>
 <dd>[birds of paradise](#birds of paradise) <small>(Any card name containing the words birds, of, and paradise)</small></dd>
@@ -46,8 +47,7 @@ The search bar recognizes a set of special commands similar to some other card d
 
 <dt><u>E</u>dition:</dt>
 <dd>[set:lea](#set:lea) <small>(Cards that appear in Alpha, which has the set code LEA)</small></dd>
-<dd>[e:lea,leb](#e:lea,leb) <small>(Cards that appear in Alpha or Beta)</small></dd>
-<dd><a href="#e:lea,leb -(e:lea e:leb)">e:lea,leb -(e:lea e:leb)</a> <small>(Cards that appear in Alpha or Beta but not in both editions)</small></dd>
+<dd>[e:lea or e:leb](#e:lea or e:leb) <small>(Cards that appear in Alpha or Beta)</small></dd>
 
 <dt>Negate:</dt>
 <dd>[c:wu -c:m](#c:wu -c:m) <small>(Any card that is white or blue, but not multicolored)</small></dd>

cockatrice/resources/icons/swap.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" fill="#000000" version="1.1" id="Capa_1"
+     xmlns="http://www.w3.org/2000/svg"
+     width="800px" height="800px" viewBox="0 0 71.753 71.753"
+     xml:space="preserve">
+<g>
+	<path d="M39.798,20.736H28.172v20.738L11.625,41.47V20.736H0L19.899,0.839L39.798,20.736z M51.855,70.914l19.897-19.896H60.129
+		V30.282l-16.547-0.004v20.74H31.957L51.855,70.914z"/>
+</g>
+</svg>

cockatrice/resources/tips/tips_of_the_day.xml

@@ -7,9 +7,9 @@
     </tip>
     <tip>
         <title>Suggesting New Tips</title>
-        <text>You can suggest new Tips of the Day by reaching out to the development team on &lt;a href="https://gitter.im/cockatrice/cockatrice"&gt;Gitter&lt;/a&gt;!</text>
-        <image>gitter.png</image>
-        <date>2018-03-01</date>
+        <text>You can suggest new Tips of the Day by reaching out to the development team on &lt;a href="https://discord.gg/3Z9yzmA"&gt;Discord&lt;/a&gt;!</text>
+        <image>discord.png</image>
+        <date>2023-10-18</date>
     </tip>
     <tip>
         <title>Reporting Bugs</title>

cockatrice/resources/usericons/pawn_donator_double.svg

@@ -2,20 +2,20 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="100"
    height="100"
    id="svg5322"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="registered.svg">
+   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
+   sodipodi:docname="pawn_donator_double.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs3">
     <inkscape:perspective
@@ -226,16 +226,6 @@
          offset="1"
          id="stop5193-4" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5181-9"
-       id="linearGradient5436"
-       x1="12.105612"
-       y1="1021.5341"
-       x2="87.549789"
-       y2="1021.5341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-952.36218)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5173-1"
@@ -288,6 +278,28 @@
        id="linearGradient5799"
        xlink:href="#linearGradient5181-9"
        inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2"
+       id="linearGradient3"
+       x1="49.889599"
+       y1="87.971054"
+       x2="50.103622"
+       y2="27.668242"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2878408,0,0,1.2878408,-14.204862,937.12313)" />
+    <linearGradient
+       id="linearGradient2"
+       inkscape:collect="always">
+      <stop
+         style="stop-color:#8c5fd3;stop-opacity:1;"
+         offset="0"
+         id="stop2" />
+      <stop
+         style="stop-color:#b284e9;stop-opacity:1;"
+         offset="0.5"
+         id="stop1" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      inkscape:document-units="mm"
@@ -297,16 +309,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.8"
-     inkscape:cx="-150.71429"
-     inkscape:cy="59.570011"
+     inkscape:zoom="6.0735294"
+     inkscape:cx="53.675545"
+     inkscape:cy="53.922518"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1028"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1147"
+     inkscape:window-height="1211"
+     inkscape:window-x="2678"
+     inkscape:window-y="120"
+     inkscape:window-maximized="0"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showguides="true">
+    <sodipodi:guide
+       position="49.829627,61.114263"
+       orientation="1,0"
+       id="guide1"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
   <metadata
      id="metadata4">
     <rdf:RDF>
@@ -325,9 +347,20 @@
      id="layer1"
      transform="translate(0,-952.36218)">
     <path
-       style="fill:url(#linearGradient5436);fill-opacity:1;stroke:black;stroke-width:2.78220295999999980;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       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="path3597-8" />
+       id="right" />
+    <path
+       style="opacity:1;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 51.28696,1001.834 0,-46.98372 1.434151,0.16768 c 5.155008,0.60274 9.462857,2.72154 12.938257,6.36366 4.74393,4.9715 6.87913,11.35611 6.16464,18.43328 -0.53702,5.31935 -3.09008,10.59498 -6.83833,14.13074 l -1.94072,1.83069 3.04083,2.20427 c 3.58084,2.5957 7.18975,6.4912 9.55296,10.3116 4.89572,7.9144 9.23593,21.4918 8.50487,26.6055 -0.81312,5.6877 -5.43872,9.6977 -13.62216,11.8093 -3.80822,0.9826 -7.68056,1.4713 -14.763321,1.8633 l -4.471177,0.2474 0,-46.9837 z"
+       id="left"
+       inkscape:connector-curvature="0" />
+    <path
+       style="display:inline;fill:url(#linearGradient3);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.77952756;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       d="m 32.758369,1023.3386 c -11.433625,-11.4486 -17.473759,-17.611 -17.925056,-18.2881 -5.1991493,-7.80033 -4.072462,-18.0055 2.698653,-24.44352 0.714467,-0.67932 1.7595,-1.54783 2.322296,-1.93001 1.523368,-1.0345 4.16292,-2.23825 5.970504,-2.72281 1.443337,-0.38692 1.89368,-0.43006 4.608041,-0.44142 3.235152,-0.0136 4.137158,0.12212 6.533598,0.9827 3.134814,1.12573 4.852536,2.32851 8.590659,6.01531 1.655211,1.63249 3.214977,3.04629 3.466142,3.14178 0.581823,0.22121 1.425484,0.22197 2.004581,0.002 0.248578,-0.0945 1.808341,-1.50526 3.466143,-3.135 3.106188,-3.05362 4.561863,-4.18308 6.729637,-5.22153 5.163233,-2.47341 10.985326,-2.50551 16.312741,-0.0899 2.006474,0.90978 3.995303,2.39379 5.679043,4.16678 1.393273,1.46713 2.577641,3.13214 3.390238,4.83339 1.300107,2.7219 1.79207,4.98307 1.79207,8.23671 0,4.67613 -1.161204,8.04312 -4.066015,11.78952 -0.567611,0.7321 -8.293484,8.5311 -17.668765,17.8362 l -16.660107,16.5352 z"
+       id="path2"
+       sodipodi:nodetypes="sssssssssssssssssscs"
+       inkscape:label="heart" />
   </g>
 </svg>

cockatrice/resources/usericons/pawn_donator_single.svg

@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="100"
+   height="100"
+   id="svg5322"
+   version="1.1"
+   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
+   sodipodi:docname="pawn_donator_single.svg"
+   xml:space="preserve"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
+     id="defs3"><linearGradient
+       id="linearGradient2"
+       inkscape:collect="always"><stop
+         style="stop-color:#8c5fd3;stop-opacity:1;"
+         offset="0"
+         id="stop2" /><stop
+         style="stop-color:#b284e9;stop-opacity:1;"
+         offset="0.5"
+         id="stop1" /></linearGradient><inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective5328" /><inkscape:perspective
+       id="perspective5305"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" /><linearGradient
+       id="linearGradient5181"><stop
+         style="stop-color:#0fbb00;stop-opacity:1;"
+         offset="0"
+         id="stop5183" /><stop
+         style="stop-color:#064400;stop-opacity:1;"
+         offset="1"
+         id="stop5185" /></linearGradient><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600-2"
+       id="radialGradient3606-7"
+       cx="324.32715"
+       cy="131.40274"
+       fx="324.32715"
+       fy="131.40274"
+       r="25.501276"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" /><linearGradient
+       id="linearGradient3600-2"><stop
+         style="stop-color:#ffc33d;stop-opacity:1;"
+         offset="0"
+         id="stop3602-4" /><stop
+         style="stop-color:#e09900;stop-opacity:1;"
+         offset="1"
+         id="stop3604-9" /></linearGradient><inkscape:perspective
+       id="perspective5478"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" /><linearGradient
+       id="linearGradient5189"><stop
+         style="stop-color:#000ec9;stop-opacity:1;"
+         offset="0"
+         id="stop5191" /><stop
+         style="stop-color:#000657;stop-opacity:1;"
+         offset="1"
+         id="stop5193" /></linearGradient><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600-4"
+       id="radialGradient3606-1"
+       cx="324.32715"
+       cy="131.40274"
+       fx="324.32715"
+       fy="131.40274"
+       r="25.501276"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" /><linearGradient
+       id="linearGradient3600-4"><stop
+         style="stop-color:#ffc33d;stop-opacity:1;"
+         offset="0"
+         id="stop3602-3" /><stop
+         style="stop-color:#e09900;stop-opacity:1;"
+         offset="1"
+         id="stop3604-5" /></linearGradient><inkscape:perspective
+       id="perspective5559"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5173"
+       id="linearGradient5179"
+       x1="167.33386"
+       y1="178.83276"
+       x2="244.78181"
+       y2="178.83276"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       id="linearGradient5173"><stop
+         style="stop-color:#f50000;stop-opacity:1;"
+         offset="0"
+         id="stop5175" /><stop
+         style="stop-color:#950000;stop-opacity:1;"
+         offset="1"
+         id="stop5177" /></linearGradient><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600"
+       id="radialGradient5169"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
+       cx="324.32715"
+       cy="131.40274"
+       fx="324.32715"
+       fy="131.40274"
+       r="25.501276" /><linearGradient
+       id="linearGradient3600"><stop
+         style="stop-color:#ffc13d;stop-opacity:1;"
+         offset="0"
+         id="stop3602" /><stop
+         style="stop-color:#e09900;stop-opacity:1;"
+         offset="1"
+         id="stop3604" /></linearGradient><radialGradient
+       r="25.501276"
+       fy="131.40274"
+       fx="324.32715"
+       cy="131.40274"
+       cx="324.32715"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5574"
+       xlink:href="#linearGradient3600"
+       inkscape:collect="always" /><inkscape:perspective
+       id="perspective5663"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" /><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600-7"
+       id="radialGradient3606-8"
+       cx="324.32715"
+       cy="131.40274"
+       fx="324.32715"
+       fy="131.40274"
+       r="25.501276"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" /><linearGradient
+       id="linearGradient3600-7"><stop
+         style="stop-color:#ffc13d;stop-opacity:1;"
+         offset="0"
+         id="stop3602-7" /><stop
+         style="stop-color:#e09900;stop-opacity:1;"
+         offset="1"
+         id="stop3604-6" /></linearGradient><radialGradient
+       r="25.501276"
+       fy="131.40274"
+       fx="324.32715"
+       cy="131.40274"
+       cx="324.32715"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5676"
+       xlink:href="#linearGradient3600-7"
+       inkscape:collect="always" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2"
+       id="linearGradient3"
+       x1="49.889599"
+       y1="87.971054"
+       x2="50.103622"
+       y2="27.668242"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2878408,0,0,1.2878408,-14.204016,-15.239682)" /></defs><sodipodi:namedview
+     inkscape:document-units="mm"
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9195959"
+     inkscape:cx="55.179583"
+     inkscape:cy="45.519999"
+     inkscape:current-layer="layer2"
+     showgrid="false"
+     inkscape:window-width="1147"
+     inkscape:window-height="1211"
+     inkscape:window-x="3260"
+     inkscape:window-y="138"
+     inkscape:window-maximized="0"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showguides="true"><sodipodi:guide
+       position="50.002551,111.99556"
+       orientation="1,0"
+       id="guide3"
+       inkscape:locked="false" /></sodipodi:namedview><metadata
+     id="metadata4"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-952.36218)"
+     style="display:inline"><path
+       style="display:inline;opacity:1;fill-opacity:1;stroke:#000000;stroke-width:2.7822;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 49.84375,1.71875 C 36.719738,1.71875 26.0625,12.375988 26.0625,25.5 c 0,7.477454 3.475825,14.112734 8.875,18.46875 -10.497549,5.974948 -17.018351,18.227376 -20.625,31.6875 -5.2744126,19.6844 15.911513,22.5625 35.53125,22.5625 19.619736,0 40.705577,-3.2516 35.53125,-22.5625 C 81.693381,61.916246 75.224585,49.827177 64.8125,43.9375 70.181573,39.580662 73.59375,32.953205 73.59375,25.5 c 0,-13.124012 -10.625988,-23.78125 -23.75,-23.78125 z"
+       id="left"
+       transform="translate(0,952.36218)" /></g><g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Layer 2"><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"
+       d="M 32.759215,70.975878 C 21.325591,59.527249 15.285457,53.364742 14.83416,52.687661 9.63501,44.887358 10.761698,34.682189 17.532813,28.244167 c 0.714467,-0.67932 1.7595,-1.547825 2.322296,-1.930012 1.523368,-1.034499 4.16292,-2.238249 5.970504,-2.722807 1.443337,-0.386915 1.89368,-0.430056 4.60804,-0.441421 3.235152,-0.01355 4.137158,0.122126 6.533598,0.982701 3.134814,1.125736 4.852536,2.328512 8.590659,6.015311 1.655211,1.632489 3.214977,3.046293 3.466142,3.141784 0.581823,0.221209 1.425484,0.221963 2.004581,0.0018 0.248578,-0.09451 1.808341,-1.50526 3.466143,-3.135003 3.106188,-3.053615 4.561863,-4.183076 6.729637,-5.221531 5.163233,-2.473409 10.985326,-2.505514 16.312741,-0.08995 2.006474,0.909779 3.995303,2.393791 5.679043,4.166785 1.393273,1.467129 2.577641,3.132133 3.390238,4.833386 1.300107,2.721904 1.79207,4.98307 1.79207,8.23671 0,4.676126 -1.161204,8.043076 -4.066015,11.789548 -0.567611,0.732076 -8.293484,8.531153 -17.668765,17.836181 l -16.660107,16.53525 z"
+       id="path2"
+       sodipodi:nodetypes="sssssssssssssssssscs"
+       inkscape:label="heart" /></g></svg>

cockatrice/resources/usericons/pawn_double.svg

@@ -2,20 +2,20 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="100"
    height="100"
    id="svg5322"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="normal.svg">
+   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
+   sodipodi:docname="pawn_double.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs3">
     <inkscape:perspective
@@ -195,66 +195,16 @@
          id="stop3604-6" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3600-7"
-       id="radialGradient5254"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
-       cx="324.32715"
-       cy="131.40274"
-       fx="324.32715"
+       r="25.501276"
        fy="131.40274"
-       r="25.501276" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5189-1"
-       id="linearGradient5394"
+       fx="324.32715"
+       cy="131.40274"
+       cx="324.32715"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
        gradientUnits="userSpaceOnUse"
-       x1="385.03503"
-       y1="180.09546"
-       x2="462.48297"
-       y2="180.09546"
-       gradientTransform="matrix(0.96839241,0,0,0.96839241,-360.365,847.52359)" />
-    <linearGradient
-       id="linearGradient5189-1">
-      <stop
-         style="stop-color:#32c8ed;stop-opacity:1;"
-         offset="0"
-         id="stop5191-0" />
-      <stop
-         style="stop-color:#32c8ed;stop-opacity:1;"
-         offset="1"
-         id="stop5193-4" />
-    </linearGradient>
-    <linearGradient
-       y2="180.09546"
-       x2="462.48297"
-       y1="180.09546"
-       x1="385.03503"
-       gradientTransform="matrix(0.96839241,0,0,0.96839241,-318.22214,876.88769)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5411"
-       xlink:href="#linearGradient5189-1"
+       id="radialGradient5676"
+       xlink:href="#linearGradient3600-7"
        inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5189-1"
-       id="linearGradient5436"
-       x1="12.105612"
-       y1="1021.5341"
-       x2="87.549789"
-       y2="1021.5341"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5189-1"
-       id="linearGradient3795"
-       gradientUnits="userSpaceOnUse"
-       x1="12.105612"
-       y1="1021.5341"
-       x2="87.549789"
-       y2="1021.5341"
-       gradientTransform="translate(0,-952.36218)" />
   </defs>
   <sodipodi:namedview
      inkscape:document-units="mm"
@@ -264,16 +214,19 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.8"
-     inkscape:cx="-150.71429"
-     inkscape:cy="59.570011"
-     inkscape:current-layer="layer1"
+     inkscape:zoom="5.6"
+     inkscape:cx="63.214286"
+     inkscape:cy="46.160714"
+     inkscape:current-layer="g5249"
      showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1028"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1147"
+     inkscape:window-height="1211"
+     inkscape:window-x="2842"
+     inkscape:window-y="58"
+     inkscape:window-maximized="0"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1" />
   <metadata
      id="metadata4">
     <rdf:RDF>
@@ -291,10 +244,25 @@
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-952.36218)">
-    <path
-       style="fill:url(#linearGradient3795);fill-opacity:1;stroke:black;stroke-width:2.78220295999999980;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;opacity:1"
-       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="path3597-8" />
+    <g
+       id="g5249"
+       transform="translate(0.53874115,0.90502985)">
+      <path
+         style="stroke:#000000;stroke-width:4.45809746000000030;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
+         d="m 49.582319,954.34642 c -12.850034,0 -23.284789,10.43476 -23.284789,23.28479 0,7.32135 3.403263,13.81811 8.689724,18.08319 -10.278401,5.8502 -16.663073,17.8469 -20.19443,31.0259 -5.1178053,19.1 15.207096,22.0401 34.269334,22.0915 l 0,0.031 c 0.290839,0 0.566498,0.031 0.856734,0.031 19.210152,0 39.855802,-3.1837 34.789494,-22.0914 -3.636192,-13.5705 -10.027831,-25.4711 -20.378015,-31.17899 5.208701,-4.26694 8.506139,-10.73278 8.506139,-17.9914 0,-12.85003 -10.404159,-23.28479 -23.254191,-23.28479 z"
+         id="left"
+         inkscape:connector-curvature="0" />
+      <path
+         fill="none"
+         style="stroke:#000000;stroke-width:1.97203517px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 50.522358,952.70715 0,95.71425"
+         id="center"
+         inkscape:connector-curvature="0" />
+      <path
+         style="opacity:1;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.71966;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 51.054254,1001.4773 v -45.77683 l 1.097241,0.005 c 3.642211,0.0172 9.170661,2.46935 12.395732,5.49816 4.897489,4.59945 7.421654,10.97001 6.981907,17.62114 -0.389167,5.88609 -2.631878,10.66609 -6.951818,14.81672 l -2.05562,1.97506 2.959813,2.0746 c 3.467097,2.43015 7.403677,6.55065 9.666109,10.11765 3.325898,5.2437 6.79289,13.8355 8.153827,20.2065 2.584451,12.0989 -5.997953,18.2384 -26.592174,19.0232 l -5.655017,0.2154 v -45.7768 z"
+         id="right"
+         inkscape:connector-curvature="0" />
+    </g>
   </g>
 </svg>

cockatrice/resources/usericons/pawn_judge_double.svg

@@ -2,33 +2,22 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="100"
    height="100"
    id="svg5322"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="registered_vip.svg">
+   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
+   sodipodi:docname="pawn_judge_double.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs3">
-    <linearGradient
-       id="linearGradient5181-9-1">
-      <stop
-         id="stop4188"
-         offset="0"
-         style="stop-color:#ece400;stop-opacity:1" />
-      <stop
-         id="stop4190"
-         offset="1"
-         style="stop-color:#ec8b00;stop-opacity:1" />
-    </linearGradient>
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 526.18109 : 1"
@@ -237,16 +226,6 @@
          offset="1"
          id="stop5193-4" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5181-9-1"
-       id="linearGradient5436"
-       x1="47.268291"
-       y1="933.14362"
-       x2="48.665382"
-       y2="1050.2666"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-952.36218)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5173-1"
@@ -309,15 +288,18 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="4.2946338"
-     inkscape:cx="35.27742"
-     inkscape:cy="65.175571"
-     inkscape:current-layer="layer1"
+     inkscape:cx="34.112338"
+     inkscape:cy="64.964794"
+     inkscape:current-layer="svg5322"
      showgrid="false"
-     inkscape:window-width="1152"
-     inkscape:window-height="811"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1440"
+     inkscape:window-height="792"
+     inkscape:window-x="2921"
+     inkscape:window-y="661"
+     inkscape:window-maximized="0"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1" />
   <metadata
      id="metadata4">
     <rdf:RDF>
@@ -326,7 +308,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -336,9 +318,20 @@
      id="layer1"
      transform="translate(0,-952.36218)">
     <path
-       style="fill:url(#linearGradient5436);fill-opacity:1;stroke:black;stroke-width:2.78149606;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       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="path3597-8" />
+       id="right" />
+    <path
+       style="opacity:1;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 51.28696,1001.834 0,-46.98372 1.434151,0.16768 c 5.155008,0.60274 9.462857,2.72154 12.938257,6.36366 4.74393,4.9715 6.87913,11.35611 6.16464,18.43328 -0.53702,5.31935 -3.09008,10.59498 -6.83833,14.13074 l -1.94072,1.83069 3.04083,2.20427 c 3.58084,2.5957 7.18975,6.4912 9.55296,10.3116 4.89572,7.9144 9.23593,21.4918 8.50487,26.6055 -0.81312,5.6877 -5.43872,9.6977 -13.62216,11.8093 -3.80822,0.9826 -7.68056,1.4713 -14.763321,1.8633 l -4.471177,0.2474 0,-46.9837 z"
+       id="left"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 46.656521,12.167234 18.055171,18.054184 a 6.6081919,6.6078288 0 0 1 -0.126303,9.352065 6.6804126,6.6800456 0 0 1 -8.233169,1.011048 l -7.944268,7.943843 6.463762,6.445343 a 6.9331851,6.9328042 0 0 1 5.741536,2.022073 l 28.057729,28.092294 a 6.9962797,6.9958953 0 0 1 -9.894222,9.893685 L 50.719018,66.907526 A 7.0595711,7.0591833 0 0 1 49.18433,59.270613 l -5.741527,-5.741238 -7.944298,7.943843 A 6.716523,6.7161541 0 0 1 25.134866,69.832263 L 7.079684,51.778091 a 6.716523,6.7161541 0 0 1 8.39566,-10.345064 L 36.31101,20.59853 a 6.716523,6.7161541 0 0 1 10.345612,-8.431329 z"
+       id="path1-2"
+       style="display:inline;fill:#e1964c;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.7852;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:label="gavel"
+       transform="translate(0,952.36218)" />
   </g>
 </svg>

cockatrice/resources/usericons/pawn_judge_single.svg

@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="100"
+   height="100"
+   id="svg5322"
+   version="1.1"
+   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
+   sodipodi:docname="pawn_judge_single.svg"
+   xml:space="preserve"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
+     id="defs3"><inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective5328" /><inkscape:perspective
+       id="perspective5305"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" /><linearGradient
+       id="linearGradient5181"><stop
+         style="stop-color:#0fbb00;stop-opacity:1;"
+         offset="0"
+         id="stop5183" /><stop
+         style="stop-color:#064400;stop-opacity:1;"
+         offset="1"
+         id="stop5185" /></linearGradient><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600-2"
+       id="radialGradient3606-7"
+       cx="324.32715"
+       cy="131.40274"
+       fx="324.32715"
+       fy="131.40274"
+       r="25.501276"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" /><linearGradient
+       id="linearGradient3600-2"><stop
+         style="stop-color:#ffc33d;stop-opacity:1;"
+         offset="0"
+         id="stop3602-4" /><stop
+         style="stop-color:#e09900;stop-opacity:1;"
+         offset="1"
+         id="stop3604-9" /></linearGradient><inkscape:perspective
+       id="perspective5478"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" /><linearGradient
+       id="linearGradient5189"><stop
+         style="stop-color:#000ec9;stop-opacity:1;"
+         offset="0"
+         id="stop5191" /><stop
+         style="stop-color:#000657;stop-opacity:1;"
+         offset="1"
+         id="stop5193" /></linearGradient><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600-4"
+       id="radialGradient3606-1"
+       cx="324.32715"
+       cy="131.40274"
+       fx="324.32715"
+       fy="131.40274"
+       r="25.501276"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" /><linearGradient
+       id="linearGradient3600-4"><stop
+         style="stop-color:#ffc33d;stop-opacity:1;"
+         offset="0"
+         id="stop3602-3" /><stop
+         style="stop-color:#e09900;stop-opacity:1;"
+         offset="1"
+         id="stop3604-5" /></linearGradient><inkscape:perspective
+       id="perspective5559"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5173"
+       id="linearGradient5179"
+       x1="167.33386"
+       y1="178.83276"
+       x2="244.78181"
+       y2="178.83276"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       id="linearGradient5173"><stop
+         style="stop-color:#f50000;stop-opacity:1;"
+         offset="0"
+         id="stop5175" /><stop
+         style="stop-color:#950000;stop-opacity:1;"
+         offset="1"
+         id="stop5177" /></linearGradient><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600"
+       id="radialGradient5169"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
+       cx="324.32715"
+       cy="131.40274"
+       fx="324.32715"
+       fy="131.40274"
+       r="25.501276" /><linearGradient
+       id="linearGradient3600"><stop
+         style="stop-color:#ffc13d;stop-opacity:1;"
+         offset="0"
+         id="stop3602" /><stop
+         style="stop-color:#e09900;stop-opacity:1;"
+         offset="1"
+         id="stop3604" /></linearGradient><radialGradient
+       r="25.501276"
+       fy="131.40274"
+       fx="324.32715"
+       cy="131.40274"
+       cx="324.32715"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5574"
+       xlink:href="#linearGradient3600"
+       inkscape:collect="always" /><inkscape:perspective
+       id="perspective5663"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" /><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600-7"
+       id="radialGradient3606-8"
+       cx="324.32715"
+       cy="131.40274"
+       fx="324.32715"
+       fy="131.40274"
+       r="25.501276"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" /><linearGradient
+       id="linearGradient3600-7"><stop
+         style="stop-color:#ffc13d;stop-opacity:1;"
+         offset="0"
+         id="stop3602-7" /><stop
+         style="stop-color:#e09900;stop-opacity:1;"
+         offset="1"
+         id="stop3604-6" /></linearGradient><radialGradient
+       r="25.501276"
+       fy="131.40274"
+       fx="324.32715"
+       cy="131.40274"
+       cx="324.32715"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5676"
+       xlink:href="#linearGradient3600-7"
+       inkscape:collect="always" /></defs><sodipodi:namedview
+     inkscape:document-units="mm"
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6"
+     inkscape:cx="58.035715"
+     inkscape:cy="30.982143"
+     inkscape:current-layer="svg5322"
+     showgrid="false"
+     inkscape:window-width="2560"
+     inkscape:window-height="1369"
+     inkscape:window-x="2552"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showguides="true"><sodipodi:guide
+       position="50.002551,111.99556"
+       orientation="1,0"
+       id="guide3"
+       inkscape:locked="false" /></sodipodi:namedview><metadata
+     id="metadata4"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-952.36218)"
+     style="display:inline">
+    <path
+       style="display:inline;opacity:1;fill-opacity:1;stroke:#000000;stroke-width:2.7822;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 49.84375,1.71875 C 36.719738,1.71875 26.0625,12.375988 26.0625,25.5 c 0,7.477454 3.475825,14.112734 8.875,18.46875 -10.497549,5.974948 -17.018351,18.227376 -20.625,31.6875 -5.2744126,19.6844 15.911513,22.5625 35.53125,22.5625 19.619736,0 40.705577,-3.2516 35.53125,-22.5625 C 81.693381,61.916246 75.224585,49.827177 64.8125,43.9375 70.181573,39.580662 73.59375,32.953205 73.59375,25.5 c 0,-13.124012 -10.625988,-23.78125 -23.75,-23.78125 z"
+       id="left"
+       sodipodi:insensitive="true"
+       transform="translate(0,952.36218)" />
+    <path
+       d="m 46.233565,28.34179 -1.622479,1.622479 a 0.59382712,0.59382712 0 0 1 -0.840444,-0.01135 0.60031703,0.60031703 0 0 1 -0.09086,-0.739851 l -0.713891,-0.71389 -0.579225,0.580848 a 0.62303175,0.62303175 0 0 1 -0.181718,0.515948 l -2.524576,2.521331 a 0.62870157,0.62870157 0 0 1 -0.889118,-0.889117 l 2.522954,-2.521332 a 0.63438908,0.63438908 0 0 1 0.686308,-0.137911 l 0.515949,-0.515947 -0.713891,-0.713892 a 0.603562,0.603562 0 0 1 -0.751204,-0.9313 l 1.622478,-1.62248 a 0.603562,0.603562 0 0 1 0.929682,0.754453 l 1.872338,1.87234 a 0.603562,0.603562 0 0 1 0.7577,0.92968 z"
+       id="path1-2"
+       style="display:inline;fill:#e1964c;fill-rule:nonzero;stroke:#000000;stroke-width:0.34015748;stroke-opacity:1;fill-opacity:1;stroke-dasharray:none"
+       transform="matrix(0,-11.111111,11.111111,0,-268.32014,1478.2316)"
+       inkscape:label="gavel" /></g></svg>

cockatrice/resources/usericons/pawn_single.svg

@@ -2,20 +2,20 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="100"
    height="100"
    id="svg5322"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="vip.svg">
+   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
+   sodipodi:docname="pawn_single.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs3">
     <inkscape:perspective
@@ -194,57 +194,16 @@
          offset="1"
          id="stop3604-6" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5189-1"
-       id="linearGradient5394"
+    <radialGradient
+       r="25.501276"
+       fy="131.40274"
+       fx="324.32715"
+       cy="131.40274"
+       cx="324.32715"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
        gradientUnits="userSpaceOnUse"
-       x1="385.03503"
-       y1="180.09546"
-       x2="462.48297"
-       y2="180.09546"
-       gradientTransform="matrix(0.96839241,0,0,0.96839241,-360.365,847.52359)" />
-    <linearGradient
-       id="linearGradient5189-1">
-      <stop
-         style="stop-color:#000ec9;stop-opacity:1;"
-         offset="0"
-         id="stop5191-0" />
-      <stop
-         style="stop-color:#000657;stop-opacity:1;"
-         offset="1"
-         id="stop5193-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5173-1"
-       id="linearGradient5581"
-       gradientUnits="userSpaceOnUse"
-       x1="167.33386"
-       y1="178.83276"
-       x2="244.78181"
-       y2="178.83276"
-       gradientTransform="matrix(0.96839241,0,0,0.96839241,-149.54484,848.74636)" />
-    <linearGradient
-       id="linearGradient5173-1">
-      <stop
-         style="stop-color:#ff2700;stop-opacity:1;"
-         offset="0"
-         id="stop5175-5" />
-      <stop
-         style="stop-color:#ff2700;stop-opacity:1;"
-         offset="1"
-         id="stop5177-3" />
-    </linearGradient>
-    <linearGradient
-       y2="178.83276"
-       x2="244.78181"
-       y1="178.83276"
-       x1="167.33386"
-       gradientTransform="matrix(0.96839241,0,0,0.96839241,-52.401983,877.75333)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5598"
-       xlink:href="#linearGradient5173-1"
+       id="radialGradient5676"
+       xlink:href="#linearGradient3600-7"
        inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
@@ -255,16 +214,19 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="-59.166471"
-     inkscape:cy="4.9508223"
+     inkscape:zoom="5.6"
+     inkscape:cx="63.214286"
+     inkscape:cy="46.160714"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="792"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1147"
+     inkscape:window-height="1211"
+     inkscape:window-x="3185"
+     inkscape:window-y="44"
+     inkscape:window-maximized="0"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1" />
   <metadata
      id="metadata4">
     <rdf:RDF>
@@ -283,9 +245,9 @@
      id="layer1"
      transform="translate(0,-952.36218)">
     <path
-       style="fill:#8d5fd3;fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;opacity:1"
        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 "
-       id="path3597-8"
+       id="left"
        transform="translate(0,952.36218)" />
   </g>
 </svg>

cockatrice/resources/usericons/pawn_vip_double.svg

@@ -337,19 +337,19 @@
      id="layer1"
      transform="translate(0,-952.36218)">
     <path
-       style="fill:#ffffff;fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       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="path3597-8" />
+       id="right" />
     <path
-       style="opacity:1;fill:#000000;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"
+       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="path5355"
+       id="left"
        inkscape:connector-curvature="0" />
     <path
        sodipodi:type="star"
        style="fill:url(#linearGradient3425-5);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="path3415-0"
+       id="star"
        sodipodi:sides="5"
        sodipodi:cx="27.80283"
        sodipodi:cy="970.9433"

cockatrice/resources/usericons/pawn_vip_single.svg

@@ -337,14 +337,14 @@
      id="layer1"
      transform="translate(0,-952.36218)">
     <path
-       style="fill:#ff0000;fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       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="path3597-8" />
+       id="left" />
     <path
        sodipodi:type="star"
        style="fill:url(#linearGradient3425);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="path3415"
+       id="star"
        sodipodi:sides="5"
        sodipodi:cx="27.80283"
        sodipodi:cy="970.9433"

cockatrice/resources/usericons/star_double.svg

@@ -114,18 +114,18 @@
      inkscape:current-layer="svg2" />
   <path
      d="M 61.442826,23.621762 38.532402,23.515555 31.556101,0.331013 24.578789,23.515555 1.6673502,23.621765 20.267785,38.422001 10.863888,63.668987 31.556101,47.626631 52.258426,63.668987 42.843404,38.422001 z"
-     id="path4-9"
+     id="outline"
      style="fill:#000000;fill-opacity:1"
      inkscape:connector-curvature="0" />
   <path
      d="M 55.041981,25.814432 36.921945,25.730432 31.404334,7.3935963 25.885923,25.730432 7.7650846,25.814434 22.476316,37.520057 15.0387,57.488097 31.404334,44.800071 47.777965,57.488097 40.331551,37.520057 z"
-     id="path4"
-     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero"
+     id="left"
+     style="fill-opacity:1;fill-rule:nonzero"
      inkscape:connector-curvature="0" />
   <path
      d="M 56.276895,25.211993 37.3433,24.856806 31.486705,5.7742084 c 0.04705,37.4359336 -0.01851,2.6744908 -0.0678,40.1841446 L 48.19932,58.580578 40.956295,37.527792 z"
-     id="path4-1"
-     style="fill:#000000;fill-opacity:1;fill-rule:nonzero"
+     id="right"
+     style="fill-opacity:1;fill-rule:nonzero"
      inkscape:connector-curvature="0"
      sodipodi:nodetypes="ccccccc" />
 </svg>

cockatrice/resources/usericons/star_single.svg

@@ -109,7 +109,7 @@
      inkscape:connector-curvature="0" />
   <path
      d="M 57.150089,25.064396 37.504323,24.973324 31.522122,5.092503 25.539054,24.973324 5.8924192,25.064399 21.842354,37.75565 13.778482,59.405024 31.522122,45.64865 49.274434,59.405024 41.201022,37.75565 z"
-     id="path4"
-     style="fill:url(#linearGradient3756);fill-opacity:1"
+     id="left"
+     style="fill-opacity:1"
      inkscape:connector-curvature="0" />
 </svg>

cockatrice/resources/userlevels/admin.svg

@@ -1,301 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="100"
-   height="100"
-   id="svg5322"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="admin.svg">
-  <defs
-     id="defs3">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective5328" />
-    <inkscape:perspective
-       id="perspective5305"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       id="linearGradient5181">
-      <stop
-         style="stop-color:#0fbb00;stop-opacity:1;"
-         offset="0"
-         id="stop5183" />
-      <stop
-         style="stop-color:#064400;stop-opacity:1;"
-         offset="1"
-         id="stop5185" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3600-2"
-       id="radialGradient3606-7"
-       cx="324.32715"
-       cy="131.40274"
-       fx="324.32715"
-       fy="131.40274"
-       r="25.501276"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" />
-    <linearGradient
-       id="linearGradient3600-2">
-      <stop
-         style="stop-color:#ffc33d;stop-opacity:1;"
-         offset="0"
-         id="stop3602-4" />
-      <stop
-         style="stop-color:#e09900;stop-opacity:1;"
-         offset="1"
-         id="stop3604-9" />
-    </linearGradient>
-    <inkscape:perspective
-       id="perspective5478"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       id="linearGradient5189">
-      <stop
-         style="stop-color:#000ec9;stop-opacity:1;"
-         offset="0"
-         id="stop5191" />
-      <stop
-         style="stop-color:#000657;stop-opacity:1;"
-         offset="1"
-         id="stop5193" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3600-4"
-       id="radialGradient3606-1"
-       cx="324.32715"
-       cy="131.40274"
-       fx="324.32715"
-       fy="131.40274"
-       r="25.501276"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" />
-    <linearGradient
-       id="linearGradient3600-4">
-      <stop
-         style="stop-color:#ffc33d;stop-opacity:1;"
-         offset="0"
-         id="stop3602-3" />
-      <stop
-         style="stop-color:#e09900;stop-opacity:1;"
-         offset="1"
-         id="stop3604-5" />
-    </linearGradient>
-    <inkscape:perspective
-       id="perspective5559"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5173"
-       id="linearGradient5179"
-       x1="167.33386"
-       y1="178.83276"
-       x2="244.78181"
-       y2="178.83276"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient5173">
-      <stop
-         style="stop-color:#f50000;stop-opacity:1;"
-         offset="0"
-         id="stop5175" />
-      <stop
-         style="stop-color:#950000;stop-opacity:1;"
-         offset="1"
-         id="stop5177" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3600"
-       id="radialGradient5169"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
-       cx="324.32715"
-       cy="131.40274"
-       fx="324.32715"
-       fy="131.40274"
-       r="25.501276" />
-    <linearGradient
-       id="linearGradient3600">
-      <stop
-         style="stop-color:#ffc13d;stop-opacity:1;"
-         offset="0"
-         id="stop3602" />
-      <stop
-         style="stop-color:#e09900;stop-opacity:1;"
-         offset="1"
-         id="stop3604" />
-    </linearGradient>
-    <radialGradient
-       r="25.501276"
-       fy="131.40274"
-       fx="324.32715"
-       cy="131.40274"
-       cx="324.32715"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5574"
-       xlink:href="#linearGradient3600"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective5663"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3600-7"
-       id="radialGradient3606-8"
-       cx="324.32715"
-       cy="131.40274"
-       fx="324.32715"
-       fy="131.40274"
-       r="25.501276"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" />
-    <linearGradient
-       id="linearGradient3600-7">
-      <stop
-         style="stop-color:#ffc13d;stop-opacity:1;"
-         offset="0"
-         id="stop3602-7" />
-      <stop
-         style="stop-color:#e09900;stop-opacity:1;"
-         offset="1"
-         id="stop3604-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5189-1"
-       id="linearGradient5394"
-       gradientUnits="userSpaceOnUse"
-       x1="385.03503"
-       y1="180.09546"
-       x2="462.48297"
-       y2="180.09546"
-       gradientTransform="matrix(0.96839241,0,0,0.96839241,-360.365,847.52359)" />
-    <linearGradient
-       id="linearGradient5189-1">
-      <stop
-         style="stop-color:#000ec9;stop-opacity:1;"
-         offset="0"
-         id="stop5191-0" />
-      <stop
-         style="stop-color:#000657;stop-opacity:1;"
-         offset="1"
-         id="stop5193-4" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5173-1"
-       id="linearGradient5436"
-       x1="12.105612"
-       y1="1021.5341"
-       x2="87.549789"
-       y2="1021.5341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-952.36218)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5173-1"
-       id="linearGradient5581"
-       gradientUnits="userSpaceOnUse"
-       x1="167.33386"
-       y1="178.83276"
-       x2="244.78181"
-       y2="178.83276"
-       gradientTransform="matrix(0.96839241,0,0,0.96839241,-149.54484,848.74636)" />
-    <linearGradient
-       id="linearGradient5173-1">
-      <stop
-         style="stop-color:#ff2700;stop-opacity:1;"
-         offset="0"
-         id="stop5175-5" />
-      <stop
-         style="stop-color:#ff2700;stop-opacity:1;"
-         offset="1"
-         id="stop5177-3" />
-    </linearGradient>
-    <linearGradient
-       y2="178.83276"
-       x2="244.78181"
-       y1="178.83276"
-       x1="167.33386"
-       gradientTransform="matrix(0.96839241,0,0,0.96839241,-52.401983,877.75333)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5598"
-       xlink:href="#linearGradient5173-1"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:document-units="mm"
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8"
-     inkscape:cx="-32.045264"
-     inkscape:cy="65.284297"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1028"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-952.36218)">
-    <path
-       style="fill:url(#linearGradient5436);fill-opacity:1;stroke:black;stroke-width:2.78220295999999980;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="path3597-8" />
-  </g>
-</svg>

cockatrice/resources/userlevels/admin_buddy.svg

@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 64 64"
-   enable-background="new 0 0 64 64"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   width="100%"
-   height="100%"
-   sodipodi:docname="admin_buddy.svg">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10">
-    <linearGradient
-       id="linearGradient3766">
-      <stop
-         style="stop-color:#ff2700;stop-opacity:1;"
-         offset="0"
-         id="stop3768" />
-      <stop
-         style="stop-color:#820000;stop-opacity:1;"
-         offset="1"
-         id="stop3770" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5225">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5227" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop5229" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5219"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5221" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3758">
-      <stop
-         id="stop3760"
-         offset="0"
-         style="stop-color:#0fbb00;stop-opacity:1;" />
-      <stop
-         id="stop3762"
-         offset="1"
-         style="stop-color:#064400;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3750">
-      <stop
-         style="stop-color:#ece400;stop-opacity:1;"
-         offset="0"
-         id="stop3752" />
-      <stop
-         style="stop-color:#ece400;stop-opacity:0;"
-         offset="1"
-         id="stop3754" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3758-7"
-       id="linearGradient3756-1"
-       x1="1.960216"
-       y1="31.261461"
-       x2="60.456024"
-       y2="31.261461"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3758-7">
-      <stop
-         id="stop3760-4"
-         offset="0"
-         style="stop-color:#ece400;stop-opacity:1;" />
-      <stop
-         id="stop3762-0"
-         offset="1"
-         style="stop-color:#ec8b00;stop-opacity:1;" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1028"
-     id="namedview8"
-     showgrid="false"
-     inkscape:zoom="5.2149125"
-     inkscape:cx="-37.840247"
-     inkscape:cy="51.245759"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <path
-     d="M 61.442826,23.621762 38.532402,23.515555 31.556101,0.331013 24.578789,23.515555 1.6673502,23.621765 20.267785,38.422001 10.863888,63.668987 31.556101,47.626631 52.258426,63.668987 42.843404,38.422001 z"
-     id="path4-9"
-     style="fill:#000000;fill-opacity:1"
-     inkscape:connector-curvature="0" />
-  <path
-     d="M 57.150089,25.064396 37.504323,24.973324 31.522122,5.092503 25.539054,24.973324 5.8924192,25.064399 21.842354,37.75565 13.778482,59.405024 31.522122,45.64865 49.274434,59.405024 41.201022,37.75565 z"
-     id="path4"
-     style="fill:#ff2700;fill-opacity:1;fill-rule:nonzero"
-     inkscape:connector-curvature="0" />
-</svg>

cockatrice/resources/userlevels/admin_vip_buddy.svg

@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 64 64"
-   enable-background="new 0 0 64 64"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   width="100%"
-   height="100%"
-   sodipodi:docname="admin_buddy.svg">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10">
-    <linearGradient
-       id="linearGradient3766">
-      <stop
-         style="stop-color:#ff2700;stop-opacity:1;"
-         offset="0"
-         id="stop3768" />
-      <stop
-         style="stop-color:#820000;stop-opacity:1;"
-         offset="1"
-         id="stop3770" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5225">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5227" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop5229" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5219"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5221" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3758">
-      <stop
-         id="stop3760"
-         offset="0"
-         style="stop-color:#0fbb00;stop-opacity:1;" />
-      <stop
-         id="stop3762"
-         offset="1"
-         style="stop-color:#064400;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3750">
-      <stop
-         style="stop-color:#ece400;stop-opacity:1;"
-         offset="0"
-         id="stop3752" />
-      <stop
-         style="stop-color:#ece400;stop-opacity:0;"
-         offset="1"
-         id="stop3754" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3758-7"
-       id="linearGradient3756-1"
-       x1="1.960216"
-       y1="31.261461"
-       x2="60.456024"
-       y2="31.261461"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3758-7">
-      <stop
-         id="stop3760-4"
-         offset="0"
-         style="stop-color:#ece400;stop-opacity:1;" />
-      <stop
-         id="stop3762-0"
-         offset="1"
-         style="stop-color:#ec8b00;stop-opacity:1;" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1028"
-     id="namedview8"
-     showgrid="false"
-     inkscape:zoom="5.2149125"
-     inkscape:cx="-37.840247"
-     inkscape:cy="51.245759"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <path
-     d="M 61.442826,23.621762 38.532402,23.515555 31.556101,0.331013 24.578789,23.515555 1.6673502,23.621765 20.267785,38.422001 10.863888,63.668987 31.556101,47.626631 52.258426,63.668987 42.843404,38.422001 z"
-     id="path4-9"
-     style="fill:#000000;fill-opacity:1"
-     inkscape:connector-curvature="0" />
-  <path
-     d="M 57.150089,25.064396 37.504323,24.973324 31.522122,5.092503 25.539054,24.973324 5.8924192,25.064399 21.842354,37.75565 13.778482,59.405024 31.522122,45.64865 49.274434,59.405024 41.201022,37.75565 z"
-     id="path4"
-     style="fill:#ff2700;fill-opacity:1;fill-rule:nonzero"
-     inkscape:connector-curvature="0" />
-</svg>

cockatrice/resources/userlevels/moderator.svg

@@ -1,294 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="100"
-   height="100"
-   id="svg5322"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="moderator.svg">
-  <defs
-     id="defs3">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective5328" />
-    <inkscape:perspective
-       id="perspective5305"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       id="linearGradient5181">
-      <stop
-         style="stop-color:#0fbb00;stop-opacity:1;"
-         offset="0"
-         id="stop5183" />
-      <stop
-         style="stop-color:#064400;stop-opacity:1;"
-         offset="1"
-         id="stop5185" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3600-2"
-       id="radialGradient3606-7"
-       cx="324.32715"
-       cy="131.40274"
-       fx="324.32715"
-       fy="131.40274"
-       r="25.501276"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" />
-    <linearGradient
-       id="linearGradient3600-2">
-      <stop
-         style="stop-color:#ffc33d;stop-opacity:1;"
-         offset="0"
-         id="stop3602-4" />
-      <stop
-         style="stop-color:#e09900;stop-opacity:1;"
-         offset="1"
-         id="stop3604-9" />
-    </linearGradient>
-    <inkscape:perspective
-       id="perspective5478"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       id="linearGradient5189">
-      <stop
-         style="stop-color:#000ec9;stop-opacity:1;"
-         offset="0"
-         id="stop5191" />
-      <stop
-         style="stop-color:#000657;stop-opacity:1;"
-         offset="1"
-         id="stop5193" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3600-4"
-       id="radialGradient3606-1"
-       cx="324.32715"
-       cy="131.40274"
-       fx="324.32715"
-       fy="131.40274"
-       r="25.501276"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" />
-    <linearGradient
-       id="linearGradient3600-4">
-      <stop
-         style="stop-color:#ffc33d;stop-opacity:1;"
-         offset="0"
-         id="stop3602-3" />
-      <stop
-         style="stop-color:#e09900;stop-opacity:1;"
-         offset="1"
-         id="stop3604-5" />
-    </linearGradient>
-    <inkscape:perspective
-       id="perspective5559"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5173"
-       id="linearGradient5179"
-       x1="167.33386"
-       y1="178.83276"
-       x2="244.78181"
-       y2="178.83276"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient5173">
-      <stop
-         style="stop-color:#f50000;stop-opacity:1;"
-         offset="0"
-         id="stop5175" />
-      <stop
-         style="stop-color:#950000;stop-opacity:1;"
-         offset="1"
-         id="stop5177" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3600"
-       id="radialGradient5169"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
-       cx="324.32715"
-       cy="131.40274"
-       fx="324.32715"
-       fy="131.40274"
-       r="25.501276" />
-    <linearGradient
-       id="linearGradient3600">
-      <stop
-         style="stop-color:#ffc13d;stop-opacity:1;"
-         offset="0"
-         id="stop3602" />
-      <stop
-         style="stop-color:#e09900;stop-opacity:1;"
-         offset="1"
-         id="stop3604" />
-    </linearGradient>
-    <radialGradient
-       r="25.501276"
-       fy="131.40274"
-       fx="324.32715"
-       cy="131.40274"
-       cx="324.32715"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5574"
-       xlink:href="#linearGradient3600"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective5663"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3600-7"
-       id="radialGradient3606-8"
-       cx="324.32715"
-       cy="131.40274"
-       fx="324.32715"
-       fy="131.40274"
-       r="25.501276"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" />
-    <linearGradient
-       id="linearGradient3600-7">
-      <stop
-         style="stop-color:#ffc13d;stop-opacity:1;"
-         offset="0"
-         id="stop3602-7" />
-      <stop
-         style="stop-color:#e09900;stop-opacity:1;"
-         offset="1"
-         id="stop3604-6" />
-    </linearGradient>
-    <radialGradient
-       r="25.501276"
-       fy="131.40274"
-       fx="324.32715"
-       cy="131.40274"
-       cx="324.32715"
-       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5676"
-       xlink:href="#linearGradient3600-7"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:document-units="mm"
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6"
-     inkscape:cx="63.241533"
-     inkscape:cy="46.246766"
-     inkscape:current-layer="g5249"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1028"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-952.36218)">
-    <g
-       id="g5249"
-       transform="translate(0.53874115,0.90502985)">
-      <path
-         style="fill:#ffffff;stroke:#000000;stroke-width:4.45809746000000030;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
-         d="m 49.582319,954.34642 c -12.850034,0 -23.284789,10.43476 -23.284789,23.28479 0,7.32135 3.403263,13.81811 8.689724,18.08319 -10.278401,5.8502 -16.663073,17.8469 -20.19443,31.0259 -5.1178053,19.1 15.207096,22.0401 34.269334,22.0915 l 0,0.031 c 0.290839,0 0.566498,0.031 0.856734,0.031 19.210152,0 39.855802,-3.1837 34.789494,-22.0914 -3.636192,-13.5705 -10.027831,-25.4711 -20.378015,-31.17899 5.208701,-4.26694 8.506139,-10.73278 8.506139,-17.9914 0,-12.85003 -10.404159,-23.28479 -23.254191,-23.28479 z"
-         id="path3597-8"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#000000;stroke-width:0.97203517px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 50.522358,952.70715 0,95.71425"
-         id="path5303"
-         inkscape:connector-curvature="0" />
-      <path
-         style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 51.062274,1000.5844 0,-46.66155 1.096703,0.005 c 3.640423,0.0175 9.166159,2.51708 12.389647,5.60443 4.895085,4.68835 7.418012,11.18204 6.97848,17.96172 -0.388976,5.99986 -2.630586,10.87224 -6.948405,15.1031 l -2.054611,2.01323 2.95836,2.1147 c 3.465395,2.47714 7.400043,6.67727 9.661364,10.31317 3.324266,5.3451 6.789556,14.1029 8.149825,20.5971 2.583182,12.3327 -5.995009,18.5909 -26.579121,19.3908 l -5.652242,0.2196 0,-46.6616 z"
-         id="path5343"
-         inkscape:connector-curvature="0" />
-      <path
-         style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 51.062274,1000.5844 0,-46.66155 1.096703,0.005 c 3.711439,0.0179 9.230395,2.54932 12.52612,5.74551 2.710429,2.62858 4.363146,5.23853 5.699734,9.00096 0.930917,2.62048 1.042531,3.35671 1.066373,7.03397 0.02902,4.47725 -0.343832,6.4262 -1.860873,9.72679 -1.358173,2.95494 -2.652341,4.81714 -4.971275,7.15326 l -2.043484,2.05863 2.932618,2.09329 c 6.98445,4.98544 12.210204,12.81934 15.750058,23.61084 3.543721,10.8033 3.39602,15.1985 -0.654452,19.4747 -4.329667,4.571 -11.449354,6.7169 -23.88928,7.2003 l -5.652242,0.2196 0,-46.6616 z"
-         id="path5345"
-         inkscape:connector-curvature="0" />
-      <path
-         style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 51.062274,1000.5844 0,-46.66155 1.127086,0 c 1.963684,0 6.316627,1.3793 8.624731,2.73288 1.305624,0.76568 3.277555,2.429 4.764529,4.01888 4.347263,4.6481 6.318993,10.15893 5.954049,16.6411 -0.326518,5.79966 -2.122114,9.97998 -6.25177,14.55473 -1.44716,1.60313 -2.388203,2.91735 -2.210758,3.08744 0.169927,0.16289 1.447842,1.10199 2.839812,2.08691 6.268453,4.43531 11.362918,11.94641 14.960201,22.05661 2.740177,7.7013 3.480992,12.7857 2.399253,16.4664 -0.490882,1.6703 -1.040601,2.5538 -2.66191,4.2781 -4.29247,4.5651 -11.326737,6.6778 -23.892981,7.176 l -5.652242,0.2241 0,-46.6616 z"
-         id="path5347"
-         inkscape:connector-curvature="0" />
-      <path
-         style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 51.062274,1000.5855 0,-46.66265 1.127086,0 c 1.830826,0 6.182017,1.32383 8.427379,2.56398 3.074383,1.69804 7.222246,6.22736 8.789514,9.59784 4.043357,8.69543 2.602054,18.25614 -3.837601,25.45626 -1.482649,1.65774 -2.695724,3.09743 -2.695724,3.19932 0,0.10189 1.186029,0.99046 2.635621,1.97461 3.078254,2.08987 6.81705,5.92344 9.062839,9.29254 3.274171,4.9119 7.232757,14.564 8.731682,21.29 0.646579,2.9014 0.614978,6.1318 -0.08275,8.4594 -0.86467,2.8846 -4.147214,6.2392 -7.573604,7.74 -5.13932,2.251 -10.156844,3.194 -18.763476,3.5265 l -5.820965,0.2249 0,-46.6627 z"
-         id="path5349"
-         inkscape:connector-curvature="0" />
-      <path
-         style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 51.062274,1000.5853 0,-46.66245 1.164456,0 c 4.764705,0 11.112502,3.49049 14.697127,8.08157 5.260553,6.73756 6.190324,16.72129 2.284493,24.53056 -0.608066,1.21576 -2.304134,3.5367 -3.77148,5.16099 -1.466571,1.62342 -2.603753,3.01808 -2.527074,3.09924 0.07667,0.0811 1.300896,0.95003 2.720481,1.93083 6.904062,4.77006 12.487313,13.40446 16.085176,24.87536 1.733472,5.5268 2.208105,8.1847 2.003089,11.2173 -0.604468,8.9414 -9.318247,13.5855 -26.66658,14.2125 l -5.989688,0.2165 0,-46.6624 z"
-         id="path5351"
-         inkscape:connector-curvature="0" />
-      <path
-         style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 51.062274,1000.7111 0,-46.78825 1.265427,0.005 c 4.153532,0.0173 9.758512,2.75815 13.295303,6.50137 1.792452,1.89707 2.63621,3.17089 3.798098,5.73397 1.746736,3.85324 2.225454,6.0014 2.225454,9.98629 0,6.50755 -2.416561,12.11247 -7.223569,16.75421 -0.945331,0.91283 -1.642858,1.7317 -1.550059,1.81971 0.0928,0.088 1.155757,0.85585 2.362131,1.70631 3.35942,2.36829 4.992087,3.86859 7.229212,6.64329 3.924869,4.8681 7.249491,11.7229 9.87191,20.3544 1.173448,3.8623 1.289753,4.5994 1.289753,8.1737 0,3.6878 -0.0614,4.0459 -1.001592,5.8425 -1.309266,2.5017 -3.108338,4.122 -6.422247,5.7839 -4.375689,2.1945 -9.62921,3.3669 -16.70364,3.7278 -2.134354,0.1088 -4.905639,0.2757 -6.158413,0.3708 l -2.277768,0.1729 0,-46.7882 z"
-         id="path5353"
-         inkscape:connector-curvature="0" />
-      <path
-         style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 51.062274,1000.6174 0,-46.98372 1.434151,0.16768 c 5.155008,0.60274 9.462857,2.72154 12.938259,6.36366 4.743924,4.9715 6.879132,11.35611 6.164642,18.43328 -0.537028,5.31935 -3.090083,10.59498 -6.838339,14.13074 l -1.940717,1.83069 3.040832,2.20427 c 3.580837,2.59571 7.189745,6.4912 9.552957,10.3116 4.895721,7.9144 9.235933,21.4918 8.504868,26.6055 -0.813112,5.6877 -5.438715,9.6977 -13.622159,11.8093 -3.808212,0.9826 -7.680557,1.4713 -14.763317,1.8633 l -4.471177,0.2474 0,-46.9837 z"
-         id="path5355"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>

cockatrice/resources/userlevels/moderator_vip_buddy.svg

@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 64 64"
-   enable-background="new 0 0 64 64"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   width="100%"
-   height="100%"
-   sodipodi:docname="moderator_buddy.svg">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10">
-    <linearGradient
-       id="linearGradient5225">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5227" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop5229" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5219"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5221" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3758">
-      <stop
-         id="stop3760"
-         offset="0"
-         style="stop-color:#0fbb00;stop-opacity:1;" />
-      <stop
-         id="stop3762"
-         offset="1"
-         style="stop-color:#064400;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3750">
-      <stop
-         style="stop-color:#ece400;stop-opacity:1;"
-         offset="0"
-         id="stop3752" />
-      <stop
-         style="stop-color:#ece400;stop-opacity:0;"
-         offset="1"
-         id="stop3754" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3758-7"
-       id="linearGradient3756-1"
-       x1="1.960216"
-       y1="31.261461"
-       x2="60.456024"
-       y2="31.261461"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3758-7">
-      <stop
-         id="stop3760-4"
-         offset="0"
-         style="stop-color:#ece400;stop-opacity:1;" />
-      <stop
-         id="stop3762-0"
-         offset="1"
-         style="stop-color:#ec8b00;stop-opacity:1;" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1028"
-     id="namedview8"
-     showgrid="false"
-     inkscape:zoom="5.2149125"
-     inkscape:cx="-26.445493"
-     inkscape:cy="31.598459"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <path
-     d="M 61.442826,23.621762 38.532402,23.515555 31.556101,0.331013 24.578789,23.515555 1.6673502,23.621765 20.267785,38.422001 10.863888,63.668987 31.556101,47.626631 52.258426,63.668987 42.843404,38.422001 z"
-     id="path4-9"
-     style="fill:#000000;fill-opacity:1"
-     inkscape:connector-curvature="0" />
-  <path
-     d="M 55.041981,25.814432 36.921945,25.730432 31.404334,7.3935963 25.885923,25.730432 7.7650846,25.814434 22.476316,37.520057 15.0387,57.488097 31.404334,44.800071 47.777965,57.488097 40.331551,37.520057 z"
-     id="path4"
-     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero"
-     inkscape:connector-curvature="0" />
-  <path
-     d="M 56.276895,25.211993 37.3433,24.856806 31.486705,5.7742084 c 0.04705,37.4359336 -0.01851,2.6744908 -0.0678,40.1841446 L 48.19932,58.580578 40.956295,37.527792 z"
-     id="path4-1"
-     style="fill:#000000;fill-opacity:1;fill-rule:nonzero"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccccccc" />
-</svg>

cockatrice/resources/userlevels/registered_donator_buddy.svg

@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 64 64"
-   enable-background="new 0 0 64 64"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   width="100%"
-   height="100%"
-   sodipodi:docname="vip_buddy.svg">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10">
-    <linearGradient
-       id="linearGradient3766">
-      <stop
-         style="stop-color:#ff2700;stop-opacity:1;"
-         offset="0"
-         id="stop3768" />
-      <stop
-         style="stop-color:#820000;stop-opacity:1;"
-         offset="1"
-         id="stop3770" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5225">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5227" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop5229" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5219"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5221" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3758">
-      <stop
-         id="stop3760"
-         offset="0"
-         style="stop-color:#0fbb00;stop-opacity:1;" />
-      <stop
-         id="stop3762"
-         offset="1"
-         style="stop-color:#064400;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3750">
-      <stop
-         style="stop-color:#ece400;stop-opacity:1;"
-         offset="0"
-         id="stop3752" />
-      <stop
-         style="stop-color:#ece400;stop-opacity:0;"
-         offset="1"
-         id="stop3754" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3758-7"
-       id="linearGradient3756-1"
-       x1="1.960216"
-       y1="31.261461"
-       x2="60.456024"
-       y2="31.261461"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3758-7">
-      <stop
-         id="stop3760-4"
-         offset="0"
-         style="stop-color:#ece400;stop-opacity:1;" />
-      <stop
-         id="stop3762-0"
-         offset="1"
-         style="stop-color:#ec8b00;stop-opacity:1;" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1440"
-     inkscape:window-height="792"
-     id="namedview8"
-     showgrid="false"
-     inkscape:zoom="5.2149125"
-     inkscape:cx="14.509163"
-     inkscape:cy="51.245759"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <path
-     d="M 61.442826,23.621762 38.532402,23.515555 31.556101,0.331013 24.578789,23.515555 1.6673502,23.621765 20.267785,38.422001 10.863888,63.668987 31.556101,47.626631 52.258426,63.668987 42.843404,38.422001 z"
-     id="path4-9"
-     style="fill:#000000;fill-opacity:1"
-     inkscape:connector-curvature="0" />
-  <path
-     d="M 57.150089,25.064396 37.504323,24.973324 31.522122,5.092503 25.539054,24.973324 5.8924192,25.064399 21.842354,37.75565 13.778482,59.405024 31.522122,45.64865 49.274434,59.405024 41.201022,37.75565 z"
-     id="path4"
-     style="fill:#8d5fd3;fill-opacity:1;fill-rule:nonzero"
-     inkscape:connector-curvature="0" />
-</svg>

cockatrice/resources/userlevels/registered_vip_buddy.svg

@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 64 64"
-   enable-background="new 0 0 64 64"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   width="100%"
-   height="100%"
-   sodipodi:docname="registered_vip_buddy.svg">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10">
-    <linearGradient
-       id="linearGradient4153">
-      <stop
-         style="stop-color:#ffec79;stop-opacity:1"
-         offset="0"
-         id="stop4155" />
-      <stop
-         style="stop-color:#f2c15b;stop-opacity:1"
-         offset="1"
-         id="stop4157" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3758">
-      <stop
-         id="stop3760"
-         offset="0"
-         style="stop-color:#80d600;stop-opacity:1;" />
-      <stop
-         id="stop3762"
-         offset="1"
-         style="stop-color:#80d600;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3750">
-      <stop
-         style="stop-color:#ece400;stop-opacity:1;"
-         offset="0"
-         id="stop3752" />
-      <stop
-         style="stop-color:#ece400;stop-opacity:0;"
-         offset="1"
-         id="stop3754" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3758-7"
-       id="linearGradient3756"
-       x1="31.290251"
-       y1="-19.003599"
-       x2="31.135509"
-       y2="67.496323"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.87626222,0,0,0.87626222,4.174756,4.8555263)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3758-7"
-       id="linearGradient3756-1"
-       x1="1.960216"
-       y1="31.261461"
-       x2="60.456024"
-       y2="31.261461"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3758-7">
-      <stop
-         id="stop3760-4"
-         offset="0"
-         style="stop-color:#ece400;stop-opacity:1;" />
-      <stop
-         id="stop3762-0"
-         offset="1"
-         style="stop-color:#ec8b00;stop-opacity:1;" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1152"
-     inkscape:window-height="811"
-     id="namedview8"
-     showgrid="false"
-     inkscape:zoom="7.375"
-     inkscape:cx="29.258475"
-     inkscape:cy="35.341768"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <path
-     d="M 61.442826,23.621762 38.532402,23.515555 31.556101,0.331013 24.578789,23.515555 1.6673502,23.621765 20.267785,38.422001 10.863888,63.668987 31.556101,47.626631 52.258426,63.668987 42.843404,38.422001 z"
-     id="path4-9"
-     style="fill:#000000;fill-opacity:1"
-     inkscape:connector-curvature="0" />
-  <path
-     d="M 57.150089,25.064396 37.504323,24.973324 31.522122,5.092503 25.539054,24.973324 5.8924192,25.064399 21.842354,37.75565 13.778482,59.405024 31.522122,45.64865 49.274434,59.405024 41.201022,37.75565 z"
-     id="path4"
-     style="fill:url(#linearGradient3756);fill-opacity:1"
-     inkscape:connector-curvature="0" />
-</svg>

cockatrice/src/cardframe.cpp

@@ -1,123 +0,0 @@
-#include "cardframe.h"
-
-#include "cardinfopicture.h"
-#include "cardinfotext.h"
-#include "carditem.h"
-#include "main.h"
-#include "settingscache.h"
-
-#include <QSplitter>
-#include <QVBoxLayout>
-#include <utility>
-
-CardFrame::CardFrame(const QString &cardName, QWidget *parent) : QTabWidget(parent), info(nullptr), cardTextOnly(false)
-{
-    setContentsMargins(3, 3, 3, 3);
-    pic = new CardInfoPicture();
-    pic->setObjectName("pic");
-    text = new CardInfoText();
-    text->setObjectName("text");
-    connect(text, SIGNAL(linkActivated(const QString &)), this, SLOT(setCard(const QString &)));
-
-    tab1 = new QWidget(this);
-    tab2 = new QWidget(this);
-    tab3 = new QWidget(this);
-
-    tab1->setObjectName("tab1");
-    tab2->setObjectName("tab2");
-    tab3->setObjectName("tab3");
-
-    insertTab(ImageOnlyView, tab1, QString());
-    insertTab(TextOnlyView, tab2, QString());
-    insertTab(ImageAndTextView, tab3, QString());
-    connect(this, SIGNAL(currentChanged(int)), this, SLOT(setViewMode(int)));
-
-    tab1Layout = new QVBoxLayout();
-    tab1Layout->setObjectName("tab1Layout");
-    tab1Layout->setContentsMargins(0, 0, 0, 0);
-    tab1Layout->setSpacing(0);
-    tab1->setLayout(tab1Layout);
-
-    tab2Layout = new QVBoxLayout();
-    tab2Layout->setObjectName("tab2Layout");
-    tab2Layout->setContentsMargins(0, 0, 0, 0);
-    tab2Layout->setSpacing(0);
-    tab2->setLayout(tab2Layout);
-
-    splitter = new QSplitter();
-    splitter->setObjectName("splitter");
-    splitter->setOrientation(Qt::Vertical);
-
-    tab3Layout = new QVBoxLayout();
-    tab3Layout->setObjectName("tab3Layout");
-    tab3Layout->setContentsMargins(0, 0, 0, 0);
-    tab3Layout->setSpacing(0);
-    tab3Layout->addWidget(splitter);
-    tab3->setLayout(tab3Layout);
-
-    setViewMode(SettingsCache::instance().getCardInfoViewMode());
-
-    setCard(db->getCard(cardName));
-}
-
-void CardFrame::retranslateUi()
-{
-    setTabText(ImageOnlyView, tr("Image"));
-    setTabText(TextOnlyView, tr("Description"));
-    setTabText(ImageAndTextView, tr("Both"));
-}
-
-void CardFrame::setViewMode(int mode)
-{
-    if (currentIndex() != mode)
-        setCurrentIndex(mode);
-
-    switch (mode) {
-        case ImageOnlyView:
-        case TextOnlyView:
-            tab1Layout->addWidget(pic);
-            tab2Layout->addWidget(text);
-            break;
-        case ImageAndTextView:
-            splitter->addWidget(pic);
-            splitter->addWidget(text);
-            break;
-        default:
-            break;
-    }
-
-    SettingsCache::instance().setCardInfoViewMode(mode);
-}
-
-void CardFrame::setCard(CardInfoPtr card)
-{
-    if (info) {
-        disconnect(info.data(), nullptr, this, nullptr);
-    }
-
-    info = std::move(card);
-
-    if (info) {
-        connect(info.data(), SIGNAL(destroyed()), this, SLOT(clearCard()));
-    }
-
-    text->setCard(info);
-    pic->setCard(info);
-}
-
-void CardFrame::setCard(const QString &cardName)
-{
-    setCard(db->guessCard(cardName));
-}
-
-void CardFrame::setCard(AbstractCardItem *card)
-{
-    if (card) {
-        setCard(card->getInfo());
-    }
-}
-
-void CardFrame::clearCard()
-{
-    setCard((CardInfoPtr) nullptr);
-}

cockatrice/src/cardinfopicture.cpp

@@ -1,60 +0,0 @@
-#include "cardinfopicture.h"
-
-#include "carditem.h"
-#include "main.h"
-#include "pictureloader.h"
-
-#include <QPainter>
-#include <QStyle>
-#include <QWidget>
-
-CardInfoPicture::CardInfoPicture(QWidget *parent) : QWidget(parent), info(nullptr), pixmapDirty(true)
-{
-    setMinimumHeight(100);
-}
-
-void CardInfoPicture::setCard(CardInfoPtr card)
-{
-    if (info) {
-        disconnect(info.data(), nullptr, this, nullptr);
-    }
-
-    info = card;
-
-    if (info) {
-        connect(info.data(), SIGNAL(pixmapUpdated()), this, SLOT(updatePixmap()));
-    }
-
-    updatePixmap();
-}
-
-void CardInfoPicture::resizeEvent(QResizeEvent *)
-{
-    updatePixmap();
-}
-
-void CardInfoPicture::updatePixmap()
-{
-    pixmapDirty = true;
-    update();
-}
-
-void CardInfoPicture::loadPixmap()
-{
-    if (info)
-        PictureLoader::getPixmap(resizedPixmap, info, size());
-    else
-        PictureLoader::getCardBackPixmap(resizedPixmap, size());
-}
-
-void CardInfoPicture::paintEvent(QPaintEvent *)
-{
-    if (width() == 0 || height() == 0)
-        return;
-
-    if (pixmapDirty)
-        loadPixmap();
-
-    QPainter painter(this);
-    style()->drawItemPixmap(&painter, rect(), Qt::AlignHCenter, resizedPixmap);
-}

cockatrice/src/cardinfopicture.h

@@ -1,31 +0,0 @@
-#ifndef CARDINFOPICTURE_H
-#define CARDINFOPICTURE_H
-
-#include "carddatabase.h"
-
-#include <QWidget>
-
-class AbstractCardItem;
-
-class CardInfoPicture : public QWidget
-{
-    Q_OBJECT
-
-private:
-    CardInfoPtr info;
-    QPixmap resizedPixmap;
-    bool pixmapDirty;
-
-public:
-    CardInfoPicture(QWidget *parent = nullptr);
-
-protected:
-    void resizeEvent(QResizeEvent *event);
-    void paintEvent(QPaintEvent *);
-    void loadPixmap();
-public slots:
-    void setCard(CardInfoPtr card);
-    void updatePixmap();
-};
-
-#endif

cockatrice/src/cardinfowidget.h

@@ -1,36 +0,0 @@
-#ifndef CARDINFOWIDGET_H
-#define CARDINFOWIDGET_H
-
-#include "carddatabase.h"
-
-#include <QComboBox>
-#include <QFrame>
-#include <QStringList>
-
-class CardInfoPicture;
-class CardInfoText;
-class AbstractCardItem;
-
-class CardInfoWidget : public QFrame
-{
-    Q_OBJECT
-
-private:
-    qreal aspectRatio;
-    CardInfoPtr info;
-    CardInfoPicture *pic;
-    CardInfoText *text;
-
-public:
-    explicit CardInfoWidget(const QString &cardName, QWidget *parent = nullptr, Qt::WindowFlags f = {});
-
-public slots:
-    void setCard(CardInfoPtr card);
-    void setCard(const QString &cardName);
-    void setCard(AbstractCardItem *card);
-
-private slots:
-    void clear();
-};
-
-#endif

cockatrice/src/cardlist.cpp

@@ -1,63 +0,0 @@
-#include "cardlist.h"
-
-#include "carddatabase.h"
-#include "carditem.h"
-
-#include <algorithm>
-
-CardList::CardList(bool _contentsKnown) : QList<CardItem *>(), contentsKnown(_contentsKnown)
-{
-}
-
-CardItem *CardList::findCard(const int id, const bool remove, int *position)
-{
-    if (!contentsKnown) {
-        if (empty())
-            return 0;
-        CardItem *temp = at(0);
-        if (remove)
-            removeAt(0);
-        if (position)
-            *position = id;
-        return temp;
-    } else
-        for (int i = 0; i < size(); i++) {
-            CardItem *temp = at(i);
-            if (temp->getId() == id) {
-                if (remove)
-                    removeAt(i);
-                if (position)
-                    *position = i;
-                return temp;
-            }
-        }
-    return 0;
-}
-
-class CardList::compareFunctor
-{
-private:
-    int flags;
-
-public:
-    explicit compareFunctor(int _flags) : flags(_flags)
-    {
-    }
-    inline bool operator()(CardItem *a, CardItem *b) const
-    {
-        if (flags & SortByType) {
-            QString t1 = a->getInfo() ? a->getInfo()->getMainCardType() : QString();
-            QString t2 = b->getInfo() ? b->getInfo()->getMainCardType() : QString();
-            if ((t1 == t2) && (flags & SortByName))
-                return a->getName() < b->getName();
-            return t1 < t2;
-        } else
-            return a->getName() < b->getName();
-    }
-};
-
-void CardList::sort(int flags)
-{
-    compareFunctor cf(flags);
-    std::sort(begin(), end(), cf);
-}

cockatrice/src/cardlist.h

@@ -1,31 +0,0 @@
-#ifndef CARDLIST_H
-#define CARDLIST_H
-
-#include <QList>
-
-class CardItem;
-
-class CardList : public QList<CardItem *>
-{
-private:
-    class compareFunctor;
-
-protected:
-    bool contentsKnown;
-
-public:
-    enum SortFlags
-    {
-        SortByName = 1,
-        SortByType = 2
-    };
-    CardList(bool _contentsKnown);
-    CardItem *findCard(const int id, const bool remove, int *position = NULL);
-    bool getContentsKnown() const
-    {
-        return contentsKnown;
-    }
-    void sort(int flags = SortByName);
-};
-
-#endif

cockatrice/src/client/game_logic/abstract_client.cpp

@@ -1,6 +1,6 @@
-#include "abstractclient.h"
+#include "abstract_client.h"
 
-#include "client_metatypes.h"
+#include "../../server/pending_command.h"
 #include "featureset.h"
 #include "get_pb_extension.h"
 #include "pb/commands.pb.h"
@@ -18,7 +18,6 @@
 #include "pb/event_user_left.pb.h"
 #include "pb/event_user_message.pb.h"
 #include "pb/server_message.pb.h"
-#include "pending_command.h"
 
 #include <google/protobuf/descriptor.h>
 
@@ -53,7 +52,7 @@ AbstractClient::AbstractClient(QObject *parent)
     FeatureSet features;
     features.initalizeFeatureList(clientFeatures);
 
-    connect(this, SIGNAL(sigQueuePendingCommand(PendingCommand *)), this, SLOT(queuePendingCommand(PendingCommand *)));
+    connect(this, &AbstractClient::sigQueuePendingCommand, this, &AbstractClient::queuePendingCommand);
 }
 
 AbstractClient::~AbstractClient()

cockatrice/src/client/game_logic/abstract_client.h

@@ -48,6 +48,7 @@ class AbstractClient : public QObject
     Q_OBJECT
 signals:
     void statusChanged(ClientStatus _status);
+    void maxPingTime(int seconds, int maxSeconds);
 
     // Room events
     void roomEventReceived(const RoomEvent &event);
@@ -97,8 +98,8 @@ protected:
     virtual void sendCommandContainer(const CommandContainer &cont) = 0;
 
 public:
-    AbstractClient(QObject *parent = nullptr);
-    ~AbstractClient();
+    explicit AbstractClient(QObject *parent = nullptr);
+    ~AbstractClient() override;
 
     ClientStatus getStatus() const
     {

cockatrice/src/client/game_logic/key_signals.cpp

@@ -1,4 +1,4 @@
-#include "keysignals.h"
+#include "key_signals.h"
 
 #include <QKeyEvent>
 

cockatrice/src/client/game_logic/key_signals.h

@@ -23,7 +23,7 @@ signals:
     void onCtrlC();
 
 protected:
-    virtual bool eventFilter(QObject *, QEvent *event);
+    bool eventFilter(QObject *, QEvent *event) override;
 };
 
 #endif

cockatrice/src/client/get_text_with_max.cpp

@@ -1,4 +1,4 @@
-#include "gettextwithmax.h"
+#include "get_text_with_max.h"
 
 QString getTextWithMax(QWidget *parent,
                        const QString &title,

cockatrice/src/client/get_text_with_max.h

@@ -2,7 +2,7 @@
 #ifndef GETTEXTWITHMAX_H
 #define GETTEXTWITHMAX_H
 
-#include "stringsizes.h"
+#include "trice_limits.h"
 
 #include <QInputDialog>
 

cockatrice/src/client/network/client_update_checker.cpp

@@ -0,0 +1,35 @@
+#include "client_update_checker.h"
+
+#include "../../settings/cache_settings.h"
+#include "release_channel.h"
+
+ClientUpdateChecker::ClientUpdateChecker(QObject *parent) : QObject(parent)
+{
+}
+
+void ClientUpdateChecker::check()
+{
+    auto releaseChannel = SettingsCache::instance().getUpdateReleaseChannel();
+
+    finishedCheckConnection =
+        connect(releaseChannel, &ReleaseChannel::finishedCheck, this, &ClientUpdateChecker::actFinishedCheck);
+    errorConnection = connect(releaseChannel, &ReleaseChannel::error, this, &ClientUpdateChecker::actError);
+
+    releaseChannel->checkForUpdates();
+}
+
+void ClientUpdateChecker::actFinishedCheck(bool needToUpdate, bool isCompatible, Release *release)
+{
+    disconnect(finishedCheckConnection);
+    disconnect(errorConnection);
+
+    emit finishedCheck(needToUpdate, isCompatible, release);
+}
+
+void ClientUpdateChecker::actError(const QString &errorString)
+{
+    disconnect(finishedCheckConnection);
+    disconnect(errorConnection);
+
+    emit error(errorString);
+}

cockatrice/src/client/network/client_update_checker.h

@@ -0,0 +1,45 @@
+#ifndef CLIENT_UPDATE_CHECKER_H
+#define CLIENT_UPDATE_CHECKER_H
+#include <QObject>
+
+class Release;
+
+/**
+ * We use a singleton instance of UpdateChannel, which can cause interference and feedback loops when multiple objects
+ * connect to it.
+ *
+ * This class encapsulates the usage of that UpdateChannel to ensure that the check only happens once per connection and
+ * the connection is destroyed after it's been used.
+ */
+class ClientUpdateChecker : public QObject
+{
+    Q_OBJECT
+
+    QMetaObject::Connection finishedCheckConnection;
+    QMetaObject::Connection errorConnection;
+
+    void actFinishedCheck(bool needToUpdate, bool isCompatible, Release *release);
+    void actError(const QString &errorString);
+
+public:
+    explicit ClientUpdateChecker(QObject *parent = nullptr);
+    /**
+     * Actually performs the check, using the currently selected update channel in the settings.
+     * Any resulting signals will only be sent once.
+     * This method should only be called ONCE per instance.
+     */
+    void check();
+
+signals:
+    /**
+     * Forwarded from UpdateChannel::finishedCheck
+     */
+    void finishedCheck(bool needToUpdate, bool isCompatible, Release *release);
+
+    /**
+     * Forwarded from UpdateChannel::error
+     */
+    void error(const QString &errorString);
+};
+
+#endif // CLIENT_UPDATE_CHECKER_H

cockatrice/src/client/network/release_channel.cpp

@@ -1,4 +1,4 @@
-#include "releasechannel.h"
+#include "release_channel.h"
 
 #include "version_string.h"
 
@@ -21,11 +21,8 @@
 
 #define GIT_SHORT_HASH_LEN 7
 
-int ReleaseChannel::sharedIndex = 0;
-
 ReleaseChannel::ReleaseChannel() : netMan(new QNetworkAccessManager(this)), response(nullptr), lastRelease(nullptr)
 {
-    index = sharedIndex++;
 }
 
 ReleaseChannel::~ReleaseChannel()
@@ -36,13 +33,13 @@ ReleaseChannel::~ReleaseChannel()
 void ReleaseChannel::checkForUpdates()
 {
     QString releaseChannelUrl = getReleaseChannelUrl();
-    qDebug() << "Searching for updates on the channel: " << releaseChannelUrl;
+    qCDebug(ReleaseChannelLog) << "Searching for updates on the channel: " << releaseChannelUrl;
     response = netMan->get(QNetworkRequest(releaseChannelUrl));
-    connect(response, SIGNAL(finished()), this, SLOT(releaseListFinished()));
+    connect(response, &QNetworkReply::finished, this, &ReleaseChannel::releaseListFinished);
 }
 
 // Different release channel checking functions for different operating systems
-#if defined(Q_OS_OSX)
+#if defined(Q_OS_MACOS)
 bool ReleaseChannel::downloadMatchesCurrentOS(const QString &fileName)
 {
     static QRegularExpression version_regex("macOS-(\\d+)\\.(\\d+)");
@@ -89,7 +86,7 @@ QString StableReleaseChannel::getManualDownloadUrl() const
 
 QString StableReleaseChannel::getName() const
 {
-    return tr("Stable Releases");
+    return tr("Default");
 }
 
 QString StableReleaseChannel::getReleaseChannelUrl() const
@@ -112,7 +109,7 @@ void StableReleaseChannel::releaseListFinished()
     QVariantMap resultMap = jsonResponse.toVariant().toMap();
     if (!(resultMap.contains("name") && resultMap.contains("html_url") && resultMap.contains("tag_name") &&
           resultMap.contains("published_at"))) {
-        qWarning() << "Invalid received from the release update server.";
+        qWarning() << "Invalid received from the release update server:" << resultMap;
         emit error(tr("Invalid reply received from the release update server."));
         return;
     }
@@ -148,17 +145,17 @@ void StableReleaseChannel::releaseListFinished()
 
     QString shortHash = lastRelease->getCommitHash().left(GIT_SHORT_HASH_LEN);
     QString myHash = QString(VERSION_COMMIT);
-    qDebug() << "Current hash=" << myHash << "update hash=" << shortHash;
+    qCDebug(ReleaseChannelLog) << "Current hash=" << myHash << "update hash=" << shortHash;
 
-    qDebug() << "Got reply from release server, name=" << lastRelease->getName()
-             << "desc=" << lastRelease->getDescriptionUrl() << "date=" << lastRelease->getPublishDate()
-             << "url=" << lastRelease->getDownloadUrl();
+    qCDebug(ReleaseChannelLog) << "Got reply from release server, name=" << lastRelease->getName()
+                               << "desc=" << lastRelease->getDescriptionUrl()
+                               << "date=" << lastRelease->getPublishDate() << "url=" << lastRelease->getDownloadUrl();
 
     const QString &tagName = resultMap["tag_name"].toString();
     QString url = QString(STABLETAG_URL) + tagName;
-    qDebug() << "Searching for commit hash corresponding to stable channel tag: " << tagName;
+    qCDebug(ReleaseChannelLog) << "Searching for commit hash corresponding to stable channel tag: " << tagName;
     response = netMan->get(QNetworkRequest(url));
-    connect(response, SIGNAL(finished()), this, SLOT(tagListFinished()));
+    connect(response, &QNetworkReply::finished, this, &StableReleaseChannel::tagListFinished);
 }
 
 void StableReleaseChannel::tagListFinished()
@@ -181,11 +178,11 @@ void StableReleaseChannel::tagListFinished()
     }
 
     lastRelease->setCommitHash(resultMap["object"].toMap()["sha"].toString());
-    qDebug() << "Got reply from tag server, commit=" << lastRelease->getCommitHash();
+    qCDebug(ReleaseChannelLog) << "Got reply from tag server, commit=" << lastRelease->getCommitHash();
 
     QString shortHash = lastRelease->getCommitHash().left(GIT_SHORT_HASH_LEN);
     QString myHash = QString(VERSION_COMMIT);
-    qDebug() << "Current hash=" << myHash << "update hash=" << shortHash;
+    qCDebug(ReleaseChannelLog) << "Current hash=" << myHash << "update hash=" << shortHash;
     const bool needToUpdate = (QString::compare(shortHash, myHash, Qt::CaseInsensitive) != 0);
 
     emit finishedCheck(needToUpdate, lastRelease->isCompatibleVersionFound(), lastRelease);
@@ -203,7 +200,7 @@ QString BetaReleaseChannel::getManualDownloadUrl() const
 
 QString BetaReleaseChannel::getName() const
 {
-    return tr("Beta Releases");
+    return tr("Beta");
 }
 
 QString BetaReleaseChannel::getReleaseChannelUrl() const
@@ -252,15 +249,15 @@ void BetaReleaseChannel::releaseListFinished()
     lastRelease->setName(QString("%1 (%2)").arg(resultMap["tag_name"].toString()).arg(shortHash));
     lastRelease->setDescriptionUrl(QString(BETARELEASE_CHANGESURL).arg(VERSION_COMMIT, shortHash));
 
-    qDebug() << "Got reply from release server, size=" << resultMap.size() << "name=" << lastRelease->getName()
-             << "desc=" << lastRelease->getDescriptionUrl() << "commit=" << lastRelease->getCommitHash()
-             << "date=" << lastRelease->getPublishDate();
+    qCDebug(ReleaseChannelLog) << "Got reply from release server, size=" << resultMap.size()
+                               << "name=" << lastRelease->getName() << "desc=" << lastRelease->getDescriptionUrl()
+                               << "commit=" << lastRelease->getCommitHash() << "date=" << lastRelease->getPublishDate();
 
     QString betaBuildDownloadUrl = resultMap["assets_url"].toString();
 
-    qDebug() << "Searching for a corresponding file on the beta channel: " << betaBuildDownloadUrl;
+    qCDebug(ReleaseChannelLog) << "Searching for a corresponding file on the beta channel: " << betaBuildDownloadUrl;
     response = netMan->get(QNetworkRequest(betaBuildDownloadUrl));
-    connect(response, SIGNAL(finished()), this, SLOT(fileListFinished()));
+    connect(response, &QNetworkReply::finished, this, &BetaReleaseChannel::fileListFinished);
 }
 
 void BetaReleaseChannel::fileListFinished()
@@ -278,7 +275,7 @@ void BetaReleaseChannel::fileListFinished()
     QVariantList resultList = jsonResponse.toVariant().toList();
     QString shortHash = lastRelease->getCommitHash().left(GIT_SHORT_HASH_LEN);
     QString myHash = QString(VERSION_COMMIT);
-    qDebug() << "Current hash=" << myHash << "update hash=" << shortHash;
+    qCDebug(ReleaseChannelLog) << "Current hash=" << myHash << "update hash=" << shortHash;
 
     bool needToUpdate = (QString::compare(shortHash, myHash, Qt::CaseInsensitive) != 0);
     bool compatibleVersion = false;
@@ -295,7 +292,7 @@ void BetaReleaseChannel::fileListFinished()
         if (downloadMatchesCurrentOS(*url)) {
             compatibleVersion = true;
             lastRelease->setDownloadUrl(*url);
-            qDebug() << "Found compatible version url=" << *url;
+            qCDebug(ReleaseChannelLog) << "Found compatible version url=" << *url;
             break;
         }
     }

cockatrice/src/client/network/release_channel.h

@@ -2,11 +2,14 @@
 #define RELEASECHANNEL_H
 
 #include <QDate>
+#include <QLoggingCategory>
 #include <QObject>
 #include <QString>
 #include <QVariantMap>
 #include <utility>
 
+inline Q_LOGGING_CATEGORY(ReleaseChannelLog, "release_channel");
+
 class QNetworkReply;
 class QNetworkAccessManager;
 
@@ -82,9 +85,6 @@ public:
     ~ReleaseChannel() override;
 
 protected:
-    // shared by all instances
-    static int sharedIndex;
-    int index;
     QNetworkAccessManager *netMan;
     QNetworkReply *response;
     Release *lastRelease;
@@ -94,10 +94,6 @@ protected:
     virtual QString getReleaseChannelUrl() const = 0;
 
 public:
-    int getIndex() const
-    {
-        return index;
-    }
     Release *getLastRelease()
     {
         return lastRelease;

cockatrice/src/client/network/replay_timeline_widget.cpp

@@ -0,0 +1,193 @@
+#include "replay_timeline_widget.h"
+
+#include <QPainter>
+#include <QPainterPath>
+#include <QPalette>
+#include <QTimer>
+
+ReplayTimelineWidget::ReplayTimelineWidget(QWidget *parent)
+    : QWidget(parent), maxBinValue(1), maxTime(1), timeScaleFactor(1.0), currentVisualTime(0), currentProcessedTime(0),
+      currentEvent(0)
+{
+    replayTimer = new QTimer(this);
+    connect(replayTimer, &QTimer::timeout, this, &ReplayTimelineWidget::replayTimerTimeout);
+
+    rewindBufferingTimer = new QTimer(this);
+    rewindBufferingTimer->setSingleShot(true);
+    connect(rewindBufferingTimer, &QTimer::timeout, this, &ReplayTimelineWidget::processRewind);
+}
+
+void ReplayTimelineWidget::setTimeline(const QList<int> &_replayTimeline)
+{
+    replayTimeline = _replayTimeline;
+    histogram.clear();
+    int binEndTime = BIN_LENGTH - 1;
+    int binValue = 0;
+    for (int i : replayTimeline) {
+        if (i > binEndTime) {
+            histogram.append(binValue);
+            if (binValue > maxBinValue)
+                maxBinValue = binValue;
+            while (i > binEndTime + BIN_LENGTH) {
+                histogram.append(0);
+                binEndTime += BIN_LENGTH;
+            }
+            binValue = 1;
+            binEndTime += BIN_LENGTH;
+        } else
+            ++binValue;
+    }
+    histogram.append(binValue);
+    if (!replayTimeline.isEmpty())
+        maxTime = replayTimeline.last();
+
+    update();
+}
+
+void ReplayTimelineWidget::paintEvent(QPaintEvent * /* event */)
+{
+    QPainter painter(this);
+    painter.drawRect(0, 0, width() - 1, height() - 1);
+
+    qreal binWidth = (qreal)width() / histogram.size();
+    QPainterPath path;
+    path.moveTo(0, height() - 1);
+    for (int i = 0; i < histogram.size(); ++i)
+        path.lineTo(qRound(i * binWidth), (height() - 1) * (1.0 - (qreal)histogram[i] / maxBinValue));
+    path.lineTo(width() - 1, height() - 1);
+    path.lineTo(0, height() - 1);
+    painter.fillPath(path, Qt::black);
+
+    const QColor barColor = QColor::fromHsv(120, 255, 255, 100);
+    quint64 w = (quint64)(width() - 1) * (quint64)currentVisualTime / maxTime;
+    painter.fillRect(0, 0, static_cast<int>(w), height() - 1, barColor);
+}
+
+void ReplayTimelineWidget::mousePressEvent(QMouseEvent *event)
+{
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+    int newTime = static_cast<int>((qint64)maxTime * (qint64)event->position().x() / width());
+#else
+    int newTime = static_cast<int>((qint64)maxTime * (qint64)event->x() / width());
+#endif
+    // don't buffer rewinds from clicks, since clicks usually don't happen fast enough to require buffering
+    skipToTime(newTime, false);
+}
+
+void ReplayTimelineWidget::skipToTime(int newTime, bool doRewindBuffering)
+{
+    // check boundary conditions
+    if (newTime < 0) {
+        newTime = 0;
+    }
+    if (newTime > maxTime) {
+        newTime = maxTime;
+    }
+
+    newTime -= newTime % TIMER_INTERVAL_MS; // Time should always be a multiple of the interval
+
+    const bool isBackwardsSkip = newTime < currentProcessedTime;
+    currentVisualTime = newTime;
+
+    if (isBackwardsSkip) {
+        handleBackwardsSkip(doRewindBuffering);
+    } else {
+        processNewEvents(FORWARD_SKIP);
+    }
+
+    update();
+}
+
+/// @param doRewindBuffering When true, if multiple backward skips are made in quick succession, only a single rewind
+/// is processed at the end. When false, the backwards skip will always cause an immediate rewind
+void ReplayTimelineWidget::handleBackwardsSkip(bool doRewindBuffering)
+{
+    if (doRewindBuffering) {
+        // We use a one-shot timer to implement the rewind buffering.
+        // The rewind only happens once the timer runs out.
+        // If another backwards skip happens, the timer will just get reset instead of rewinding.
+        rewindBufferingTimer->stop();
+        rewindBufferingTimer->start(SettingsCache::instance().getRewindBufferingMs());
+    } else {
+        // otherwise, process the rewind immediately
+        processRewind();
+    }
+}
+
+void ReplayTimelineWidget::processRewind()
+{
+    // stop any queued-up rewinds
+    rewindBufferingTimer->stop();
+
+    // process the rewind
+    currentEvent = 0;
+    emit rewound();
+    processNewEvents(BACKWARD_SKIP);
+}
+
+QSize ReplayTimelineWidget::sizeHint() const
+{
+    return {-1, 50};
+}
+
+QSize ReplayTimelineWidget::minimumSizeHint() const
+{
+    return {400, 50};
+}
+
+void ReplayTimelineWidget::replayTimerTimeout()
+{
+    currentVisualTime += TIMER_INTERVAL_MS;
+
+    processNewEvents(NORMAL_PLAYBACK);
+
+    if (!(currentVisualTime % 1000))
+        update();
+}
+
+/// Processes all unprocessed events up to the current time.
+void ReplayTimelineWidget::processNewEvents(PlaybackMode playbackMode)
+{
+    currentProcessedTime = currentVisualTime;
+
+    while ((currentEvent < replayTimeline.size()) && (replayTimeline[currentEvent] < currentProcessedTime)) {
+        Player::EventProcessingOptions options;
+
+        // backwards skip => always skip reveal windows
+        // forwards skip => skip reveal windows that don't happen within a big skip of the target
+        if (playbackMode == BACKWARD_SKIP || currentProcessedTime - replayTimeline[currentEvent] > BIG_SKIP_MS)
+            options |= Player::EventProcessingOption::SKIP_REVEAL_WINDOW;
+
+        // backwards skip => always skip tap animation
+        if (playbackMode == BACKWARD_SKIP)
+            options |= Player::EventProcessingOption::SKIP_TAP_ANIMATION;
+
+        emit processNextEvent(options);
+        ++currentEvent;
+    }
+    if (currentEvent == replayTimeline.size()) {
+        emit replayFinished();
+        replayTimer->stop();
+    }
+}
+
+void ReplayTimelineWidget::setTimeScaleFactor(qreal _timeScaleFactor)
+{
+    timeScaleFactor = _timeScaleFactor;
+    replayTimer->setInterval(static_cast<int>(TIMER_INTERVAL_MS / timeScaleFactor));
+}
+
+void ReplayTimelineWidget::startReplay()
+{
+    replayTimer->start(static_cast<int>(TIMER_INTERVAL_MS / timeScaleFactor));
+}
+
+void ReplayTimelineWidget::stopReplay()
+{
+    replayTimer->stop();
+}
+
+void ReplayTimelineWidget::skipByAmount(int amount)
+{
+    skipToTime(currentVisualTime + amount, amount < 0);
+}

cockatrice/src/client/network/replay_timeline_widget.h

@@ -1,6 +1,8 @@
 #ifndef REPLAY_TIMELINE_WIDGET
 #define REPLAY_TIMELINE_WIDGET
 
+#include "../../game/player/player.h"
+
 #include <QList>
 #include <QMouseEvent>
 #include <QWidget>
@@ -12,23 +14,44 @@ class ReplayTimelineWidget : public QWidget
 {
     Q_OBJECT
 signals:
-    void processNextEvent();
+    void processNextEvent(Player::EventProcessingOptions options);
     void replayFinished();
     void rewound();
 
 private:
+    enum PlaybackMode
+    {
+        NORMAL_PLAYBACK,
+        FORWARD_SKIP,
+        BACKWARD_SKIP
+    };
+
+    static constexpr int TIMER_INTERVAL_MS = 200;
+    static constexpr int BIN_LENGTH = 5000;
+
     QTimer *replayTimer;
+    QTimer *rewindBufferingTimer;
     QList<int> replayTimeline;
     QList<int> histogram;
-    static const int binLength;
     int maxBinValue, maxTime;
     qreal timeScaleFactor;
-    int currentTime;
+    int currentVisualTime;    // time currently displayed by the timeline
+    int currentProcessedTime; // time that events are currently processed up to. Could differ from visual time due to
+                              // rewind buffering
     int currentEvent;
+
+    void skipToTime(int newTime, bool doRewindBuffering);
+    void handleBackwardsSkip(bool doRewindBuffering);
+    void processRewind();
+    void processNewEvents(PlaybackMode playbackMode);
 private slots:
     void replayTimerTimeout();
 
 public:
+    static constexpr int SMALL_SKIP_MS = 1000;
+    static constexpr int BIG_SKIP_MS = 10000;
+    static constexpr qreal FAST_FORWARD_SCALE_FACTOR = 10.0;
+
     explicit ReplayTimelineWidget(QWidget *parent = nullptr);
     void setTimeline(const QList<int> &_replayTimeline);
     QSize sizeHint() const override;
@@ -41,6 +64,7 @@ public:
 public slots:
     void startReplay();
     void stopReplay();
+    void skipByAmount(int amount); // use a negative amount to skip backwards
 
 protected:
     void paintEvent(QPaintEvent *event) override;

cockatrice/src/client/network/sets_model.cpp

@@ -1,4 +1,4 @@
-#include "setsmodel.h"
+#include "sets_model.h"
 
 #include <QSortFilterProxyModel>
 
@@ -195,6 +195,13 @@ void SetsModel::swapRows(int oldRow, int newRow)
     emit dataChanged(index(0, 0), index(rowCount() - 1, columnCount() - 1));
 }
 
+void SetsModel::restoreOriginalOrder()
+{
+    int numRows = rowCount();
+    sets.defaultSort();
+    emit dataChanged(index(0, 0), index(numRows - 1, columnCount() - 1));
+}
+
 void SetsModel::sort(int column, Qt::SortOrder order)
 {
     QMultiMap<QString, CardSetPtr> setMap;

cockatrice/src/client/network/sets_model.h

@@ -1,7 +1,7 @@
 #ifndef SETSMODEL_H
 #define SETSMODEL_H
 
-#include "carddatabase.h"
+#include "../../game/cards/card_database.h"
 
 #include <QAbstractTableModel>
 #include <QMimeData>
@@ -49,44 +49,47 @@ public:
         LongNameCol,
         ShortNameCol,
         SetTypeCol,
-        ReleaseDateCol
+        ReleaseDateCol,
+        PriorityCol
     };
     enum Role
     {
         SortRole = Qt::UserRole
     };
 
-    SetsModel(CardDatabase *_db, QObject *parent = nullptr);
-    ~SetsModel();
-    int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    int columnCount(const QModelIndex &parent = QModelIndex()) const
+    explicit SetsModel(CardDatabase *_db, QObject *parent = nullptr);
+    ~SetsModel() override;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const override
     {
         Q_UNUSED(parent);
         return NUM_COLS;
     }
-    QVariant data(const QModelIndex &index, int role) const;
-    bool setData(const QModelIndex &index, const QVariant &value, int role);
-    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
-    Qt::ItemFlags flags(const QModelIndex &index) const;
-    Qt::DropActions supportedDropActions() const;
+    QVariant data(const QModelIndex &index, int role) const override;
+    bool setData(const QModelIndex &index, const QVariant &value, int role) override;
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
+    Qt::ItemFlags flags(const QModelIndex &index) const override;
+    Qt::DropActions supportedDropActions() const override;
 
-    QMimeData *mimeData(const QModelIndexList &indexes) const;
-    bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent);
-    QStringList mimeTypes() const;
+    QMimeData *mimeData(const QModelIndexList &indexes) const override;
+    bool
+    dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override;
+    QStringList mimeTypes() const override;
     void swapRows(int oldRow, int newRow);
     void toggleRow(int row, bool enable);
     void toggleRow(int row);
     void toggleAll(bool);
-    void sort(int column, Qt::SortOrder order = Qt::AscendingOrder);
+    void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override;
     void save(CardDatabase *db);
     void restore(CardDatabase *db);
+    void restoreOriginalOrder();
 };
 
 class SetsDisplayModel : public QSortFilterProxyModel
 {
     Q_OBJECT
 public:
-    SetsDisplayModel(QObject *parent = NULL);
+    explicit SetsDisplayModel(QObject *parent = nullptr);
 
 protected:
     bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;

cockatrice/src/client/network/spoiler_background_updater.cpp

@@ -1,9 +1,10 @@
-#include "spoilerbackgroundupdater.h"
+#include "spoiler_background_updater.h"
 
-#include "carddatabase.h"
-#include "main.h"
-#include "settingscache.h"
-#include "window_main.h"
+#include "../../game/cards/card_database.h"
+#include "../../game/cards/card_database_manager.h"
+#include "../../main.h"
+#include "../../settings/cache_settings.h"
+#include "../ui/window_main.h"
 
 #include <QApplication>
 #include <QCryptographicHash>
@@ -27,7 +28,7 @@ SpoilerBackgroundUpdater::SpoilerBackgroundUpdater(QObject *apParent) : QObject(
         // File exists means we're in spoiler season
         startSpoilerDownloadProcess(SPOILERS_STATUS_URL, false);
     } else {
-        qDebug() << "Spoilers Disabled";
+        qCDebug(SpoilerBackgroundUpdaterLog) << "Spoilers Disabled";
     }
 }
 
@@ -44,10 +45,10 @@ void SpoilerBackgroundUpdater::downloadFromURL(QUrl url, bool saveResults)
 
     if (saveResults) {
         // This will write out to the file (used for spoiler.xml)
-        connect(reply, SIGNAL(finished()), this, SLOT(actDownloadFinishedSpoilersFile()));
+        connect(reply, &QNetworkReply::finished, this, &SpoilerBackgroundUpdater::actDownloadFinishedSpoilersFile);
     } else {
         // This will check the status (used to see if we're in spoiler season or not)
-        connect(reply, SIGNAL(finished()), this, SLOT(actCheckIfSpoilerSeasonEnabled()));
+        connect(reply, &QNetworkReply::finished, this, &SpoilerBackgroundUpdater::actCheckIfSpoilerSeasonEnabled);
     }
 }
 
@@ -66,7 +67,7 @@ void SpoilerBackgroundUpdater::actDownloadFinishedSpoilersFile()
         reply->deleteLater();
         emit spoilerCheckerDone();
     } else {
-        qDebug() << "Error downloading spoilers file" << errorCode;
+        qCDebug(SpoilerBackgroundUpdaterLog) << "Error downloading spoilers file" << errorCode;
         emit spoilerCheckerDone();
     }
 }
@@ -80,11 +81,11 @@ bool SpoilerBackgroundUpdater::deleteSpoilerFile()
 
     // Delete the spoiler.xml file
     if (file.exists() && file.remove()) {
-        qDebug() << "Deleting spoiler.xml";
+        qCDebug(SpoilerBackgroundUpdaterLog) << "Deleting spoiler.xml";
         return true;
     }
 
-    qDebug() << "Error: Spoiler.xml not found or not deleted";
+    qCDebug(SpoilerBackgroundUpdaterLog) << "Error: Spoiler.xml not found or not deleted";
     return false;
 }
 
@@ -100,24 +101,24 @@ void SpoilerBackgroundUpdater::actCheckIfSpoilerSeasonEnabled()
             trayIcon->showMessage(tr("Spoilers season has ended"), tr("Deleting spoiler.xml. Please run Oracle"));
         }
 
-        qDebug() << "Spoiler Season Offline";
+        qCDebug(SpoilerBackgroundUpdaterLog) << "Spoiler Season Offline";
         emit spoilerCheckerDone();
     } else if (errorCode == QNetworkReply::NoError) {
-        qDebug() << "Spoiler Service Online";
+        qCDebug(SpoilerBackgroundUpdaterLog) << "Spoiler Service Online";
         startSpoilerDownloadProcess(SPOILERS_URL, true);
     } else if (errorCode == QNetworkReply::HostNotFoundError) {
         if (trayIcon) {
             trayIcon->showMessage(tr("Spoilers download failed"), tr("No internet connection"));
         }
 
-        qDebug() << "Spoiler download failed due to no internet connection";
+        qCDebug(SpoilerBackgroundUpdaterLog) << "Spoiler download failed due to no internet connection";
         emit spoilerCheckerDone();
     } else {
         if (trayIcon) {
             trayIcon->showMessage(tr("Spoilers download failed"), tr("Error") + " " + (short)errorCode);
         }
 
-        qDebug() << "Spoiler download failed with reason" << errorCode;
+        qCDebug(SpoilerBackgroundUpdaterLog) << "Spoiler download failed with reason" << errorCode;
         emit spoilerCheckerDone();
     }
 }
@@ -138,19 +139,19 @@ bool SpoilerBackgroundUpdater::saveDownloadedFile(QByteArray data)
             trayIcon->showMessage(tr("Spoilers already up to date"), tr("No new spoilers added"));
         }
 
-        qDebug() << "Spoilers Up to Date";
+        qCDebug(SpoilerBackgroundUpdaterLog) << "Spoilers Up to Date";
         return false;
     }
 
     QFile file(fileName);
     if (!file.open(QIODevice::WriteOnly)) {
-        qDebug() << "Spoiler Service Error: File open (w) failed for" << fileName;
+        qCDebug(SpoilerBackgroundUpdaterLog) << "Spoiler Service Error: File open (w) failed for" << fileName;
         file.close();
         return false;
     }
 
     if (file.write(data) == -1) {
-        qDebug() << "Spoiler Service Error: File write (w) failed for" << fileName;
+        qCDebug(SpoilerBackgroundUpdaterLog) << "Spoiler Service Error: File write (w) failed for" << fileName;
         file.close();
         return false;
     }
@@ -158,21 +159,25 @@ bool SpoilerBackgroundUpdater::saveDownloadedFile(QByteArray data)
     file.close();
 
     // Data written, so reload the card database
-    qDebug() << "Spoiler Service Data Written";
-    const auto reloadOk = QtConcurrent::run([] { db->loadCardDatabases(); });
+    qCDebug(SpoilerBackgroundUpdaterLog) << "Spoiler Service Data Written";
+    const auto reloadOk = QtConcurrent::run([] { CardDatabaseManager::getInstance()->loadCardDatabases(); });
 
     // If the user has notifications enabled, let them know
     // when the database was last updated
     if (trayIcon) {
         QList<QByteArray> lines = data.split('\n');
 
-        foreach (QByteArray line, lines) {
+        for (const QByteArray &line : lines) {
             if (line.contains("Created At:")) {
                 QString timeStamp = QString(line).replace("Created At:", "").trimmed();
                 timeStamp.chop(6); // Remove " (UTC)"
 
                 auto utcTime = QLocale().toDateTime(timeStamp, "ddd, MMM dd yyyy, hh:mm:ss");
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+                utcTime.setTimeZone(QTimeZone::UTC);
+#else
                 utcTime.setTimeSpec(Qt::UTC);
+#endif
 
                 QString localTime = utcTime.toLocalTime().toString("MMM d, hh:mm");
 
@@ -197,12 +202,12 @@ QByteArray SpoilerBackgroundUpdater::getHash(const QString fileName)
         QCryptographicHash hash(QCryptographicHash::Algorithm::Md5);
         hash.addData(bytes);
 
-        qDebug() << "File Hash =" << hash.result();
+        qCDebug(SpoilerBackgroundUpdaterLog) << "File Hash =" << hash.result();
 
         file.close();
         return hash.result();
     } else {
-        qDebug() << "getHash ReadOnly failed!";
+        qCDebug(SpoilerBackgroundUpdaterLog) << "getHash ReadOnly failed!";
         file.close();
         return QByteArray();
     }
@@ -216,7 +221,7 @@ QByteArray SpoilerBackgroundUpdater::getHash(QByteArray data)
     QCryptographicHash hash(QCryptographicHash::Algorithm::Md5);
     hash.addData(bytes);
 
-    qDebug() << "Data Hash =" << hash.result();
+    qCDebug(SpoilerBackgroundUpdaterLog) << "Data Hash =" << hash.result();
 
     return hash.result();
 }

cockatrice/src/client/network/spoiler_background_updater.h

@@ -2,9 +2,12 @@
 #define COCKATRICE_SPOILER_DOWNLOADER_H
 
 #include <QByteArray>
+#include <QLoggingCategory>
 #include <QObject>
 #include <QProcess>
 
+inline Q_LOGGING_CATEGORY(SpoilerBackgroundUpdaterLog, "spoiler_background_updater");
+
 class SpoilerBackgroundUpdater : public QObject
 {
     Q_OBJECT

cockatrice/src/client/sound_engine.cpp

@@ -1,19 +1,22 @@
-#include "soundengine.h"
+#include "sound_engine.h"
 
-#include "settingscache.h"
+#include "../settings/cache_settings.h"
 
-#include <QAudioOutput>
 #include <QDir>
 #include <QMediaPlayer>
 
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+#include <QAudioOutput>
+#endif
+
 #define DEFAULT_THEME_NAME "Default"
 #define TEST_SOUND_FILENAME "player_join"
 
-SoundEngine::SoundEngine(QObject *parent) : QObject(parent), player(nullptr)
+SoundEngine::SoundEngine(QObject *parent) : QObject(parent), audioOutput(nullptr), player(nullptr)
 {
     ensureThemeDirectoryExists();
-    connect(&SettingsCache::instance(), SIGNAL(soundThemeChanged()), this, SLOT(themeChangedSlot()));
-    connect(&SettingsCache::instance(), SIGNAL(soundEnabledChanged()), this, SLOT(soundEnabledChanged()));
+    connect(&SettingsCache::instance(), &SettingsCache::soundThemeChanged, this, &SoundEngine::themeChangedSlot);
+    connect(&SettingsCache::instance(), &SettingsCache::soundEnabledChanged, this, &SoundEngine::soundEnabledChanged);
 
     soundEnabledChanged();
     themeChangedSlot();
@@ -23,32 +26,40 @@ SoundEngine::~SoundEngine()
 {
     if (player) {
         player->deleteLater();
-        player = 0;
+        player = nullptr;
+    }
+    if (audioOutput) {
+        audioOutput->deleteLater();
+        audioOutput = nullptr;
     }
 }
 
 void SoundEngine::soundEnabledChanged()
 {
     if (SettingsCache::instance().getSoundEnabled()) {
-        qDebug() << "SoundEngine: enabling sound with" << audioData.size() << "sounds";
+        qCDebug(SoundEngineLog) << "SoundEngine: enabling sound with" << audioData.size() << "sounds";
         if (!player) {
             player = new QMediaPlayer;
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
-            auto qAudioOutput = new QAudioOutput;
-            player->setAudioOutput(qAudioOutput);
+            audioOutput = new QAudioOutput(player);
+            player->setAudioOutput(audioOutput);
 #endif
         }
     } else {
-        qDebug() << "SoundEngine: disabling sound";
+        qCDebug(SoundEngineLog) << "SoundEngine: disabling sound";
         if (player) {
             player->stop();
             player->deleteLater();
             player = nullptr;
         }
+        if (audioOutput) {
+            audioOutput->deleteLater();
+            audioOutput = nullptr;
+        }
     }
 }
 
-void SoundEngine::playSound(QString fileName)
+void SoundEngine::playSound(const QString &fileName)
 {
     if (!player) {
         return;
@@ -79,7 +90,7 @@ void SoundEngine::ensureThemeDirectoryExists()
 {
     if (SettingsCache::instance().getSoundThemeName().isEmpty() ||
         !getAvailableThemes().contains(SettingsCache::instance().getSoundThemeName())) {
-        qDebug() << "Sounds theme name not set, setting default value";
+        qCDebug(SoundEngineLog) << "Sounds theme name not set, setting default value";
         SettingsCache::instance().setSoundThemeName(DEFAULT_THEME_NAME);
     }
 }
@@ -120,7 +131,7 @@ QStringMap &SoundEngine::getAvailableThemes()
 void SoundEngine::themeChangedSlot()
 {
     QString themeName = SettingsCache::instance().getSoundThemeName();
-    qDebug() << "Sound theme changed:" << themeName;
+    qCDebug(SoundEngineLog) << "Sound theme changed:" << themeName;
 
     QDir dir = getAvailableThemes().value(themeName);
 

cockatrice/src/client/sound_engine.h

@@ -1,12 +1,15 @@
 #ifndef SOUNDENGINE_H
 #define SOUNDENGINE_H
 
+#include <QAudioOutput>
+#include <QLoggingCategory>
 #include <QMap>
 #include <QMediaPlayer>
 #include <QObject>
 #include <QString>
 
-class QAudioOutput;
+inline Q_LOGGING_CATEGORY(SoundEngineLog, "sound_engine");
+
 class QBuffer;
 
 typedef QMap<QString, QString> QStringMap;
@@ -15,14 +18,15 @@ class SoundEngine : public QObject
 {
     Q_OBJECT
 public:
-    SoundEngine(QObject *parent = nullptr);
-    ~SoundEngine();
-    void playSound(QString fileName);
+    explicit SoundEngine(QObject *parent = nullptr);
+    ~SoundEngine() override;
+    void playSound(const QString &fileName);
     QStringMap &getAvailableThemes();
 
 private:
     QStringMap availableThemes;
     QMap<QString, QString> audioData;
+    QAudioOutput *audioOutput;
     QMediaPlayer *player;
 
 protected:

cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response.cpp

@@ -0,0 +1,45 @@
+#include "edhrec_commander_api_response.h"
+
+#include <QDebug>
+#include <QJsonArray>
+
+void EdhrecCommanderApiResponse::fromJson(const QJsonObject &json)
+{
+    // Parse the collapsed DeckStatistics
+    deckStats.fromJson(json);
+
+    // Parse Archidekt section
+    QJsonArray archidektJson = json.value("archidekt").toArray();
+    archidekt.fromJson(archidektJson);
+
+    // Parse other fields
+    similar = json.value("similar").toObject();
+    header = json.value("header").toString();
+    panels = json.value("panels").toObject();
+    description = json.value("description").toString();
+    QJsonObject containerJson = json.value("container").toObject();
+    container.fromJson(containerJson);
+}
+
+void EdhrecCommanderApiResponse::debugPrint() const
+{
+    qDebug() << "Deck Statistics:";
+    qDebug() << "  Creature:" << deckStats.creature;
+    qDebug() << "  Instant:" << deckStats.instant;
+    qDebug() << "  Sorcery:" << deckStats.sorcery;
+    qDebug() << "  Artifact:" << deckStats.artifact;
+    qDebug() << "  Enchantment:" << deckStats.enchantment;
+    qDebug() << "  Battle:" << deckStats.battle;
+    qDebug() << "  Planeswalker:" << deckStats.planeswalker;
+    qDebug() << "  Land:" << deckStats.land;
+    qDebug() << "  Basic:" << deckStats.basic;
+    qDebug() << "  Nonbasic:" << deckStats.nonbasic;
+
+    archidekt.debugPrint();
+
+    qDebug() << "Similar:" << similar;
+    qDebug() << "Header:" << header;
+    qDebug() << "Panels:" << panels;
+    qDebug() << "Description:" << description;
+    container.debugPrint();
+}

cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response.h

@@ -0,0 +1,28 @@
+#ifndef DECKDATA_H
+#define DECKDATA_H
+
+#include "edhrec_commander_api_response_archidekt_links.h"
+#include "edhrec_commander_api_response_average_deck_statistics.h"
+#include "edhrec_commander_api_response_card_container.h"
+
+#include <QDebug>
+#include <QJsonObject>
+#include <QString>
+
+// Represents the main structure of the JSON
+class EdhrecCommanderApiResponse
+{
+public:
+    EdhrecCommanderApiResponseAverageDeckStatistics deckStats;
+    EdhrecCommanderApiResponseArchidektLinks archidekt;
+    QJsonObject similar;
+    QString header;
+    QJsonObject panels;
+    QString description;
+    EdhrecCommanderApiResponseCardContainer container;
+
+    void fromJson(const QJsonObject &json);
+    void debugPrint() const;
+};
+
+#endif // DECKDATA_H

cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_archidekt_links.cpp

@@ -0,0 +1,43 @@
+#include "edhrec_commander_api_response_archidekt_links.h"
+
+#include <QDebug>
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
+
+void EdhrecCommanderApiResponseArchidektLink::fromJson(const QJsonObject &json)
+{
+    c = json.value("c").toString();
+    f = json.value("f").toInt(0);
+    q = json.value("q").toInt(0);
+    u = json.value("u").toString();
+}
+
+void EdhrecCommanderApiResponseArchidektLink::debugPrint() const
+{
+    qDebug() << "  C:" << c;
+    qDebug() << "  F:" << f;
+    qDebug() << "  Q:" << q;
+    qDebug() << "  U:" << u;
+}
+
+void EdhrecCommanderApiResponseArchidektLinks::fromJson(const QJsonArray &json)
+{
+    entries.clear();
+    for (const QJsonValue &value : json) {
+        if (value.isObject()) {
+            QJsonObject entryJson = value.toObject();
+            EdhrecCommanderApiResponseArchidektLink entry;
+            entry.fromJson(entryJson);
+            entries.append(entry);
+        }
+    }
+}
+
+void EdhrecCommanderApiResponseArchidektLinks::debugPrint() const
+{
+    qDebug() << "Archidekt Entries:";
+    for (const auto &entry : entries) {
+        entry.debugPrint();
+    }
+}

cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_archidekt_links.h

@@ -0,0 +1,32 @@
+#ifndef ARCHIDEKTENTRY_H
+#define ARCHIDEKTENTRY_H
+
+#include <QDebug>
+#include <QJsonObject>
+#include <QString>
+#include <QVector>
+
+// Represents a single Archidekt entry
+class EdhrecCommanderApiResponseArchidektLink
+{
+public:
+    QString c;
+    int f = 0;
+    int q = 0;
+    QString u;
+
+    void fromJson(const QJsonObject &json);
+    void debugPrint() const;
+};
+
+// Represents the Archidekt section as a list of entries
+class EdhrecCommanderApiResponseArchidektLinks
+{
+public:
+    QVector<EdhrecCommanderApiResponseArchidektLink> entries;
+
+    void fromJson(const QJsonArray &json);
+    void debugPrint() const;
+};
+
+#endif // ARCHIDEKTENTRY_H

cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_average_deck_statistics.cpp

@@ -0,0 +1,15 @@
+#include "edhrec_commander_api_response_average_deck_statistics.h"
+
+void EdhrecCommanderApiResponseAverageDeckStatistics::fromJson(const QJsonObject &json)
+{
+    creature = json.value("creature").toInt(0);
+    instant = json.value("instant").toInt(0);
+    sorcery = json.value("sorcery").toInt(0);
+    artifact = json.value("artifact").toInt(0);
+    enchantment = json.value("enchantment").toInt(0);
+    battle = json.value("battle").toInt(0);
+    planeswalker = json.value("planeswalker").toInt(0);
+    land = json.value("land").toInt(0);
+    basic = json.value("basic").toInt(0);
+    nonbasic = json.value("nonbasic").toInt(0);
+}

cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_average_deck_statistics.h

@@ -0,0 +1,22 @@
+#ifndef AVERAGE_DECK_STATISTICS_H
+#define AVERAGE_DECK_STATISTICS_H
+
+#include <QJsonObject>
+
+// Represents the typical deck statistics (collapsed section)
+struct EdhrecCommanderApiResponseAverageDeckStatistics
+{
+    int creature = 0;
+    int instant = 0;
+    int sorcery = 0;
+    int artifact = 0;
+    int enchantment = 0;
+    int battle = 0;
+    int planeswalker = 0;
+    int land = 0;
+    int basic = 0;
+    int nonbasic = 0;
+
+    void fromJson(const QJsonObject &json);
+};
+#endif // AVERAGE_DECK_STATISTICS_H

cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_card_container.cpp

@@ -0,0 +1,49 @@
+#include "edhrec_commander_api_response_card_container.h"
+
+#include <QDebug>
+#include <QJsonArray>
+#include <QJsonObject>
+
+void EdhrecCommanderApiResponseCardContainer::fromJson(const QJsonObject &json)
+{
+    // Parse breadcrumb
+    QJsonArray breadcrumbArray = json.value("breadcrumb").toArray();
+    for (const QJsonValue &breadcrumbValue : breadcrumbArray) {
+        breadcrumb.push_back(breadcrumbValue.toObject());
+    }
+
+    description = json.value("description").toString();
+    QJsonObject jsonDict = json.value("json_dict").toObject();
+    card.fromJson(jsonDict.value("card").toObject());
+    QJsonArray cardlistsArray = jsonDict.value("cardlists").toArray();
+
+    for (const QJsonValue &cardlistValue : cardlistsArray) {
+        QJsonObject cardlistObj = cardlistValue.toObject();
+        QJsonArray cardviewsArray = cardlistObj.value("cardviews").toArray();
+        EdhrecCommanderApiResponseCardList cardView;
+        cardView.fromJson(cardlistValue.toObject());
+        cardlists.push_back(cardView);
+    }
+
+    keywords = json.value("keywords").toString();
+    title = json.value("title").toString();
+}
+
+void EdhrecCommanderApiResponseCardContainer::debugPrint() const
+{
+    qDebug() << "Breadcrumb:";
+    for (const auto &breadcrumbEntry : breadcrumb) {
+        qDebug() << breadcrumbEntry;
+    }
+
+    qDebug() << "Description:" << description;
+    card.debugPrint();
+
+    qDebug() << "Cardlists:";
+    for (const auto &cardlist : cardlists) {
+        cardlist.debugPrint();
+    }
+
+    qDebug() << "Keywords:" << keywords;
+    qDebug() << "Title:" << title;
+}

cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_card_container.h

@@ -0,0 +1,60 @@
+#ifndef CONTAINER_ENTRY_H
+#define CONTAINER_ENTRY_H
+
+#include "edhrec_commander_api_response_card_list.h"
+#include "edhrec_commander_api_response_commander_details.h"
+
+#include <QDebug>
+#include <QJsonArray>
+#include <QJsonObject>
+#include <QString>
+#include <QVector>
+
+class EdhrecCommanderApiResponseCardContainer
+{
+public:
+    // Constructor
+    EdhrecCommanderApiResponseCardContainer() = default;
+
+    // Parse deck-related data from JSON
+    void fromJson(const QJsonObject &json);
+
+    // Debug method for logging
+    void debugPrint() const;
+
+    // Getter methods for deck container
+    const QString &getDescription() const
+    {
+        return description;
+    }
+    const QVector<QJsonObject> &getBreadcrumb() const
+    {
+        return breadcrumb;
+    }
+    const EdhrecCommanderApiResponseCommanderDetails &getCommanderDetails() const
+    {
+        return card;
+    }
+    const QVector<EdhrecCommanderApiResponseCardList> &getCardlists() const
+    {
+        return cardlists;
+    }
+    const QString &getKeywords() const
+    {
+        return keywords;
+    }
+    const QString &getTitle() const
+    {
+        return title;
+    }
+
+private:
+    QString description;
+    QVector<QJsonObject> breadcrumb;
+    EdhrecCommanderApiResponseCommanderDetails card;
+    QVector<EdhrecCommanderApiResponseCardList> cardlists;
+    QString keywords;
+    QString title;
+};
+
+#endif // CONTAINER_ENTRY_H

cockatrice/src/client/tabs/api/edhrec/api_response/edhrec_commander_api_response_card_details.cpp

@@ -0,0 +1,36 @@
+#include "edhrec_commander_api_response_card_details.h"
+
+#include <QDebug>
+
+EdhrecCommanderApiResponseCardDetails::EdhrecCommanderApiResponseCardDetails()
+    : synergy(0.0), inclusion(0), numDecks(0), potentialDecks(0)
+{
+}
+
+void EdhrecCommanderApiResponseCardDetails::fromJson(const QJsonObject &json)
+{
+    // Parse the fields from the JSON object
+    name = json.value("name").toString();
+    sanitized = json.value("sanitized").toString();
+    sanitizedWo = json.value("sanitized_wo").toString();
+    url = json.value("url").toString();
+    synergy = json.value("synergy").toDouble(0.0);
+    inclusion = json.value("inclusion").toInt(0);
+    label = json.value("label").toString();
+    numDecks = json.value("num_decks").toInt(0);
+    potentialDecks = json.value("potential_decks").toInt(0);
+}
+
+void EdhrecCommanderApiResponseCardDetails::debugPrint() const
+{
+    // Print out all the fields for debugging
+    qDebug() << "Name:" << name;
+    qDebug() << "Sanitized:" << sanitized;
+    qDebug() << "Sanitized Wo:" << sanitizedWo;
+    qDebug() << "URL:" << url;
+    qDebug() << "Synergy:" << synergy;
+    qDebug() << "Inclusion:" << inclusion;
+    qDebug() << "Label:" << label;
+    qDebug() << "Num Decks:" << numDecks;
+    qDebug() << "Potential Decks:" << potentialDecks;
+}