diff --git a/.ci/Fedora45/Dockerfile b/.ci/Fedora43/Dockerfile similarity index 96% rename from .ci/Fedora45/Dockerfile rename to .ci/Fedora43/Dockerfile index a7c49b249..8aa345651 100644 --- a/.ci/Fedora45/Dockerfile +++ b/.ci/Fedora43/Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:45 +FROM fedora:43 RUN dnf install -y \ ca-certificates \ diff --git a/.ci/compile.sh b/.ci/compile.sh index 7414b2dc3..bf5a169af 100755 --- a/.ci/compile.sh +++ b/.ci/compile.sh @@ -175,9 +175,9 @@ fi if [[ $MAKE_SANITIZE ]]; then flags+=("-DENABLE_SANITIZERS=ON") else - # Every leg states the flag explicitly rather than relying on the CMake - # default, so a build directory reused from a sanitized configuration can - # never leak libasan/libubsan into a shipped binary. + # The release-package step re-runs cmake in the same build dir, so an + # ENABLE_SANITIZERS=ON left over from the debug step would otherwise leak + # into the shipped binaries (libasan/libubsan Depends in the DEB). flags+=("-DENABLE_SANITIZERS=OFF") fi if [[ $MAKE_COVERAGE ]]; then @@ -185,6 +185,9 @@ if [[ $MAKE_COVERAGE ]]; then fi if [[ $USE_CCACHE ]]; then flags+=("-DUSE_CCACHE=1") + # PCH-aware caching is required or ccache refuses to cache any TU that + # consumes a precompiled header, silently recompiling everything on every run. + ccache --set-config sloppiness=pch_defines,time_macros if [[ $CCACHE_SIZE ]]; then # note, this setting persists after running the script ccache --max-size "$CCACHE_SIZE" @@ -203,11 +206,6 @@ if [[ ${WITH_CRASH_REPORTING:-} == "ON" ]]; then # developer builds never reach Sentry. flags+=("-DWITH_CRASH_REPORTING=ON") fi -if [[ ${COCKATRICE_DEBUG_INFO_LEVEL:-} ]]; then - # CI lowers the DWARF level so one build configuration fits its compiler-cache bound; - # see the option in CMakeLists.txt. Empty keeps the built-in flags. - flags+=("-DCOCKATRICE_DEBUG_INFO_LEVEL=$COCKATRICE_DEBUG_INFO_LEVEL") -fi if [[ ${BUILDTYPE:-Release} == "Release" && -n ${COCKATRICE_SENTRY_DSN:-} ]]; then # Release-only: Debug builds stay DSN-free so crashes from developer builds # never reach Sentry. Empty (local builds, forks without the secret, and non-tag @@ -313,24 +311,16 @@ if [[ $RUNNER_OS == macOS ]]; then if [[ $MAKE_PACKAGE ]]; then # Workaround https://github.com/actions/runner-images/issues/7522 - # have hdiutil repeat the command 10 times in hope of success. - # The wrapper has to exit non-zero once it gives up: CPack reads that status to - # decide whether the disk image was created, so a zero exit turns a failed hdiutil - # into a much later, misleading "Problem copying the package" error that hides - # hdiutil's own message. + # have hdiutil repeat the command 10 times in hope of success hdiutil_script="/tmp/hdiutil.sh" # shellcheck disable=SC2016 echo '#!/bin/bash - attempts=10 i=0 - while true; do - hdiutil "$@" && exit 0 - rc=$? - if (( ++i >= attempts )); then - echo "::error::hdiutil $1 failed $i times (last status $rc), giving up" >&2 - exit "$rc" + while ! hdiutil "$@"; do + if (( ++i >= 10 )); then + echo "Error: hdiutil failed $i times!" >&2 + break fi - echo "hdiutil $1 attempt $i/$attempts failed (status $rc), retrying" >&2 sleep 1 done' >"$hdiutil_script" chmod +x "$hdiutil_script" @@ -380,21 +370,6 @@ echo "Running cmake with flags: ${flags[*]}" cmake .. "${flags[@]}" echo "::endgroup::" -if [[ $USE_CCACHE ]]; then - # PCH-aware caching is required or ccache refuses to cache any TU that consumes a - # precompiled header, silently recompiling everything on every run. The mtime and ctime - # entries cover files created during the build itself: the moc/uic/rcc output and the - # protobuf headers are generated after ccache starts, so without them every TU including - # one is read as a race and never cached. Checked-out sources are older than the compile - # that follows them and do not trip the check. - # - # This has to run after configure: CMakeLists.txt sets sloppiness=pch_defines,time_macros - # at configure time, and --set-config replaces the whole list rather than extending it, so - # setting it earlier would leave the build below with two entries. Re-asserting all four - # here is what actually reaches the compiler; the order is the point. - ccache --set-config sloppiness=pch_defines,time_macros,include_file_mtime,include_file_ctime -fi - echo "::group::Build project" cpuinfo echo "Running cmake --build with flags: ${buildflags[*]}" diff --git a/.ci/docker.sh b/.ci/docker.sh index c78ba3c31..64ea6baa7 100644 --- a/.ci/docker.sh +++ b/.ci/docker.sh @@ -181,11 +181,6 @@ function RUN () if [[ ${WITH_CRASH_REPORTING:-} ]]; then args+=(--env "WITH_CRASH_REPORTING=${WITH_CRASH_REPORTING}") fi - # Same reason: the DWARF level reaches compile.sh only if it is handed to the container, - # and without it CI would cache objects twice the size its bounds were measured for. - if [[ ${COCKATRICE_DEBUG_INFO_LEVEL:-} ]]; then - args+=(--env "COCKATRICE_DEBUG_INFO_LEVEL=${COCKATRICE_DEBUG_INFO_LEVEL}") - fi # shellcheck disable=2086 docker run "${args[@]}" $RUN_ARGS "$IMAGE_NAME" bash "$BUILD_SCRIPT" $RUN_OPTS "$@" return $? diff --git a/.ci/release_template.md b/.ci/release_template.md index 8eb4c7ebd..23b475150 100644 --- a/.ci/release_template.md +++ b/.ci/release_template.md @@ -21,8 +21,8 @@ Available pre-compiled binaries for installation: • Ubuntu 24.04 LTS Noble Numbat • Debian 13 Trixie • Debian 12 Bookworm - • Fedora 45 • Fedora 44 + • Fedora 43 General Linux support is available via a flatpak package hosted at Flathub (x86 & ARM)! Thanks to courtesy of @FFY00, the app is also available in Arch Linux's official extra repository. diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml index b859556aa..c97b48342 100644 --- a/.github/workflows/desktop-build.yml +++ b/.github/workflows/desktop-build.yml @@ -33,18 +33,10 @@ on: - 'CMakeLists.txt' - 'vcpkg.json' - 'vcpkg' # needed to match submodule bumps (gitlink) - # The legs the pull-request matrix leaves out run here instead, so the legacy distros and - # the slow macOS runner stay covered without gating a pull request on them. Tags still - # build every leg, because a tag is what ships. - schedule: - - cron: '23 3 * * *' # Cancel earlier, unfinished runs of this workflow on the same branch (unless on tag --> release) concurrency: - # The event name is part of the group because a nightly run and a push run on master share - # refs/heads/master but must not cancel each other: the nightly would drop the push's vcpkg - # import, and a merge landing during the nightly would drop that night's coverage. - group: "${{ github.workflow }} @ ${{ github.ref_name }} (${{ github.event_name }})" + group: "${{ github.workflow }} @ ${{ github.ref_name }}" cancel-in-progress: ${{ github.ref_type != 'tag' }} jobs: @@ -109,36 +101,6 @@ jobs: --title "$release_name" \ --notes-file "$body_path" - vcpkg-baseline: - name: vcpkg baseline - runs-on: ubuntu-slim - steps: - - name: "Checkout" - uses: actions/checkout@v7 - - # vcpkg-tool reads versions/baseline.json out of the commit named by - # `builtin-baseline`, through the `vcpkg` submodule's git history. A submodule - # pointer that lags the manifest - e.g. a stale `vcpkg/` worktree captured by - # `git add` in a PR - makes every vcpkg leg fail in configure with "failed to - # `git show` versions/baseline.json". That reads like a baseline or network - # problem, when the pointer is what has to move. Check the two agree here in - # seconds instead of on five build legs. - - name: "Check the submodule pointer against the manifest baseline" - shell: bash - run: | - pointer="$(git rev-parse HEAD:vcpkg 2>/dev/null || true)" - baseline="$(sed -nE 's/.*"builtin-baseline"[[:space:]]*:[[:space:]]*"([0-9a-f]{40})".*/\1/p' vcpkg.json)" - if [[ -z "$pointer" || -z "$baseline" ]]; then - echo "::error file=vcpkg.json::could not read the vcpkg submodule pointer or the builtin-baseline" - exit 1 - fi - if [[ "$pointer" != "$baseline" ]]; then - echo "::error file=vcpkg.json::vcpkg submodule is at $pointer but builtin-baseline is $baseline" - echo "Move them together: git -C vcpkg checkout $baseline && git add vcpkg" - exit 1 - fi - echo "vcpkg submodule and builtin-baseline agree on $baseline" - build-linux: strategy: fail-fast: false @@ -149,8 +111,6 @@ jobs: allow-failure: yes package: skip # We are packaged in Arch already - debug_test: yes # see the note on Fedora 45 below - ccache_size: 850M # Debug plus the suite: 660 MB of objects at -g1 - distro: Servatrice_Debian version: 12 @@ -158,145 +118,77 @@ jobs: package: DEB server_only: yes test: skip - # 4.7 min and the server alone: nothing here for a compiler cache to save. - persist_ccache: 'false' + + - distro: Debian + version: 12 + + package: DEB + test: skip # Running tests on all distros is superfluous - distro: Debian version: 13 package: DEB - ccache_size: 800M # Release plus the suite: 614 MB of objects at -g1 - - # The single Fedora leg used to build Debug for the suite and Release for the - # package in one job (measured on Fedora 44: 30.8 min, the only leg slower than - # Windows), so the package compile waited behind the Debug one. Two legs run in - # parallel and each keeps a cache that holds exactly one configuration. - # - # Arch and Fedora 45 are the two newest toolchains, and the -Wno-error= exceptions - # in CMakeLists.txt exist for exactly their warnings. This leg compiles Debug - # because only Debug passes -Werror, so it is where a new warning still fails. - - distro: Fedora - version: 45 - variant: debug # separate image and ccache from the release leg below - - package: skip - debug_test: yes - ccache_size: 850M # Debug plus the suite: 660 MB of objects at -g1 - distro: Fedora - version: 45 - variant: release # separate image and ccache from the debug leg above + version: 43 package: RPM - test: skip # The debug leg above runs this distro's suite - ccache_size: 800M # Release plus the package: 614 MB of objects at -g1 + test: skip # Running tests on all distros is superfluous + + - distro: Fedora + version: 44 + + package: RPM + + - distro: Ubuntu + version: 24.04 + + package: DEB + test: skip # Running tests on all distros is superfluous - distro: Ubuntu version: 26.04 package: DEB - test: skip # The sanitizer leg below runs this distro's suite - # 18.1 min, and the same distro as the sanitize leg below, which runs this suite. - persist_ccache: 'false' - # The one leg that runs the suite under AddressSanitizer and - # UndefinedBehaviorSanitizer. Debian 13 and Fedora 45 keep covering the - # uninstrumented suite, so nothing is lost by instrumenting this one. - # - # It packages nothing. A sanitized Debug build is not something to ship, and - # carrying the package build here meant 18 minutes of Release compile queued - # behind the instrumented one in a single job. The leg above publishes this - # distro's DEB. + # The one leg that runs the suite under AddressSanitizer and + # UndefinedBehaviorSanitizer. Debian 13 and Fedora 44 keep covering the + # uninstrumented suite, so nothing is lost by instrumenting this one. + sanitize: yes + - distro: Ubuntu version: 26.04 - variant: sanitize # separate image and ccache, same distro + variant: cover # separate image and ccache, same distro + # The one leg that runs instrumented for line coverage and publishes the report as + # a workflow artifact. It is a separate leg rather than a second flag on the + # sanitizer leg because the two instruments answer different questions: the + # sanitizer leg reports what the run did wrong, the coverage leg reports what the + # run never touched at all. Combining them would also slow both down. Packaging is + # skipped because the leg above already publishes the DEB for this distro. + coverage: yes package: skip - sanitize: yes - ccache_size: 1200M # instrumented objects are larger than the 614 MB measured; estimated name: ${{ matrix.distro }} ${{ matrix.version }}${{ matrix.variant && format(' {0}', matrix.variant) || '' }} needs: configure - # The nightly legs live in build-linux-nightly below. A leg is in exactly one of the two - # matrices, so nothing that reviews a change waits for a distro nobody is changing for. - if: github.event_name != 'schedule' runs-on: ubuntu-latest # https://github.com/actions/runner-images continue-on-error: ${{ matrix.allow-failure == 'yes' }} timeout-minutes: 70 env: CACHE: ${{ github.workspace }}/.cache/${{ matrix.distro }}${{ matrix.version }}${{ matrix.variant }} # directory for caching docker image and ccache CCACHE_EVICTION_AGE: 7d - # The bound is sized against the repository's 10 GB cache quota - # (https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy), - # not against what one leg would like: the quota also holds about 0.9 GB of buildkit - # layers (mode=min in docker-release.yml), 0.8 GB of vcpkg, 0.7 GB of Qt and the CodeQL - # trap caches (about 1 GB each, which prune-caches below does not manage). - # - # Measured 2026-11-04: one configuration costs 1.2 GB with full DWARF and 660 MB with - # -g1 (COCKATRICE_DEBUG_INFO_LEVEL below), and the size of the cache decides the hit - # rate far more sharply than its fill suggests. A 6G cache served 1059 of 1059 calls; - # the 700M bound on the same leg served 14%, because ccache fills to the limit and then - # evicts the entries the next build is about to ask for. A cache that cannot hold a - # whole configuration therefore buys almost nothing, and the quota goes to fewer legs - # at a size that holds one: - # - # Arch Debug + suite 660 MB working set 850M - # Debian 13 Release + suite 614 MB 800M - # Fedora 45 debug Debug + suite 660 MB 850M - # Fedora 45 release Release + package 614 MB 800M - # Ubuntu 26.04 sanitize ~1.0 GB 1200M - # - # That is about 5.3 GB of bounds, and with the fixed entries above it puts the quota at - # roughly 9.8 GB of 10 - so only legs worth their share get one. A leg keeps no cache - # when it duplicates another leg's coverage (Ubuntu 26.04 behind the sanitize leg of - # the same distro; macOS 15 and macOS 27 Debug behind macOS 14; Servatrice covers the - # server alone and finishes in 4.7 min). Those four run cold: 4.7, 18.1, 16.5 and - # 15.8 min. The five that stay compile the client on the toolchains a change can break - # and are the ones a cache shortens by the most. Measured job totals on master - # 2026-11-04 also show the ceiling this leaves: Windows 10 is 29.5 min and compiles for - # 23.7 of it with no compiler cache at all, so Windows still sets the pull-request - # wall clock no matter how warm these legs are (see build-vcpkg). - # - # Re-add a leg only with a bound that holds its whole configuration: a smaller one is - # worse than none. - # - # Every key listed in LIVE_CCACHE_KEYS in prune-caches below must match this matrix. - CCACHE_SIZE: ${{ matrix.ccache_size || '700M' }} - # Debug information dominates a cached object: with the built-in flags one - # configuration is 1.2 GB and no per-leg bound can hold it, so CI lowers the level to - # 1 (file and line, which is what a failing test or a sanitizer backtrace reports) and - # one configuration halves. Empty on tags and on the nightly legs, which ship binaries - # and keep full DWARF for the Sentry symbols; a tag restores a cache it cannot use and - # is slower, which is accepted because a tag is rare and only pull requests gate. - COCKATRICE_DEBUG_INFO_LEVEL: ${{ github.ref_type != 'tag' && '1' || '' }} + CCACHE_SIZE: 600M # space of all repo is 10Gi: https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy CMAKE_GENERATOR: 'Ninja' NAME: ${{ matrix.distro }}${{ matrix.version }} IMAGE_SUFFIX: ${{ matrix.variant }} - # Which build the suite runs in, decided once per leg here so the steps' if: conditions - # and their shells cannot drift apart. A step's own env is not visible to its if:, which - # is why these live at job level rather than on the release step. - # DEBUG_TEST the instrumented legs (symbols and instrumentation matter) and the two - # newest distro toolchains, which only fail on a warning in Debug. - # RUN_TESTS every other leg that tests runs the suite against the release build it may - # also package, so testing and packaging cost one compile instead of two. - DEBUG_TEST: ${{ matrix.sanitize == 'yes' || matrix.coverage == 'yes' || matrix.debug_test == 'yes' }} - RUN_TESTS: ${{ matrix.test != 'skip' && !(matrix.sanitize == 'yes' || matrix.coverage == 'yes' || matrix.debug_test == 'yes') }} - # Whether this leg restores and saves its compiler cache. Not every pull-request leg - # keeps one: a cache only pays for itself when its bound holds a whole configuration - # (see the sizing comment above), and a leg that duplicates another leg's coverage - # spends quota without adding any. The nightly-only legs keep none either. Fedora 45 - # states it per leg: its two configurations have their own job and key, so neither - # bound is shared with a build whose objects it would evict. - PERSIST_CCACHE: ${{ matrix.persist_ccache || 'true' }} - # Shared with build-linux-nightly so the two leg sets run the same steps. - steps: &linux-steps + steps: - name: "Checkout" uses: actions/checkout@v7 - name: "Restore compiler cache (ccache)" id: restore_ccache - if: env.PERSIST_CCACHE == 'true' uses: actions/cache/restore@v6 with: key: ccache-${{ matrix.distro }}${{ matrix.version }}${{ matrix.variant }} @@ -306,11 +198,8 @@ jobs: shell: bash run: source .ci/docker.sh --build - # The instrumented legs and the two newest distro toolchains build and test Debug; every - # other leg runs its suite against the release build below, so testing and packaging cost - # one compile instead of two. - name: "Build debug and test" - if: env.DEBUG_TEST == 'true' + if: matrix.test != 'skip' shell: bash env: sanitize: '${{ matrix.sanitize }}' @@ -350,23 +239,15 @@ jobs: path: coverage/ if-no-files-found: warn - # One build serves both purposes: the suite runs against the same configuration that - # gets packaged, so a packaging leg no longer pays for a full Debug compile it then - # throws away. macOS and Windows have always tested their release build. - # - # Instrumented and debug-test legs reach this step only when they also package; their - # suite already ran in the debug step above, so the tests are not repeated here. - - name: "Build release, test and package" + - name: "Build release package" id: build - if: matrix.package != 'skip' || env.RUN_TESTS == 'true' + if: matrix.package != 'skip' shell: bash env: SUFFIX: '-${{ matrix.distro }}${{ matrix.version }}' package: '${{ matrix.package }}' server_only: '${{ matrix.server_only }}' - # Only a leg that packages builds the shipping configuration; a release build that - # only runs tests stays free of the crash reporting SDK. - WITH_CRASH_REPORTING: ${{ matrix.package != 'skip' && 'ON' || '' }} + WITH_CRASH_REPORTING: 'ON' # Tag builds only: artifacts from master pushes and PR branches must not report to # Sentry. Forks get no secrets on pull_request, so they keep the mock fallback either way. # configure.outputs.tag is set for ANY tag, so beta (Development) tags get the DSN @@ -376,7 +257,6 @@ jobs: source .ci/docker.sh args=() [[ $server_only == yes ]] && args+=(--no-client) - [[ $RUN_TESTS == true ]] && args+=(--test) [[ $GITHUB_REF == "refs/heads/master" ]] && args+=(--evict-ccache "$CCACHE_EVICTION_AGE") args+=(--ccache "$CCACHE_SIZE") args+=(--cmake-generator "$CMAKE_GENERATOR") @@ -386,14 +266,7 @@ jobs: # configures, and empty keeps the mock fallback. export RUN_ARGS="${RUN_ARGS:-} -e COCKATRICE_SENTRY_DSN" - # --package takes an optional type, so the flag and its argument have to travel - # together or the type would become the next flag. - package_args=() - [[ -n $package && $package != skip ]] && package_args+=(--package "$package") - - # compile.sh runs the tests before the package target, so a failing suite stops the - # leg before anything is built into an installer. - RUN --server --release "${package_args[@]}" "${args[@]}" + RUN --server --release --package "$package" "${args[@]}" - name: "Install sentry-cli" if: matrix.package != 'skip' && needs.configure.outputs.tag != null @@ -442,7 +315,7 @@ jobs: # Delete used cache to emulate a ccache update. See https://github.com/actions/cache/issues/342 - name: "Delete remote compiler cache (ccache)" - if: github.ref == 'refs/heads/master' && env.PERSIST_CCACHE == 'true' && steps.restore_ccache.outputs.cache-hit + if: github.ref == 'refs/heads/master' && steps.restore_ccache.outputs.cache-hit continue-on-error: true env: CACHE_PRIMARY_KEY: ${{ steps.restore_ccache.outputs.cache-primary-key }} @@ -453,7 +326,7 @@ jobs: fi - name: "Save updated compiler cache (ccache)" - if: github.ref == 'refs/heads/master' && env.PERSIST_CCACHE == 'true' + if: github.ref == 'refs/heads/master' uses: actions/cache/save@v6 with: key: ${{ steps.restore_ccache.outputs.cache-primary-key }} @@ -495,93 +368,39 @@ jobs: GH_TOKEN: ${{ github.token }} run: gh attestation verify "$BUILD_PATH" --repo Cockatrice/Cockatrice - build-linux-nightly: - strategy: - fail-fast: false - matrix: - include: - - distro: Debian - version: 12 # previous stable, still covered by the nightly - - package: DEB - test: skip # Running tests on all distros is superfluous - - - distro: Fedora - version: 44 # previous release, still covered by the nightly - - package: RPM - test: skip # Running tests on all distros is superfluous - - - distro: Ubuntu - version: 24.04 # previous LTS, still covered by the nightly - - package: DEB - test: skip # Running tests on all distros is superfluous - - # The one leg that runs instrumented for line coverage and publishes the report as - # a workflow artifact. It stays a separate leg rather than a second flag on the - # sanitizer leg because the two instruments answer different questions: the - # sanitizer leg reports what the run did wrong, the coverage leg reports what the - # run never touched at all. Combining them would also slow both down. - # - # It moved here from build-linux: gcovr.cfg sets no fail_under, so the leg cannot - # fail a build, and nothing consumes the report per change, which made it an - # artifact nobody read on every pull request. On the default branch it becomes a - # trend instead. Image and ccache keys come from distro, version and variant, so - # they are unchanged and the warm cache that leg built still matches. - - distro: Ubuntu - version: 26.04 - variant: cover # separate image and ccache, same distro - - coverage: yes - package: skip - # A report must not redden the nightly run: vcpkg-cache-import only imports the - # archives of a run whose conclusion is success. - allow-failure: yes - - name: ${{ matrix.distro }} ${{ matrix.version }}${{ matrix.variant && format(' {0}', matrix.variant) || '' }} - needs: configure - # A nightly and a tag build cover the legs a pull request or a merge does not wait for: - # the previous release of each distro, and the one instrument that only reports. - if: github.event_name == 'schedule' || github.ref_type == 'tag' - runs-on: ubuntu-latest # https://github.com/actions/runner-images - continue-on-error: ${{ matrix.allow-failure == 'yes' }} - timeout-minutes: 70 - env: - CACHE: ${{ github.workspace }}/.cache/${{ matrix.distro }}${{ matrix.version }}${{ matrix.variant }} # directory for caching docker image and ccache - CCACHE_EVICTION_AGE: 7d - # These legs do not keep a compiler cache: they run once a day (and on tags) and gate - # nothing, so their share of the 10 GB quota goes to the pull-request legs instead. - # A cold nightly build costs minutes on a runner nobody waits for; a cold pull request - # build costs a review. CCACHE_SIZE is still passed so ccache trims its scratch dir. - PERSIST_CCACHE: 'false' - CCACHE_SIZE: 600M - CMAKE_GENERATOR: 'Ninja' - NAME: ${{ matrix.distro }}${{ matrix.version }} - IMAGE_SUFFIX: ${{ matrix.variant }} - # The shared steps below gate on these, so they have to be derived here too. Left - # undefined they silently skipped the build the leg exists for: the coverage leg - # found build/ empty and its report collection failed on every nightly and tag run. - # Same derivation as the pull request job above. - DEBUG_TEST: ${{ matrix.sanitize == 'yes' || matrix.coverage == 'yes' || matrix.debug_test == 'yes' }} - RUN_TESTS: ${{ matrix.test != 'skip' && !(matrix.sanitize == 'yes' || matrix.coverage == 'yes' || matrix.debug_test == 'yes') }} - steps: *linux-steps - build-vcpkg: strategy: fail-fast: false matrix: include: - os: macOS - target: 14 # EOL 2026-09-14 - runner: xcode-27 # https://github.com/actions/runner-images/blob/main/images/macos/xcode-27-arm64-Readme.md + target: 13 # EOL 2025-09-15 + runner: macos-15-intel # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md + # macos-26-intel is very slow and fails in CPack during DMG config if not increasing Finder timeout + + ccache_eviction_age: 7d + cmake_generator: Ninja + make_package: 1 + override_target: 13 + package_suffix: "-macOS13_Intel" + qt_version: 6.11.* + qt_modules: qtimageformats qtmultimedia qtshadertools qtwebsockets + soc: Intel + type: Release + use_ccache: 1 + vcpkg_scope: 'vcpkg/macos13-x64-xcode26.3/' + vcpkg_upload: 1 # only one leg per vcpkg_scope hands its archives over + xcode: "26.3" + + - os: macOS + target: 14 # EOL 2026-?? + runner: macos-26 # https://github.com/actions/runner-images/blob/main/images/macos/macos-26-arm64-Readme.md ccache_eviction_age: 7d cmake_generator: Ninja make_package: 1 override_target: 14 package_suffix: "-macOS14" - ccache_size: 800M # one Release configuration plus the suite at -g1 qt_version: 6.11.* qt_modules: qtimageformats qtmultimedia qtshadertools qtwebsockets soc: Apple @@ -590,17 +409,17 @@ jobs: vcpkg_deployment_target: 14 vcpkg_scope: 'vcpkg/macos14-arm64-xcode26.6/' vcpkg_upload: 1 # only one leg per vcpkg_scope hands its archives over + xcode: "26.6" - os: macOS - target: 15 # EOL 2027-?? - runner: xcode-27 # https://github.com/actions/runner-images/blob/main/images/macos/xcode-27-arm64-Readme.md + target: 15 + runner: macos-26 # https://github.com/actions/runner-images/blob/main/images/macos/macos-26-arm64-Readme.md ccache_eviction_age: 7d cmake_generator: Ninja make_package: 1 override_target: 15 package_suffix: "-macOS15" - persist_ccache: 'false' # 16.5 min: shorter than the Windows leg qt_version: 6.11.* qt_modules: qtimageformats qtmultimedia qtshadertools qtwebsockets soc: Apple @@ -608,14 +427,14 @@ jobs: use_ccache: 1 vcpkg_deployment_target: 14 vcpkg_scope: 'vcpkg/macos14-arm64-xcode26.6/' + xcode: "26.6" - os: macOS - target: 27 - runner: xcode-27 # https://github.com/actions/runner-images/blob/main/images/macos/xcode-27-arm64-Readme.md + target: 26 + runner: macos-26 # https://github.com/actions/runner-images/blob/main/images/macos/macos-26-arm64-Readme.md ccache_eviction_age: 7d cmake_generator: Ninja - persist_ccache: 'false' # 15.8 min: shorter than the Windows leg qt_version: 6.11.* qt_modules: qtimageformats qtmultimedia qtshadertools qtwebsockets soc: Apple @@ -623,6 +442,7 @@ jobs: use_ccache: 1 vcpkg_deployment_target: 14 vcpkg_scope: 'vcpkg/macos14-arm64-xcode26.6/' + xcode: "26.6" - os: Windows target: 10 @@ -646,27 +466,14 @@ jobs: vcpkg_upload: 1 # only one leg per vcpkg_scope hands its archives over name: ${{ matrix.os }} ${{ matrix.target }}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} - needs: [configure, vcpkg-baseline] - # The nightly leg lives in build-vcpkg-nightly below, next to the Linux nightly legs. - if: github.event_name != 'schedule' + needs: configure runs-on: ${{ matrix.runner }} timeout-minutes: 100 env: CCACHE_DIR: ${{ github.workspace }}/.cache/ - # One macOS configuration is about 600 MB of objects at -g1, so its bound needs to be - # 800M to hold one whole; a smaller cache serves a few percent and is worthless (see - # the sizing comment in build-linux). macOS 14 keeps the one macOS cache: it runs the - # suite against the shipping Release build and is the longest of the three at 24.2 min. - # macOS 15 (16.5) and macOS 27 Debug (15.8) duplicate its coverage and are shorter, so - # they run cold. - CCACHE_SIZE: ${{ matrix.ccache_size || '700M' }} - PERSIST_CCACHE: ${{ matrix.persist_ccache || 'true' }} - # MSVC has no -g level, so the Windows leg does not ask for one; it has no compiler - # cache to shrink anyway (see the sizing comment in build-linux). - COCKATRICE_DEBUG_INFO_LEVEL: ${{ matrix.os != 'Windows' && github.ref_type != 'tag' && '1' || '' }} + CCACHE_SIZE: 600M # space of all repo is 10Gi: https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy - # Shared with build-vcpkg-nightly so the two leg sets run the same steps. - steps: &vcpkg-steps + steps: - name: "Checkout" uses: actions/checkout@v7 with: @@ -683,11 +490,11 @@ jobs: run: brew install ccache - name: "[macOS] Restore compiler cache (ccache)" - if: matrix.os == 'macOS' && matrix.use_ccache == 1 && env.PERSIST_CCACHE == 'true' + if: matrix.os == 'macOS' && matrix.use_ccache == 1 id: restore_ccache uses: actions/cache/restore@v6 with: - key: ccache-${{ matrix.os }}${{ matrix.override_target }}-${{ matrix.runner }} + key: ccache-${{ matrix.runner }}_${{ matrix.override_target }}-Xcode${{ matrix.xcode }} path: ${{ env.CCACHE_DIR }} - name: "[macOS] Install aqtinstall" @@ -777,17 +584,11 @@ jobs: # job. A scope nobody has written to yet therefore leaves the directory missing # and fails the job, which is exactly the state every scope starts in. Make the # directory up front so an empty scope is a cache miss instead of an error. - # always() covers the cache step itself failing: the action's post save still runs - # then, and it should report the real error instead of ENOENT. It cannot rescue a - # failure before the cache step, since a post step only runs for an action whose - # main step did. The fallback keeps this guard from failing when the cache step was - # skipped and left no path output. - name: "Create vcpkg cache directory" - if: always() shell: bash env: CACHE_DIR: '${{ steps.vcpkg-cache.outputs.path }}' - run: mkdir -p "${CACHE_DIR:-$GITHUB_WORKSPACE/.vcpkg-cache}" + run: mkdir -p "$CACHE_DIR" # Uses environment variables, see compile.sh for more details - name: "Build Cockatrice" @@ -802,6 +603,7 @@ jobs: # configure.outputs.tag is set for ANY tag, so beta (Development) tags get the DSN # and the symbol upload below just like full releases. COCKATRICE_SENTRY_DSN: ${{ needs.configure.outputs.tag != null && secrets.SENTRY_DSN || '' }} + DEVELOPER_DIR: '/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer' GITHUB_TOKEN: ${{ github.token }} # needed for vcpkg dependency graph updates, see VCPKG_FEATURE_FLAGS MACOS_CERTIFICATE: ${{ secrets.PROD_MACOS_CERTIFICATE }} MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }} @@ -1013,7 +815,7 @@ jobs: # Delete used cache to emulate a ccache update. See https://github.com/actions/cache/issues/342 - name: "[macOS] Delete remote compiler cache (ccache)" - if: matrix.os == 'macOS' && matrix.use_ccache == 1 && env.PERSIST_CCACHE == 'true' && github.ref == 'refs/heads/master' && steps.restore_ccache.outputs.cache-hit + if: matrix.os == 'macOS' && matrix.use_ccache == 1 && github.ref == 'refs/heads/master' && steps.restore_ccache.outputs.cache-hit continue-on-error: true env: CACHE_PRIMARY_KEY: ${{ steps.restore_ccache.outputs.cache-primary-key }} @@ -1024,7 +826,7 @@ jobs: fi - name: "[macOS] Cache updated compiler cache (ccache)" - if: matrix.os == 'macOS' && matrix.use_ccache == 1 && env.PERSIST_CCACHE == 'true' && github.ref == 'refs/heads/master' + if: matrix.os == 'macOS' && matrix.use_ccache == 1 && github.ref == 'refs/heads/master' uses: actions/cache/save@v6 with: key: ${{ steps.restore_ccache.outputs.cache-primary-key }} @@ -1140,44 +942,6 @@ jobs: GH_TOKEN: ${{ github.token }} run: gh attestation verify "$BUILD_PATH" --repo Cockatrice/Cockatrice - build-vcpkg-nightly: - strategy: - fail-fast: false - matrix: - include: - - os: macOS - target: 13 # EOL 2025-09-15 - runner: macos-15-intel # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md - # macos-26-intel is very slow and fails in CPack during DMG config if not increasing Finder timeout - - ccache_eviction_age: 7d - cmake_generator: Ninja - make_package: 1 - override_target: 13 - package_suffix: "-macOS13_Intel" - qt_version: 6.11.* - qt_modules: qtimageformats qtmultimedia qtshadertools qtwebsockets - soc: Intel - type: Release - use_ccache: 1 - vcpkg_scope: 'vcpkg/macos13-x64-xcode26.3/' - vcpkg_upload: 1 # only one leg per vcpkg_scope hands its archives over - - name: ${{ matrix.os }} ${{ matrix.target }}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} - needs: configure - # The EOL target on the slowest runner is too slow to gate a change, so it runs in the - # nightly and on tags only, where the vcpkg cache import also has to accept schedule runs. - if: github.event_name == 'schedule' || github.ref_type == 'tag' - runs-on: ${{ matrix.runner }} - timeout-minutes: 100 - env: - CCACHE_DIR: ${{ github.workspace }}/.cache/ - # Like build-linux-nightly: this leg keeps no compiler cache, so the quota stays with - # the pull-request legs (see PERSIST_CCACHE there). - PERSIST_CCACHE: 'false' - CCACHE_SIZE: 600M - steps: *vcpkg-steps - prune-caches: name: Prune caches # Only master writes caches at all, so only master may clean them up too @@ -1186,66 +950,38 @@ jobs: continue-on-error: true # freeing space must never fail a build steps: - # The repository holds 10 GB of cache against entries that want more, and GitHub evicts - # the least recently used entry whenever that is exceeded. The vcpkg entries are the - # reason that never happens: the restore above touches every entry under the prefix on - # every run, so a dead ABI generation keeps its access date fresh forever and age based - # eviction can never reach it. Deleting by age alone cannot fix that, only knowing which - # scope an entry belongs to can. The same is true of a compiler cache of a leg that no - # longer keeps one: its restore would keep touching it, so the live key list below is - # what retires it. - # - # docker-release's image builds keep their layer cache in the same quota: one blob per - # layer, keyed buildkit-blob-1-, plus one index--1- entry per image - # scope that lists them. They are written with mode=min, so only the final image stage - # is kept and the set stays small. A layer a build actually needs is downloaded, which - # refreshes its access date, so an old date means the builds have stopped using it and - # age is the right test. Dropping a blob an index still lists costs the next image build - # one rebuilt layer; docker-release gates nothing, so that is cheaper than keeping the - # entries forever. + # The repository holds 10Gi of cache against entries that want more, and GitHub + # evicts the least recently used entry whenever that is exceeded. The vcpkg + # entries are the reason that never happens: the restore above touches every + # entry under the prefix on every run, so a dead ABI generation keeps its access + # date fresh forever and age based eviction can never reach it. Deleting by age + # alone cannot fix that, only knowing which scope an entry belongs to can. - name: "Delete unusable cache entries" shell: bash env: GH_TOKEN: ${{ github.token }} - # Must list every vcpkg_scope of the build-vcpkg and build-vcpkg-nightly - # matrices above, or the entries of a scope that is still in use get deleted - # on the next run. + # Must list every vcpkg_scope of the build-vcpkg matrix above, or the entries of + # a scope that is still in use get deleted on the next run. LIVE_VCPKG_SCOPES: 'vcpkg/macos13-x64-xcode26.3/ vcpkg/macos14-arm64-xcode26.6/ vcpkg/windows10-x64-vs2026/' - # Must list the ccache key of every leg that keeps a compiler cache - # (PERSIST_CCACHE in build-linux and build-vcpkg), or a live entry is deleted. - # The nightly legs and the pull-request legs that finish under the Windows leg - # keep none, so their leftover entries are reclaimed here instead of waiting out - # the age rule. - LIVE_CCACHE_KEYS: 'ccache-Arch ccache-Debian13 ccache-Fedora45debug ccache-Fedora45release ccache-Ubuntu26.04sanitize ccache-macOS14-xcode-27' run: | gh api --paginate "repos/$GITHUB_REPOSITORY/actions/caches?per_page=100" \ --jq '.actions_caches[] | [.id, .ref, .key, .last_accessed_at] | @tsv' >"$RUNNER_TEMP/caches.tsv" cutoff="$(( $(date -u +%s) - 7 * 24 * 3600 ))" live=" ${LIVE_VCPKG_SCOPES} " - live_ccache=" ${LIVE_CCACHE_KEYS} " - deleted=0 while IFS=$'\t' read -r id ref key accessed; do [[ -n $id ]] || continue - # Only ever touch the key shapes our workflows create (buildkit-* and index-* - # come from docker-release.yml), so that an entry of some other workflow can - # never be deleted by accident + # Only ever touch the key shapes this workflow creates, so that an entry of + # some other workflow can never be deleted by accident case "$key" in - vcpkg/* | ccache-* | Qt* | buildkit-* | index-*) ;; + vcpkg/* | ccache-* | Qt*) ;; *) continue ;; esac reason="" if [[ $ref != refs/heads/master ]]; then reason="scoped to $ref" - elif [[ $key == ccache-* ]]; then - # An exact token compare, because one key can be a prefix of another: - # ccache-Ubuntu26.04 is a prefix of ccache-Ubuntu26.04sanitize, and only - # the sanitize entry is live. - if [[ $live_ccache != *" $key "* ]]; then - reason="no pull-request leg keeps it" - fi elif [[ $key == vcpkg/* ]]; then # "/", cut the hash off the end to get the scope scope="vcpkg/${key#vcpkg/}" diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml index 1537d6d4d..937386940 100644 --- a/.github/workflows/docker-release.yml +++ b/.github/workflows/docker-release.yml @@ -84,18 +84,12 @@ jobs: password: ${{ github.token }} # Don't push for non-publishing triggers - # - # The layer cache shares the repository's 10 GB Actions cache quota with the compiler - # caches (see CCACHE_SIZE in desktop-build.yml). mode=min keeps only the final image - # stage: the build stage sits behind `COPY . .`, so its compile layer is invalidated by - # every source change and was never read back, yet it was the bulk of the ~2 GB this - # cache held. The final runtime stage is the part that still pays off. - name: "Build image" if: steps.login.outcome != 'success' uses: docker/build-push-action@v7 with: cache-from: type=gha,scope=${{ env.CACHE_SCOPE }} - cache-to: ${{ case(github.ref == 'refs/heads/master', format('type=gha,mode=min,scope={0}', env.CACHE_SCOPE), '') }} + cache-to: ${{ case(github.ref == 'refs/heads/master', format('type=gha,mode=max,scope={0}', env.CACHE_SCOPE), '') }} context: . platforms: ${{ matrix.platform }} push: false @@ -107,7 +101,7 @@ jobs: uses: docker/build-push-action@v7 with: cache-from: type=gha,scope=${{ env.CACHE_SCOPE }} - cache-to: type=gha,mode=min,scope=${{ env.CACHE_SCOPE }} + cache-to: type=gha,mode=max,scope=${{ env.CACHE_SCOPE }} context: . labels: | org.opencontainers.image.description=${{ env.OCI_DESCRIPTION }} diff --git a/.github/workflows/vcpkg-cache-import.yml b/.github/workflows/vcpkg-cache-import.yml index 0a377a8fd..3cc7b2203 100644 --- a/.github/workflows/vcpkg-cache-import.yml +++ b/.github/workflows/vcpkg-cache-import.yml @@ -4,14 +4,12 @@ name: Import vcpkg cache # rebuilds protobuf, openssl and abseil from source and saves them into the shared # cache, where every later run can restore them. # -# Only master pushes and the nightly schedule run on master are imported here: the -# collect step, keys.txt and the zip contents all come from the workflow run being -# imported, so importing from an unmerged pull request would let anyone who can push -# a branch — or a bot actor such as Dependabot, whose PRs are same-repo — promote -# arbitrary binaries into the scope that master and tag builds restore and link into -# signed releases. Forks build untrusted code and must never reach that scope either. -# A scheduled run is the default branch at the commit a master push already built, so -# it carries the same trust as a push. +# Only master pushes are imported here: the collect step, keys.txt and the zip +# contents all come from the workflow run being imported, so importing from an +# unmerged pull request would let anyone who can push a branch — or a bot actor +# such as Dependabot, whose PRs are same-repo — promote arbitrary binaries into +# the scope that master and tag builds restore and link into signed releases. +# Forks build untrusted code and must never reach that scope either. # # repository_dispatch is not used on purpose: it would also resolve to the default branch, # but it counts as a low-trust trigger and may only write there when it declares a @@ -40,7 +38,7 @@ jobs: # the shared scope even if they somehow target the default branch. if: >- github.event.workflow_run.conclusion == 'success' && - (github.event.workflow_run.event == 'push' || github.event.workflow_run.event == 'schedule') && + github.event.workflow_run.event == 'push' && github.event.workflow_run.head_branch == 'master' && github.event.workflow_run.head_repository.full_name == github.repository && !endsWith(github.event.workflow_run.actor.login, '[bot]') && diff --git a/.gitmodules b/.gitmodules index e69c8e686..732fec7ca 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,3 @@ [submodule "doxygen-awesome-css"] path = doc/doxygen/theme url = https://github.com/jothepro/doxygen-awesome-css.git -[submodule "external/qttesting"] - path = external/qttesting - url = https://github.com/Kitware/QtTesting.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 53508fcd1..41fe393e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,8 +20,6 @@ option(WITH_CLIENT "Build Cockatrice client" ON) option(WITH_ORACLE "Build Cockatrice card database tool (Oracle)" ON) # Compile Servatrice option(WITH_SERVER "Build Cockatrice server (Servatrice)" OFF) -# Compile GUI tests (QtTesting widget-level playback) -option(WITH_GUI_TEST "Build the QtTesting-based GUI test harness" OFF) # Compile tests option(TEST "Build tests" OFF) # Build with AddressSanitizer and UndefinedBehaviorSanitizer @@ -31,14 +29,6 @@ option(ENABLE_COVERAGE "Build instrumented for GCC line coverage" OFF) # Use vcpkg regardless of OS option(USE_VCPKG "Use vcpkg regardless of OS" OFF) -# The GUI test harness lives in a submodule; a checkout without it must still configure. -if(WITH_GUI_TEST AND NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/external/qttesting/CMakeLists.txt") - message(WARNING "WITH_GUI_TEST is ON but external/qttesting is missing, so GUI tests are disabled.\n" - "Run 'git submodule update --init external/qttesting' to enable them." - ) - set(WITH_GUI_TEST OFF) -endif() - # Default to "Release" build type # User-provided value for CMAKE_BUILD_TYPE must be checked before the PROJECT() call if(DEFINED CMAKE_BUILD_TYPE) @@ -65,10 +55,6 @@ if(USE_CCACHE AND NOT WIN32) # PCH-aware caching, matching .ci/compile.sh: without this ccache refuses # to cache any TU that consumes a precompiled header, so every PCH-backed # target recompiles from scratch on each build. - # The include_file_mtime/include_file_ctime entries that CI also sets are - # deliberately not set here: --set-config writes the user's global - # ccache.conf, and those two would turn off the modified-during-compile - # check for every project on the machine, not just this one. execute_process(COMMAND ${CCACHE_PROGRAM} --set-config sloppiness=pch_defines,time_macros) message(STATUS "Found CCache ${CCACHE_PROGRAM}") endif() @@ -85,8 +71,6 @@ if(WIN32 OR USE_VCPKG) ) # Qt path set by user or env var if(QTDIR - OR QTDIR32 - OR QTDIR64 OR DEFINED ENV{QTDIR} OR DEFINED ENV{QTDIR32} OR DEFINED ENV{QTDIR64} @@ -106,7 +90,7 @@ endif() # A project name is needed for CPack # Version can be overriden by git tags, see cmake/getversion.cmake -project("Cockatrice" VERSION 3.2.0) +project("Cockatrice" VERSION 3.1.2) # Set release name if not provided via env/cmake var if(NOT DEFINED GIT_TAG_RELEASENAME) @@ -238,27 +222,6 @@ include(Sanitizers) include(Coverage) include(CrashReporting) -# Debug information is what makes a cached object large, and a build configuration needs more -# room than a per-leg cache bound can spare when it carries full DWARF: ccache then fills to -# its limit and evicts the entries the next build is about to ask for, so it serves a few -# percent of calls while holding most of a build. CI sets a lower level so one whole -# configuration fits; level 1 keeps file and line, which is what a failing test or a sanitizer -# backtrace reports. Empty (the default) leaves local, distro and release builds exactly as -# they were. This comes after CrashReporting, so the -g it adds for Sentry symbols cannot -# raise the level again. -set(COCKATRICE_DEBUG_INFO_LEVEL - "" - CACHE STRING "DWARF level for Debug and Release objects (empty keeps the built-in flags)" -) -if(NOT COCKATRICE_DEBUG_INFO_LEVEL STREQUAL "") - if(MSVC) - message(WARNING "COCKATRICE_DEBUG_INFO_LEVEL is ignored on MSVC") - else() - string(APPEND CMAKE_CXX_FLAGS_DEBUG " -g${COCKATRICE_DEBUG_INFO_LEVEL}") - string(APPEND CMAKE_CXX_FLAGS_RELEASE " -g${COCKATRICE_DEBUG_INFO_LEVEL}") - endif() -endif() - # GNU systems need to define the Mersenne exponent for the RNG to compile w/o warning if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") add_definitions("-DSFMT_MEXP=19937") @@ -273,13 +236,13 @@ else() set(_lib_suffix 32) endif() -if(NOT "${QTDIR${_lib_suffix}}" STREQUAL "") +if(DEFINED QTDIR${_lib_suffix}) list(APPEND CMAKE_PREFIX_PATH "${QTDIR${_lib_suffix}}") -elseif(NOT "${QTDIR}" STREQUAL "") +elseif(DEFINED QTDIR) list(APPEND CMAKE_PREFIX_PATH "${QTDIR}") -elseif(NOT "$ENV{QTDIR${_lib_suffix}}" STREQUAL "") +elseif(DEFINED ENV{QTDIR${_lib_suffix}}) list(APPEND CMAKE_PREFIX_PATH "$ENV{QTDIR${_lib_suffix}}") -elseif(NOT "$ENV{QTDIR}" STREQUAL "") +elseif(DEFINED ENV{QTDIR}) list(APPEND CMAKE_PREFIX_PATH "$ENV{QTDIR}") endif() @@ -287,22 +250,7 @@ message(STATUS "Update Translations: ${UPDATE_TRANSLATIONS}") include(FindQtRuntime) -# Reject APIs that were deprecated before the oldest Qt release we support -# (6.4). Qt 6.5 renamed the switch, so use whichever spelling the found -# version understands while still compiling everywhere. -if(Qt6_VERSION VERSION_GREATER_EQUAL 6.5) - add_compile_definitions(QT_DISABLE_DEPRECATED_UP_TO=0x060400) -else() - add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x060400) -endif() - -# Set once here for every target: these variables are inherited by the -# subdirectories, so the per-directory copies were redundant. Only the -# variables are set; qt_standard_project_setup would also change the runtime -# output directories and the install RPATH. set(CMAKE_AUTOMOC TRUE) -set(CMAKE_AUTOUIC TRUE) -set(CMAKE_AUTORCC TRUE) # Find other needed libraries find_package(Protobuf CONFIG) @@ -472,9 +420,6 @@ if(WITH_ORACLE OR WITH_CLIENT) add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_models ${CMAKE_BINARY_DIR}/libcockatrice_models) add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_filters ${CMAKE_BINARY_DIR}/libcockatrice_filters) endif() -if(WITH_CLIENT) - add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_game ${CMAKE_BINARY_DIR}/libcockatrice_game) -endif() if(WITH_SERVER) add_subdirectory(servatrice) @@ -498,34 +443,6 @@ if(WITH_ORACLE) set(CPACK_INSTALL_CMAKE_PROJECTS "Oracle;Oracle;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS}) endif() -if(WITH_GUI_TEST) - set(QtTesting_QT_VERSION "6") - # QtTesting registers its own unit tests when BUILD_TESTING is on. They target the - # Qt version the harness was written for and fail on Qt 6.11 (toolbutton - # long-press recording), and they are not Cockatrice's tests, so suppress them - # for the duration of the subdirectory instead of painting ctest red. - if(DEFINED BUILD_TESTING) - set(_cockatrice_saved_build_testing ${BUILD_TESTING}) - endif() - set(BUILD_TESTING - OFF - CACHE BOOL "Build the testing tree." FORCE - ) - add_subdirectory(external/qttesting) - if(DEFINED _cockatrice_saved_build_testing) - set(BUILD_TESTING - ${_cockatrice_saved_build_testing} - CACHE BOOL "Build the testing tree." FORCE - ) - else() - unset(BUILD_TESTING CACHE) - endif() - # cl.exe has no warnings-as-errors here, and it rejects -Wno-error with D8021. - if(NOT MSVC) - target_compile_options(qttesting PRIVATE -Wno-error) - endif() -endif() - if(TEST) include(CTest) add_subdirectory(tests) @@ -533,5 +450,5 @@ endif() if(Qt6_FOUND AND Qt6_VERSION_MINOR GREATER_EQUAL 3) # Qt6.3+ requires project finalization to support translations - qt_finalize_project() + qt6_finalize_project() endif() diff --git a/Testing/README.md b/Testing/README.md deleted file mode 100644 index cb990ec29..000000000 --- a/Testing/README.md +++ /dev/null @@ -1,66 +0,0 @@ -# GUI tests - -Widget-level playback tests for the Cockatrice client, driven by -[QtTesting](https://github.com/Kitware/QtTesting) (`external/qttesting`, a submodule). -Each `*_test.xml` file is a list of events that QtTesting replays against the running -application; a test passes when every event is handled without error. - -## Running - -```bash -git submodule update --init external/qttesting # once -cmake -S . -B build/debug -DCMAKE_BUILD_TYPE=Debug -DWITH_SERVER=0 -DWITH_GUI_TEST=ON -cmake --build build/debug -j 24 - -./Testing/run_test.sh --all # headless, offscreen -./Testing/run_test.sh Testing/smoke_test.xml # one file -./Testing/run_test.sh --visual Testing/smoke_test.xml # shows the window -``` - -`WITH_GUI_TEST` is on by default; a checkout without the submodule configures with a -warning and no harness. `COCKATRICE_BIN` points the runner at another build, and -`TEST_TIMEOUT` (seconds, default 180) bounds a single test — a failing event inside a -modal dialog can otherwise leave the process alive. The client also hard-exits a few -seconds after playback returns, whatever the result. - -The tests are **not** part of `ctest`: they need a card database and a developer's -settings, so they stay a local loop for now. - -## Caveats - -- **Not hermetic.** The client reads the local settings and card database, so a test can - pass on one machine and fail on another. Avoid asserting things that restored - workspace state or user preferences decide (for example the number of open tabs). -- **English labels only.** Menu entries are addressed by their (translated) text, so the - tests expect the source language. Widgets are addressed by objectName paths, which are - stable across translations. -- Actions that open a dialog are followed by a `pause` event: playback continues in the - dialog's own event loop, and the pause gives the UI time to build itself. -- Widget paths include Qt-internal names where a QTabWidget is involved - (`qt_tabwidget_stackedwidget`), and the deck views in a game are indexed - (`tabbedDeckView_0`, `tabbedDeckView_1`). - -## Writing a test - -A test is a `` list. Widgets are named by their path from the main window, e.g. -`MainWindow/tabSupervisor/stackedWidget/TabGame/phasesMenu`. Useful commands: - -| Command | Arguments | Effect | -|---------|-----------|--------| -| `activate` | action or menu name | triggers a QAction (menus are opened first) | -| `key` | Qt key code | presses that key on the focused widget | -| `pause` | milliseconds | waits, letting the UI settle | -| `clickCard` | `card,zone` | double click the card found in that zone (plays it from hand) | -| `flipCard` | `card,zone` | right-click → *Turn Over* | -| `cardAction` | `card,zone,label` | right-click → first menu entry whose label contains `label` (submenus included) | -| `moveCard` | `card,srcZone,dstZone` | drags the card onto the destination zone | -| `drawArrow` | `srcCard,srcZone,dstCard,dstZone` | right-drag an arrow between two cards | -| `createToken` | `name,color,pt` | creates a token as the active local player | -| `selectItem` | `item label` | selects the tree/list entry with that label | -| `typeText` | `text` | types text one key event at a time | -| `expectProperty` | `property,value` | fails playback unless the widget property matches | - -The card, item and property commands are `pqCockatriceEventPlayer` -(`cockatrice/src/game_graphics/pq_cockatrice_event_player.h`). They resolve cards by name -and zone through the `QGraphicsScene` and send real mouse events at the card's current -viewport position, so a test does not depend on the window size or screen resolution. diff --git a/Testing/card_actions_test.xml b/Testing/card_actions_test.xml deleted file mode 100644 index 8d6de4c2b..000000000 --- a/Testing/card_actions_test.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Testing/deck_editor_open_test.xml b/Testing/deck_editor_open_test.xml deleted file mode 100644 index ab74b1c63..000000000 --- a/Testing/deck_editor_open_test.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/Testing/deck_editor_search_test.xml b/Testing/deck_editor_search_test.xml deleted file mode 100644 index 6641ac3b2..000000000 --- a/Testing/deck_editor_search_test.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/Testing/dialog_lifecycle_test.xml b/Testing/dialog_lifecycle_test.xml deleted file mode 100644 index 00510b802..000000000 --- a/Testing/dialog_lifecycle_test.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/Testing/game_mechanics_test.xml b/Testing/game_mechanics_test.xml deleted file mode 100644 index efef78707..000000000 --- a/Testing/game_mechanics_test.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Testing/integration_test.xml b/Testing/integration_test.xml deleted file mode 100644 index 33191d1ac..000000000 --- a/Testing/integration_test.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Testing/local_game_lifecycle_test.xml b/Testing/local_game_lifecycle_test.xml deleted file mode 100644 index bdc964921..000000000 --- a/Testing/local_game_lifecycle_test.xml +++ /dev/null @@ -1,178 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Testing/menu_open_close_test.xml b/Testing/menu_open_close_test.xml deleted file mode 100644 index d894b47b5..000000000 --- a/Testing/menu_open_close_test.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/Testing/nonmodal_manage_sets_test.xml b/Testing/nonmodal_manage_sets_test.xml deleted file mode 100644 index 5fe2bfc0c..000000000 --- a/Testing/nonmodal_manage_sets_test.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/Testing/nonmodal_tip_test.xml b/Testing/nonmodal_tip_test.xml deleted file mode 100644 index 0f4ffc825..000000000 --- a/Testing/nonmodal_tip_test.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/Testing/nonmodal_view_log_test.xml b/Testing/nonmodal_view_log_test.xml deleted file mode 100644 index 3369f1fd5..000000000 --- a/Testing/nonmodal_view_log_test.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/Testing/run_test.sh b/Testing/run_test.sh deleted file mode 100755 index 8ff3fe028..000000000 --- a/Testing/run_test.sh +++ /dev/null @@ -1,118 +0,0 @@ -#!/bin/bash -# Run QtTesting XML test files against the Cockatrice build. -# -# Usage: -# ./Testing/run_test.sh [--visual] [--all | ...] -# -# Options: -# --visual Run with native display (shows the GUI window). -# Default is headless (QT_QPA_PLATFORM=offscreen). -# --all Run every *.xml file in Testing/. -# -# Environment: -# COCKATRICE_BIN Path to the client binary (default: build/debug/cockatrice/cockatrice, -# or the .app bundle binary on macOS). -# TEST_TIMEOUT Seconds a single test may run before it is killed (default: 180). -# Uses timeout, or gtimeout from coreutils on macOS. -# -# Requires the debug build to exist at build/debug/cockatrice/cockatrice. - -set -euo pipefail -shopt -s nullglob - -REPO_ROOT="$(cd "$(dirname "$0")/.." && pwd -P)" -if [ -n "${COCKATRICE_BIN:-}" ]; then - COCKATRICE="$COCKATRICE_BIN" -elif [ "$(uname -s)" = "Darwin" ]; then - # A macOS build produces an app bundle, not a bare executable. - COCKATRICE="$REPO_ROOT/build/debug/cockatrice/cockatrice.app/Contents/MacOS/cockatrice" -else - COCKATRICE="$REPO_ROOT/build/debug/cockatrice/cockatrice" -fi -TEST_DIR="$REPO_ROOT/Testing" -TEST_TIMEOUT="${TEST_TIMEOUT:-180}" - -# Stock macOS has no `timeout`; coreutils provides `gtimeout`. Without either the -# runner still works, but a hung test is not killed. -TIMEOUT=() -if command -v timeout >/dev/null 2>&1; then - TIMEOUT=(timeout --foreground "$TEST_TIMEOUT") -elif command -v gtimeout >/dev/null 2>&1; then - TIMEOUT=(gtimeout --foreground "$TEST_TIMEOUT") -else - echo "Warning: neither timeout nor gtimeout found; tests are not time-limited." >&2 -fi - -if [ ! -f "$COCKATRICE" ]; then - echo "Error: $COCKATRICE not found. Build first:" >&2 - echo " cmake --build build/debug" >&2 - exit 1 -fi - -VISUAL=0 -if [ "${1:-}" = "--visual" ]; then - VISUAL=1 - shift -fi - -if [ "${1:-}" = "--all" ]; then - shift - TEST_FILES=("$TEST_DIR"/*.xml) - if [ ${#TEST_FILES[@]} -eq 0 ]; then - echo "No *.xml files found in $TEST_DIR" >&2 - exit 1 - fi -elif [ $# -ge 1 ]; then - TEST_FILES=("$@") -else - echo "Usage: $0 [--visual] [--all | ...]" >&2 - echo " Run a single test: $0 Testing/smoke_test.xml" >&2 - echo " Run all tests: $0 --all" >&2 - echo " Run visually: $0 --visual Testing/smoke_test.xml" >&2 - echo " Run all visually: $0 --visual --all" >&2 - exit 1 -fi - -PASS=0 -FAIL=0 -FAILED_TESTS=() - -run_one() { - local file="$1" - - local -a cmd=() - if [ "${#TIMEOUT[@]}" -gt 0 ]; then - cmd=("${TIMEOUT[@]}") - fi - cmd+=("$COCKATRICE" --no-connect --test "$file") - - if [ "$VISUAL" -eq 1 ]; then - "${cmd[@]}" - else - env QT_QPA_PLATFORM=offscreen "${cmd[@]}" - fi -} - -for f in "${TEST_FILES[@]}"; do - name="$(basename "$f")" - printf "%-40s " "$name" - if run_one "$f"; then - echo "PASS" - PASS=$((PASS + 1)) - else - echo "FAIL" - FAIL=$((FAIL + 1)) - FAILED_TESTS+=("$name") - fi -done - -TOTAL=$((PASS + FAIL)) -echo "" -echo "Results: $PASS/$TOTAL passed, $FAIL failed" -if [ "$FAIL" -gt 0 ]; then - echo "Failed:" - for t in "${FAILED_TESTS[@]}"; do - echo " $t" - done - exit 1 -fi diff --git a/Testing/settings_dialog_test.xml b/Testing/settings_dialog_test.xml deleted file mode 100644 index 2dd9dda0a..000000000 --- a/Testing/settings_dialog_test.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/Testing/settings_navigation_test.xml b/Testing/settings_navigation_test.xml deleted file mode 100644 index c112966e0..000000000 --- a/Testing/settings_navigation_test.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Testing/settings_search_test.xml b/Testing/settings_search_test.xml deleted file mode 100644 index ba60251f0..000000000 --- a/Testing/settings_search_test.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/Testing/smoke_test.xml b/Testing/smoke_test.xml deleted file mode 100644 index a31edbdd4..000000000 --- a/Testing/smoke_test.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/cmake/FindQtRuntime.cmake b/cmake/FindQtRuntime.cmake index 7b644276d..2d74aca4d 100644 --- a/cmake/FindQtRuntime.cmake +++ b/cmake/FindQtRuntime.cmake @@ -1,6 +1,6 @@ # Find a compatible Qt version # Inputs: WITH_SERVER, WITH_CLIENT, WITH_ORACLE -# Optional Input: Qt6_DIR -- Directory containing Qt6Config.cmake +# Optional Input: QT6_DIR -- Hint as to where Qt6 lives on the system # Output: COCKATRICE_QT_VERSION_NAME -- Example values: Qt6 # Output: SERVATRICE_QT_MODULES # Output: COCKATRICE_QT_MODULES @@ -57,17 +57,7 @@ find_package( QUIET HINTS ${Qt6_DIR} ) if(NOT Qt6_FOUND) - set(_QT_DIAGNOSTIC "") - if(Qt6_NOT_FOUND_MESSAGE) - set(_QT_DIAGNOSTIC "\nQt package diagnostic: ${Qt6_NOT_FOUND_MESSAGE}") - endif() - message(FATAL_ERROR - "No suitable version of Qt was found. Qt 6.4.2 or newer with these components is required: " - "${REQUIRED_QT_COMPONENTS};Linguist.\n" - "Set QTDIR or CMAKE_PREFIX_PATH to the Qt installation prefix, or Qt6_DIR to the directory " - "containing Qt6Config.cmake." - "${_QT_DIAGNOSTIC}" - ) + message(FATAL_ERROR "No suitable version of Qt was found") endif() set(COCKATRICE_QT_VERSION_NAME Qt6) diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index f34961b0b..4bd1bde56 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -15,7 +15,6 @@ set(cockatrice_SOURCES src/client/network/update/client/client_update_checker.cpp src/client/network/update/client/release_channel.cpp src/client/network/update/card_spoiler/spoiler_background_updater.cpp - src/client/network/update/card_spoiler/spoiler_file.cpp src/client/crash/crash_reporter.cpp src/client/latency_graph_widget.cpp src/client/latency_status_widget.cpp @@ -26,7 +25,9 @@ set(cockatrice_SOURCES src/client/settings/shortcut_treeview.cpp src/client/settings/shortcuts_settings.cpp src/interface/deck_loader/card_node_function.cpp + src/interface/deck_loader/deck_file_format.cpp src/interface/deck_loader/deck_loader.cpp + src/interface/deck_loader/loaded_deck.cpp src/interface/widgets/dialogs/dlg_connect.cpp src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp src/interface/widgets/dialogs/dlg_create_game.cpp @@ -57,7 +58,6 @@ set(cockatrice_SOURCES src/interface/widgets/dialogs/dlg_settings.cpp src/interface/widgets/dialogs/dlg_startup_card_check.cpp src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp - src/interface/widgets/dialogs/dlg_turn_order.cpp src/interface/widgets/dialogs/dlg_update.cpp src/interface/widgets/dialogs/dlg_view_log.cpp src/interface/widgets/dialogs/override_printing_warning.cpp @@ -71,27 +71,36 @@ set(cockatrice_SOURCES src/filters/filter_builder.cpp src/filters/filter_tree_model.cpp src/filters/syntax_help.cpp + src/game/abstract_game.cpp + src/game/arrow_registry.cpp src/game_graphics/board/abstract_card_drag_item.cpp src/game_graphics/board/abstract_card_item.cpp src/game_graphics/board/abstract_counter.cpp + src/game/board/arrow_data.cpp src/game_graphics/board/arrow_item.cpp - src/game_graphics/board/arrow_registry.cpp src/game_graphics/board/arrow_target.cpp src/game_graphics/board/card_drag_item.cpp src/game_graphics/board/card_item.cpp + src/game/board/card_list.cpp + src/game/board/card_state.cpp src/game_graphics/board/counter_general.cpp + src/game/board/counter_state.cpp src/game_graphics/board/translate_counter_name.cpp src/game_graphics/deckview/deck_view.cpp src/game_graphics/deckview/deck_view_container.cpp src/game_graphics/deckview/tabbed_deck_view_container.cpp - src/game_graphics/dialogs/dlg_annotation.cpp src/game_graphics/dialogs/dlg_create_token.cpp src/game_graphics/dialogs/dlg_move_top_cards_until.cpp src/game_graphics/dialogs/dlg_roll_dice.cpp + src/game/game.cpp + src/game/game_event_handler.cpp + src/game/game_meta_info.cpp src/game_graphics/game_scene.cpp + src/game/game_state.cpp src/game_graphics/game_view.cpp src/game_graphics/hand_counter.cpp src/game_graphics/log/message_log_widget.cpp + src/game/phase.cpp src/game_graphics/phases_toolbar.cpp src/game_graphics/player/menu/card_menu.cpp src/game_graphics/player/menu/custom_zone_menu.cpp @@ -109,11 +118,23 @@ set(cockatrice_SOURCES src/game_graphics/tally/stats_tally.cpp src/game_graphics/tally/subtype_tally.cpp src/game_graphics/tally/tally.cpp + src/game/player/player_actions.cpp src/game_graphics/player/player_area.cpp src/game_graphics/player/player_dialogs.cpp + src/game/player/player_event_handler.cpp src/game_graphics/player/player_graphics_item.cpp + src/game/player/player_info.cpp src/game_graphics/player/player_list_widget.cpp + src/game/player/player_logic.cpp + src/game/player/player_manager.cpp src/game_graphics/player/player_target.cpp + src/game/replay.cpp + src/game/zones/card_zone_logic.cpp + src/game/zones/hand_zone_logic.cpp + src/game/zones/pile_zone_logic.cpp + src/game/zones/stack_zone_logic.cpp + src/game/zones/table_zone_logic.cpp + src/game/zones/view_zone_logic.cpp src/game_graphics/zones/card_zone.cpp src/game_graphics/zones/hand_zone.cpp src/game_graphics/zones/pile_zone.cpp @@ -151,13 +172,11 @@ set(cockatrice_SOURCES src/interface/widgets/utility/reversed_completer_model.cpp src/interface/pixel_map_generator.cpp src/interface/theme_config.cpp - src/interface/theme_icon.cpp src/interface/theme_manager.cpp src/interface/palette_editor/color_button.cpp src/interface/palette_editor/palette_generator.cpp src/interface/palette_editor/quick_setup_panel.cpp src/interface/palette_editor/palette_grid_widget.cpp - src/interface/palette_editor/font_grid_widget.cpp src/interface/palette_editor/palette_editor_dialog.cpp src/interface/widgets/cards/additional_info/color_identity_widget.cpp src/interface/widgets/cards/additional_info/deck_color_identity.cpp @@ -175,7 +194,6 @@ set(cockatrice_SOURCES src/interface/widgets/cards/card_info_picture_widget.cpp src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.cpp src/interface/widgets/cards/card_info_text_widget.cpp - src/interface/widgets/cards/card_picture_delegate.cpp src/interface/widgets/cards/card_size_widget.cpp src/interface/widgets/cards/deck_card_zone_display_widget.cpp src/interface/widgets/cards/deck_preview_card_picture_widget.cpp @@ -253,8 +271,6 @@ set(cockatrice_SOURCES src/interface/widgets/playmat/playmat_settings_dialog.cpp src/interface/widgets/quick_settings/settings_button_widget.cpp src/interface/widgets/quick_settings/settings_popup_widget.cpp - src/interface/widgets/replay/replay_event_index.cpp - src/interface/widgets/replay/replay_event_sidebar.cpp src/interface/widgets/replay/replay_manager.cpp src/interface/widgets/replay/replay_quick_settings_widget.cpp src/interface/widgets/replay/replay_timeline_widget.cpp @@ -297,7 +313,6 @@ set(cockatrice_SOURCES src/interface/widgets/utility/sequence_edit.cpp src/interface/widgets/utility/visibility_change_listener.cpp src/interface/widgets/utility/visibility_change_listener.h - src/interface/widgets/visual_database_display/card_database_visual_view.cpp src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp @@ -455,8 +470,6 @@ set(cockatrice_SOURCES src/interface/intents/intent_open_shared_deck.h src/interface/intents/url_parser.cpp src/interface/intents/url_parser.h - src/interface/widgets/server/user/user_games_model.cpp - src/interface/widgets/server/user/user_games_model.h src/interface/widgets/server/user/user_info_popup.cpp src/interface/widgets/server/user/user_info_popup.h ) @@ -500,15 +513,7 @@ if(APPLE) set(cockatrice_SOURCES ${cockatrice_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns) endif(APPLE) -# The fonts and card artwork produce a large C++ byte array with qt_add_resources. -# Embed the data in the compiled resource object instead, keeping compiler memory -# independent of that payload. Qt's two-pass resource build is unsupported on iOS. -if(IOS) - qt_add_resources(cockatrice_RESOURCES_RCC ${cockatrice_RESOURCES}) -else() - qt_add_big_resources(cockatrice_RESOURCES_RCC ${cockatrice_RESOURCES}) -endif() -set_source_files_properties(${cockatrice_RESOURCES} PROPERTIES SKIP_AUTORCC ON) +qt6_add_resources(cockatrice_RESOURCES_RCC ${cockatrice_RESOURCES}) # Declare path variables set(ICONDIR @@ -529,12 +534,11 @@ set(COCKATRICE_MAC_QM_INSTALL_DIR "cockatrice.app/Contents/Resources/translation set(COCKATRICE_UNIX_QM_INSTALL_DIR "share/cockatrice/translations") set(COCKATRICE_WIN32_QM_INSTALL_DIR "translations") -qt_add_executable( +qt6_add_executable( cockatrice WIN32 MACOSX_BUNDLE ${cockatrice_SOURCES} - ${cockatrice_RESOURCES} ${cockatrice_RESOURCES_RCC} ${cockatrice_MOC_SRCS} MANUAL_FINALIZATION @@ -542,7 +546,7 @@ qt_add_executable( target_precompile_headers(cockatrice PRIVATE "${CMAKE_SOURCE_DIR}/cmake/pch/qtwidgets_pch.h") -qt_add_shaders( +qt6_add_shaders( cockatrice "onboarding_shaders" PREFIX @@ -554,7 +558,7 @@ qt_add_shaders( src/interface/widgets/onboarding/shaders/brand_plate.frag ) -qt_add_resources( +qt6_add_resources( cockatrice "onboarding_qml" PREFIX @@ -570,7 +574,6 @@ target_link_libraries( PUBLIC libcockatrice_card libcockatrice_deck_list libcockatrice_filters - libcockatrice_game libcockatrice_utility libcockatrice_network libcockatrice_models @@ -581,14 +584,6 @@ target_link_libraries( cockatrice_target_enable_crash_reporting(cockatrice) -if(WITH_GUI_TEST) - # These two translate between XML test files and the QtTesting event pipeline; - # they need the QtTesting headers, so they only exist with the harness. - target_sources(cockatrice PRIVATE src/game_graphics/pq_cockatrice_event_player.cpp src/interface/recording.cpp) - target_link_libraries(cockatrice PRIVATE QtTesting) - target_compile_definitions(cockatrice PRIVATE WITH_GUI_TEST) -endif() - if(UNIX) if(APPLE) set(MACOSX_BUNDLE_INFO_STRING "${PROJECT_NAME}") @@ -795,7 +790,7 @@ endif() if(Qt6LinguistTools_FOUND) #Qt6 Translations happen after the executable is built up if(UPDATE_TRANSLATIONS) - qt_add_translations( + qt6_add_translations( cockatrice TS_FILES ${cockatrice_TS} @@ -805,7 +800,7 @@ if(Qt6LinguistTools_FOUND) cockatrice_QM ) else() - qt_add_translations(cockatrice TS_FILES ${cockatrice_TS} QM_FILES_OUTPUT_VARIABLE cockatrice_QM) + qt6_add_translations(cockatrice TS_FILES ${cockatrice_TS} QM_FILES_OUTPUT_VARIABLE cockatrice_QM) endif() if(UNIX) @@ -831,4 +826,4 @@ if(Qt6LinguistTools_FOUND) endforeach() endif() -qt_finalize_target(cockatrice) +qt6_finalize_target(cockatrice) diff --git a/cockatrice/cockatrice.qrc b/cockatrice/cockatrice.qrc index 229cdd125..4ec3d2385 100644 --- a/cockatrice/cockatrice.qrc +++ b/cockatrice/cockatrice.qrc @@ -6,18 +6,19 @@ resources/hand.svg resources/hr.jpg - resources/icons/arrow_down.svg + resources/icons/arrow_bottom_green.svg + resources/icons/arrow_down_green.svg resources/icons/arrow_history.svg - resources/icons/arrow_left.svg + resources/icons/arrow_left_green.svg resources/icons/arrow_redo.svg - resources/icons/arrow_right.svg - resources/icons/arrow_right_sideboard.svg - resources/icons/arrow_to_bottom.svg - resources/icons/arrow_to_top.svg - resources/icons/arrow_up.svg + resources/icons/arrow_right_blue.svg + resources/icons/arrow_right_green.svg + resources/icons/arrow_top_green.svg + resources/icons/arrow_up_green.svg resources/icons/arrow_undo.svg resources/icons/circle_half_stroke.svg resources/icons/clearsearch.svg + resources/icons/cogwheel.svg resources/icons/conceded.svg resources/icons/decrement.svg resources/icons/delete.svg @@ -27,6 +28,7 @@ resources/icons/filter.svg resources/icons/floppy_disk.svg resources/icons/forgot_password.svg + resources/icons/gear.svg resources/icons/increment.svg resources/icons/info.svg resources/icons/lock.svg @@ -39,6 +41,7 @@ resources/icons/reload.svg resources/icons/remove_row.svg resources/icons/rename.svg + resources/icons/scale_balanced.svg resources/icons/scales.svg resources/icons/scroll.svg resources/icons/search.svg @@ -49,6 +52,7 @@ resources/icons/swap.svg resources/icons/sync.svg resources/icons/tab_changed.svg + resources/icons/update.png resources/icons/view.svg resources/icons/mana/B.svg diff --git a/cockatrice/resources/config/qtlogging.ini b/cockatrice/resources/config/qtlogging.ini index e4b845af9..7ac0d9ca4 100644 --- a/cockatrice/resources/config/qtlogging.ini +++ b/cockatrice/resources/config/qtlogging.ini @@ -10,7 +10,6 @@ # or set = false to disable logging #main = true -#recording = true #qt_translator = true #window_main.* = true #release_channel = true diff --git a/cockatrice/resources/icons/arrow_bottom_green.svg b/cockatrice/resources/icons/arrow_bottom_green.svg new file mode 100644 index 000000000..3a45053ad --- /dev/null +++ b/cockatrice/resources/icons/arrow_bottom_green.svg @@ -0,0 +1,793 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/cockatrice/resources/icons/arrow_down.svg b/cockatrice/resources/icons/arrow_down.svg deleted file mode 100644 index 0ff237f52..000000000 --- a/cockatrice/resources/icons/arrow_down.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/cockatrice/resources/icons/arrow_down_green.svg b/cockatrice/resources/icons/arrow_down_green.svg new file mode 100644 index 000000000..574c12060 --- /dev/null +++ b/cockatrice/resources/icons/arrow_down_green.svg @@ -0,0 +1,793 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/cockatrice/resources/icons/arrow_history.svg b/cockatrice/resources/icons/arrow_history.svg index 29374d23a..d130758e6 100644 --- a/cockatrice/resources/icons/arrow_history.svg +++ b/cockatrice/resources/icons/arrow_history.svg @@ -1,5 +1,8 @@ - - - - - + + + + history + + + + \ No newline at end of file diff --git a/cockatrice/resources/icons/arrow_left.svg b/cockatrice/resources/icons/arrow_left.svg deleted file mode 100644 index 7a88deddb..000000000 --- a/cockatrice/resources/icons/arrow_left.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/cockatrice/resources/icons/arrow_left_green.svg b/cockatrice/resources/icons/arrow_left_green.svg new file mode 100644 index 000000000..1b9eb0684 --- /dev/null +++ b/cockatrice/resources/icons/arrow_left_green.svg @@ -0,0 +1,791 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/cockatrice/resources/icons/arrow_redo.svg b/cockatrice/resources/icons/arrow_redo.svg index 141260269..dd89e3314 100644 --- a/cockatrice/resources/icons/arrow_redo.svg +++ b/cockatrice/resources/icons/arrow_redo.svg @@ -1,4 +1,40 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cockatrice/resources/icons/arrow_right.svg b/cockatrice/resources/icons/arrow_right.svg deleted file mode 100644 index f0ac5d5bf..000000000 --- a/cockatrice/resources/icons/arrow_right.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/cockatrice/resources/icons/arrow_right_blue.svg b/cockatrice/resources/icons/arrow_right_blue.svg new file mode 100644 index 000000000..334cd68fd --- /dev/null +++ b/cockatrice/resources/icons/arrow_right_blue.svg @@ -0,0 +1,789 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/cockatrice/resources/icons/arrow_right_green.svg b/cockatrice/resources/icons/arrow_right_green.svg new file mode 100644 index 000000000..db491985d --- /dev/null +++ b/cockatrice/resources/icons/arrow_right_green.svg @@ -0,0 +1,789 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/cockatrice/resources/icons/arrow_right_sideboard.svg b/cockatrice/resources/icons/arrow_right_sideboard.svg deleted file mode 100644 index 79a8cd5d3..000000000 --- a/cockatrice/resources/icons/arrow_right_sideboard.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/cockatrice/resources/icons/arrow_to_bottom.svg b/cockatrice/resources/icons/arrow_to_bottom.svg deleted file mode 100644 index 291a527d2..000000000 --- a/cockatrice/resources/icons/arrow_to_bottom.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/cockatrice/resources/icons/arrow_to_top.svg b/cockatrice/resources/icons/arrow_to_top.svg deleted file mode 100644 index aac38cc33..000000000 --- a/cockatrice/resources/icons/arrow_to_top.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/cockatrice/resources/icons/arrow_top_green.svg b/cockatrice/resources/icons/arrow_top_green.svg new file mode 100644 index 000000000..c515c6a1d --- /dev/null +++ b/cockatrice/resources/icons/arrow_top_green.svg @@ -0,0 +1,793 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/cockatrice/resources/icons/arrow_undo.svg b/cockatrice/resources/icons/arrow_undo.svg index c748b37b8..2e182ffb2 100644 --- a/cockatrice/resources/icons/arrow_undo.svg +++ b/cockatrice/resources/icons/arrow_undo.svg @@ -1,4 +1,40 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cockatrice/resources/icons/arrow_up.svg b/cockatrice/resources/icons/arrow_up.svg deleted file mode 100644 index ac32b5c92..000000000 --- a/cockatrice/resources/icons/arrow_up.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/cockatrice/resources/icons/arrow_up_green.svg b/cockatrice/resources/icons/arrow_up_green.svg new file mode 100644 index 000000000..1d0f61112 --- /dev/null +++ b/cockatrice/resources/icons/arrow_up_green.svg @@ -0,0 +1,792 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/cockatrice/resources/icons/circle_half_stroke.svg b/cockatrice/resources/icons/circle_half_stroke.svg index c16f84858..42e4dbca2 100644 --- a/cockatrice/resources/icons/circle_half_stroke.svg +++ b/cockatrice/resources/icons/circle_half_stroke.svg @@ -1,4 +1 @@ - - - - + \ No newline at end of file diff --git a/cockatrice/resources/icons/clearsearch.svg b/cockatrice/resources/icons/clearsearch.svg index 49d883c68..be50d68d6 100644 --- a/cockatrice/resources/icons/clearsearch.svg +++ b/cockatrice/resources/icons/clearsearch.svg @@ -1,4 +1,276 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/cockatrice/resources/icons/cogwheel.svg b/cockatrice/resources/icons/cogwheel.svg new file mode 100644 index 000000000..8c7aad617 --- /dev/null +++ b/cockatrice/resources/icons/cogwheel.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cockatrice/resources/icons/conceded.svg b/cockatrice/resources/icons/conceded.svg index b9faf047c..a487f18bb 100644 --- a/cockatrice/resources/icons/conceded.svg +++ b/cockatrice/resources/icons/conceded.svg @@ -1,4 +1,103 @@ - - - + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/cockatrice/resources/icons/decrement.svg b/cockatrice/resources/icons/decrement.svg index 033245f85..0ceddf69f 100644 --- a/cockatrice/resources/icons/decrement.svg +++ b/cockatrice/resources/icons/decrement.svg @@ -1,3 +1,205 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + diff --git a/cockatrice/resources/icons/delete.svg b/cockatrice/resources/icons/delete.svg index d79312f1e..008d8d429 100644 --- a/cockatrice/resources/icons/delete.svg +++ b/cockatrice/resources/icons/delete.svg @@ -1,5 +1,357 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/cockatrice/resources/icons/dragon.svg b/cockatrice/resources/icons/dragon.svg index cc48d1f5c..f45af39ef 100644 --- a/cockatrice/resources/icons/dragon.svg +++ b/cockatrice/resources/icons/dragon.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/cockatrice/resources/icons/dropdown_collapsed.svg b/cockatrice/resources/icons/dropdown_collapsed.svg index 429c24974..52e833e65 100644 --- a/cockatrice/resources/icons/dropdown_collapsed.svg +++ b/cockatrice/resources/icons/dropdown_collapsed.svg @@ -1,3 +1,10 @@ - - + + + + + ]> + + diff --git a/cockatrice/resources/icons/dropdown_expanded.svg b/cockatrice/resources/icons/dropdown_expanded.svg index 0b24aeb48..fa3ee205c 100644 --- a/cockatrice/resources/icons/dropdown_expanded.svg +++ b/cockatrice/resources/icons/dropdown_expanded.svg @@ -1,3 +1,10 @@ - - + + + + + ]> + + diff --git a/cockatrice/resources/icons/filter.svg b/cockatrice/resources/icons/filter.svg index d9cdf879c..d53d9ba29 100644 --- a/cockatrice/resources/icons/filter.svg +++ b/cockatrice/resources/icons/filter.svg @@ -1,3 +1,12 @@ - - - + + + + + + + + \ No newline at end of file diff --git a/cockatrice/resources/icons/floppy_disk.svg b/cockatrice/resources/icons/floppy_disk.svg index 10b9e8172..3c5b5054d 100644 --- a/cockatrice/resources/icons/floppy_disk.svg +++ b/cockatrice/resources/icons/floppy_disk.svg @@ -1,5 +1 @@ - - - - - + \ No newline at end of file diff --git a/cockatrice/resources/icons/forgot_password.svg b/cockatrice/resources/icons/forgot_password.svg index 3bfb3bdb1..f938ca3f4 100644 --- a/cockatrice/resources/icons/forgot_password.svg +++ b/cockatrice/resources/icons/forgot_password.svg @@ -1,6 +1,6 @@ - - - - - + + + + + diff --git a/cockatrice/resources/icons/gear.svg b/cockatrice/resources/icons/gear.svg new file mode 100644 index 000000000..fdee3a297 --- /dev/null +++ b/cockatrice/resources/icons/gear.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cockatrice/resources/icons/increment.svg b/cockatrice/resources/icons/increment.svg index 52dbdb2aa..6d5f7a85a 100644 --- a/cockatrice/resources/icons/increment.svg +++ b/cockatrice/resources/icons/increment.svg @@ -1,4 +1,199 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + diff --git a/cockatrice/resources/icons/info.svg b/cockatrice/resources/icons/info.svg index 1305f6b3d..00b23cc2c 100644 --- a/cockatrice/resources/icons/info.svg +++ b/cockatrice/resources/icons/info.svg @@ -1,5 +1,43 @@ - - - - + + + + + + + + + + diff --git a/cockatrice/resources/icons/lock.svg b/cockatrice/resources/icons/lock.svg index f150ece49..b7ebf1a53 100644 --- a/cockatrice/resources/icons/lock.svg +++ b/cockatrice/resources/icons/lock.svg @@ -1,4 +1,750 @@ - - - + + + + + + + + + padlock + + + + icon + + lock + security + secure + padlock + signs_and_symbols + + + + + AJ Ashton + + + + + AJ Ashton + + + + + AJ Ashton + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cockatrice/resources/icons/not_ready_start.svg b/cockatrice/resources/icons/not_ready_start.svg index c20a5cfe6..73afda9db 100644 --- a/cockatrice/resources/icons/not_ready_start.svg +++ b/cockatrice/resources/icons/not_ready_start.svg @@ -1,4 +1,368 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/cockatrice/resources/icons/pen_to_square.svg b/cockatrice/resources/icons/pen_to_square.svg index 7d3e161ac..60ff1d9c4 100644 --- a/cockatrice/resources/icons/pen_to_square.svg +++ b/cockatrice/resources/icons/pen_to_square.svg @@ -1,4 +1 @@ - - - - + \ No newline at end of file diff --git a/cockatrice/resources/icons/pencil.svg b/cockatrice/resources/icons/pencil.svg index d274e98db..c8b81f698 100644 --- a/cockatrice/resources/icons/pencil.svg +++ b/cockatrice/resources/icons/pencil.svg @@ -1,4 +1,123 @@ - - - + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/cockatrice/resources/icons/pin.svg b/cockatrice/resources/icons/pin.svg index 9c173286b..71d4c9c9c 100644 --- a/cockatrice/resources/icons/pin.svg +++ b/cockatrice/resources/icons/pin.svg @@ -1,4 +1,24 @@ - - - + + + + + + diff --git a/cockatrice/resources/icons/player.svg b/cockatrice/resources/icons/player.svg index 9fbe39a11..e83b24654 100644 --- a/cockatrice/resources/icons/player.svg +++ b/cockatrice/resources/icons/player.svg @@ -1,8 +1,142 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/cockatrice/resources/icons/ready_start.svg b/cockatrice/resources/icons/ready_start.svg index 4c4ea5d2d..238d2aa46 100644 --- a/cockatrice/resources/icons/ready_start.svg +++ b/cockatrice/resources/icons/ready_start.svg @@ -1,3 +1,81 @@ - - + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/cockatrice/resources/icons/reload.svg b/cockatrice/resources/icons/reload.svg index e09b1b7ef..102995876 100644 --- a/cockatrice/resources/icons/reload.svg +++ b/cockatrice/resources/icons/reload.svg @@ -1,4 +1,7 @@ - - - - + + + + Svg Vector Icons : http://www.onlinewebfonts.com/icon + + \ No newline at end of file diff --git a/cockatrice/resources/icons/remove_row.svg b/cockatrice/resources/icons/remove_row.svg index 5d00ed57c..6f133cdb6 100644 --- a/cockatrice/resources/icons/remove_row.svg +++ b/cockatrice/resources/icons/remove_row.svg @@ -1,4 +1,356 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + diff --git a/cockatrice/resources/icons/rename.svg b/cockatrice/resources/icons/rename.svg index bab850808..c68a00246 100644 --- a/cockatrice/resources/icons/rename.svg +++ b/cockatrice/resources/icons/rename.svg @@ -1,7 +1,10 @@ - - - - - - + + + + + + + diff --git a/cockatrice/resources/icons/scale_balanced.svg b/cockatrice/resources/icons/scale_balanced.svg new file mode 100644 index 000000000..fae468d38 --- /dev/null +++ b/cockatrice/resources/icons/scale_balanced.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cockatrice/resources/icons/scales.svg b/cockatrice/resources/icons/scales.svg index 4b2e16fcc..a410921dd 100644 --- a/cockatrice/resources/icons/scales.svg +++ b/cockatrice/resources/icons/scales.svg @@ -1,7 +1,6 @@ - - - - - - + + + + + diff --git a/cockatrice/resources/icons/scroll.svg b/cockatrice/resources/icons/scroll.svg index edcf29d11..f4828e679 100644 --- a/cockatrice/resources/icons/scroll.svg +++ b/cockatrice/resources/icons/scroll.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/cockatrice/resources/icons/search.svg b/cockatrice/resources/icons/search.svg index be4a87f00..05439a12e 100644 --- a/cockatrice/resources/icons/search.svg +++ b/cockatrice/resources/icons/search.svg @@ -1,4 +1,198 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + \ No newline at end of file diff --git a/cockatrice/resources/icons/settings.svg b/cockatrice/resources/icons/settings.svg index 3942a0916..77a2ccfa9 100644 --- a/cockatrice/resources/icons/settings.svg +++ b/cockatrice/resources/icons/settings.svg @@ -1,4 +1,280 @@ - - - + + + + + + + + Ruota dentata grigia + + + + unsorted + + + + + Open Clip Art Library + + + + + Architetto Francesco Rollandin + + + + + Architetto Francesco Rollandin + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cockatrice/resources/icons/share.svg b/cockatrice/resources/icons/share.svg index 9d6ff21a0..a84f55847 100644 --- a/cockatrice/resources/icons/share.svg +++ b/cockatrice/resources/icons/share.svg @@ -1,7 +1,25 @@ - - - - - - + + + + + + + + + diff --git a/cockatrice/resources/icons/sort_arrow_down.svg b/cockatrice/resources/icons/sort_arrow_down.svg index e10b401f2..adf10f9f0 100644 --- a/cockatrice/resources/icons/sort_arrow_down.svg +++ b/cockatrice/resources/icons/sort_arrow_down.svg @@ -1,7 +1 @@ - - - - - - - + \ No newline at end of file diff --git a/cockatrice/resources/icons/spectator.svg b/cockatrice/resources/icons/spectator.svg index 19242f058..c580c448d 100644 --- a/cockatrice/resources/icons/spectator.svg +++ b/cockatrice/resources/icons/spectator.svg @@ -1,4 +1,106 @@ - - - + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/cockatrice/resources/icons/swap.svg b/cockatrice/resources/icons/swap.svg index 4eddb8c08..a18ca2f06 100644 --- a/cockatrice/resources/icons/swap.svg +++ b/cockatrice/resources/icons/swap.svg @@ -1,6 +1,12 @@ - - - - - - + + + + + + + + \ No newline at end of file diff --git a/cockatrice/resources/icons/sync.svg b/cockatrice/resources/icons/sync.svg index fa00b3024..e287b1993 100644 --- a/cockatrice/resources/icons/sync.svg +++ b/cockatrice/resources/icons/sync.svg @@ -1,6 +1,6 @@ - - - - - + + + + + diff --git a/cockatrice/resources/icons/tab_changed.svg b/cockatrice/resources/icons/tab_changed.svg index 1d9b8d09c..ae09ef8fd 100644 --- a/cockatrice/resources/icons/tab_changed.svg +++ b/cockatrice/resources/icons/tab_changed.svg @@ -1,4 +1,116 @@ - - - + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/cockatrice/resources/icons/update.png b/cockatrice/resources/icons/update.png new file mode 100644 index 000000000..825c0aee7 Binary files /dev/null and b/cockatrice/resources/icons/update.png differ diff --git a/cockatrice/resources/icons/view.svg b/cockatrice/resources/icons/view.svg index 19242f058..e5676d825 100644 --- a/cockatrice/resources/icons/view.svg +++ b/cockatrice/resources/icons/view.svg @@ -1,4 +1,29 @@ - - - - + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + \ No newline at end of file diff --git a/cockatrice/src/client/network/connection_controller/remote_connection_controller.cpp b/cockatrice/src/client/network/connection_controller/remote_connection_controller.cpp index c702f91f1..020e53877 100644 --- a/cockatrice/src/client/network/connection_controller/remote_connection_controller.cpp +++ b/cockatrice/src/client/network/connection_controller/remote_connection_controller.cpp @@ -3,7 +3,6 @@ #include "../../../interface/pixel_map_generator.h" #include "../../settings/cache_settings.h" #include "../interface/widgets/dialogs/dlg_connect.h" -#include "../interface/widgets/dialogs/dlg_edit_password.h" #include "../interface/widgets/dialogs/dlg_forgot_password_challenge.h" #include "../interface/widgets/dialogs/dlg_forgot_password_request.h" #include "../interface/widgets/dialogs/dlg_forgot_password_reset.h" @@ -100,10 +99,6 @@ void ConnectionController::wireClientSignals() connect(remoteClient, &RemoteClient::sigPasswordVerifierReady, this, &ConnectionController::onPasswordVerifierReady); - - connect(remoteClient, &RemoteClient::sigPasswordChangeSuccess, this, - &ConnectionController::onPasswordChangeSuccess); - connect(remoteClient, &RemoteClient::sigPasswordChangeError, this, &ConnectionController::onPasswordChangeError); } void ConnectionController::connectToServer() @@ -356,16 +351,10 @@ void ConnectionController::onLoginError(int r, } case Response::RespPasswordChangeRequired: { - // The credentials were right, but the account may not be used until a new password - // is chosen. Let the user complete the change here: sending them off to "ask the - // administrator for your temporary password" sends them in circles, since they just - // logged in with it and the session ends without a way to comply. - DlgEditPassword dlg(dialogParent); - dlg.setWindowTitle(tr("Password Change Required")); - if (dlg.exec()) { - remoteClient->changePasswordToServer(dlg.getOldPassword(), dlg.getNewPassword()); - return; // onPasswordChangeSuccess/onPasswordChangeError decides the next step - } + QMessageBox::information( + dialogParent, tr("Password Change Required"), + tr("An administrator has reset your password. Please contact your server administrator to obtain " + "your temporary password, then log in and change it via Account -> Change Password.")); remoteClient->disconnectFromServer(); return; } @@ -528,43 +517,6 @@ void ConnectionController::onNotifyUserAboutUpdate() "To update your client, go to Help -> Check for Updates.")); } -void ConnectionController::onPasswordChangeSuccess() -{ - // The credential saved for this profile is stale now: drop it so the next login asks for - // the new password instead of replaying the old verifier. - if (!pendingSaveName.isEmpty()) { - SettingsCache::instance().servers().setServerPassword(pendingSaveName, ""); - } - - QMessageBox::information(dialogParent, tr("Password Changed"), - tr("Your password has been changed. Please log in again with your new password.")); - remoteClient->disconnectFromServer(); - connectToServer(); -} - -void ConnectionController::onPasswordChangeError(int responseCode) -{ - QString reason; - switch (static_cast(responseCode)) { - case Response::RespWrongPassword: - reason = tr("The current password is incorrect."); - break; - case Response::RespPasswordTooShort: - reason = tr("The new password is too short."); - break; - case Response::RespClientUpdateRequired: - reason = tr("The server does not accept the new password format."); - break; - default: - reason = tr("The password could not be changed (error %1).").arg(responseCode); - break; - } - - QMessageBox::critical(dialogParent, tr("Password Change Failed"), reason); - remoteClient->disconnectFromServer(); - connectToServer(); -} - void ConnectionController::onForgotPasswordSuccess() { QMessageBox::information( diff --git a/cockatrice/src/client/network/connection_controller/remote_connection_controller.h b/cockatrice/src/client/network/connection_controller/remote_connection_controller.h index 2987a8d99..c8f96a9a9 100644 --- a/cockatrice/src/client/network/connection_controller/remote_connection_controller.h +++ b/cockatrice/src/client/network/connection_controller/remote_connection_controller.h @@ -94,10 +94,6 @@ private slots: // Persists the derived scrypt verifier after a successful challenge-response login void onPasswordVerifierReady(const QString &verifier); - // Completes the forced password change the server demanded at login - void onPasswordChangeSuccess(); - void onPasswordChangeError(int responseCode); - private: void wireClientSignals(); void updateWindowTitle(); diff --git a/cockatrice/src/client/network/interfaces/deck_analysis_url.h b/cockatrice/src/client/network/interfaces/deck_analysis_url.h deleted file mode 100644 index 425056270..000000000 --- a/cockatrice/src/client/network/interfaces/deck_analysis_url.h +++ /dev/null @@ -1,42 +0,0 @@ -/** - * @file deck_analysis_url.h - * @ingroup ApiInterfaces - */ - -#ifndef DECK_ANALYSIS_URL_H -#define DECK_ANALYSIS_URL_H - -#include -#include - -/** - * Validates a deck address returned by a deck analysis service. - * - * Only the expected host (optionally "www."-prefixed), HTTPS, default ports and - * URLs without user information are accepted. Legacy HTTP addresses for the same - * service are upgraded to HTTPS in place instead of being rejected. - * - * Relative addresses must be resolved against the response URL by the caller. - * - * @return true when @p url names a deck on @p serviceHost; false otherwise. - */ -inline bool normalizeAnalysisUrl(QUrl &url, const QString &serviceHost) -{ - const QString host = url.host().toLower(); - const bool legacyHttp = url.scheme() == QStringLiteral("http"); - const int defaultPort = legacyHttp ? 80 : 443; - if (!url.isValid() || (!legacyHttp && url.scheme() != QStringLiteral("https")) || !url.userInfo().isEmpty() || - !url.path().startsWith('/') || (url.port() != -1 && url.port() != defaultPort) || - (host != serviceHost && host != QStringLiteral("www.") + serviceHost)) { - return false; - } - // Both services accept HTTPS. Older public metadata may still identify the - // same deck with HTTP; retain its host/path/query while using HTTPS to open it. - if (legacyHttp) { - url.setScheme(QStringLiteral("https")); - url.setPort(-1); - } - return true; -} - -#endif diff --git a/cockatrice/src/client/network/interfaces/deck_stats_interface.cpp b/cockatrice/src/client/network/interfaces/deck_stats_interface.cpp index 22be120c4..508f0bdc9 100644 --- a/cockatrice/src/client/network/interfaces/deck_stats_interface.cpp +++ b/cockatrice/src/client/network/interfaces/deck_stats_interface.cpp @@ -1,6 +1,5 @@ #include "deck_stats_interface.h" -#include "deck_analysis_url.h" #include "libcockatrice/card/card_info.h" #include "libcockatrice/card/database/card_database_querier.h" #include "libcockatrice/deck_list/tree/inner_deck_list_node.h" @@ -11,14 +10,12 @@ #include #include #include -#include #include #include #include #include -#include #include -#include +#include #include #include #include @@ -32,56 +29,30 @@ DeckStatsInterface::DeckStatsInterface(QObject *parent) : QObject(parent) connect(manager, &QNetworkAccessManager::finished, this, &DeckStatsInterface::queryFinished); } -void DeckStatsInterface::showError(const QString &message) -{ - // The notice belongs to the originating editor, not this one-shot request. - // Retire the request before opening UI: opening a window may reenter Qt. - QWidget *owner = qobject_cast(parent()); - auto *notice = new QMessageBox(QMessageBox::Critical, tr("Deck analysis"), message, QMessageBox::Ok, owner); - notice->setTextFormat(Qt::PlainText); - notice->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard); - notice->setAttribute(Qt::WA_DeleteOnClose); - deleteLater(); - notice->open(); -} - void DeckStatsInterface::queryFinished(QNetworkReply *reply) { - if (replyHandled) { - return; - } - replyHandled = true; - // All terminal paths release the reply before showing UI or invoking an - // external URL handler, either of which may destroy the originating editor. - reply->deleteLater(); if (reply->error() != QNetworkReply::NoError) { - showError(reply->errorString()); + QMessageBox::critical(nullptr, tr("Error"), reply->errorString()); + reply->deleteLater(); + deleteLater(); return; } - const QString data = QString::fromUtf8(reply->readAll()); - static const QRegularExpression rx( - R"(]*\bproperty\s*=\s*(['"])og:url\1)[^>]*\bcontent\s*=\s*(['"])(.*?)\2)", - QRegularExpression::CaseInsensitiveOption | QRegularExpression::DotMatchesEverythingOption); - const auto match = rx.match(data); + QString data(reply->readAll()); + reply->deleteLater(); + + static const QRegularExpression rx("url().resolved(QUrl(address, QUrl::StrictMode)); - if (address.trimmed().isEmpty() || !normalizeAnalysisUrl(deckUrl, QStringLiteral("deckstats.net"))) { - showError(tr("The reply from Deckstats contained an invalid deck address.")); - return; - } + QString deckUrl = match.captured(1); + QDesktopServices::openUrl(deckUrl); - QPointer guard(this); deleteLater(); - if (!QDesktopServices::openUrl(deckUrl) && guard) { - showError(tr("Could not open your browser. Open this address to see the analyzed deck:\n%1") - .arg(deckUrl.toDisplayString())); - } } void DeckStatsInterface::getAnalyzeRequestData(const DeckList &deck, QByteArray &data) @@ -89,8 +60,12 @@ void DeckStatsInterface::getAnalyzeRequestData(const DeckList &deck, QByteArray DeckList deckWithoutTokens; copyDeckWithoutTokens(deck, deckWithoutTokens); - data.append("deck=" + QUrl::toPercentEncoding(deckWithoutTokens.writeToString_Plain())); - data.append("&decktitle=" + QUrl::toPercentEncoding(deck.getName())); + QUrl params; + QUrlQuery urlQuery; + urlQuery.addQueryItem("deck", deckWithoutTokens.writeToString_Plain()); + urlQuery.addQueryItem("decktitle", deck.getName()); + params.setQuery(urlQuery); + data.append(params.query(QUrl::EncodeReserved).toUtf8()); } void DeckStatsInterface::analyzeDeck(const DeckList &deck) @@ -109,9 +84,7 @@ void DeckStatsInterface::copyDeckWithoutTokens(const DeckList &source, DeckList { auto copyIfNotAToken = [&destination](const auto node, const auto card) { CardInfoPtr dbCard = CardDatabaseManager::query()->getCardInfo(card->getName()); - // Missing local card data is not evidence that a card is a token. Keep - // its original name and quantity so the service analyzes the whole deck. - if ((!dbCard || !dbCard->getIsToken()) && node->getName() != DECK_ZONE_MAYBEBOARD) { + if (dbCard && !dbCard->getIsToken() && node->getName() != DECK_ZONE_MAYBEBOARD) { DecklistCardNode *addedCard = destination.addCard(card->getName(), node->getName(), -1); addedCard->setNumber(card->getNumber()); } diff --git a/cockatrice/src/client/network/interfaces/deck_stats_interface.h b/cockatrice/src/client/network/interfaces/deck_stats_interface.h index b70646403..e7791075c 100644 --- a/cockatrice/src/client/network/interfaces/deck_stats_interface.h +++ b/cockatrice/src/client/network/interfaces/deck_stats_interface.h @@ -11,7 +11,6 @@ #include class QByteArray; -class QString; class QNetworkAccessManager; class QNetworkReply; class DeckList; @@ -21,8 +20,6 @@ class DeckStatsInterface : public QObject Q_OBJECT private: QNetworkAccessManager *manager; - bool replyHandled = false; - void showError(const QString &message); /** * Deckstats doesn't recognize token cards, and instead tries to find the diff --git a/cockatrice/src/client/network/interfaces/tapped_out_interface.cpp b/cockatrice/src/client/network/interfaces/tapped_out_interface.cpp index a57877b6a..34dd03765 100644 --- a/cockatrice/src/client/network/interfaces/tapped_out_interface.cpp +++ b/cockatrice/src/client/network/interfaces/tapped_out_interface.cpp @@ -1,6 +1,5 @@ #include "tapped_out_interface.h" -#include "deck_analysis_url.h" #include "libcockatrice/card/card_info.h" #include "libcockatrice/card/database/card_database_querier.h" #include "libcockatrice/deck_list/tree/inner_deck_list_node.h" @@ -14,17 +13,15 @@ #include #include #include -#include #include #include #include #include #include #include -#include #include +#include #include -#include #include #include #include @@ -38,67 +35,54 @@ TappedOutInterface::TappedOutInterface(QObject *parent) : QObject(parent) connect(manager, &QNetworkAccessManager::finished, this, &TappedOutInterface::queryFinished); } -void TappedOutInterface::showError(const QString &message) -{ - // The notice belongs to the originating editor, not this one-shot request. - // Retire the request before opening UI: opening a window may reenter Qt. - QWidget *owner = qobject_cast(parent()); - auto *notice = new QMessageBox(QMessageBox::Critical, tr("Deck analysis"), message, QMessageBox::Ok, owner); - notice->setTextFormat(Qt::PlainText); - notice->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard); - notice->setAttribute(Qt::WA_DeleteOnClose); - deleteLater(); - notice->open(); -} - void TappedOutInterface::queryFinished(QNetworkReply *reply) { - if (replyHandled) { - return; - } - replyHandled = true; - // All terminal paths release the reply before showing UI or invoking an - // external URL handler, either of which may destroy the originating editor. - reply->deleteLater(); if (reply->error() != QNetworkReply::NoError) { - showError(reply->errorString()); - return; - } - - const int httpStatus = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); - if (httpStatus >= 200 && httpStatus < 400 && reply->hasRawHeader("Location")) { - const QByteArray location = reply->rawHeader("Location"); - QUrl deckUrl = reply->url().resolved(QUrl::fromEncoded(location, QUrl::StrictMode)); - if (location.trimmed().isEmpty() || !normalizeAnalysisUrl(deckUrl, QStringLiteral("tappedout.net"))) { - showError(tr("The reply from TappedOut contained an invalid deck address.")); - return; - } - QPointer guard(this); + QMessageBox::critical(nullptr, tr("Error"), reply->errorString()); + reply->deleteLater(); deleteLater(); - if (!QDesktopServices::openUrl(deckUrl) && guard) { - showError(tr("Could not open your browser. Open this address to see the analyzed deck:\n%1") - .arg(deckUrl.toDisplayString())); - } return; } - const QString data = QString::fromUtf8(reply->readAll()); - QStringList errorMessageList = {tr("Unable to analyze the deck on TappedOut.")}; - static const QRegularExpression errorsRx("
(.*?)", - QRegularExpression::DotMatchesEverythingOption); - const auto match = errorsRx.match(data); - if (match.hasMatch()) { - static const QRegularExpression itemRx("
  • (.*?)
    • ", QRegularExpression::DotMatchesEverythingOption); - auto items = itemRx.globalMatch(match.captured(1)); - while (items.hasNext()) { - const QString error = QTextDocumentFragment::fromHtml(items.next().captured(1)).toPlainText().simplified(); - if (!error.isEmpty()) { - errorMessageList.append(error); + int httpStatus = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); + if (reply->hasRawHeader("Location")) { + /* + * If the reply contains a "Location" header, a relative URL to the deck on TappedOut + * can be extracted from the header. The http status is a 302 "redirect". + */ + QString deckUrl = reply->rawHeader("Location"); + qCInfo(TappedOutInterfaceLog) << "Tappedout: good reply, http status" << httpStatus << "location" << deckUrl; + QDesktopServices::openUrl("https://tappedout.net" + deckUrl); + } else { + /* + * Otherwise, the deck has not been parsed correctly. Error messages can be extracted + * from the html. Css pseudo selector for errors: $("div.alert-danger > ul > li") + */ + QString data(reply->readAll()); + QStringList errorMessageList = {tr("Unable to analyze the deck.")}; + + static const QRegularExpression rx("
    (.*?)"); + auto match = rx.match(data); + if (match.hasMatch()) { + QString errors = match.captured(1); + static const QRegularExpression rx2("
  • (.*?)
    • "); + static const QRegularExpression rxremove("<[^>]*>"); + auto matchIterator = rx2.globalMatch(errors); + while (matchIterator.hasNext()) { + auto match2 = matchIterator.next(); + errorMessageList.append(match2.captured(1).remove(rxremove).simplified()); } } + + QString errorMessage = errorMessageList.join("\n"); + qCWarning(TappedOutInterfaceLog) << "Tappedout: bad reply, http status" << httpStatus << "size" << data.size() + << "message" << errorMessage; + + QMessageBox::critical(nullptr, tr("Error"), errorMessage); } - qCWarning(TappedOutInterfaceLog) << "TappedOut analysis failed, HTTP status" << httpStatus; - showError(errorMessageList.join('\n')); + + reply->deleteLater(); + deleteLater(); } void TappedOutInterface::getAnalyzeRequestData(const DeckList &deck, QByteArray &data) @@ -106,9 +90,13 @@ void TappedOutInterface::getAnalyzeRequestData(const DeckList &deck, QByteArray DeckList mainboard, sideboard; copyDeckSplitMainAndSide(deck, mainboard, sideboard); - data.append("name=" + QUrl::toPercentEncoding(deck.getName())); - data.append("&mainboard=" + QUrl::toPercentEncoding(mainboard.writeToString_Plain(false, true))); - data.append("&sideboard=" + QUrl::toPercentEncoding(sideboard.writeToString_Plain(false, true))); + QUrl params; + QUrlQuery urlQuery; + urlQuery.addQueryItem("name", deck.getName()); + urlQuery.addQueryItem("mainboard", mainboard.writeToString_Plain(false, true)); + urlQuery.addQueryItem("sideboard", sideboard.writeToString_Plain(false, true)); + params.setQuery(urlQuery); + data.append(params.query(QUrl::EncodeReserved).toUtf8()); } void TappedOutInterface::analyzeDeck(const DeckList &deck) @@ -129,9 +117,7 @@ void TappedOutInterface::copyDeckSplitMainAndSide(const DeckList &source, DeckLi { auto copyMainOrSide = [&mainboard, &sideboard](const auto node, const auto card) { CardInfoPtr dbCard = CardDatabaseManager::query()->getCardInfo(card->getName()); - // Exclude confirmed tokens, but preserve cards missing from the local - // database, including newly released cards in an imported deck. - if ((dbCard && dbCard->getIsToken()) || node->getName() == DECK_ZONE_MAYBEBOARD) { + if (!dbCard || dbCard->getIsToken() || node->getName() == DECK_ZONE_MAYBEBOARD) { return; } diff --git a/cockatrice/src/client/network/interfaces/tapped_out_interface.h b/cockatrice/src/client/network/interfaces/tapped_out_interface.h index 27e8c2273..615991b07 100644 --- a/cockatrice/src/client/network/interfaces/tapped_out_interface.h +++ b/cockatrice/src/client/network/interfaces/tapped_out_interface.h @@ -14,7 +14,6 @@ inline Q_LOGGING_CATEGORY(TappedOutInterfaceLog, "tapped_out_interface"); class QByteArray; -class QString; class QNetworkAccessManager; class QNetworkReply; class DeckList; @@ -30,8 +29,6 @@ class TappedOutInterface : public QObject Q_OBJECT private: QNetworkAccessManager *manager; - bool replyHandled = false; - void showError(const QString &message); void copyDeckSplitMainAndSide(const DeckList &source, DeckList &mainboard, DeckList &sideboard); private slots: diff --git a/cockatrice/src/client/network/parsers/deck_link_to_api_transformer.cpp b/cockatrice/src/client/network/parsers/deck_link_to_api_transformer.cpp index 2b307735d..7127b0a29 100644 --- a/cockatrice/src/client/network/parsers/deck_link_to_api_transformer.cpp +++ b/cockatrice/src/client/network/parsers/deck_link_to_api_transformer.cpp @@ -15,18 +15,14 @@ static const QString ARCHIDEKT_SUFFIX = "/?format=json"; static const QString MOXFIELD_BASE = "https://api.moxfield.com/v2/decks/all/"; static const QString MOXFIELD_SUFFIX = "/"; -static const QString DECKSTATS_BASE = "https://deckstats.net/decks/"; static const QString DECKSTATS_SUFFIX = "?include_comments=1&export_mtgarena=1"; -static const QString MANABOX_BASE = "https://cloud.manabox.app/decks/"; - bool parseDeckUrl(const QString &url, ParsedDeckInfo &outInfo) { static QRegularExpression rxTappedOut("tappedout\\.net/(?:mtg-decks/)?([^/?#]+)"); static QRegularExpression rxArchidekt("archidekt\\.com/decks/(\\d+)"); static QRegularExpression rxMoxfield("moxfield\\.com/decks/([a-zA-Z0-9_-]+)"); static QRegularExpression rxDeckstats("deckstats\\.net/decks/(\\d+/[a-zA-Z0-9_-]+)"); - static QRegularExpression rxManabox("manabox\\.app/decks/([a-zA-Z0-9_-]+)"); QRegularExpressionMatch match; @@ -53,18 +49,11 @@ bool parseDeckUrl(const QString &url, ParsedDeckInfo &outInfo) return true; } else if ((match = rxDeckstats.match(url)).hasMatch()) { QString deckPath = match.captured(1); - outInfo = ParsedDeckInfo{.baseUrl = DECKSTATS_BASE, + outInfo = ParsedDeckInfo{.baseUrl = "https://deckstats.net/decks/", .deckID = deckPath, - .fullUrl = DECKSTATS_BASE + deckPath + DECKSTATS_SUFFIX, + .fullUrl = "https://deckstats.net/decks/" + deckPath + DECKSTATS_SUFFIX, .provider = DeckProvider::Deckstats}; return true; - } else if ((match = rxManabox.match(url)).hasMatch()) { - QString deckPath = match.captured(1); - outInfo = ParsedDeckInfo{.baseUrl = MANABOX_BASE, - .deckID = deckPath, - .fullUrl = MANABOX_BASE + deckPath, - .provider = DeckProvider::Manabox}; - return true; } return false; diff --git a/cockatrice/src/client/network/parsers/deck_link_to_api_transformer.h b/cockatrice/src/client/network/parsers/deck_link_to_api_transformer.h index d3bff976f..bbdd70c97 100644 --- a/cockatrice/src/client/network/parsers/deck_link_to_api_transformer.h +++ b/cockatrice/src/client/network/parsers/deck_link_to_api_transformer.h @@ -15,7 +15,6 @@ enum class DeckProvider Archidekt, Moxfield, Deckstats, - Manabox, Unknown }; diff --git a/cockatrice/src/client/network/parsers/interface_json_deck_parser.h b/cockatrice/src/client/network/parsers/interface_json_deck_parser.h index 7e15d472f..87fde4d54 100644 --- a/cockatrice/src/client/network/parsers/interface_json_deck_parser.h +++ b/cockatrice/src/client/network/parsers/interface_json_deck_parser.h @@ -8,19 +8,12 @@ #define INTERFACE_JSON_DECK_PARSER_H #include "../../../interface/deck_loader/card_node_function.h" -#include "libcockatrice/deck_list/tree/inner_deck_list_node.h" #include #include -#include -#include -#include -#include #include #include -inline Q_LOGGING_CATEGORY(InterfaceJsonDeckParserLog, "interface_json_deck_parser"); - class IJsonDeckParser { public: @@ -39,6 +32,9 @@ public: QString deckName = obj.value("name").toString(); QString deckDescription = obj.value("description").toString(); + deckList.setName(deckName); + deckList.setComments(deckDescription); + QString outputText; QTextStream outStream(&outputText); @@ -54,14 +50,8 @@ public: outStream << quantity << ' ' << cardName << " (" << setName << ") " << collectorNumber << '\n'; } - outStream.flush(); - outStream.seek(0); deckList.loadFromStream_Plain(outStream, false, CardNameNormalizer()); - deckList.setName(deckName); - deckList.setComments(deckDescription); deckList.forEachCard(CardNodeFunction::ResolveProviderId()); - deckList.setName(deckName); - deckList.setComments(deckDescription); return deckList; } @@ -77,6 +67,9 @@ public: QString deckName = obj.value("name").toString(); QString deckDescription = obj.value("description").toString(); + deckList.setName(deckName); + deckList.setComments(deckDescription); + QString outputText; QTextStream outStream(&outputText); @@ -104,14 +97,8 @@ public: outStream << quantity << ' ' << cardName << " (" << setName << ") " << collectorNumber << '\n'; } - outStream.flush(); - outStream.seek(0); deckList.loadFromStream_Plain(outStream, false, CardNameNormalizer()); - deckList.setName(deckName); - deckList.setComments(deckDescription); deckList.forEachCard(CardNodeFunction::ResolveProviderId()); - deckList.setName(deckName); - deckList.setComments(deckDescription); QJsonObject commandersObj = obj.value("commanders").toObject(); if (!commandersObj.isEmpty()) { @@ -127,113 +114,6 @@ public: } } - // Moxfield stores Oathbreaker signature spells in their own board, - // separate from both mainboard and commanders. They are playable deck - // cards, but must not replace the Oathbreaker as the banner card. - const QJsonObject signatureSpells = obj.value("signatureSpells").toObject(); - for (auto it = signatureSpells.begin(); it != signatureSpells.end(); ++it) { - const QJsonObject entry = it.value().toObject(); - const QJsonObject card = entry.value("card").toObject(); - const QString name = card.value("name").toString(); - const int quantity = entry.value("quantity").toInt(); - if (name.isEmpty() || quantity <= 0) { - continue; - } - const QString set = card.value("set").toString().toUpper(); - const QString collectorNumber = card.value("cn").toString(); - const QString providerId = card.value("scryfall_id").toString(); - deckList.addCards(name, quantity, DECK_ZONE_MAIN, -1, set, collectorNumber, providerId); - } - - return deckList; - } -}; - -class ManaboxJsonParser : public IJsonDeckParser -{ - enum BoardType : quint32 - { - MainBoard = 0, - SideBoard = 1, - Commander = 2, - MaybeBoard = 3, - }; - -public: - DeckList parse(const QJsonObject &obj) override - { - DeckList deckList; - - QString deckName = obj.value("name").toString(); - - QString outputText; - QString mainboardText; - QString sideboardText; - QTextStream mainboardStream(&mainboardText); - QTextStream sideboardStream(&sideboardText); - QTextStream outStream(&outputText); - - auto commanderList = QList(); - auto maybeboardList = QList(); - for (auto entry : obj.value("cards").toArray()) { - auto card = entry.toObject(); - - auto collectorNumber = card.value("collectorNumber").toString(); - auto cardName = card.value("name").toString(); - auto boardType = static_cast(card.value("boardCategory").toInt()); - auto setName = card.value("setId").toString(); - auto quantity = card.value("quantity").toInt(); - auto providerId = card.value("scryfallId").toString(); - - switch (boardType) { - case MainBoard: - mainboardStream << quantity << ' ' << cardName << " (" << setName << ") " << collectorNumber - << '\n'; - break; - case SideBoard: - sideboardStream << "SB: " << quantity << ' ' << cardName << " (" << setName << ") " - << collectorNumber << '\n'; - break; - case MaybeBoard: - maybeboardList.append(card); - break; - case Commander: - commanderList.append(card); - break; - default: - qCWarning(InterfaceJsonDeckParserLog) - << "Unknown ManaBox Zone" << card.value("boardCategory").toInt() << "for" << cardName; - break; - } - } - - outStream << mainboardText << sideboardText; - - deckList.loadFromStream_Plain(outStream, false, CardNameNormalizer()); - deckList.setName(deckName); - deckList.forEachCard(CardNodeFunction::ResolveProviderId()); - - for (const auto &maybeboardCard : maybeboardList) { - QString cardName = maybeboardCard.value("name").toString(); - QString setName = maybeboardCard.value("setId").toString().toUpper(); - QString collectorNumber = maybeboardCard.value("collectorNumber").toString(); - QString providerId = maybeboardCard.value("scryfallId").toString(); - - for (int x = 0; x < maybeboardCard.value("quantity").toInt(); x++) { - deckList.addCard(cardName, DECK_ZONE_MAYBEBOARD, -1, setName, collectorNumber, providerId); - } - } - for (const auto &commanderCard : commanderList) { - - QString commanderName = commanderCard.value("name").toString(); - QString setName = commanderCard.value("setId").toString().toUpper(); - QString collectorNumber = commanderCard.value("collectorNumber").toString(); - QString providerId = commanderCard.value("scryfallId").toString(); - - deckList.setBannerCard({commanderName, providerId}); - deckList.addCard(commanderName, DECK_ZONE_MAIN, -1, setName, collectorNumber, providerId); - } - return deckList; } }; diff --git a/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp b/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp index d74414d4a..62668c4d9 100644 --- a/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp +++ b/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp @@ -2,305 +2,253 @@ #include "../../../../main.h" #include "../../../settings/cache_settings.h" -#include "spoiler_file.h" -#include +#include +#include +#include #include +#include #include #include #include +#include +#include +#include +#include #include #include #include +#include #include -#include +#include #include #include -#include +#include +#include #include #include #include #include #include +#include +#include #include -namespace -{ -const QUrl SPOILERS_STATUS_URL( - QStringLiteral("https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/SpoilerSeasonEnabled")); -const QUrl SPOILERS_URL(QStringLiteral("https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/spoiler.xml")); -// Request coordination stays on the GUI thread; reload workers never access it. -QPointer currentUpdater; -QPointer> activeReload; -quint64 newestOperation = 0; +#define SPOILERS_STATUS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/SpoilerSeasonEnabled" +#define SPOILERS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/spoiler.xml" -bool removeSpoilerFile(const QString &path) +SpoilerBackgroundUpdater::SpoilerBackgroundUpdater(QObject *apParent) : QObject(apParent), cardUpdateProcess(nullptr) { - QFile file(path); - if (!file.exists()) { - return false; - } - if (!file.remove()) { - qCWarning(SpoilerBackgroundUpdaterLog) << "Could not remove spoiler database" << path << file.errorString(); - return false; - } - return true; -} -} // namespace - -SpoilerBackgroundUpdater::SpoilerBackgroundUpdater(QObject *parent, bool forceReload) - : QObject(parent), enabledAtStart(SettingsCache::instance().downloads().getDownloadSpoilersStatus()), - forceReload(forceReload), targetPath(SettingsCache::instance().paths().getSpoilerCardDatabasePath()), - operationId(++newestOperation), manager(NetworkManagerFactory::create(this)), notificationIcon(trayIcon) -{ - connect(&SettingsCache::instance().downloads(), &DownloadSettings::downloadSpoilerStatusChanged, this, - &SpoilerBackgroundUpdater::cancelIfSettingsChanged); - connect(&SettingsCache::instance().paths(), &PathsSettings::cardDatabasePathChanged, this, - &SpoilerBackgroundUpdater::cancelIfSettingsChanged); - // Even a disabled/no-op operation completes after its caller can connect signals. - QTimer::singleShot(0, this, &SpoilerBackgroundUpdater::begin); -} - -void SpoilerBackgroundUpdater::begin() -{ - if (completed) { - return; - } - if (cancelled || operationId != newestOperation || - (reloadOnly ? SettingsCache::instance().downloads().getDownloadSpoilersStatus() - : (!enabledAtStart || !SettingsCache::instance().downloads().getDownloadSpoilersStatus())) || - targetPath != SettingsCache::instance().paths().getSpoilerCardDatabasePath()) { - finish(); - return; - } - const auto previous = currentUpdater; - if (activeReload) { - // The existing database API stores its final load status after its parser - // mutex is released. Do not overlap updater-owned calls to that API. - connect(activeReload, &QFutureWatcher::finished, this, &SpoilerBackgroundUpdater::begin, - static_cast(Qt::QueuedConnection | Qt::SingleShotConnection)); - if (previous && previous != this) { - previous->cancel(); - } - return; - } - currentUpdater = this; - QPointer guard(this); - if (previous && previous != this) { - previous->cancel(); - } - if (!guard) { - return; - } - if (!isCurrent()) { - finish(); - } else if (reloadOnly) { - if (QFileInfo::exists(targetPath) && !removeSpoilerFile(targetPath)) { - finish(tr("The spoiler database could not be removed. Check its file permissions and use Reload Card " - "Database to retry.")); - return; - } - reloadDatabase(false); + isSpoilerDownloadEnabled = SettingsCache::instance().downloads().getDownloadSpoilersStatus(); + if (isSpoilerDownloadEnabled) { + // Start the process of checking if we're in spoiler season + // File exists means we're in spoiler season + startSpoilerDownloadProcess(SPOILERS_STATUS_URL, false); } else { - downloadFromURL(SPOILERS_STATUS_URL, false); + qCInfo(SpoilerBackgroundUpdaterLog) << "Spoilers Disabled"; } } -bool SpoilerBackgroundUpdater::isCurrent() const +void SpoilerBackgroundUpdater::startSpoilerDownloadProcess(QString url, bool saveResults) { - return !completed && !cancelled && currentUpdater == this && operationId == newestOperation && - (reloadOnly != SettingsCache::instance().downloads().getDownloadSpoilersStatus()) && - targetPath == SettingsCache::instance().paths().getSpoilerCardDatabasePath(); + auto spoilerURL = QUrl(url); + downloadFromURL(spoilerURL, saveResults); } -void SpoilerBackgroundUpdater::cancelIfSettingsChanged() +void SpoilerBackgroundUpdater::downloadFromURL(QUrl url, bool saveResults) { - if (reloadOnly == SettingsCache::instance().downloads().getDownloadSpoilersStatus() || - targetPath != SettingsCache::instance().paths().getSpoilerCardDatabasePath()) { - cancel(); - } -} - -void SpoilerBackgroundUpdater::cancel() -{ - if (completed) { - return; - } - cancelled = true; - const auto reply = activeReply; - activeReply.clear(); - QPointer guard(this); - if (reply) { - reply->abort(); - if (reply) { - reply->deleteLater(); - } - } - // A running reload owns no updater state. Allow its completion to retire its - // watcher before a heap-owned updater is released by the caller. - if (guard && !reloading) { - finish(); - } -} - -void SpoilerBackgroundUpdater::downloadFromURL(const QUrl &url, bool saveResults) -{ - QNetworkRequest request(url); + auto *nam = NetworkManagerFactory::create(this); + auto request = QNetworkRequest(url); request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING)); - request.setTransferTimeout(60000); - activeReply = manager->get(request); - if (saveResults) { - connect(activeReply, &QNetworkReply::finished, this, - &SpoilerBackgroundUpdater::actDownloadFinishedSpoilersFile); - } else { - connect(activeReply, &QNetworkReply::finished, this, &SpoilerBackgroundUpdater::actCheckIfSpoilerSeasonEnabled); - } -} + QNetworkReply *reply = nam->get(request); -void SpoilerBackgroundUpdater::actCheckIfSpoilerSeasonEnabled() -{ - auto *reply = qobject_cast(sender()); - if (!reply || reply != activeReply) { - return; - } - activeReply.clear(); - reply->deleteLater(); - if (!isCurrent()) { - finish(); - return; - } - if (reply->error() == QNetworkReply::NoError) { - downloadFromURL(SPOILERS_URL, true); - } else if (reply->error() == QNetworkReply::ContentNotFoundError) { - const bool existed = QFileInfo::exists(targetPath); - seasonEnded = existed; - if (existed && !removeSpoilerFile(targetPath)) { - finish(tr("The spoiler season has ended, but the old spoiler database could not be removed.")); - return; - } - if (existed || forceReload) { - reloadDatabase(false); - } else { - finish(); - } + if (saveResults) { + // This will write out to the file (used for spoiler.xml) + connect(reply, &QNetworkReply::finished, this, &SpoilerBackgroundUpdater::actDownloadFinishedSpoilersFile); } else { - finish(tr("Could not check spoiler availability: %1").arg(reply->errorString())); + // This will check the status (used to see if we're in spoiler season or not) + connect(reply, &QNetworkReply::finished, this, &SpoilerBackgroundUpdater::actCheckIfSpoilerSeasonEnabled); } } void SpoilerBackgroundUpdater::actDownloadFinishedSpoilersFile() { - auto *reply = qobject_cast(sender()); - if (!reply || reply != activeReply) { - return; - } - activeReply.clear(); - reply->deleteLater(); - if (!isCurrent()) { - finish(); - return; - } - if (reply->error() != QNetworkReply::NoError) { - finish(tr("Could not download spoilers: %1").arg(reply->errorString())); - return; - } - spoilerData = reply->readAll(); - QString error; - const auto result = SpoilerFile::save(targetPath, spoilerData, [this] { return isCurrent(); }, error); - if (result == SpoilerFile::SaveResult::Failed) { - finish(isCurrent() ? error : QString()); - } else if (result == SpoilerFile::SaveResult::Written || forceReload) { - reloadDatabase(result == SpoilerFile::SaveResult::Written); + // Check for server reply + auto *reply = dynamic_cast(sender()); + QNetworkReply::NetworkError errorCode = reply->error(); + + if (errorCode == QNetworkReply::NoError) { + spoilerData = reply->readAll(); + + // Save the spoiler.xml file to the disk + saveDownloadedFile(spoilerData); + + reply->deleteLater(); + emit spoilerCheckerDone(); } else { - finish(); - } -} - -void SpoilerBackgroundUpdater::reloadDatabase(bool updated) -{ - reloading = true; - auto *database = CardDatabaseManager::getInstance(); - // The job outlives an individual request, so destroying that request cannot - // let a newer updater overlap the worker that is still completing. - auto *watcher = new QFutureWatcher(QCoreApplication::instance()); - activeReload = watcher; - connect(watcher, &QFutureWatcher::finished, watcher, [watcher] { - if (activeReload == watcher) { - activeReload.clear(); - } - watcher->deleteLater(); - }); - connect(watcher, &QFutureWatcher::finished, this, [this, watcher, database, updated] { - bool loaded = false; - try { - loaded = watcher->result() && database->getLoadStatus() == Ok; - } catch (const std::exception &error) { - qCWarning(SpoilerBackgroundUpdaterLog) << "Spoiler database reload failed:" << error.what(); - } - reloading = false; - if (!isCurrent()) { - finish(); - } else if (!loaded) { - finish(reloadOnly - ? tr("Could not reload card data after disabling spoilers. Use Reload Card Database to retry.") - : tr("Could not reload card data after updating spoilers. Use Update Spoilers to retry the " - "reload.")); - } else { - finish({}, updated); - } - }); - watcher->setFuture(QtConcurrent::run([database] { - database->reloadCardDatabasesAndNotify(); - return true; - })); -} - -void SpoilerBackgroundUpdater::finish(const QString &error, bool updated) -{ - if (completed) { - return; - } - completed = true; - spoilerData = QByteArray(); - if (currentUpdater == this) { - currentUpdater.clear(); - } - QPointer guard(this); - if (!error.isEmpty() && !cancelled) { - qCWarning(SpoilerBackgroundUpdaterLog) << error; - if (notificationIcon) { - notificationIcon->showMessage(tr("Spoiler update failed"), error); - } - if (!guard) { - return; - } - emit spoilerUpdateFailed(error); - } else if (updated && !cancelled) { - if (notificationIcon) { - notificationIcon->showMessage(tr("Spoilers have been updated!"), - tr("The card database now includes the downloaded spoilers.")); - } - } else if (seasonEnded && !cancelled && notificationIcon) { - notificationIcon->showMessage(tr("Spoiler season has ended"), - tr("The spoiler database was removed. Please run Oracle to get released cards.")); - } - if (guard) { + qCWarning(SpoilerBackgroundUpdaterLog) << "Error downloading spoilers file" << errorCode; emit spoilerCheckerDone(); } } -SpoilerBackgroundUpdater *SpoilerBackgroundUpdater::current() +bool SpoilerBackgroundUpdater::deleteSpoilerFile() { - return currentUpdater; + QString fileName = SettingsCache::instance().paths().getSpoilerCardDatabasePath(); + QFileInfo fi(fileName); + QDir fileDir(fi.path()); + QFile file(fileName); + + // Delete the spoiler.xml file + if (file.exists() && file.remove()) { + qCInfo(SpoilerBackgroundUpdaterLog) << "Deleting spoiler.xml"; + return true; + } + + qCInfo(SpoilerBackgroundUpdaterLog) << "Error: Spoiler.xml not found or not deleted"; + return false; } -SpoilerBackgroundUpdater *SpoilerBackgroundUpdater::deleteSpoilerFile() +void SpoilerBackgroundUpdater::actCheckIfSpoilerSeasonEnabled() { - // Deletion and the following reload share the operation lifetime. Callers can - // observe either failure before the queued operation starts, and an explicit - // retry still reloads when the file has already been removed. - auto *updater = new SpoilerBackgroundUpdater(QCoreApplication::instance(), true); - updater->reloadOnly = true; - connect(updater, &SpoilerBackgroundUpdater::spoilerCheckerDone, updater, &QObject::deleteLater); - return updater; + auto *response = dynamic_cast(sender()); + QNetworkReply::NetworkError errorCode = response->error(); + + if (errorCode == QNetworkReply::ContentNotFoundError) { + // Spoiler season is offline at this point, so the spoiler.xml file can be safely deleted + // The user should run Oracle to get the latest card information + if (deleteSpoilerFile() && trayIcon) { + trayIcon->showMessage(tr("Spoilers season has ended"), tr("Deleting spoiler.xml. Please run Oracle")); + } + + qCInfo(SpoilerBackgroundUpdaterLog) << "Spoiler Season Offline"; + emit spoilerCheckerDone(); + } else if (errorCode == QNetworkReply::NoError) { + qCInfo(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")); + } + + qCWarning(SpoilerBackgroundUpdaterLog) << "Spoiler download failed due to no internet connection"; + emit spoilerCheckerDone(); + } else { + if (trayIcon) { + trayIcon->showMessage(tr("Spoilers download failed"), tr("Error") + " " + (short)errorCode); + } + + qCWarning(SpoilerBackgroundUpdaterLog) << "Spoiler download failed with reason" << errorCode; + emit spoilerCheckerDone(); + } +} + +bool SpoilerBackgroundUpdater::saveDownloadedFile(QByteArray data) +{ + QString fileName = SettingsCache::instance().paths().getSpoilerCardDatabasePath(); + QFileInfo fi(fileName); + QDir fileDir(fi.path()); + + if (!fileDir.exists() && !fileDir.mkpath(fileDir.absolutePath())) { + return false; + } + + // Check if the data matches. If it does, then spoilers are up to date. + if (getHash(fileName) == getHash(data)) { + if (trayIcon) { + trayIcon->showMessage(tr("Spoilers already up to date"), tr("No new spoilers added")); + } + + qCInfo(SpoilerBackgroundUpdaterLog) << "Spoilers Up to Date"; + return false; + } + + QFile file(fileName); + if (!file.open(QIODevice::WriteOnly)) { + qCWarning(SpoilerBackgroundUpdaterLog) << "Spoiler Service Error: File open (w) failed for" << fileName; + file.close(); + return false; + } + + if (file.write(data) == -1) { + qCWarning(SpoilerBackgroundUpdaterLog) << "Spoiler Service Error: File write (w) failed for" << fileName; + file.close(); + return false; + } + + file.close(); + + // Data written, so reload the card database + qCInfo(SpoilerBackgroundUpdaterLog) << "Spoiler Service Data Written"; + // Spoilers can introduce sets the config has never seen; the loader never + // runs checkUnknownSets() itself, so run it once the finished snapshot has + // been swapped in. + auto *watcher = new QFutureWatcher(this); + connect(watcher, &QFutureWatcher::finished, this, [watcher] { + watcher->deleteLater(); + CardDatabaseManager::getInstance()->checkUnknownSets(); + }); + watcher->setFuture(QtConcurrent::run([] { CardDatabaseManager::getInstance()->loadCardDatabases(); })); + + // If the user has notifications enabled, let them know + // when the database was last updated + if (trayIcon) { + QList lines = data.split('\n'); + + 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"); + + trayIcon->showMessage(tr("Spoilers have been updated!"), tr("Last change:") + " " + localTime); + emit spoilersUpdatedSuccessfully(); + return true; + } + } + } + + return true; +} + +QByteArray SpoilerBackgroundUpdater::getHash(const QString fileName) +{ + QFile file(fileName); + + if (file.open(QFile::ReadOnly)) { + // Only read the first 512 bytes (enough to get the "created" tag) + const QByteArray bytes = file.read(512); + + QCryptographicHash hash(QCryptographicHash::Algorithm::Md5); + hash.addData(bytes); + + qCInfo(SpoilerBackgroundUpdaterLog) << "File Hash =" << hash.result(); + + file.close(); + return hash.result(); + } else { + qCWarning(SpoilerBackgroundUpdaterLog) << "getHash ReadOnly failed!"; + file.close(); + return QByteArray(); + } +} + +QByteArray SpoilerBackgroundUpdater::getHash(QByteArray data) +{ + // Only read the first 512 bytes (enough to get the "created" tag) + const QByteArray bytes = data.left(512); + + QCryptographicHash hash(QCryptographicHash::Algorithm::Md5); + hash.addData(bytes); + + qCInfo(SpoilerBackgroundUpdaterLog) << "Data Hash =" << hash.result(); + + return hash.result(); } diff --git a/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.h b/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.h index fd90eb688..a6c4ed00f 100644 --- a/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.h +++ b/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.h @@ -2,6 +2,7 @@ * @file spoiler_background_updater.h * @ingroup Client */ +//! \todo Document this file. #ifndef COCKATRICE_SPOILER_DOWNLOADER_H #define COCKATRICE_SPOILER_DOWNLOADER_H @@ -9,13 +10,10 @@ #include #include #include -#include #include #include -class QNetworkAccessManager; -class QNetworkReply; -class QSystemTrayIcon; +class QProcess; class QUrl; inline Q_LOGGING_CATEGORY(SpoilerBackgroundUpdaterLog, "spoiler_background_updater"); @@ -24,48 +22,30 @@ class SpoilerBackgroundUpdater : public QObject { Q_OBJECT public: - explicit SpoilerBackgroundUpdater(QObject *parent = nullptr, bool forceReload = false); + explicit SpoilerBackgroundUpdater(QObject *apParent = nullptr); inline QString getCardUpdaterBinaryName() { return "oracle"; } - // Queues removal and reload; the application owns the returned updater and - // deletes it on completion. Callers can connect its failure/completion signals. - static SpoilerBackgroundUpdater *deleteSpoilerFile(); - // The operation currently running, if any. The updater outlives the page that - // started it, so a reopened page uses this to observe the in-flight update. - static SpoilerBackgroundUpdater *current(); + QByteArray getHash(const QString fileName); + QByteArray getHash(QByteArray data); + static bool deleteSpoilerFile(); private slots: - void begin(); void actDownloadFinishedSpoilersFile(); void actCheckIfSpoilerSeasonEnabled(); - void cancelIfSettingsChanged(); private: - const bool enabledAtStart; - const bool forceReload; - const QString targetPath; - const quint64 operationId; - QNetworkAccessManager *manager; - QPointer activeReply; - QPointer notificationIcon; + bool isSpoilerDownloadEnabled; + QProcess *cardUpdateProcess; QByteArray spoilerData; - bool completed = false; - bool cancelled = false; - bool reloading = false; - bool seasonEnded = false; - bool reloadOnly = false; - - bool isCurrent() const; - void cancel(); - void finish(const QString &error = {}, bool updated = false); - void downloadFromURL(const QUrl &url, bool saveResults); - void reloadDatabase(bool updated); + void startSpoilerDownloadProcess(QString url, bool saveResults); + void downloadFromURL(QUrl url, bool saveResults); + bool saveDownloadedFile(QByteArray data); signals: + void spoilersUpdatedSuccessfully(); void spoilerCheckerDone(); - void spoilerUpdateFailed(const QString &message); }; -#endif // COCKATRICE_SPOILER_DOWNLOADER_H +#endif // COCKATRICE_SPOILER_DOWNLOADER_H \ No newline at end of file diff --git a/cockatrice/src/client/network/update/card_spoiler/spoiler_file.cpp b/cockatrice/src/client/network/update/card_spoiler/spoiler_file.cpp deleted file mode 100644 index 554ea1108..000000000 --- a/cockatrice/src/client/network/update/card_spoiler/spoiler_file.cpp +++ /dev/null @@ -1,109 +0,0 @@ -#include "spoiler_file.h" - -#include -#include -#include -#include -#include -#include -#include - -namespace -{ -QByteArray hashFile(const QString &path) -{ - QFile file(path); - if (!file.open(QIODevice::ReadOnly)) { - return {}; - } - QCryptographicHash hash(QCryptographicHash::Sha256); - return hash.addData(&file) ? hash.result() : QByteArray(); -} -} // namespace - -namespace SpoilerFile -{ -QString validate(const QByteArray &data) -{ - QXmlStreamReader xml(data); - if (!xml.readNextStartElement() || xml.name() != QStringLiteral("cockatrice_carddatabase")) { - return QCoreApplication::translate( - "SpoilerBackgroundUpdater", - "The download is not a Cockatrice card database. The previous spoiler file was preserved."); - } - bool versionOk = false; - const int version = xml.attributes().value(QStringLiteral("version")).toInt(&versionOk); - if (!versionOk || (version != 3 && version != 4)) { - return QCoreApplication::translate( - "SpoilerBackgroundUpdater", - "The spoiler database uses an unsupported format. The previous spoiler file was preserved."); - } - bool hasCards = false; - int depth = 1; - while (!xml.atEnd()) { - const auto token = xml.readNext(); - if (token == QXmlStreamReader::StartElement) { - ++depth; - if (depth == 2 && xml.name() == QStringLiteral("cards")) { - hasCards = true; - } - } else if (token == QXmlStreamReader::EndElement) { - --depth; - } - } - if (xml.hasError() || !hasCards) { - return QCoreApplication::translate( - "SpoilerBackgroundUpdater", - "The spoiler database is incomplete or invalid. The previous spoiler file was preserved."); - } - return {}; -} - -SaveResult -save(const QString &targetPath, const QByteArray &data, const std::function &isCurrent, QString &error) -{ - error = validate(data); - if (!error.isEmpty()) { - return SaveResult::Failed; - } - if (!isCurrent()) { - error = QCoreApplication::translate("SpoilerBackgroundUpdater", - "The spoiler update was cancelled because its settings changed."); - return SaveResult::Failed; - } - if (hashFile(targetPath) == QCryptographicHash::hash(data, QCryptographicHash::Sha256)) { - return SaveResult::Unchanged; - } - const QDir directory = QFileInfo(targetPath).dir(); - if (!directory.exists() && !directory.mkpath(QStringLiteral("."))) { - error = QCoreApplication::translate("SpoilerBackgroundUpdater", - "Could not create the spoiler database directory: %1") - .arg(directory.absolutePath()); - return SaveResult::Failed; - } - QSaveFile file(targetPath); - file.setDirectWriteFallback(false); - if (!file.open(QIODevice::WriteOnly) || file.write(data) != data.size() || !file.flush()) { - error = QCoreApplication::translate( - "SpoilerBackgroundUpdater", - "Could not save the spoiler database to %1: %2. The previous file was preserved.") - .arg(targetPath, file.errorString()); - return SaveResult::Failed; - } - if (!isCurrent()) { - file.cancelWriting(); - error = QCoreApplication::translate("SpoilerBackgroundUpdater", - "The spoiler update was cancelled because its settings changed."); - return SaveResult::Failed; - } - if (!file.commit()) { - error = QCoreApplication::translate( - "SpoilerBackgroundUpdater", - "Could not replace the spoiler database at %1: %2. The previous file was preserved.") - .arg(targetPath, file.errorString()); - return SaveResult::Failed; - } - return SaveResult::Written; -} - -} // namespace SpoilerFile diff --git a/cockatrice/src/client/network/update/card_spoiler/spoiler_file.h b/cockatrice/src/client/network/update/card_spoiler/spoiler_file.h deleted file mode 100644 index 3a138cdea..000000000 --- a/cockatrice/src/client/network/update/card_spoiler/spoiler_file.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef COCKATRICE_SPOILER_FILE_H -#define COCKATRICE_SPOILER_FILE_H - -#include -#include -#include - -namespace SpoilerFile -{ -enum class SaveResult -{ - Failed, - Unchanged, - Written -}; - -QString validate(const QByteArray &data); -// Validate before opening the destination, compare complete files, and replace -// atomically. Check operation ownership both before writing and before committing. -SaveResult -save(const QString &targetPath, const QByteArray &data, const std::function &isCurrent, QString &error); -} // namespace SpoilerFile - -#endif // COCKATRICE_SPOILER_FILE_H diff --git a/cockatrice/src/client/network/update/client/update_downloader.cpp b/cockatrice/src/client/network/update/client/update_downloader.cpp index 8b5ef3d6c..8868876fa 100644 --- a/cockatrice/src/client/network/update/client/update_downloader.cpp +++ b/cockatrice/src/client/network/update/client/update_downloader.cpp @@ -1,16 +1,15 @@ #include "update_downloader.h" +#include +#include #include -#include +#include #include #include #include -#include -#include #include #include #include -#include UpdateDownloader::UpdateDownloader(QObject *parent) : QObject(parent), response(nullptr) { @@ -24,116 +23,48 @@ void UpdateDownloader::beginDownload(QUrl downloadUrl) originalUrl = downloadUrl; } - if (auto *old = std::exchange(response, nullptr)) { - old->abort(); - old->deleteLater(); - } - - errorReported = false; - cancelRequested = false; - - // The transfer timeout comes from the manager (NetworkManagerFactory). response = netMan->get(QNetworkRequest(downloadUrl)); connect(response, &QNetworkReply::finished, this, &UpdateDownloader::fileFinished); - connect(response, &QNetworkReply::errorOccurred, this, &UpdateDownloader::downloadError); connect(response, &QNetworkReply::downloadProgress, this, &UpdateDownloader::downloadProgress); - connect(this, &UpdateDownloader::stopDownload, this, &UpdateDownloader::cancelDownload); + connect(this, &UpdateDownloader::stopDownload, response, &QNetworkReply::abort); } -void UpdateDownloader::downloadError(QNetworkReply::NetworkError networkError) +void UpdateDownloader::downloadError(QNetworkReply::NetworkError) { - // A reply that was superseded by beginDownload() can still deliver a - // queued error; it must not be reported against the current reply. - if (response == nullptr || sender() != response || errorReported) { + if (response == nullptr) { return; } - // A transfer timeout aborts the reply, so it arrives as OperationCanceledError. - // Only an abort the user asked for is suppressed; every other cancel is a - // stalled transfer and has to be reported. - if (networkError == QNetworkReply::OperationCanceledError) { - if (cancelRequested) { - return; - } - - errorReported = true; - emit error(tr("The download timed out. Check your connection and try again.")); - return; - } - - errorReported = true; - emit error(response->errorString()); -} - -void UpdateDownloader::cancelDownload() -{ - cancelRequested = true; - if (response != nullptr) { - response->abort(); - } + emit error(response->errorString().toUtf8()); } void UpdateDownloader::fileFinished() { - // An aborted, superseded reply also emits finished(). Only the reply - // currently stored in response may be consumed. - if (response == nullptr || sender() != response) { + // If we finished but there's a redirect, follow it + QVariant redirect = response->attribute(QNetworkRequest::RedirectionTargetAttribute); + if (!redirect.isNull()) { + beginDownload(redirect.toUrl()); return; } - // errorOccurred normally reports this first; keep the check for errors that - // only surface when the reply finishes. - if (response->error() != QNetworkReply::NoError) { - downloadError(response->error()); - response->deleteLater(); - response = nullptr; + // Handle any errors we had + if (response->error()) { + emit error(response->errorString()); return; } - // Give the update its own private directory. The name is unpredictable, so a - // local user cannot pre-create or symlink the path, and the original file - // name (including the installer suffix) is preserved inside it. - QTemporaryDir downloadDir(QDir::temp().filePath(QStringLiteral("cockatrice-update-XXXXXX"))); - if (!downloadDir.isValid()) { - emit error(tr("Could not create a temporary directory for the download.")); - response->deleteLater(); - response = nullptr; - return; - } - downloadDir.setAutoRemove(false); + // Work out the file name of the download + QString fileName = QDir::temp().path() + QDir::separator() + originalUrl.toString().section('/', -1); - const QString remoteName = QFileInfo(originalUrl.path()).fileName(); - const QString fileName = downloadDir.filePath(remoteName.isEmpty() ? QStringLiteral("update") : remoteName); - - QSaveFile file(fileName); + // Save the build in a temporary directory + QFile file(fileName); if (!file.open(QIODevice::WriteOnly)) { - downloadDir.remove(); - emit error(tr("Could not open the file for writing: %1").arg(file.errorString())); - response->deleteLater(); - response = nullptr; + emit error(tr("Could not open the file for reading.")); return; } - const QByteArray data = response->readAll(); - if (file.write(data) != data.size()) { - file.cancelWriting(); - downloadDir.remove(); - emit error(tr("Could not write the downloaded file to disk.")); - response->deleteLater(); - response = nullptr; - return; - } - - if (!file.commit()) { - downloadDir.remove(); - emit error(tr("Could not save the downloaded file: %1").arg(file.errorString())); - response->deleteLater(); - response = nullptr; - return; - } - - response->deleteLater(); - response = nullptr; + file.write(response->readAll()); + file.close(); // Emit the success signal with a URL to the download file emit downloadSuccessful(QUrl::fromLocalFile(fileName)); diff --git a/cockatrice/src/client/network/update/client/update_downloader.h b/cockatrice/src/client/network/update/client/update_downloader.h index 7704eca38..8aeefb22a 100644 --- a/cockatrice/src/client/network/update/client/update_downloader.h +++ b/cockatrice/src/client/network/update/client/update_downloader.h @@ -32,13 +32,10 @@ private: QUrl originalUrl; QNetworkAccessManager *netMan; QNetworkReply *response; - bool errorReported = false; - bool cancelRequested = false; private slots: void fileFinished(); void downloadProgress(qint64 bytesRead, qint64 totalBytes); void downloadError(QNetworkReply::NetworkError); - void cancelDownload(); }; #endif // COCKATRICE_UPDATEDOWNLOADER_H diff --git a/cockatrice/src/client/settings/cache_settings.cpp b/cockatrice/src/client/settings/cache_settings.cpp index b40e26377..08eccf1e4 100644 --- a/cockatrice/src/client/settings/cache_settings.cpp +++ b/cockatrice/src/client/settings/cache_settings.cpp @@ -6,7 +6,6 @@ #include "shortcuts_settings.h" #include -#include #include #include #include @@ -48,32 +47,7 @@ Q_GLOBAL_STATIC(SettingsCache, settingsCache) SettingsCache &SettingsCache::instance() { - SettingsCache &cache = *settingsCache; // returns a QT managed singleton reference - // The release channels own QNetworkAccessManagers, which must be destroyed - // while the application object is alive. ~SettingsCache() runs during - // static teardown, after QApplication is gone, so hook the application's - // shutdown instead. Retried here because the first access may predate the - // application object. - cache.installShutdownHook(); - return cache; -} - -void SettingsCache::installShutdownHook() -{ - if (shutdownHookInstalled) { - return; - } - QCoreApplication *application = QCoreApplication::instance(); - if (application == nullptr) { - return; - } - connect(application, &QCoreApplication::aboutToQuit, this, [this] { - for (ReleaseChannel *releaseChannel : std::as_const(releaseChannels)) { - delete releaseChannel; - } - releaseChannels.clear(); - }); - shutdownHookInstalled = true; + return *settingsCache; // returns a QT managed singleton reference } QString SettingsCache::getDataPath() diff --git a/cockatrice/src/client/settings/cache_settings.h b/cockatrice/src/client/settings/cache_settings.h index 8ccf6f76b..9aeb88a18 100644 --- a/cockatrice/src/client/settings/cache_settings.h +++ b/cockatrice/src/client/settings/cache_settings.h @@ -90,13 +90,8 @@ private: QString themeName; QList releaseChannels; - bool shutdownHookInstalled = false; bool isPortableBuild; - // Connects the aboutToQuit handler that deletes the release channels while - // the application object is still alive; a no-op before it exists. - void installShutdownHook(); - [[nodiscard]] QString getSafeConfigPath(QString configEntry, QString defaultPath) const; [[nodiscard]] QString getSafeConfigFilePath(QString configEntry, QString defaultPath) const; void loadPaths(); diff --git a/cockatrice/src/client/settings/shortcut_treeview.cpp b/cockatrice/src/client/settings/shortcut_treeview.cpp index 2501798cb..4a5bafb01 100644 --- a/cockatrice/src/client/settings/shortcut_treeview.cpp +++ b/cockatrice/src/client/settings/shortcut_treeview.cpp @@ -1,6 +1,5 @@ #include "shortcut_treeview.h" -#include "../../interface/theme_manager.h" #include "cache_settings.h" #include "shortcuts_settings.h" @@ -79,18 +78,6 @@ ShortcutTreeView::ShortcutTreeView(QWidget *parent) : QTreeView(parent) connect(&SettingsCache::instance().shortcuts(), &ShortcutsSettings::shortCutChanged, this, &ShortcutTreeView::refreshShortcuts); - - // Group headers store their font on the item; re-apply the role family on - // font changes (setFont emits itemChanged, which repaints the rows). - connect(themeManager, &ThemeManager::fontsChanged, this, [this] { - QFont groupFont = themeManager->appFont(AppFont::InterfaceDefault); - groupFont.setBold(true); - for (int row = 0; row < shortcutsModel->rowCount(); ++row) { - if (auto *groupItem = shortcutsModel->item(row)) { - groupItem->setFont(groupFont); - } - } - }); } void ShortcutTreeView::populateShortcutsModel() @@ -106,8 +93,7 @@ void ShortcutTreeView::populateShortcutsModel() curParent = parentItems.value(group); } else { curParent = new QStandardItem(group); - // Family comes from the InterfaceDefault theme role; bold stays caller-side. - QFont font = themeManager->appFont(AppFont::InterfaceDefault); + static QFont font = curParent->font(); font.setBold(true); curParent->setFont(font); parentItems.insert(group, curParent); diff --git a/libcockatrice_game/libcockatrice/game/translation.h b/cockatrice/src/client/translation.h similarity index 100% rename from libcockatrice_game/libcockatrice/game/translation.h rename to cockatrice/src/client/translation.h diff --git a/cockatrice/src/database/interface/settings_card_preference_provider.h b/cockatrice/src/database/interface/settings_card_preference_provider.h index f4bf23141..1feb2006b 100644 --- a/cockatrice/src/database/interface/settings_card_preference_provider.h +++ b/cockatrice/src/database/interface/settings_card_preference_provider.h @@ -2,18 +2,13 @@ #define COCKATRICE_SETTINGS_CARD_PREFERENCE_PROVIDER_H #include "../../client/settings/cache_settings.h" -#include #include #include #include -class SettingsCardPreferenceProvider : public QObject, public ICardPreferenceProvider +class SettingsCardPreferenceProvider : public ICardPreferenceProvider { public: - explicit SettingsCardPreferenceProvider(QObject *parent = nullptr) : QObject(parent) - { - } - [[nodiscard]] QString getCardPreferenceOverride(const QString &cardName) const override { return SettingsCache::instance().cardOverrides().getCardPreferenceOverride(cardName); diff --git a/cockatrice/src/filters/deck_filter_string.cpp b/cockatrice/src/filters/deck_filter_string.cpp index f0df897fc..616311750 100644 --- a/cockatrice/src/filters/deck_filter_string.cpp +++ b/cockatrice/src/filters/deck_filter_string.cpp @@ -1,5 +1,6 @@ #include "deck_filter_string.h" +#include "../interface/deck_loader/loaded_deck.h" #include "libcockatrice/card/card_localization.h" #include "libcockatrice/card/database/card_database_querier.h" #include "libcockatrice/deck_list/deck_list.h" @@ -14,7 +15,6 @@ #include #include #include -#include #include #include #include diff --git a/cockatrice/src/filters/deck_filter_string.h b/cockatrice/src/filters/deck_filter_string.h index b27cf87ca..76b891b59 100644 --- a/cockatrice/src/filters/deck_filter_string.h +++ b/cockatrice/src/filters/deck_filter_string.h @@ -11,7 +11,6 @@ #include #include #include -#include struct CardSearchLanguage; struct LoadedDeck; diff --git a/cockatrice/src/filters/filter_builder.cpp b/cockatrice/src/filters/filter_builder.cpp index 9c2a91a5b..22679abb1 100644 --- a/cockatrice/src/filters/filter_builder.cpp +++ b/cockatrice/src/filters/filter_builder.cpp @@ -1,6 +1,6 @@ #include "filter_builder.h" -#include "../interface/theme_icon.h" +#include "../interface/pixel_map_generator.h" #include "../interface/widgets/utility/custom_line_edit.h" #include @@ -30,7 +30,7 @@ FilterBuilder::FilterBuilder(QWidget *parent) : QWidget(parent) typeCombo->addItem(CardFilter::typeName(static_cast(i)), QVariant(i)); } - QPushButton *ok = new QPushButton(loadThemedIcon(QStringLiteral("icons/increment")), QString()); + QPushButton *ok = new QPushButton(themePixmap(QStringLiteral("icons/increment")), QString()); ok->setObjectName("ok"); ok->setMaximumSize(20, 20); diff --git a/cockatrice/src/filters/filter_tree_model.cpp b/cockatrice/src/filters/filter_tree_model.cpp index 66fe39821..b3bf307f1 100644 --- a/cockatrice/src/filters/filter_tree_model.cpp +++ b/cockatrice/src/filters/filter_tree_model.cpp @@ -1,7 +1,5 @@ #include "filter_tree_model.h" -#include "../interface/theme_manager.h" - #include #include #include @@ -13,27 +11,6 @@ class QObject; -namespace -{ -/** - * @brief Visits every filter item below @p node, depth first. - */ -template void forEachFilter(const FilterTreeNode *node, const Callback &callback) -{ - if (node == nullptr) { - return; - } - - if (const auto *filterItem = dynamic_cast(node)) { - callback(filterItem); - } - - for (int i = 0; i < node->childCount(); ++i) { - forEachFilter(node->nodeAt(i), callback); - } -} -} // namespace - FilterTreeModel::FilterTreeModel(QObject *parent) : QAbstractItemModel(parent) { fTree = new FilterTree; @@ -41,12 +18,6 @@ FilterTreeModel::FilterTreeModel(QObject *parent) : QAbstractItemModel(parent) connect(fTree, &FilterTree::postInsertRow, this, &FilterTreeModel::proxyEndInsertRow); connect(fTree, &FilterTree::preRemoveRow, this, &FilterTreeModel::proxyBeginRemoveRow); connect(fTree, &FilterTree::postRemoveRow, this, &FilterTreeModel::proxyEndRemoveRow); - // FontRole data reads the DeckList role live; rebroadcast so attached - // views re-query instead of waiting for an incidental repaint. - connect(themeManager, &ThemeManager::fontsChanged, this, [this] { - emit layoutAboutToBeChanged(); - emit layoutChanged(); - }); } FilterTreeModel::~FilterTreeModel() @@ -139,31 +110,46 @@ void FilterTreeModel::clearFiltersOfType(CardFilter::Attr filterType) QList FilterTreeModel::getFiltersOfType(CardFilter::Attr filterType) const { QList filters; - forEachFilter(fTree, [&](const FilterItem *filterItem) { - if (filterItem->attr() == filterType) { - filters.append(new CardFilter(filterItem->text(), filterItem->type(), filterItem->attr())); - } - }); - return filters; -} + if (!fTree) { + return filters; + } -QStringList FilterTreeModel::getFilterTermsOfType(CardFilter::Attr filterType) const -{ - QStringList terms; - forEachFilter(fTree, [&](const FilterItem *filterItem) { - if (filterItem->attr() == filterType) { - terms.append(filterItem->text()); + std::function traverse; + traverse = [&](const FilterTreeNode *node) { + if (const auto *filterItem = dynamic_cast(node)) { + if (filterItem->attr() == filterType) { + QString text = filterItem->text(); + filters.append(new CardFilter(text, filterItem->type(), filterItem->attr())); + } } - }); - return terms; + for (int i = 0; i < node->childCount(); ++i) { + traverse(node->nodeAt(i)); + } + }; + + traverse(fTree); + return filters; } QList FilterTreeModel::allFilters() const { QList filters; - forEachFilter(fTree, [&](const FilterItem *filterItem) { - filters.append(new CardFilter(filterItem->text(), filterItem->type(), filterItem->attr())); - }); + if (!fTree) { + return filters; + } + + std::function traverse; + traverse = [&](const FilterTreeNode *node) { + if (const auto *filterItem = dynamic_cast(node)) { + QString text = filterItem->text(); + filters.append(new CardFilter(text, filterItem->type(), filterItem->attr())); + } + for (int i = 0; i < node->childCount(); ++i) { + traverse(node->nodeAt(i)); + } + }; + + traverse(fTree); return filters; } @@ -210,8 +196,7 @@ QVariant FilterTreeModel::data(const QModelIndex &index, int role) const switch (role) { case Qt::FontRole: if (!node->isLeaf()) { - // Family comes from the DeckList theme role; bold stays caller-side. - QFont f = themeManager->appFont(AppFont::DeckList); + QFont f; f.setBold(true); return f; } diff --git a/cockatrice/src/filters/filter_tree_model.h b/cockatrice/src/filters/filter_tree_model.h index 05f34f508..826fcc941 100644 --- a/cockatrice/src/filters/filter_tree_model.h +++ b/cockatrice/src/filters/filter_tree_model.h @@ -28,14 +28,7 @@ public slots: void addFilter(const CardFilter *f); void removeFilter(const CardFilter *f); void clearFiltersOfType(CardFilter::Attr filterType); - /** - * @brief Copies every active filter of one attribute into new CardFilter objects. - * - * The caller owns the returned filters. Prefer getFilterTermsOfType() when only - * the terms are needed. - */ [[nodiscard]] QList getFiltersOfType(CardFilter::Attr filterType) const; - /// @brief Copies every active filter into new CardFilter objects. The caller owns them. [[nodiscard]] QList allFilters() const; private slots: @@ -55,13 +48,6 @@ public: { return fTree; } - - /** - * @brief The texts of every active filter of one attribute, without allocating filters. - * - * Prefer this over getFiltersOfType() when only the filter terms are needed. - */ - [[nodiscard]] QStringList getFilterTermsOfType(CardFilter::Attr filterType) const; [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override; [[nodiscard]] int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const override; [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override; diff --git a/libcockatrice_game/libcockatrice/game/abstract_game.cpp b/cockatrice/src/game/abstract_game.cpp similarity index 88% rename from libcockatrice_game/libcockatrice/game/abstract_game.cpp rename to cockatrice/src/game/abstract_game.cpp index a93f44018..efc575eff 100644 --- a/libcockatrice_game/libcockatrice/game/abstract_game.cpp +++ b/cockatrice/src/game/abstract_game.cpp @@ -18,6 +18,8 @@ AbstractGame::AbstractGame(QObject *_parent) : QObject(_parent) { gameMetaInfo = new GameMetaInfo(this); gameEventHandler = new GameEventHandler(this); + + activeCard = nullptr; } bool AbstractGame::isHost() const @@ -46,7 +48,12 @@ void AbstractGame::loadReplay(const GameReplay *replay) gameMetaInfo->setSpectatorsOmniscient(true); } -CardState *AbstractGame::getCard(int playerId, const QString &zoneName, int cardId) const +void AbstractGame::setActiveCard(CardItem *card) +{ + activeCard = card; +} + +CardItem *AbstractGame::getCard(int playerId, const QString &zoneName, int cardId) const { PlayerLogic *player = playerManager->getPlayer(playerId); if (!player) { diff --git a/libcockatrice_game/libcockatrice/game/abstract_game.h b/cockatrice/src/game/abstract_game.h similarity index 82% rename from libcockatrice_game/libcockatrice/game/abstract_game.h rename to cockatrice/src/game/abstract_game.h index 00a95a3b8..326af8ac9 100644 --- a/libcockatrice_game/libcockatrice/game/abstract_game.h +++ b/cockatrice/src/game/abstract_game.h @@ -11,14 +11,14 @@ #include #include +class CardItem; class AbstractClient; -class CardState; class GameEventHandler; class GameMetaInfo; class GameReplay; class GameState; class PlayerManager; -class CardState; + class AbstractGame : public QObject { Q_OBJECT @@ -30,6 +30,7 @@ public: GameState *gameState; GameEventHandler *gameEventHandler; PlayerManager *playerManager; + CardItem *activeCard; GameMetaInfo *getGameMetaInfo() { @@ -57,7 +58,13 @@ public: void loadReplay(const GameReplay *replay); - CardState *getCard(int playerId, const QString &zoneName, int cardId) const; + CardItem *getCard(int playerId, const QString &zoneName, int cardId) const; + + void setActiveCard(CardItem *card); + CardItem *getActiveCard() const + { + return activeCard; + } }; #endif // COCKATRICE_ABSTRACT_GAME_H diff --git a/cockatrice/src/game_graphics/board/arrow_registry.cpp b/cockatrice/src/game/arrow_registry.cpp similarity index 93% rename from cockatrice/src/game_graphics/board/arrow_registry.cpp rename to cockatrice/src/game/arrow_registry.cpp index 10b3cde2f..c05134a75 100644 --- a/cockatrice/src/game_graphics/board/arrow_registry.cpp +++ b/cockatrice/src/game/arrow_registry.cpp @@ -1,9 +1,9 @@ #include "arrow_registry.h" -#include "arrow_item.h" +#include "../game_graphics/board/arrow_item.h" +#include "board/arrow_data.h" #include -#include void ArrowRegistry::insert(QSharedPointer data, ArrowItem *arrow) { diff --git a/cockatrice/src/game_graphics/board/arrow_registry.h b/cockatrice/src/game/arrow_registry.h similarity index 94% rename from cockatrice/src/game_graphics/board/arrow_registry.h rename to cockatrice/src/game/arrow_registry.h index 7103747e8..ca3b04090 100644 --- a/cockatrice/src/game_graphics/board/arrow_registry.h +++ b/cockatrice/src/game/arrow_registry.h @@ -4,7 +4,6 @@ #include #include #include -#include class ArrowItem; struct ArrowData; diff --git a/libcockatrice_game/libcockatrice/game/board/arrow_data.cpp b/cockatrice/src/game/board/arrow_data.cpp similarity index 100% rename from libcockatrice_game/libcockatrice/game/board/arrow_data.cpp rename to cockatrice/src/game/board/arrow_data.cpp diff --git a/libcockatrice_game/libcockatrice/game/board/arrow_data.h b/cockatrice/src/game/board/arrow_data.h similarity index 100% rename from libcockatrice_game/libcockatrice/game/board/arrow_data.h rename to cockatrice/src/game/board/arrow_data.h diff --git a/libcockatrice_game/libcockatrice/game/board/card_list.cpp b/cockatrice/src/game/board/card_list.cpp similarity index 70% rename from libcockatrice_game/libcockatrice/game/board/card_list.cpp rename to cockatrice/src/game/board/card_list.cpp index 361c51502..94bae67cd 100644 --- a/libcockatrice_game/libcockatrice/game/board/card_list.cpp +++ b/cockatrice/src/game/board/card_list.cpp @@ -1,6 +1,7 @@ #include "card_list.h" -#include "card_state.h" +#include "../../game_graphics/board/card_item.h" +#include "libcockatrice/card/printing/exact_card.h" #include #include @@ -10,26 +11,26 @@ #include #include -CardList::CardList(bool _contentsKnown) : QList(), contentsKnown(_contentsKnown) +CardList::CardList(bool _contentsKnown) : QList(), contentsKnown(_contentsKnown) { } /** - * @brief Finds the CardState with the given id in the list. + * @brief Finds the CardItem with the given id in the list. * If contentsKnown is false, then this just returns the first element of the list. * * @param cardId The id of the card to find. * - * @returns A pointer to the CardState, or a nullptr if not found. + * @returns A pointer to the CardItem, or a nullptr if not found. */ -CardState *CardList::findCard(const int cardId) const +CardItem *CardList::findCard(const int cardId) const { if (!contentsKnown && !empty()) { return at(0); } else { - for (auto *cardState : *this) { - if (cardState->getId() == cardId) { - return cardState; + for (auto *cardItem : *this) { + if (cardItem->getId() == cardId) { + return cardItem; } } } @@ -37,7 +38,7 @@ CardState *CardList::findCard(const int cardId) const } /** - * @brief sorts the list by using string comparison on properties extracted from the CardState + * @brief sorts the list by using string comparison on properties extracted from the CardItem * The cards are compared using each property in order. * If two cards have the same value for a property, then the next property in the list is used. * @@ -50,7 +51,7 @@ void CardList::sortBy(const QList &option) return; } - auto comparator = [&option](CardState *a, CardState *b) { + auto comparator = [&option](CardItem *a, CardItem *b) { for (auto prop : option) { auto extractor = getExtractorFor(prop); QString t1 = extractor(a); @@ -115,26 +116,26 @@ static QString getColorSortString(const CardInfo &c, bool appendAtEnd) } /** - * @brief returns the function that extracts the given property from the CardState. + * @brief returns the function that extracts the given property from the CardItem. */ -std::function CardList::getExtractorFor(SortOption option) +std::function CardList::getExtractorFor(SortOption option) { switch (option) { case NoSort: - return [](CardState *) { return ""; }; + return [](CardItem *) { return ""; }; case SortByMainType: - return [](CardState *c) { return c->getCardInfo().getMainCardType(); }; + return [](CardItem *c) { return c->getCardInfo().getMainCardType(); }; case SortByManaValue: // getCmc returns the int as a string. We pad with 0's so that string comp also works on it - return [](CardState *c) { return c->getCard() ? c->getCardInfo().getCmc().rightJustified(4, '0') : ""; }; + return [](CardItem *c) { return c->getCard() ? c->getCardInfo().getCmc().rightJustified(4, '0') : ""; }; case SortByColorGrouping: - return [](CardState *c) { return c->getCard() ? getColorSortString(c->getCardInfo(), false) : ""; }; + return [](CardItem *c) { return c->getCard() ? getColorSortString(c->getCardInfo(), false) : ""; }; case SortByName: - return [](CardState *c) { return c->getName(); }; + return [](CardItem *c) { return c->getName(); }; case SortByType: - return [](CardState *c) { return c->getCardInfo().getCardType(); }; + return [](CardItem *c) { return c->getCardInfo().getCardType(); }; case SortByManaCost: - return [](CardState *c) { + return [](CardItem *c) { if (!c->getCard()) { return QString(); } @@ -146,18 +147,18 @@ std::function CardList::getExtractorFor(SortOption option) return QString("%1%2").arg(info.getCmc(), 4, QChar('0')).arg(info.getManaCost()); }; case SortByColors: - return [](CardState *c) { return c->getCard() ? getColorSortString(c->getCardInfo(), true) : ""; }; + return [](CardItem *c) { return c->getCard() ? getColorSortString(c->getCardInfo(), true) : ""; }; case SortByPt: // do the same padding trick as above return - [](CardState *c) { return c->getCard() ? c->getCardInfo().getPowTough().rightJustified(10, '0') : ""; }; + [](CardItem *c) { return c->getCard() ? c->getCardInfo().getPowTough().rightJustified(10, '0') : ""; }; case SortBySet: - return [](CardState *c) { return c->getCardInfo().getSetsNames(); }; + return [](CardItem *c) { return c->getCardInfo().getSetsNames(); }; case SortByPrinting: - return [](CardState *c) { return c->getProviderId(); }; + return [](CardItem *c) { return c->getProviderId(); }; } // this line should never be reached qCWarning(CardListLog) << "cardlist.cpp: Could not find extractor for SortOption" << option; - return [](CardState *) { return ""; }; + return [](CardItem *) { return ""; }; } \ No newline at end of file diff --git a/libcockatrice_game/libcockatrice/game/board/card_list.h b/cockatrice/src/game/board/card_list.h similarity index 84% rename from libcockatrice_game/libcockatrice/game/board/card_list.h rename to cockatrice/src/game/board/card_list.h index b3037d0f6..b5427df0d 100644 --- a/libcockatrice_game/libcockatrice/game/board/card_list.h +++ b/cockatrice/src/game/board/card_list.h @@ -14,9 +14,9 @@ inline Q_LOGGING_CATEGORY(CardListLog, "card_list"); -class CardState; +class CardItem; -class CardList : public QList +class CardList : public QList { protected: bool contentsKnown; @@ -43,7 +43,7 @@ public: SortByPrinting }; explicit CardList(bool _contentsKnown); - CardState *findCard(const int cardId) const; + CardItem *findCard(const int cardId) const; bool getContentsKnown() const { return contentsKnown; @@ -51,7 +51,7 @@ public: void sortBy(const QList &options); - static std::function getExtractorFor(SortOption option); + static std::function getExtractorFor(SortOption option); }; #endif diff --git a/cockatrice/src/game/board/card_state.cpp b/cockatrice/src/game/board/card_state.cpp new file mode 100644 index 000000000..3f879a849 --- /dev/null +++ b/cockatrice/src/game/board/card_state.cpp @@ -0,0 +1,113 @@ +#include "card_state.h" + +#include + +void CardState::resetState(bool keepAnnotations) +{ + attacking = false; + counters.clear(); + pt.clear(); + if (!keepAnnotations) { + annotation.clear(); + } + attachedTo = nullptr; +} + +void CardState::setZone(CardZoneLogic *_zone) +{ + if (zone == _zone) { + return; + } + + zone = _zone; + emit zoneChanged(this, zone); + emit stateChanged(); +} + +void CardState::setAttacking(bool _attacking) +{ + if (attacking == _attacking) { + return; + } + attacking = _attacking; + emit attackingChanged(_attacking); + emit stateChanged(); +} + +void CardState::insertCounter(int id, int value) +{ + counters.insert(id, value); + + emit countersChanged(counters); + emit stateChanged(); +} + +void CardState::setCounter(int id, int value) +{ + if (value) { + counters[id] = value; + } else { + counters.remove(id); + } + + emit countersChanged(counters); + emit stateChanged(); +} + +void CardState::clearCounters() +{ + counters.clear(); + emit countersChanged(counters); + emit stateChanged(); +} + +void CardState::setAnnotation(const QString &_annotation) +{ + if (annotation == _annotation) { + return; + } + annotation = _annotation; + emit annotationChanged(annotation); + emit stateChanged(); +} + +void CardState::setPT(const QString &_pt) +{ + if (pt == _pt) { + return; + } + pt = _pt; + emit ptChanged(pt); + emit stateChanged(); +} + +void CardState::setDoesntUntap(bool _doesntUntap) +{ + if (doesntUntap == _doesntUntap) { + return; + } + doesntUntap = _doesntUntap; + emit doesntUntapChanged(_doesntUntap); + emit stateChanged(); +} + +void CardState::setDestroyOnZoneChange(bool _destroyOnZoneChange) +{ + if (destroyOnZoneChange == _destroyOnZoneChange) { + return; + } + + destroyOnZoneChange = _destroyOnZoneChange; + emit destroyOnZoneChangeChanged(_destroyOnZoneChange); + emit stateChanged(); +} + +void CardState::setAttachedTo(CardItem *_attachedTo) +{ + if (attachedTo == _attachedTo) { + return; + } + attachedTo = _attachedTo; + emit attachedToChanged(_attachedTo); + emit stateChanged(); +} \ No newline at end of file diff --git a/cockatrice/src/game/board/card_state.h b/cockatrice/src/game/board/card_state.h new file mode 100644 index 000000000..ca7aaf927 --- /dev/null +++ b/cockatrice/src/game/board/card_state.h @@ -0,0 +1,106 @@ +#ifndef COCKATRICE_CARD_STATE_H +#define COCKATRICE_CARD_STATE_H + +#include +#include +#include +#include + +class CardZoneLogic; +class CardItem; + +class CardState : public QObject +{ + Q_OBJECT + +private: + bool attacking = false; + QMap counters; + QString annotation; + QString pt; + bool doesntUntap = false; + bool destroyOnZoneChange = false; + + CardItem *attachedTo = nullptr; + CardZoneLogic *zone = nullptr; + +signals: + void stateChanged(); + + void attackingChanged(bool newValue); + void countersChanged(const QMap &newCounters); + void annotationChanged(const QString &newAnnotation); + void ptChanged(const QString &newPt); + void doesntUntapChanged(bool newValue); + void destroyOnZoneChangeChanged(bool newValue); + void attachedToChanged(CardItem *newAttachedTo); + void zoneChanged(CardState *changedCard, CardZoneLogic *newZone); + +public: + explicit CardState(QObject *parent, CardZoneLogic *_zone) : QObject(parent), zone(_zone) + { + } + + void resetState(bool keepAnnotations); + + CardZoneLogic *getZone() const + { + return zone; + } + + void setZone(CardZoneLogic *_zone); + + bool getAttacking() const + { + return attacking; + } + void setAttacking(bool _attacking); + + const QMap &getCounters() const + { + return counters; + } + + void insertCounter(int id, int value); + + void setCounter(int id, int value); + + void clearCounters(); + + QString getAnnotation() const + { + return annotation; + } + + void setAnnotation(const QString &_annotation); + + QString getPT() const + { + return pt; + } + + void setPT(const QString &_pt); + + bool getDoesntUntap() const + { + return doesntUntap; + } + + void setDoesntUntap(bool _doesntUntap); + + bool getDestroyOnZoneChange() const + { + return destroyOnZoneChange; + } + + void setDestroyOnZoneChange(bool _destroyOnZoneChange); + + CardItem *getAttachedTo() const + { + return attachedTo; + } + + void setAttachedTo(CardItem *_attachedTo); +}; + +#endif // COCKATRICE_CARD_STATE_H diff --git a/libcockatrice_game/libcockatrice/game/board/counter_state.cpp b/cockatrice/src/game/board/counter_state.cpp similarity index 100% rename from libcockatrice_game/libcockatrice/game/board/counter_state.cpp rename to cockatrice/src/game/board/counter_state.cpp diff --git a/libcockatrice_game/libcockatrice/game/board/counter_state.h b/cockatrice/src/game/board/counter_state.h similarity index 100% rename from libcockatrice_game/libcockatrice/game/board/counter_state.h rename to cockatrice/src/game/board/counter_state.h diff --git a/libcockatrice_game/libcockatrice/game/game.cpp b/cockatrice/src/game/game.cpp similarity index 75% rename from libcockatrice_game/libcockatrice/game/game.cpp rename to cockatrice/src/game/game.cpp index a1a4a31a8..7343d052a 100644 --- a/libcockatrice_game/libcockatrice/game/game.cpp +++ b/cockatrice/src/game/game.cpp @@ -16,16 +16,13 @@ Game::Game(QObject *_parent, bool isLocalGame, QList &_clients, const Event_GameJoined &event, - const QMap &_roomGameTypes, - IInterfaceSettingsProvider *interfaceSettings, - ICardPreferenceProvider *cardPreferences) + const QMap &_roomGameTypes) : AbstractGame(_parent) { gameMetaInfo->setFromProto(event.game_info()); gameMetaInfo->setRoomGameTypes(_roomGameTypes); gameState = new GameState(this, 0, event.host_id(), isLocalGame, _clients, false, event.resuming(), -1, false); connect(gameMetaInfo, &GameMetaInfo::startedChanged, gameState, &GameState::onStartedChanged); - playerManager = new PlayerManager(this, event.player_id(), event.judge(), event.spectator(), interfaceSettings, - cardPreferences); + playerManager = new PlayerManager(this, event.player_id(), event.judge(), event.spectator()); gameMetaInfo->setStarted(false); } diff --git a/libcockatrice_game/libcockatrice/game/game.h b/cockatrice/src/game/game.h similarity index 69% rename from libcockatrice_game/libcockatrice/game/game.h rename to cockatrice/src/game/game.h index f80b75ea5..6a309cfb2 100644 --- a/libcockatrice_game/libcockatrice/game/game.h +++ b/cockatrice/src/game/game.h @@ -18,9 +18,6 @@ class QString; template class QMap; template class QList; -class ICardPreferenceProvider; -class IInterfaceSettingsProvider; - class Game : public AbstractGame { Q_OBJECT @@ -30,9 +27,7 @@ public: bool isLocalGame, QList &_clients, const Event_GameJoined &event, - const QMap &_roomGameTypes, - IInterfaceSettingsProvider *interfaceSettings = nullptr, - ICardPreferenceProvider *cardPreferences = nullptr); + const QMap &_roomGameTypes); }; #endif // COCKATRICE_GAME_H diff --git a/libcockatrice_game/libcockatrice/game/game_event_handler.cpp b/cockatrice/src/game/game_event_handler.cpp similarity index 80% rename from libcockatrice_game/libcockatrice/game/game_event_handler.cpp rename to cockatrice/src/game/game_event_handler.cpp index 7ef502400..7b08af47c 100644 --- a/libcockatrice_game/libcockatrice/game/game_event_handler.cpp +++ b/cockatrice/src/game/game_event_handler.cpp @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include @@ -29,21 +28,12 @@ #include #include #include -#include #include -#include #include #include #include -#include #include #include -#include -#include -#include -#include -#include -#include #include #include #include @@ -52,14 +42,12 @@ #include #include #include -#include #include #include #include #include #include #include -#include #include #include @@ -192,9 +180,6 @@ void GameEventHandler::processGameEventContainer(const GameEventContainer &cont, case GameEvent::REVERSE_TURN: eventReverseTurn(event.GetExtension(Event_ReverseTurn::ext), playerId, context); break; - case GameEvent::PLAYER_ORDER_CHANGED: - eventPlayerOrderChanged(event.GetExtension(Event_PlayerOrderChanged::ext), playerId, context); - break; default: { PlayerLogic *player = game->getPlayerManager()->getPlayers().value(playerId, 0); @@ -221,16 +206,6 @@ void GameEventHandler::handleReverseTurn() sendGameCommand(Command_ReverseTurn()); } -void GameEventHandler::handleSetPlayerOrder(const QList &playerNames, bool randomize) -{ - Command_SetPlayerOrder command; - command.set_randomize(randomize); - for (const QString &name : playerNames) { - command.add_player_names(name.toStdString()); - } - sendGameCommand(command); -} - void GameEventHandler::handleActiveLocalPlayerConceded() { sendGameCommand(Command_Concede()); @@ -248,89 +223,6 @@ void GameEventHandler::handleActivePhaseChanged(int phase) sendGameCommand(cmd); } -void GameEventHandler::handleUntapAll() -{ - Command_SetCardAttr cmd; - cmd.set_zone(ZoneNames::TABLE); - cmd.set_attribute(AttrTapped); - cmd.set_attr_value("0"); - - sendGameCommand(cmd); -} - -void GameEventHandler::handleDrawCard() -{ - Command_DrawCards cmd; - cmd.set_number(1); - - sendGameCommand(cmd); -} - -PendingCommand *GameEventHandler::prepareDeckSelect(const QString &deckList) -{ - Command_DeckSelect cmd; - cmd.set_deck(deckList.toStdString()); - - return prepareGameCommand(cmd); -} - -PendingCommand *GameEventHandler::prepareDeckSelectId(int deckId) -{ - Command_DeckSelect cmd; - cmd.set_deck_id(deckId); - - return prepareGameCommand(cmd); -} - -PendingCommand *GameEventHandler::prepareSetPlaymat(const PlaymatInfo &playmat) -{ - Command_SetPlaymat cmd; - auto *pp = cmd.mutable_playmat_params(); - pp->set_card_name(playmat.card.name.toStdString()); - pp->set_card_provider_id(playmat.card.providerId.toStdString()); - pp->set_margin_pct_l(playmat.params.marginPctL); - pp->set_margin_pct_r(playmat.params.marginPctR); - pp->set_vertical_offset(playmat.params.verticalOffset); - pp->set_zoom(playmat.params.zoom); - - return prepareGameCommand(cmd); -} - -void GameEventHandler::sendReadyStart(bool ready, int playerId) -{ - Command_ReadyStart cmd; - cmd.set_ready(ready); - - sendGameCommand(cmd, playerId); -} - -void GameEventHandler::sendForceStart(int playerId) -{ - Command_ReadyStart cmd; - cmd.set_force_start(true); - cmd.set_ready(true); - - sendGameCommand(cmd, playerId); -} - -void GameEventHandler::sendSetSideboardLock(bool locked, int playerId) -{ - Command_SetSideboardLock cmd; - cmd.set_locked(locked); - - sendGameCommand(cmd, playerId); -} - -void GameEventHandler::sendSetSideboardPlan(const QList &plan, int playerId) -{ - Command_SetSideboardPlan cmd; - for (const auto &zone : plan) { - cmd.add_move_list()->CopyFrom(zone); - } - - sendGameCommand(cmd, playerId); -} - void GameEventHandler::handleGameLeft() { sendGameCommand(Command_LeaveGame()); @@ -393,27 +285,6 @@ void GameEventHandler::eventGameStateChanged(const Event_GameStateChanged &event { const int playerListSize = event.player_list_size(); - if (event.has_local_player_id()) { - game->getPlayerManager()->setLocalPlayerId(event.local_player_id()); - } - - QSet authoritativePlayerIds; - for (int i = 0; i < playerListSize; ++i) { - const ServerInfo_PlayerProperties &prop = event.player_list(i).properties(); - if (!prop.spectator()) { - authoritativePlayerIds.insert(prop.player_id()); - } - } - - // Players whose seats were shuffled away from the previous game are no longer - // part of the authoritative list and must be removed. - for (int stalePlayerId : game->getPlayerManager()->getPlayers().keys()) { - if (!authoritativePlayerIds.contains(stalePlayerId)) { - game->getPlayerManager()->removePlayer(stalePlayerId); - emit playerLeft(stalePlayerId); - } - } - QVector>> opponentDecksToDisplay; for (int i = 0; i < playerListSize; ++i) { @@ -458,19 +329,6 @@ void GameEventHandler::eventGameStateChanged(const Event_GameStateChanged &event emit remotePlayersDecksSelected(opponentDecksToDisplay); - // The server emits player_list in seat order, so record it to lay out the - // table by seating rather than by player id. - QList seatOrder; - for (int i = 0; i < playerListSize; ++i) { - const ServerInfo_PlayerProperties &prop = event.player_list(i).properties(); - if (!prop.spectator()) { - seatOrder.append(prop.player_id()); - } - } - if (!seatOrder.isEmpty()) { - game->getGameState()->setSeatOrder(seatOrder); - } - game->getGameState()->setGameTime(event.seconds_elapsed()); if (event.game_started() && !game->getGameMetaInfo()->started()) { @@ -675,33 +533,6 @@ void GameEventHandler::eventReverseTurn(const Event_ReverseTurn &event, emit logTurnReversed(player, event.reversed()); } -void GameEventHandler::eventPlayerOrderChanged(const Event_PlayerOrderChanged &event, - int /*eventPlayerId*/, - const GameEventContext & /*context*/) -{ - QStringList playerNames; - for (const auto &name : event.player_names()) { - playerNames.append(QString::fromStdString(name)); - } - - // Track the seating by stable player id so the table layout and the turn - // order dialog follow the shuffled order instead of id order. - QList seatOrder; - const auto &players = game->getPlayerManager()->getPlayers(); - for (const QString &name : playerNames) { - for (auto it = players.constBegin(); it != players.constEnd(); ++it) { - if (it.value() && it.value()->getPlayerInfo()->getName() == name) { - seatOrder.append(it.key()); - break; - } - } - } - if (!seatOrder.isEmpty()) { - game->getGameState()->setSeatOrder(seatOrder); - } - emit logTurnOrderChanged(playerNames, event.randomized()); -} - void GameEventHandler::eventGameHostChanged(const Event_GameHostChanged & /*event*/, int eventPlayerId, const GameEventContext & /*context*/) diff --git a/libcockatrice_game/libcockatrice/game/game_event_handler.h b/cockatrice/src/game/game_event_handler.h similarity index 79% rename from libcockatrice_game/libcockatrice/game/game_event_handler.h rename to cockatrice/src/game/game_event_handler.h index bfcf355b0..30021d295 100644 --- a/libcockatrice_game/libcockatrice/game/game_event_handler.h +++ b/cockatrice/src/game/game_event_handler.h @@ -29,14 +29,13 @@ // GameEventContext, ServerInfo_Player and ServerInfo_User are passed by value // to signals and slots, so the moc-generated code needs the complete types. #include -#include #include #include -#include class AbstractClient; class AbstractGame; class GameEventContainer; +class GameEventContext; class PendingCommand; class PlayerLogic; class Response; @@ -51,7 +50,6 @@ class Event_GameSay; class Event_Kicked; class Event_ReverseTurn; class Event_Ping; -class Event_PlayerOrderChanged; class ServerInfo_PlayerProperties; namespace google { @@ -114,16 +112,6 @@ public: /** @brief Request reversing the current turn order. */ void handleReverseTurn(); - /** - * @brief Request a new seating / turn order. - * - * Only the game host (or a moderator) may do this before the game starts. - * - * @param playerNames Ordered list of player names. Ignored when randomize is true. - * @param randomize Ask the server to shuffle the seats instead. - */ - void handleSetPlayerOrder(const QList &playerNames, bool randomize); - /** @brief Concede the game for the currently active local player. */ void handleActiveLocalPlayerConceded(); @@ -139,12 +127,6 @@ public: */ void handleActivePhaseChanged(int phase); - /** @brief Request untapping every permanent on the table. */ - void handleUntapAll(); - - /** @brief Request drawing a single card. */ - void handleDrawCard(); - /** @brief Leave the current game session. */ void handleGameLeft(); @@ -163,70 +145,6 @@ public: void handleArrowDeletion(int creatorId, int arrowId); void handleArrowDeletionFinished(const Response &response, int creatorId, int arrowId); - /** - * @brief Prepare a deck selection from its native deck list text. - * - * The returned command is not sent yet, so the caller can connect to - * PendingCommand::finished before handing it to sendGameCommand(). - * - * @param deckList Serialized deck list. - * @return The pending command awaiting the deck download response. - */ - PendingCommand *prepareDeckSelect(const QString &deckList); - - /** - * @brief Prepare a deck selection for a deck stored on the server. - * - * The returned command is not sent yet, so the caller can connect to - * PendingCommand::finished before handing it to sendGameCommand(). - * - * @param deckId Server-side deck identifier. - * @return The pending command awaiting the deck download response. - */ - PendingCommand *prepareDeckSelectId(int deckId); - - /** - * @brief Build the playmat command for a player without sending it. - * - * The returned command is not sent yet, so the caller can connect to - * PendingCommand::finished before handing it to sendGameCommand(). - * - * @param playmat Resolved playmat card and positioning parameters. - * @return The pending command awaiting the playmat response. - */ - PendingCommand *prepareSetPlaymat(const PlaymatInfo &playmat); - - /** - * @brief Set a player's ready state. - * - * @param ready Whether the player is ready. - * @param playerId Player the state applies to. - */ - void sendReadyStart(bool ready, int playerId); - - /** - * @brief Force-start the game, kicking every player who is not ready. - * - * @param playerId Player issuing the force start. - */ - void sendForceStart(int playerId); - - /** - * @brief Lock or unlock a player's sideboard. - * - * @param locked Whether the sideboard is locked. - * @param playerId Player the lock applies to. - */ - void sendSetSideboardLock(bool locked, int playerId); - - /** - * @brief Send a player's sideboard plan. - * - * @param plan Cards to move between zones when leaving sideboarding. - * @param playerId Player the plan belongs to. - */ - void sendSetSideboardPlan(const QList &plan, int playerId); - /** @} */ /** @name Incoming event processing @@ -327,10 +245,6 @@ public: /** @brief Handle a turn reversal event. */ void eventReverseTurn(const Event_ReverseTurn &event, int eventPlayerId, const GameEventContext &context); - /** @brief Handle a change of the seating / turn order. */ - void - eventPlayerOrderChanged(const Event_PlayerOrderChanged &event, int eventPlayerId, const GameEventContext &context); - /** @brief Handle ping / latency updates. */ void eventPing(const Event_Ping &event, int eventPlayerId, const GameEventContext &context); @@ -458,7 +372,6 @@ signals: void logLeave(PlayerLogic *player, QString reason); void logKicked(); void logTurnReversed(PlayerLogic *player, bool reversed); - void logTurnOrderChanged(QStringList playerNames, bool randomized); void logGameClosed(); void logActivePlayer(PlayerLogic *activePlayer); void logActivePhaseChanged(int activePhase); diff --git a/libcockatrice_game/libcockatrice/game/game_meta_info.cpp b/cockatrice/src/game/game_meta_info.cpp similarity index 100% rename from libcockatrice_game/libcockatrice/game/game_meta_info.cpp rename to cockatrice/src/game/game_meta_info.cpp diff --git a/libcockatrice_game/libcockatrice/game/game_meta_info.h b/cockatrice/src/game/game_meta_info.h similarity index 100% rename from libcockatrice_game/libcockatrice/game/game_meta_info.h rename to cockatrice/src/game/game_meta_info.h diff --git a/libcockatrice_game/libcockatrice/game/game_state.cpp b/cockatrice/src/game/game_state.cpp similarity index 100% rename from libcockatrice_game/libcockatrice/game/game_state.cpp rename to cockatrice/src/game/game_state.cpp diff --git a/libcockatrice_game/libcockatrice/game/game_state.h b/cockatrice/src/game/game_state.h similarity index 81% rename from libcockatrice_game/libcockatrice/game/game_state.h rename to cockatrice/src/game/game_state.h index 4d02019ce..55784fb91 100644 --- a/libcockatrice_game/libcockatrice/game/game_state.h +++ b/cockatrice/src/game/game_state.h @@ -33,11 +33,7 @@ public: void setHostId(int _hostId) { - if (hostId == _hostId) { - return; - } hostId = _hostId; - emit hostChanged(hostId); } QList getClients() const @@ -116,19 +112,6 @@ public: return hostId; } - void setSeatOrder(const QList &order) - { - if (seatOrder != order) { - seatOrder = order; - emit seatOrderChanged(seatOrder); - } - } - - QList getSeatOrder() const - { - return seatOrder; - } - int getSecondsElapsed() const { return secondsElapsed; @@ -140,8 +123,6 @@ signals: void gameStopped(); void activePhaseChanged(int activePhase); void activePlayerChanged(int playerId); - void hostChanged(int hostId); - void seatOrderChanged(const QList &seatOrder); public slots: void incrementGameTime(); @@ -161,9 +142,6 @@ private: int currentPhase; int activePlayer; bool gameClosed; - //! Player ids in seating (turn) order, first to play first. Empty until the - //! server sends an order, in which case players are laid out in id order. - QList seatOrder; }; #endif // COCKATRICE_GAME_STATE_H diff --git a/libcockatrice_game/libcockatrice/game/phase.cpp b/cockatrice/src/game/phase.cpp similarity index 100% rename from libcockatrice_game/libcockatrice/game/phase.cpp rename to cockatrice/src/game/phase.cpp diff --git a/libcockatrice_game/libcockatrice/game/phase.h b/cockatrice/src/game/phase.h similarity index 100% rename from libcockatrice_game/libcockatrice/game/phase.h rename to cockatrice/src/game/phase.h diff --git a/libcockatrice_game/libcockatrice/game/player/event_processing_options.h b/cockatrice/src/game/player/event_processing_options.h similarity index 100% rename from libcockatrice_game/libcockatrice/game/player/event_processing_options.h rename to cockatrice/src/game/player/event_processing_options.h diff --git a/libcockatrice_game/libcockatrice/game/player/player_actions.cpp b/cockatrice/src/game/player/player_actions.cpp similarity index 84% rename from libcockatrice_game/libcockatrice/game/player/player_actions.cpp rename to cockatrice/src/game/player/player_actions.cpp index 90823fec6..35682ede8 100644 --- a/libcockatrice_game/libcockatrice/game/player/player_actions.cpp +++ b/cockatrice/src/game/player/player_actions.cpp @@ -1,8 +1,13 @@ #include "player_actions.h" +#include "../../client/settings/cache_settings.h" +#include "../../game_graphics/board/card_item.h" +#include "../../game_graphics/dialogs/dlg_create_token.h" +#include "../../game_graphics/dialogs/dlg_move_top_cards_until.h" +#include "../../game_graphics/player/card_menu_action_type.h" +#include "../../game_graphics/zones/table_zone.h" +#include "../../interface/deck_loader/loaded_deck.h" #include "../abstract_game.h" -#include "../board/arrow_data.h" -#include "../board/card_state.h" #include "../board/counter_state.h" #include "../game_event_handler.h" #include "../zones/card_zone_logic.h" @@ -26,6 +31,8 @@ #include #include #include +#include +#include #include #include #include @@ -44,15 +51,10 @@ #include #include #include -#include -#include -#include #include #include -#include #include #include -#include #include #include #include @@ -62,12 +64,11 @@ #include #include #include -#include #include #include -#include +#include +#include #include -#include #include #include #include @@ -79,11 +80,8 @@ // milliseconds in between triggers of the move top cards until action static constexpr int MOVE_TOP_CARD_UNTIL_INTERVAL = 100; -PlayerActions::PlayerActions(PlayerLogic *_player, - IInterfaceSettingsProvider *_interfaceSettings, - ICardPreferenceProvider *_cardPreferences) - : QObject(_player), player(_player), interfaceSettings(_interfaceSettings), cardPreferences(_cardPreferences), - lastTokenTableRow(0), movingCardsUntil(false) +PlayerActions::PlayerActions(PlayerLogic *_player) + : QObject(_player), player(_player), lastTokenTableRow(0), movingCardsUntil(false) { connect(this, &PlayerActions::requestZoneViewToggle, player, &PlayerLogic::onRequestZoneViewToggle); @@ -93,27 +91,7 @@ PlayerActions::PlayerActions(PlayerLogic *_player, connect(moveTopCardTimer, &QTimer::timeout, [this]() { actMoveTopCardToPlay(); }); } -bool PlayerActions::getPlayToStack() const -{ - return interfaceSettings ? interfaceSettings->getPlayToStack() : true; -} - -int PlayerActions::getStartingHandSize() const -{ - return interfaceSettings ? interfaceSettings->getStartingHandSize() : 7; -} - -bool PlayerActions::getAnnotateTokens() const -{ - return interfaceSettings ? interfaceSettings->getAnnotateTokens() : false; -} - -QString PlayerActions::getCardPreferenceOverride(const QString &cardName) const -{ - return cardPreferences ? cardPreferences->getCardPreferenceOverride(cardName) : QString(); -} - -void PlayerActions::playCard(CardState *card, bool faceDown) +void PlayerActions::playCard(CardItem *card, bool faceDown) { if (card == nullptr) { return; @@ -134,7 +112,7 @@ void PlayerActions::playCard(CardState *card, bool faceDown) const CardInfo &info = exactCard.getInfo(); int tableRow = info.getUiAttributes().tableRow; - bool playToStack = getPlayToStack(); + bool playToStack = SettingsCache::instance().userInterface().getPlayToStack(); QString currentZone = card->getZone()->getName(); if (!faceDown && currentZone == ZoneNames::STACK && tableRow == 3) { cmd.set_target_zone(ZoneNames::GRAVE); @@ -147,7 +125,7 @@ void PlayerActions::playCard(CardState *card, bool faceDown) cmd.set_y(0); } else { tableRow = faceDown ? 2 : info.getUiAttributes().tableRow; - QPoint gridPoint = QPoint(-1, TableZoneLogic::tableRowToGridY(tableRow)); + QPoint gridPoint = QPoint(-1, TableZone::tableRowToGridY(tableRow)); cardToMove->set_face_down(faceDown); if (!faceDown) { cardToMove->set_pt(info.getPowTough().toStdString()); @@ -166,7 +144,7 @@ void PlayerActions::playCard(CardState *card, bool faceDown) * Like {@link PlayerActions::playCard}, but forces the card to be played to the table zone. * Cards with tablerow 3 (the stack) will be played to tablerow 1 (the noncreatures row). */ -void PlayerActions::playCardToTable(const CardState *card, bool faceDown) +void PlayerActions::playCardToTable(const CardItem *card, bool faceDown) { if (card == nullptr) { return; @@ -187,7 +165,7 @@ void PlayerActions::playCardToTable(const CardState *card, bool faceDown) const CardInfo &info = exactCard.getInfo(); int tableRow = faceDown ? 2 : info.getUiAttributes().tableRow; - QPoint gridPoint = QPoint(-1, TableZoneLogic::tableRowToGridY(tableRow)); + QPoint gridPoint = QPoint(-1, TableZone::tableRowToGridY(tableRow)); cardToMove->set_face_down(faceDown); if (!faceDown) { cardToMove->set_pt(info.getPowTough().toStdString()); @@ -199,60 +177,6 @@ void PlayerActions::playCardToTable(const CardState *card, bool faceDown) sendGameCommand(cmd); } -void PlayerActions::attachCards(CardState *startCard, const CardState *targetCard) -{ - if (targetCard->getAttachedTo() || targetCard->getZone()->getName() != ZoneNames::TABLE) { - return; - } - - // move card onto table first if attaching from some other zone - if (startCard->getZone()->getName() != ZoneNames::TABLE) { - playCardToTable(startCard, false); - } - - Command_AttachCard cmd; - cmd.set_start_zone(ZoneNames::TABLE); - cmd.set_card_id(startCard->getId()); - cmd.set_target_player_id(targetCard->getZone()->getPlayer()->getPlayerInfo()->getId()); - cmd.set_target_zone(targetCard->getZone()->getName().toStdString()); - cmd.set_target_card_id(targetCard->getId()); - sendGameCommand(cmd); -} - -void PlayerActions::createArrow(CardState *startCard, const ArrowData &arrow, int deleteInPhase) -{ - Command_CreateArrow cmd; - cmd.mutable_arrow_color()->CopyFrom(convertQColorToColor(arrow.color)); - cmd.set_start_player_id(arrow.startPlayerId); - cmd.set_start_zone(arrow.startZone.toStdString()); - cmd.set_start_card_id(arrow.startCardId); - cmd.set_target_player_id(arrow.targetPlayerId); - - if (!arrow.isPlayerTargeted()) { - cmd.set_target_zone(arrow.targetZone.toStdString()); - cmd.set_target_card_id(arrow.targetCardId); - } - - // if the card is in hand then it has just been moved to the stack or table as part of drawing the arrow - if (arrow.startZone == ZoneNames::HAND) { - CardInfoPtr ci = startCard->getCard().getCardPtr(); - bool playToStack = getPlayToStack(); - if (ci && ((!playToStack && ci->getUiAttributes().tableRow == 3) || - (playToStack && ci->getUiAttributes().tableRow != 0 && - startCard->getZone()->getName() != ZoneNames::STACK))) { - cmd.set_start_zone(ZoneNames::STACK); - } else { - cmd.set_start_zone(playToStack ? ZoneNames::STACK : ZoneNames::TABLE); - } - } - - if (deleteInPhase != 0) { - cmd.set_delete_in_phase(deleteInPhase); - } - - sendGameCommand(cmd); -} - void PlayerActions::actViewLibrary() { emit requestZoneViewToggle(ZoneNames::DECK, -1); @@ -431,7 +355,7 @@ void PlayerActions::actDrawCard() void PlayerActions::actRequestMulliganDialog() { - int startSize = getStartingHandSize(); + int startSize = SettingsCache::instance().userInterface().getStartingHandSize(); int handSize = player->getHandZone()->getCards().size(); int deckSize = player->getDeckZone()->getCards().size() + handSize; @@ -447,7 +371,7 @@ void PlayerActions::actMulligan(int number) } doMulligan(number); - emit startingHandSizeChosen(number); + SettingsCache::instance().userInterface().setStartingHandSize(number); } void PlayerActions::actMulliganSameSize() @@ -625,7 +549,7 @@ void PlayerActions::moveTopCardsUntil(const QString &expr, MoveTopCardsUntilOpti } } -void PlayerActions::moveOneCardUntil(CardState *card) +void PlayerActions::moveOneCardUntil(CardItem *card) { moveTopCardTimer->stop(); @@ -817,6 +741,61 @@ void PlayerActions::actMoveBottomCardToTop() sendGameCommand(cmd); } +/** + * Selects all cards in the given zone. + * + * @param zone The zone to select from + * @param filter A predicate to filter which cards are selected. Defaults to always returning true. + */ +static void selectCardsInZone( + const CardZoneLogic *zone, + std::function filter = [](const CardItem *) { return true; }) +{ + if (!zone) { + return; + } + + for (auto &cardItem : zone->getCards()) { + if (cardItem && filter(cardItem)) { + cardItem->setSelected(true); + } + } +} + +void PlayerActions::actSelectAll() +{ + const CardItem *card = player->getGame()->getActiveCard(); + if (!card) { + return; + } + + selectCardsInZone(card->getZone()); +} + +void PlayerActions::actSelectRow() +{ + const CardItem *card = player->getGame()->getActiveCard(); + if (!card) { + return; + } + + auto isSameRow = [card](const CardItem *cardItem) { + return qAbs(card->scenePos().y() - cardItem->scenePos().y()) < 50; + }; + selectCardsInZone(card->getZone(), isSameRow); +} + +void PlayerActions::actSelectColumn() +{ + const CardItem *card = player->getGame()->getActiveCard(); + if (!card) { + return; + } + + auto isSameColumn = [card](const CardItem *cardItem) { return cardItem->x() == card->x(); }; + selectCardsInZone(card->getZone(), isSameColumn); +} + void PlayerActions::actDrawBottomCard() { if (player->getDeckZone()->getCards().empty()) { @@ -950,7 +929,7 @@ void PlayerActions::actCreateToken(TokenInfo tokenToCreate) if (correctedCard) { lastTokenInfo.name = correctedCard.getName(); int tableRow = lastTokenInfo.faceDown ? 2 : correctedCard.getInfo().getUiAttributes().tableRow; - lastTokenTableRow = TableZoneLogic::tableRowToGridY(tableRow); + lastTokenTableRow = TableZone::tableRowToGridY(tableRow); if (lastTokenInfo.pt.isEmpty()) { lastTokenInfo.pt = correctedCard.getInfo().getPowTough(); } @@ -996,14 +975,15 @@ void PlayerActions::setLastTokenInfo(CardInfoPtr cardInfo) return; } - lastTokenInfo = {.name = cardInfo->getName(), - .color = cardInfo->getColors().isEmpty() ? QString() : cardInfo->getColors().left(1).toLower(), - .pt = cardInfo->getPowTough(), - .annotation = getAnnotateTokens() ? cardInfo->getText() : "", - .destroy = true, - .providerId = getCardPreferenceOverride(cardInfo->getName())}; + lastTokenInfo = { + .name = cardInfo->getName(), + .color = cardInfo->getColors().isEmpty() ? QString() : cardInfo->getColors().left(1).toLower(), + .pt = cardInfo->getPowTough(), + .annotation = SettingsCache::instance().userInterface().getAnnotateTokens() ? cardInfo->getText() : "", + .destroy = true, + .providerId = SettingsCache::instance().cardOverrides().getCardPreferenceOverride(cardInfo->getName())}; - lastTokenTableRow = TableZoneLogic::tableRowToGridY(cardInfo->getUiAttributes().tableRow); + lastTokenTableRow = TableZone::tableRowToGridY(cardInfo->getUiAttributes().tableRow); emit requestEnableAndSetCreateAnotherTokenAction(lastTokenInfo.name); } @@ -1021,20 +1001,25 @@ void PlayerActions::actCreatePredefinedToken() actCreateAnotherToken(); } -void PlayerActions::actCreateRelatedCard(const CardState *sourceCard, int index) +void PlayerActions::actCreateRelatedCard() { + const CardItem *sourceCard = player->getGame()->getActiveCard(); + if (!sourceCard) { return; } + auto *action = static_cast(sender()); + // If there is a better way of passing a CardRelation through a QAction, please add it here. auto relatedCards = sourceCard->getCardInfo().getAllRelatedCards(); - CardRelation *cardRelation = relatedCards.at(index); + CardRelation *cardRelation = relatedCards.at(action->data().toInt()); actRequestCreateRelatedFromRelationDialog(sourceCard, cardRelation); } -void PlayerActions::actCreateAllRelatedCards(const CardState *sourceCard) +void PlayerActions::actCreateAllRelatedCards() { + const CardItem *sourceCard = player->getGame()->getActiveCard(); if (!sourceCard) { return; } @@ -1120,13 +1105,13 @@ void PlayerActions::actCreateAllRelatedCards(const CardState *sourceCard) } } -void PlayerActions::actRequestCreateRelatedFromRelationDialog(const CardState *sourceCard, +void PlayerActions::actRequestCreateRelatedFromRelationDialog(const CardItem *sourceCard, const CardRelation *cardRelation) { emit requestCreateRelatedFromRelationDialog(sourceCard, cardRelation); } -bool PlayerActions::createRelatedFromRelation(const CardState *sourceCard, +bool PlayerActions::createRelatedFromRelation(const CardItem *sourceCard, const CardRelation *cardRelation, int variableCount) { @@ -1178,7 +1163,7 @@ bool PlayerActions::createRelatedFromRelation(const CardState *sourceCard, return true; } -void PlayerActions::onRelatedCardCreated(const CardState *sourceCard, const CardRelation *cardRelation) +void PlayerActions::onRelatedCardCreated(const CardItem *sourceCard, const CardRelation *cardRelation) { if (sourceCard == nullptr || cardRelation == nullptr) { return; @@ -1198,7 +1183,7 @@ void PlayerActions::onRelatedCardCreated(const CardState *sourceCard, const Card setLastToken(relatedCard.getCardPtr()); } -void PlayerActions::createCard(const CardState *sourceCard, +void PlayerActions::createCard(const CardItem *sourceCard, const QString &dbCardName, CardRelationType attachType, bool persistent, @@ -1210,7 +1195,7 @@ void PlayerActions::createCard(const CardState *sourceCard, return; } - QPoint gridPoint = QPoint(-1, TableZoneLogic::tableRowToGridY(cardInfo->getUiAttributes().tableRow)); + QPoint gridPoint = QPoint(-1, TableZone::tableRowToGridY(cardInfo->getUiAttributes().tableRow)); // create the token for the related card Command_CreateToken cmd; @@ -1229,7 +1214,7 @@ void PlayerActions::createCard(const CardState *sourceCard, } cmd.set_pt(cardInfo->getPowTough().toStdString()); - if (getAnnotateTokens()) { + if (SettingsCache::instance().userInterface().getAnnotateTokens()) { cmd.set_annotation(cardInfo->getText().toStdString()); } else { cmd.set_annotation(""); @@ -1284,7 +1269,7 @@ void PlayerActions::actRequestMoveCardXCardsFromTopDialog() emit requestMoveCardXCardsFromTopDialog(defaultNumberTopCardsToPlaceBelow, deckSize); } -void PlayerActions::actMoveCardXCardsFromTop(QList selectedCards, int number) +void PlayerActions::actMoveCardXCardsFromTop(QList selectedCards, int number) { defaultNumberTopCardsToPlaceBelow = number; @@ -1318,14 +1303,14 @@ void PlayerActions::actMoveCardXCardsFromTop(QList selectedCards, i } } -void PlayerActions::actIncPT(QList selectedCards, int deltaP, int deltaT) +void PlayerActions::actIncPT(QList selectedCards, int deltaP, int deltaT) { int playerid = player->getPlayerInfo()->getId(); QList commandList; for (auto card : selectedCards) { QString pt = card->getPT(); - const auto ptList = CardState::parsePT(pt); + const auto ptList = CardItem::parsePT(pt); QString newpt; if (ptList.isEmpty()) { newpt = QString::number(deltaP) + (deltaT ? "/" + QString::number(deltaT) : ""); @@ -1351,7 +1336,7 @@ void PlayerActions::actIncPT(QList selectedCards, int deltaP, int d player->getGame()->getGameEventHandler()->sendGameCommand(prepareGameCommand(commandList), playerid); } -void PlayerActions::actResetPT(QList selectedCards) +void PlayerActions::actResetPT(QList selectedCards) { int playerid = player->getPlayerInfo()->getId(); QList commandList; @@ -1384,7 +1369,7 @@ void PlayerActions::actResetPT(QList selectedCards) } } -void PlayerActions::actRequestSetPTDialog(QList selectedCards) +void PlayerActions::actRequestSetPTDialog(QList selectedCards) { QString oldPT; @@ -1397,11 +1382,11 @@ void PlayerActions::actRequestSetPTDialog(QList selectedCards) emit requestSetPTDialog(oldPT); } -void PlayerActions::actSetPT(QList selectedCards, const QString &pt) +void PlayerActions::actSetPT(QList selectedCards, const QString &pt) { int playerid = player->getPlayerInfo()->getId(); - const auto ptList = CardState::parsePT(pt); + const auto ptList = CardItem::parsePT(pt); bool empty = ptList.isEmpty(); QList commandList; @@ -1409,7 +1394,7 @@ void PlayerActions::actSetPT(QList selectedCards, const QString &pt auto *cmd = new Command_SetCardAttr; QString newpt = QString(); if (!empty) { - const auto oldpt = CardState::parsePT(card->getPT()); + const auto oldpt = CardItem::parsePT(card->getPT()); int ptIter = 0; for (const auto &_item : ptList) { if (_item.typeId() == QMetaType::Type::Int) { @@ -1437,65 +1422,55 @@ void PlayerActions::actSetPT(QList selectedCards, const QString &pt player->getGame()->getGameEventHandler()->sendGameCommand(prepareGameCommand(commandList), playerid); } -void PlayerActions::actIncP(QList selectedCards) +void PlayerActions::actDrawArrow() +{ + auto *card = player->getGame()->getActiveCard(); + if (card) { + card->drawArrow(Qt::red); + } +} + +void PlayerActions::actIncP(QList selectedCards) { actIncPT(selectedCards, 1, 0); } -void PlayerActions::actDecP(QList selectedCards) +void PlayerActions::actDecP(QList selectedCards) { actIncPT(selectedCards, -1, 0); } -void PlayerActions::actIncT(QList selectedCards) +void PlayerActions::actIncT(QList selectedCards) { actIncPT(selectedCards, 0, 1); } -void PlayerActions::actDecT(QList selectedCards) +void PlayerActions::actDecT(QList selectedCards) { actIncPT(selectedCards, 0, -1); } -void PlayerActions::actIncPT(QList selectedCards) +void PlayerActions::actIncPT(QList selectedCards) { actIncPT(selectedCards, 1, 1); } -void PlayerActions::actDecPT(QList selectedCards) +void PlayerActions::actDecPT(QList selectedCards) { actIncPT(selectedCards, -1, -1); } -void PlayerActions::actFlowP(QList selectedCards) +void PlayerActions::actFlowP(QList selectedCards) { actIncPT(selectedCards, 1, -1); } -void PlayerActions::actFlowT(QList selectedCards) +void PlayerActions::actFlowT(QList selectedCards) { actIncPT(selectedCards, -1, 1); } -void PlayerActions::actIncrementCounter(int counterId, int delta) -{ - Command_IncCounter cmd; - cmd.set_counter_id(counterId); - cmd.set_delta(delta); - - sendGameCommand(cmd); -} - -void PlayerActions::actSetCounter(int counterId, int value) -{ - Command_SetCounter cmd; - cmd.set_counter_id(counterId); - cmd.set_value(value); - - sendGameCommand(cmd); -} - -void PlayerActions::actReduceLifeByPower(QList selectedCards) +void PlayerActions::actReduceLifeByPower(QList selectedCards) { // find life counter auto lifeCounter = player->getLifeCounter(); @@ -1506,7 +1481,7 @@ void PlayerActions::actReduceLifeByPower(QList selectedCards) // calculate total power; int total = 0; for (auto card : selectedCards) { - QVariantList parsed = CardState::parsePT(card->getPT()); + QVariantList parsed = CardItem::parsePT(card->getPT()); if (!parsed.isEmpty()) { int power = parsed.first().toInt(); // toInt will default to 0 if it's not an int total += qMax(power, 0); @@ -1520,7 +1495,17 @@ void PlayerActions::actReduceLifeByPower(QList selectedCards) sendGameCommand(prepareGameCommand(cmd)); } -void PlayerActions::actRequestSetAnnotationDialog(QList selectedCards) +void AnnotationDialog::keyPressEvent(QKeyEvent *event) +{ + if (event->key() == Qt::Key_Return && event->modifiers() & Qt::ControlModifier) { + event->accept(); + accept(); + return; + } + QInputDialog::keyPressEvent(event); +} + +void PlayerActions::actRequestSetAnnotationDialog(QList selectedCards) { QString oldAnnotation; for (auto card : selectedCards) { @@ -1532,7 +1517,7 @@ void PlayerActions::actRequestSetAnnotationDialog(QList selectedCar emit requestSetAnnotationDialog(oldAnnotation); } -void PlayerActions::actSetAnnotation(QList selectedCards, const QString &annotation) +void PlayerActions::actSetAnnotation(QList selectedCards, const QString &annotation) { QList commandList; for (auto card : selectedCards) { @@ -1546,7 +1531,17 @@ void PlayerActions::actSetAnnotation(QList selectedCards, const QSt sendGameCommand(prepareGameCommand(commandList)); } -void PlayerActions::actUnattach(QList selectedCards) +void PlayerActions::actAttach() +{ + auto *card = player->getGame()->getActiveCard(); + if (!card) { + return; + } + + card->drawAttachArrow(); +} + +void PlayerActions::actUnattach(QList selectedCards) { QList commandList; for (auto card : selectedCards) { @@ -1562,17 +1557,17 @@ void PlayerActions::actUnattach(QList selectedCards) sendGameCommand(prepareGameCommand(commandList)); } -void PlayerActions::actAddCardCounter(QList selectedCards, int counterId) +void PlayerActions::actAddCardCounter(QList selectedCards, int counterId) { offsetCardCounter(selectedCards, counterId, 1); } -void PlayerActions::actRemoveCardCounter(QList selectedCards, int counterId) +void PlayerActions::actRemoveCardCounter(QList selectedCards, int counterId) { offsetCardCounter(selectedCards, counterId, -1); } -void PlayerActions::offsetCardCounter(QList selectedCards, int counterId, int offset) +void PlayerActions::offsetCardCounter(QList selectedCards, int counterId, int offset) { QList commandList; for (auto card : selectedCards) { @@ -1598,7 +1593,7 @@ void PlayerActions::offsetCardCounter(QList selectedCards, int coun sendGameCommand(prepareGameCommand(commandList)); } -void PlayerActions::actRequestSetCardCounterDialog(QList selectedCards, int counterId) +void PlayerActions::actRequestSetCardCounterDialog(QList selectedCards, int counterId) { // If a single card is selected, we show the old value in the dialog. Otherwise, we show "x" QString oldValueForDlg = "x"; @@ -1610,7 +1605,7 @@ void PlayerActions::actRequestSetCardCounterDialog(QList selectedCa emit requestSetCardCounterDialog(counterId, oldValueForDlg); } -void PlayerActions::actSetCardCounter(QList selectedCards, int counterId, const QString &counterValue) +void PlayerActions::actSetCardCounter(QList selectedCards, int counterId, const QString &counterValue) { QList commandList; for (auto card : selectedCards) { @@ -1631,13 +1626,11 @@ void PlayerActions::actSetCardCounter(QList selectedCards, int coun sendGameCommand(prepareGameCommand(commandList)); } -void PlayerActions::actIncrementAllCardCounters(QList cardsToUpdate) +void PlayerActions::actIncrementAllCardCounters(QList cardsToUpdate) { if (cardsToUpdate.isEmpty()) { // If no cards selected, update all cards on table - for (auto *state : player->getTableZone()->getCards()) { - cardsToUpdate.append(state); - } + cardsToUpdate = static_cast>(player->getTableZone()->getCards()); } QList commandList; @@ -1680,7 +1673,7 @@ static bool isUnwritableRevealZone(CardZoneLogic *zone) return false; } -void PlayerActions::playSelectedCards(QList selectedCards, const bool faceDown) +void PlayerActions::playSelectedCards(QList selectedCards, const bool faceDown) { // CardIds will get shuffled downwards when cards leave the deck. // We need to iterate through the cards in reverse order so cardIds don't get changed out from under us as we play @@ -1695,26 +1688,27 @@ void PlayerActions::playSelectedCards(QList selectedCards, const bo } } -void PlayerActions::actPlay(QList selectedCards) +void PlayerActions::actPlay(QList selectedCards) { playSelectedCards(selectedCards, false); } -void PlayerActions::actPlayFacedown(QList selectedCards) +void PlayerActions::actPlayFacedown(QList selectedCards) { playSelectedCards(selectedCards, true); } -void PlayerActions::actHide(QList selectedCards) +void PlayerActions::actHide(QList selectedCards) { - for (const auto &card : selectedCards) { - if (isUnwritableRevealZone(card->getZone())) { + for (const auto &item : selectedCards) { + auto *card = static_cast(item); + if (card && isUnwritableRevealZone(card->getZone())) { card->getZone()->removeCard(card); } } } -void PlayerActions::actReveal(QList selectedCards, QAction *action) +void PlayerActions::actReveal(QList selectedCards, QAction *action) { const int otherPlayerId = action->data().toInt(); @@ -1805,9 +1799,9 @@ void PlayerActions::actRevealRandomGraveyardCard(int revealToPlayerId) sendGameCommand(cmd); } -void PlayerActions::cardMenuAction(QList selectedCards, CardMenuActionType type) +void PlayerActions::cardMenuAction(QList selectedCards, CardMenuActionType type) { - QList cardList = selectedCards; + QList cardList = selectedCards; QList commandList; if (type <= cmClone) { @@ -1997,7 +1991,7 @@ void PlayerActions::cardMenuAction(QList selectedCards, CardMenuAct ctm->set_tapped(info.getUiAttributes().cipt); } - cmd->set_y(TableZoneLogic::tableRowToGridY(tableRow)); + cmd->set_y(TableZone::tableRowToGridY(tableRow)); commandList.append(cmd); } break; @@ -2046,76 +2040,6 @@ PendingCommand *PlayerActions::prepareGameCommand(const QList &cards) -{ - if (!startZone || !targetZone) { - return; - } - - Command_MoveCard cmd; - cmd.set_start_player_id(startZone->getPlayer()->getPlayerInfo()->getId()); - cmd.set_start_zone(startZone->getName().toStdString()); - cmd.set_target_player_id(targetZone->getPlayer()->getPlayerInfo()->getId()); - cmd.set_target_zone(targetZone->getName().toStdString()); - cmd.set_x(x); - cmd.set_y(y); - - if (auto *viewLogic = qobject_cast(targetZone)) { - cmd.set_is_reversed(viewLogic->getIsReversed()); - } - - for (const CardMoveRequest &card : cards) { - auto *cardToMove = cmd.mutable_cards_to_move()->add_card(); - cardToMove->set_card_id(card.cardId); - if (card.faceDown) { - cardToMove->set_face_down(true); - } - if (!card.pt.isEmpty()) { - cardToMove->set_pt(card.pt.toStdString()); - } - } - - sendGameCommand(cmd); -} - -PendingCommand *PlayerActions::prepareZoneDump(CardZoneLogic *zone, int numberCards) -{ - if (!zone) { - return nullptr; - } - - Command_DumpZone cmd; - cmd.set_player_id(zone->getPlayer()->getPlayerInfo()->getId()); - cmd.set_zone_name(zone->getName().toStdString()); - cmd.set_number_cards(numberCards); - if (auto *viewLogic = qobject_cast(zone)) { - cmd.set_is_reversed(viewLogic->getIsReversed()); - } - - return prepareGameCommand(cmd); -} - -void PlayerActions::actToggleTapped(const QString &zoneName, const QList &cards, bool tapped) -{ - QList cmdList; - for (CardState *card : cards) { - if (card->getTapped() != tapped) { - auto *cmd = new Command_SetCardAttr; - cmd->set_zone(zoneName.toStdString()); - cmd->set_card_id(card->getId()); - cmd->set_attribute(AttrTapped); - cmd->set_attr_value(tapped ? "1" : "0"); - cmdList.append(cmd); - } - } - - sendGameCommand(prepareGameCommand(cmdList)); -} - void PlayerActions::sendGameCommand(const google::protobuf::Message &command) { if (player->getPlayerInfo()->getJudge() && !player->getPlayerInfo()->getLocal()) { diff --git a/libcockatrice_game/libcockatrice/game/player/player_actions.h b/cockatrice/src/game/player/player_actions.h similarity index 54% rename from libcockatrice_game/libcockatrice/game/player/player_actions.h rename to cockatrice/src/game/player/player_actions.h index 7ed52b9a1..8fff81635 100644 --- a/libcockatrice_game/libcockatrice/game/player/player_actions.h +++ b/cockatrice/src/game/player/player_actions.h @@ -8,13 +8,12 @@ #ifndef COCKATRICE_PLAYER_ACTIONS_H #define COCKATRICE_PLAYER_ACTIONS_H +#include "../../game_graphics/board/card_item.h" // IWYU pragma: keep - moc instantiates the metatype for QList, which Qt 6.4 needs complete +#include "../../game_graphics/dialogs/dlg_create_token.h" +#include "../../game_graphics/dialogs/dlg_move_top_cards_until.h" +#include "../../game_graphics/player/card_menu_action_type.h" #include "../board/card_list.h" -#include "../board/card_state.h" -#include "card_menu_action_type.h" -#include "card_move_request.h" #include "libcockatrice/card/card_info.h" -#include "move_top_cards_until_options.h" -#include "token_info.h" #include #include @@ -23,6 +22,7 @@ #include #include +class CardItem; class CardRelation; class QAction; class QTimer; @@ -36,16 +36,10 @@ class Message; } } // namespace google -class CardState; -class CardZoneLogic; class Command_MoveCard; -class GameEventContext; -class ICardPreferenceProvider; -class IInterfaceSettingsProvider; class PendingCommand; class PlayerLogic; -class QAction; -struct ArrowData; + class PlayerActions : public QObject { Q_OBJECT @@ -56,9 +50,7 @@ public: RANDOM_CARD_FROM_ZONE = -2 }; - explicit PlayerActions(PlayerLogic *player, - IInterfaceSettingsProvider *interfaceSettings = nullptr, - ICardPreferenceProvider *cardPreferences = nullptr); + explicit PlayerActions(PlayerLogic *player); void sendGameCommand(PendingCommand *pend); void sendGameCommand(const google::protobuf::Message &command); @@ -66,52 +58,7 @@ public: PendingCommand *prepareGameCommand(const ::google::protobuf::Message &cmd); PendingCommand *prepareGameCommand(const QList &cmdList); - /** - * @brief Moves the requested cards between zones on behalf of a view. - * @param startZone Zone the cards are dragged out of. - * @param targetZone Zone the cards are dropped onto. - * @param x Horizontal target index within the zone. - * @param y Vertical target index within the zone. - * @param cards The cards to move, as chosen by the view. - */ - void - moveCards(CardZoneLogic *startZone, CardZoneLogic *targetZone, int x, int y, const QList &cards); - - /** - * @brief Prepares a dump of the given zone, for the caller to connect to and send. - * @param zone Zone to dump. - * @param numberCards How many cards to dump, -1 for all. - */ - PendingCommand *prepareZoneDump(CardZoneLogic *zone, int numberCards); - - /** - * @brief Sets the tapped state of the cards that do not already have it. - * @param zoneName Zone the cards belong to. - * @param cards Cards the view wants toggled. - * @param tapped Desired tapped state. - */ - void actToggleTapped(const QString &zoneName, const QList &cards, bool tapped); - - /** - * @brief Attaches one card to another on the table on behalf of a view. - * @param startCard Card being attached. - * @param targetCard Card being attached to. - */ - void attachCards(CardState *startCard, const CardState *targetCard); - - /** - * @brief Draws an arrow from a card to another card or a player on behalf of a view. - * - * The view resolves the endpoints before playing the card out of hand, so the - * arrow still records the zone the card started in. - * - * @param startCard Card the arrow starts from. - * @param arrow Arrow endpoints and color, as resolved by the view. - * @param deleteInPhase Phase the arrow expires in, 0 to keep it until removed. - */ - void createArrow(CardState *startCard, const ArrowData &arrow, int deleteInPhase); - - void moveOneCardUntil(CardState *card); + void moveOneCardUntil(CardItem *card); void stopMoveTopCardsUntil(); [[nodiscard]] bool isMovingCardsUntil() const @@ -140,7 +87,7 @@ signals: void requestDrawBottomCardsDialog(int defaultNumberBottomCards, int maxCards); void requestRollDieDialog(); void requestCreateTokenDialog(const QStringList &predefinedTokens); - void requestCreateRelatedFromRelationDialog(const CardState *sourceCard, const CardRelation *cardRelation); + void requestCreateRelatedFromRelationDialog(const CardItem *sourceCard, const CardRelation *cardRelation); void requestMoveCardXCardsFromTopDialog(int defaultNumberTopCardsToPlaceBelow, int deckSize); void requestSetPTDialog(const QString &oldPT); void requestSetAnnotationDialog(const QString &oldAnnotation); @@ -149,18 +96,12 @@ signals: void requestSortHand(const QList &options); void requestEnableAndSetCreateAnotherTokenAction(const QString &lastTokenName); void requestSetLastToken(CardInfoPtr lastToken); - /** - * @brief The player chose a mulligan size to remember as the starting hand size. - * - * Game logic must not write client settings itself, so persistence is left to the application. - */ - void startingHandSizeChosen(int number); public slots: void setLastToken(CardInfoPtr cardInfo); void setLastTokenInfo(CardInfoPtr cardInfo); - void playCard(CardState *c, bool faceDown); - void playCardToTable(const CardState *c, bool faceDown); + void playCard(CardItem *c, bool faceDown); + void playCardToTable(const CardItem *c, bool faceDown); void actUntapAll(); void actRequestRollDieDialog(); @@ -169,9 +110,9 @@ public slots: void actRequestCreateTokenDialog(const QStringList &predefinedTokens); void actCreateToken(TokenInfo tokenToCreate); void actCreateAnotherToken(); - void actRequestCreateRelatedFromRelationDialog(const CardState *sourceCard, const CardRelation *cardRelation); - bool createRelatedFromRelation(const CardState *sourceCard, const CardRelation *cardRelation, int variableCount); - void onRelatedCardCreated(const CardState *sourceCard, const CardRelation *cardRelation); + void actRequestCreateRelatedFromRelationDialog(const CardItem *sourceCard, const CardRelation *cardRelation); + bool createRelatedFromRelation(const CardItem *sourceCard, const CardRelation *cardRelation, int variableCount); + void onRelatedCardCreated(const CardItem *sourceCard, const CardRelation *cardRelation); void setLastRelatedCreationSucceeded(bool succeeded) { lastRelatedCreationSucceeded = succeeded; @@ -191,9 +132,9 @@ public slots: void actMulliganMinusOne(); void doMulligan(int number); - void actPlay(QList selectedCards); - void actPlayFacedown(QList selectedCards); - void actHide(QList selectedCards); + void actPlay(QList selectedCards); + void actPlayFacedown(QList selectedCards); + void actHide(QList selectedCards); void actMoveTopCardToPlay(); void actMoveTopCardToPlayFaceDown(); @@ -223,6 +164,10 @@ public slots: void actRequestMoveBottomCardsToDialog(const QString &targetZone, const QString &zoneDisplayName, bool faceDown); void moveBottomCardsTo(int number, const QString &targetZone, bool faceDown); + void actSelectAll(); + void actSelectRow(); + void actSelectColumn(); + void actViewLibrary(); void actViewHand(); void actRequestViewTopCardsDialog(); @@ -242,55 +187,47 @@ public slots: void actOpenDeckInDeckEditor(); void actCreatePredefinedToken(); - void actCreateRelatedCard(const CardState *sourceCard, int index); - void actCreateAllRelatedCards(const CardState *sourceCard); + void actCreateRelatedCard(); + void actCreateAllRelatedCards(); void actRequestMoveCardXCardsFromTopDialog(); - void actMoveCardXCardsFromTop(QList selectedCards, int number); - void actRemoveCardCounter(QList selectedCards, int counterId); - void actAddCardCounter(QList selectedCards, int counterId); - void actRequestSetCardCounterDialog(QList selectedCards, int counterId); - void actSetCardCounter(QList selectedCards, int counterId, const QString &counterValue); - void actIncrementAllCardCounters(QList cardsToUpdate); - void actUnattach(QList selectedCards); - void actIncPT(QList selectedCards, int deltaP, int deltaT); - void actResetPT(QList selectedCards); - void actRequestSetPTDialog(QList selectedCards); - void actSetPT(QList selectedCards, const QString &pt); - void actIncP(QList selectedCards); - void actDecP(QList selectedCards); - void actIncT(QList selectedCards); - void actDecT(QList selectedCards); - void actIncPT(QList selectedCards); - void actDecPT(QList selectedCards); - void actFlowP(QList selectedCards); - void actFlowT(QList selectedCards); + void actMoveCardXCardsFromTop(QList selectedCards, int number); + void actRemoveCardCounter(QList selectedCards, int counterId); + void actAddCardCounter(QList selectedCards, int counterId); + void actRequestSetCardCounterDialog(QList selectedCards, int counterId); + void actSetCardCounter(QList selectedCards, int counterId, const QString &counterValue); + void actIncrementAllCardCounters(QList cardsToUpdate); + void actAttach(); + void actUnattach(QList selectedCards); + void actDrawArrow(); + void actIncPT(QList selectedCards, int deltaP, int deltaT); + void actResetPT(QList selectedCards); + void actRequestSetPTDialog(QList selectedCards); + void actSetPT(QList selectedCards, const QString &pt); + void actIncP(QList selectedCards); + void actDecP(QList selectedCards); + void actIncT(QList selectedCards); + void actDecT(QList selectedCards); + void actIncPT(QList selectedCards); + void actDecPT(QList selectedCards); + void actFlowP(QList selectedCards); + void actFlowT(QList selectedCards); - /** @brief Adjusts a player counter by a signed delta. */ - void actIncrementCounter(int counterId, int delta); + void actReduceLifeByPower(QList selectedCards); - /** @brief Sets a player counter to an absolute value. */ - void actSetCounter(int counterId, int value); - - void actReduceLifeByPower(QList selectedCards); - - void actRequestSetAnnotationDialog(QList selectedCards); - void actSetAnnotation(QList selectedCards, const QString &annotation); - void actReveal(QList selectedCards, QAction *action); + void actRequestSetAnnotationDialog(QList selectedCards); + void actSetAnnotation(QList selectedCards, const QString &annotation); + void actReveal(QList selectedCards, QAction *action); void actRevealHand(int revealToPlayerId); void actRevealRandomHandCard(int revealToPlayerId); void actRevealLibrary(int revealToPlayerId); void actSortHand(); - void cardMenuAction(QList selectedCards, CardMenuActionType type); + void cardMenuAction(QList selectedCards, CardMenuActionType type); private: PlayerLogic *player; - // Borrowed settings providers (owned by the application). Null outside the client, in which case the compiled-in - // defaults below apply. - IInterfaceSettingsProvider *interfaceSettings; - ICardPreferenceProvider *cardPreferences; int defaultNumberTopCards = 1; int defaultNumberTopCardsToPlaceBelow = 1; @@ -308,23 +245,18 @@ private: bool lastRelatedCreationSucceeded = false; - [[nodiscard]] bool getPlayToStack() const; - [[nodiscard]] int getStartingHandSize() const; - [[nodiscard]] bool getAnnotateTokens() const; - [[nodiscard]] QString getCardPreferenceOverride(const QString &cardName) const; - - void createCard(const CardState *sourceCard, + void createCard(const CardItem *sourceCard, const QString &dbCardName, CardRelationType attach = CardRelationType::DoesNotAttach, bool persistent = false, bool faceDown = false); - void playSelectedCards(QList selectedCards, bool faceDown = false); + void playSelectedCards(QList selectedCards, bool faceDown = false); void cmdSetTopCard(Command_MoveCard &cmd); void cmdSetBottomCard(Command_MoveCard &cmd); - void offsetCardCounter(QList selectedCards, int counterId, int offset); + void offsetCardCounter(QList selectedCards, int counterId, int offset); }; #endif // COCKATRICE_PLAYER_ACTIONS_H diff --git a/libcockatrice_game/libcockatrice/game/player/player_event_handler.cpp b/cockatrice/src/game/player/player_event_handler.cpp similarity index 88% rename from libcockatrice_game/libcockatrice/game/player/player_event_handler.cpp rename to cockatrice/src/game/player/player_event_handler.cpp index 6588547da..18f6573df 100644 --- a/libcockatrice_game/libcockatrice/game/player/player_event_handler.cpp +++ b/cockatrice/src/game/player/player_event_handler.cpp @@ -1,14 +1,14 @@ #include "player_event_handler.h" +#include "../../game_graphics/board/card_item.h" +#include "../../game_graphics/zones/view_zone.h" #include "../abstract_game.h" #include "../board/arrow_data.h" #include "../board/card_list.h" -#include "../board/card_state.h" #include "../board/counter_state.h" #include "../zones/card_zone_logic.h" #include "../zones/hand_zone_logic.h" #include "../zones/pile_zone_logic.h" -#include "../zones/view_zone_logic.h" #include "libcockatrice/card/card_info.h" #include "libcockatrice/card/printing/exact_card.h" #include "libcockatrice/protocol/pb/card_attributes.pb.h" @@ -27,9 +27,6 @@ #include #include #include -#include -#include -#include #include #include #include @@ -52,7 +49,6 @@ #include #include #include -#include #include #include #include @@ -80,12 +76,12 @@ void PlayerEventHandler::eventShuffle(const Event_Shuffle &event) } // close all views that contain shuffled cards - for (auto *viewLogic : zone->getViews()) { - if (viewLogic != nullptr) { - int length = viewLogic->getCards().length(); + for (ZoneViewZone *view : zone->getViews()) { + if (view != nullptr) { + int length = view->getLogic()->getCards().length(); // we want to close empty views as well if (length == 0 || length > absStart) { // note this assumes views always start at the top of the library - viewLogic->requestClose(); + view->close(); } } else { qWarning() << zone->getName() << "of" << player->getPlayerInfo()->getName() << "holds empty zoneview!"; @@ -159,29 +155,23 @@ void PlayerEventHandler::eventCreateToken(const Event_CreateToken &event) } CardRef cardRef = {QString::fromStdString(event.card_name()), QString::fromStdString(event.card_provider_id())}; + CardItem *card = new CardItem(player, nullptr, cardRef, event.card_id()); // use db PT if not provided in event and not face-down - QString pt = QString::fromStdString(event.pt()); - if (pt.isEmpty() && !event.face_down()) { - ExactCard dbCard = CardDatabaseManager::query()->getCard(cardRef); + if (!QString::fromStdString(event.pt()).isEmpty()) { + card->setPT(QString::fromStdString(event.pt())); + } else if (!event.face_down()) { + ExactCard dbCard = card->getCard(); if (dbCard) { - pt = dbCard.getInfo().getPowTough(); + card->setPT(dbCard.getInfo().getPowTough()); } } + card->setColor(QString::fromStdString(event.color())); + card->setAnnotation(QString::fromStdString(event.annotation())); + card->setDestroyOnZoneChange(event.destroy_on_zone_change()); + card->setFaceDown(event.face_down()); - emit logCreateToken(player, cardRef.name, pt, event.face_down()); - - ServerInfo_Card cardInfo; - cardInfo.set_id(event.card_id()); - cardInfo.set_name(event.card_name()); - cardInfo.set_provider_id(event.card_provider_id()); - cardInfo.set_pt(pt.toStdString()); - cardInfo.set_color(event.color()); - cardInfo.set_annotation(event.annotation()); - cardInfo.set_destroy_on_zone_change(event.destroy_on_zone_change()); - cardInfo.set_face_down(event.face_down()); - cardInfo.set_x(event.x()); - cardInfo.set_y(event.y()); - emit zone->createCardRequested(cardInfo, true); + emit logCreateToken(player, card->getName(), card->getPT(), card->getFaceDown()); + zone->addCard(card, true, event.x(), event.y()); } void PlayerEventHandler::eventSetCardAttr(const Event_SetCardAttr &event, @@ -203,7 +193,7 @@ void PlayerEventHandler::eventSetCardAttr(const Event_SetCardAttr &event, emit logSetTapped(player, nullptr, event.attr_value() == "1"); } } else { - CardState *card = zone->getCard(event.card_id()); + CardItem *card = zone->getCard(event.card_id()); if (!card) { qWarning() << "PlayerEventHandler::eventSetCardAttr: card id=" << event.card_id() << "not found"; return; @@ -213,7 +203,7 @@ void PlayerEventHandler::eventSetCardAttr(const Event_SetCardAttr &event, } void PlayerEventHandler::setCardAttrHelper(const GameEventContext &context, - CardState *card, + CardItem *card, CardAttribute attribute, const QString &avalue, bool allCards, @@ -274,7 +264,7 @@ void PlayerEventHandler::eventSetCardCounter(const Event_SetCardCounter &event) return; } - CardState *card = zone->getCard(event.card_id()); + CardItem *card = zone->getCard(event.card_id()); if (!card) { return; } @@ -351,13 +341,13 @@ void PlayerEventHandler::eventMoveCard(const Event_MoveCard &event, const GameEv if (x == -1) { x = 0; } - CardState *card = startZone->takeCard(position, event.card_id(), startZone != targetZone); + CardItem *card = startZone->takeCard(position, event.card_id(), startZone != targetZone); if (card == nullptr) { return; } - const bool zoneChanged = startZone != targetZone; - const bool ownerChanged = zoneChanged && startZone->getPlayer() != targetZone->getPlayer(); - emit cardViewRefreshRequested(card, zoneChanged, ownerChanged ? targetZone->getPlayer() : nullptr); + if (startZone != targetZone) { + card->deleteCardInfoPopup(); + } if (event.has_card_name()) { QString name = QString::fromStdString(event.card_name()); QString providerId = @@ -366,19 +356,27 @@ void PlayerEventHandler::eventMoveCard(const Event_MoveCard &event, const GameEv } if (card->getAttachedTo() && (startZone != targetZone)) { - CardState *parentCard = card->getAttachedTo(); - // CardState::setAttachedTo removes the card from the old parent's attachedCards list and emits the zone events. + CardItem *parentCard = card->getAttachedTo(); card->setAttachedTo(nullptr); parentCard->getZone()->reorganizeCards(); } + card->deleteDragItem(); + card->setId(event.new_card_id()); card->setFaceDown(event.face_down()); if (startZone != targetZone) { - const QList &attachedCards = card->getAttachedCards(); + card->setBeingPointedAt(false); + card->setHovered(false); + + const QList &attachedCards = card->getAttachedCards(); for (auto attachedCard : attachedCards) { emit targetZone->cardAdded(attachedCard); } + + if (startZone->getPlayer() != targetZone->getPlayer()) { + card->setOwner(targetZone->getPlayer()); + } } // The log event has to be sent before the card is added to the target zone @@ -406,7 +404,7 @@ void PlayerEventHandler::eventFlipCard(const Event_FlipCard &event) if (!zone) { return; } - CardState *card = zone->getCard(event.card_id()); + CardItem *card = zone->getCard(event.card_id()); if (!card) { return; } @@ -429,28 +427,20 @@ void PlayerEventHandler::eventDestroyCard(const Event_DestroyCard &event) return; } - CardState *card = zone->getCard(event.card_id()); + CardItem *card = zone->getCard(event.card_id()); if (!card) { return; } - QList attachedCards = card->getAttachedCards(); + QList attachedCards = card->getAttachedCards(); // This list is always empty except for buggy server implementations. for (auto &attachedCard : attachedCards) { - card->removeAttachedCard(attachedCard); - attachedCard->setGridPoint(QPoint(-1, attachedCard->getGridPoint().y())); attachedCard->setAttachedTo(nullptr); - if (attachedCard->getZone() == nullptr) { - attachedCard->deleteView(); - } else { - emit attachedCard->getZone()->cardAdded(attachedCard); - attachedCard->getZone()->reorganizeCards(); - } } emit logDestroyCard(player, card->getName()); zone->takeCard(-1, event.card_id(), true); - card->deleteView(); + card->deleteLater(); } void PlayerEventHandler::eventAttachCard(const Event_AttachCard &event) @@ -458,7 +448,7 @@ void PlayerEventHandler::eventAttachCard(const Event_AttachCard &event) const QMap &playerList = player->getGame()->getPlayerManager()->getPlayers(); PlayerLogic *targetPlayer = nullptr; CardZoneLogic *targetZone = nullptr; - CardState *targetCard = nullptr; + CardItem *targetCard = nullptr; if (event.has_target_player_id()) { targetPlayer = playerList.value(event.target_player_id(), 0); if (targetPlayer) { @@ -474,12 +464,12 @@ void PlayerEventHandler::eventAttachCard(const Event_AttachCard &event) return; } - CardState *startCard = startZone->getCard(event.card_id()); + CardItem *startCard = startZone->getCard(event.card_id()); if (!startCard) { return; } - CardState *oldParent = startCard->getAttachedTo(); + CardItem *oldParent = startCard->getAttachedTo(); startCard->setAttachedTo(targetCard); @@ -508,7 +498,7 @@ void PlayerEventHandler::eventDrawCards(const Event_DrawCards &event) if (listSize) { for (int i = 0; i < listSize; ++i) { const ServerInfo_Card &cardInfo = event.cards(i); - CardState *card = _deck->takeCard(0, cardInfo.id()); + CardItem *card = _deck->takeCard(0, cardInfo.id()); QString cardName = QString::fromStdString(cardInfo.name()); QString providerId = QString::fromStdString(cardInfo.provider_id()); card->setCardRef({cardName, providerId}); @@ -556,7 +546,7 @@ void PlayerEventHandler::eventRevealCards(const Event_RevealCards &event, EventP for (const auto &card : cardList) { QString cardName = QString::fromStdString(card->name()); QString providerId = QString::fromStdString(card->provider_id()); - CardState *cardItem = zone->getCard(card->id()); + CardItem *cardItem = zone->getCard(card->id()); if (!cardItem) { continue; } diff --git a/libcockatrice_game/libcockatrice/game/player/player_event_handler.h b/cockatrice/src/game/player/player_event_handler.h similarity index 89% rename from libcockatrice_game/libcockatrice/game/player/player_event_handler.h rename to cockatrice/src/game/player/player_event_handler.h index d253deef0..88254119b 100644 --- a/libcockatrice_game/libcockatrice/game/player/player_event_handler.h +++ b/cockatrice/src/game/player/player_event_handler.h @@ -27,7 +27,7 @@ #include #include -class CardState; +class CardItem; class CardZoneLogic; class PlayerLogic; class Event_AttachCard; @@ -61,7 +61,7 @@ template class QList; * Design notes: * - All event handlers assume events are authoritative and already validated * by the server. - * - Most handlers mutate both logical state (CardState, CardZoneLogic, counters) + * - Most handlers mutate both logical state (CardItem, CardZoneLogic, counters) * and visual/UI state (views, arrows, menus). * - Logging signals are emitted *after* or *during* state mutation, depending * on whether later mutations would invalidate log data. @@ -238,7 +238,7 @@ signals: void logUndoDraw(PlayerLogic *player, QString cardName); void logUndoDrawFailed(PlayerLogic *player); void logMoveCard(PlayerLogic *player, - CardState *card, + CardItem *card, CardZoneLogic *startZone, int oldX, CardZoneLogic *targetZone, @@ -248,11 +248,11 @@ signals: void logAttachCard(PlayerLogic *player, QString cardName, PlayerLogic *targetPlayer, QString targetCardName); void logUnattachCard(PlayerLogic *player, QString cardName); void logSetCardCounter(PlayerLogic *player, QString cardName, int counterId, int value, int oldValue); - void logSetTapped(PlayerLogic *player, CardState *card, bool tapped); + void logSetTapped(PlayerLogic *player, CardItem *card, bool tapped); void logSetCounter(PlayerLogic *player, QString counterName, int value, int oldValue); - void logSetDoesntUntap(PlayerLogic *player, CardState *card, bool doesntUntap); - void logSetPT(PlayerLogic *player, CardState *card, QString newPT); - void logSetAnnotation(PlayerLogic *player, CardState *card, QString newAnnotation); + void logSetDoesntUntap(PlayerLogic *player, CardItem *card, bool doesntUntap); + void logSetPT(PlayerLogic *player, CardItem *card, QString newPT); + void logSetAnnotation(PlayerLogic *player, CardItem *card, QString newAnnotation); void logDumpZone(PlayerLogic *player, CardZoneLogic *zone, int numberCards, bool isReversed = false); void logRevealCards(PlayerLogic *player, CardZoneLogic *zone, @@ -266,23 +266,15 @@ signals: void logAlwaysLookAtTopCard(PlayerLogic *player, CardZoneLogic *zone, bool reveal); /** @} */ - void cardZoneChanged(CardState *card, bool sameZone); - void requestCardMenuUpdate(CardState *card); - /** - * @brief A card was just moved by the server and its view needs refreshing. - * - * @param card The card that moved. - * @param zoneChanged Whether the card crossed a zone boundary. - * @param newOwner The player the card now belongs to, or nullptr to leave the owner alone. - */ - void cardViewRefreshRequested(CardState *card, bool zoneChanged, PlayerLogic *newOwner); + void cardZoneChanged(CardItem *card, bool sameZone); + void requestCardMenuUpdate(const CardItem *card); private: /** Owning player instance. */ PlayerLogic *player; void setCardAttrHelper(const GameEventContext &context, - CardState *card, + CardItem *card, CardAttribute attribute, const QString &avalue, bool allCards, diff --git a/libcockatrice_game/libcockatrice/game/player/player_info.cpp b/cockatrice/src/game/player/player_info.cpp similarity index 100% rename from libcockatrice_game/libcockatrice/game/player/player_info.cpp rename to cockatrice/src/game/player/player_info.cpp diff --git a/libcockatrice_game/libcockatrice/game/player/player_info.h b/cockatrice/src/game/player/player_info.h similarity index 100% rename from libcockatrice_game/libcockatrice/game/player/player_info.h rename to cockatrice/src/game/player/player_info.h diff --git a/libcockatrice_game/libcockatrice/game/player/player_logic.cpp b/cockatrice/src/game/player/player_logic.cpp similarity index 89% rename from libcockatrice_game/libcockatrice/game/player/player_logic.cpp rename to cockatrice/src/game/player/player_logic.cpp index 96bd07164..b545b7088 100644 --- a/libcockatrice_game/libcockatrice/game/player/player_logic.cpp +++ b/cockatrice/src/game/player/player_logic.cpp @@ -1,9 +1,8 @@ #include "player_logic.h" +#include "../../game_graphics/board/card_item.h" #include "../abstract_game.h" #include "../board/arrow_data.h" -#include "../board/card_list.h" -#include "../board/card_state.h" #include "../board/counter_state.h" #include "../game_meta_info.h" #include "../zones/hand_zone_logic.h" @@ -34,17 +33,10 @@ #include #include -PlayerLogic::PlayerLogic(const ServerInfo_User &info, - int _id, - bool _local, - bool _judge, - AbstractGame *_parent, - IInterfaceSettingsProvider *interfaceSettings, - ICardPreferenceProvider *cardPreferences) +PlayerLogic::PlayerLogic(const ServerInfo_User &info, int _id, bool _local, bool _judge, AbstractGame *_parent) : QObject(_parent), game(_parent), playerInfo(new PlayerInfo(info, _id, _local, _judge)), - playerEventHandler(new PlayerEventHandler(this)), - playerActions(new PlayerActions(this, interfaceSettings, cardPreferences)), active(false), conceded(false), - zoneId(0), dialogSemaphore(false) + playerEventHandler(new PlayerEventHandler(this)), playerActions(new PlayerActions(this)), active(false), + conceded(false), zoneId(0), dialogSemaphore(false) { initializeZones(); } @@ -180,20 +172,22 @@ void PlayerLogic::processPlayerInfo(const ServerInfo_Player &info) const int cardListSize = zoneInfo.card_list_size(); if (!cardListSize) { for (int j = 0; j < zoneInfo.card_count(); ++j) { - emit zone->createCardRequested(ServerInfo_Card(), false); + zone->addCard(new CardItem(this), false, -1); } } else { for (int j = 0; j < cardListSize; ++j) { - ServerInfo_Card cardInfo = zoneInfo.card_list(j); + const ServerInfo_Card &cardInfo = zoneInfo.card_list(j); + auto *card = new CardItem(this); + card->processCardInfo(cardInfo); // Zones without coordinates (hand, piles, stack) preserve the order // they arrive in on the server in the positions of their cards list. // The x coordinate of such cards is always 0, so inserting at it // would reverse the list on reconnect. Append instead. - if (!zoneInfo.with_coords()) { - cardInfo.set_x(-1); - cardInfo.set_y(-1); + if (zoneInfo.with_coords()) { + zone->addCard(card, false, cardInfo.x(), cardInfo.y()); + } else { + zone->addCard(card, false, -1); } - emit zone->createCardRequested(cardInfo, false); } } if (zoneInfo.has_always_reveal_top_card()) { @@ -225,8 +219,8 @@ void PlayerLogic::processCardAttachment(const ServerInfo_Player &info) for (int j = 0; j < cardListSize; ++j) { const ServerInfo_Card &cardInfo = zoneInfo.card_list(j); if (cardInfo.has_attach_player_id()) { - CardState *startCard = zone->getCard(cardInfo.id()); - CardState *targetCard = + CardItem *startCard = zone->getCard(cardInfo.id()); + CardItem *targetCard = game->getCard(cardInfo.attach_player_id(), QString::fromStdString(cardInfo.attach_zone()), cardInfo.attach_card_id()); if (!targetCard) { @@ -245,19 +239,19 @@ void PlayerLogic::processCardAttachment(const ServerInfo_Player &info) } } -void PlayerLogic::addCard(AbstractCardItem *card) +void PlayerLogic::addCard(CardItem *card) { emit newCardAdded(card); } -void PlayerLogic::deleteCard(CardState *card) +void PlayerLogic::deleteCard(CardItem *card) { if (card == nullptr) { return; } else if (dialogSemaphore) { cardsToDelete.append(card); } else { - card->deleteView(); + card->deleteLater(); } } @@ -338,7 +332,7 @@ bool PlayerLogic::clearCardsToDelete() for (auto &i : cardsToDelete) { if (i != nullptr) { - i->deleteView(); + i->deleteLater(); } } cardsToDelete.clear(); diff --git a/libcockatrice_game/libcockatrice/game/player/player_logic.h b/cockatrice/src/game/player/player_logic.h similarity index 88% rename from libcockatrice_game/libcockatrice/game/player/player_logic.h rename to cockatrice/src/game/player/player_logic.h index d6c4f5187..59da7cc32 100644 --- a/libcockatrice_game/libcockatrice/game/player/player_logic.h +++ b/cockatrice/src/game/player/player_logic.h @@ -7,8 +7,6 @@ #ifndef PLAYER_H #define PLAYER_H -#include "../board/arrow_data.h" -#include "../board/counter_state.h" #include "../zones/card_zone_logic.h" #include "../zones/hand_zone_logic.h" #include "../zones/pile_zone_logic.h" @@ -19,16 +17,12 @@ #include "libcockatrice/utility/playmat_params.h" #include +#include #include #include #include #include #include -#include -#include -#include -#include -#include #include #include @@ -37,6 +31,7 @@ // signatures, which the moc-generated code needs to be complete. #include +class CardItem; class CounterState; class QWidget; class ServerInfo_PlayerProperties; @@ -47,8 +42,6 @@ template class QSharedPointer; inline Q_LOGGING_CATEGORY(PlayerLog, "player"); class AbstractCardItem; class AbstractGame; -class ICardPreferenceProvider; -class IInterfaceSettingsProvider; class PlayerInfo; class PlayerEventHandler; class PlayerActions; @@ -74,7 +67,7 @@ signals: /** @brief Emitted when the remote playmat (card/params) is updated from player properties. */ void playmatChanged(); void newCardAdded(AbstractCardItem *card); - void requestCardMenuUpdate(CardState *card); + void requestCardMenuUpdate(const CardItem *card); void counterAdded(CounterState *state); void counterRemoved(int counterId); void rearrangeCounters(); @@ -94,13 +87,7 @@ public slots: void onRequestZoneViewToggle(const QString &zoneName, int numberCards, bool isReversed); public: - PlayerLogic(const ServerInfo_User &info, - int _id, - bool _local, - bool _judge, - AbstractGame *_parent, - IInterfaceSettingsProvider *interfaceSettings = nullptr, - ICardPreferenceProvider *cardPreferences = nullptr); + PlayerLogic(const ServerInfo_User &info, int _id, bool _local, bool _judge, AbstractGame *_parent); ~PlayerLogic() override; void initializeZones(); @@ -110,8 +97,8 @@ public: void processPlayerInfo(const ServerInfo_Player &info); void processCardAttachment(const ServerInfo_Player &info); - void addCard(AbstractCardItem *c); - void deleteCard(CardState *c); + void addCard(CardItem *c); + void deleteCard(CardItem *c); bool clearCardsToDelete(); @@ -263,7 +250,7 @@ private: QMap counters; bool dialogSemaphore; - QList cardsToDelete; + QList cardsToDelete; // Playmat from player properties (for opponent display) CardRef remotePlaymatCard; @@ -271,4 +258,15 @@ private: bool hasRemotePlaymat = false; }; +class AnnotationDialog : public QInputDialog +{ + Q_OBJECT + void keyPressEvent(QKeyEvent *e) override; + +public: + explicit AnnotationDialog(QWidget *parent = nullptr) : QInputDialog(parent) + { + } +}; + #endif diff --git a/libcockatrice_game/libcockatrice/game/player/player_manager.cpp b/cockatrice/src/game/player/player_manager.cpp similarity index 86% rename from libcockatrice_game/libcockatrice/game/player/player_manager.cpp rename to cockatrice/src/game/player/player_manager.cpp index 284d21f68..4730805ad 100644 --- a/libcockatrice_game/libcockatrice/game/player/player_manager.cpp +++ b/cockatrice/src/game/player/player_manager.cpp @@ -12,12 +12,9 @@ PlayerManager::PlayerManager(AbstractGame *_game, int _localPlayerId, bool _localPlayerIsJudge, - bool localPlayerIsSpectator, - IInterfaceSettingsProvider *_interfaceSettings, - ICardPreferenceProvider *_cardPreferences) + bool localPlayerIsSpectator) : QObject(_game), game(_game), players(QMap()), localPlayerId(_localPlayerId), - localPlayerIsJudge(_localPlayerIsJudge), localPlayerIsSpectator(localPlayerIsSpectator), - interfaceSettings(_interfaceSettings), cardPreferences(_cardPreferences) + localPlayerIsJudge(_localPlayerIsJudge), localPlayerIsSpectator(localPlayerIsSpectator) { } @@ -55,7 +52,7 @@ bool PlayerManager::isLocalPlayer(int playerId) PlayerLogic *PlayerManager::addPlayer(int playerId, const ServerInfo_User &info) { auto *newPlayer = new PlayerLogic(info, playerId, isLocalPlayer(playerId) || game->getGameState()->getIsLocalGame(), - isJudge(), getGame(), interfaceSettings, cardPreferences); + isJudge(), getGame()); connect(newPlayer, &PlayerLogic::concededChanged, this, &PlayerManager::onPlayerConceded); players.insert(playerId, newPlayer); emit playerAdded(newPlayer); diff --git a/libcockatrice_game/libcockatrice/game/player/player_manager.h b/cockatrice/src/game/player/player_manager.h similarity index 82% rename from libcockatrice_game/libcockatrice/game/player/player_manager.h rename to cockatrice/src/game/player/player_manager.h index 950574112..7a9f7645b 100644 --- a/libcockatrice_game/libcockatrice/game/player/player_manager.h +++ b/cockatrice/src/game/player/player_manager.h @@ -16,8 +16,6 @@ #include class AbstractGame; -class ICardPreferenceProvider; -class IInterfaceSettingsProvider; class PlayerLogic; class PlayerManager : public QObject @@ -25,12 +23,7 @@ class PlayerManager : public QObject Q_OBJECT public: - PlayerManager(AbstractGame *_game, - int _localPlayerId, - bool _localPlayerIsJudge, - bool localPlayerIsSpectator, - IInterfaceSettingsProvider *interfaceSettings = nullptr, - ICardPreferenceProvider *cardPreferences = nullptr); + PlayerManager(AbstractGame *_game, int _localPlayerId, bool _localPlayerIsJudge, bool localPlayerIsSpectator); AbstractGame *game; QMap players; @@ -38,9 +31,6 @@ public: bool localPlayerIsJudge; bool localPlayerIsSpectator; QMap spectators; - // Borrowed settings providers forwarded to each PlayerLogic (owned by the application). - IInterfaceSettingsProvider *interfaceSettings; - ICardPreferenceProvider *cardPreferences; [[nodiscard]] bool isSpectator() const { @@ -57,11 +47,6 @@ public: return localPlayerId; } - void setLocalPlayerId(int _localPlayerId) - { - localPlayerId = _localPlayerId; - } - [[nodiscard]] const QMap &getPlayers() const { return players; diff --git a/libcockatrice_game/libcockatrice/game/replay.cpp b/cockatrice/src/game/replay.cpp similarity index 51% rename from libcockatrice_game/libcockatrice/game/replay.cpp rename to cockatrice/src/game/replay.cpp index 4d41a12ea..4ab4a6321 100644 --- a/libcockatrice_game/libcockatrice/game/replay.cpp +++ b/cockatrice/src/game/replay.cpp @@ -9,15 +9,10 @@ class GameReplay; class QObject; -Replay::Replay(QObject *_parent, - const GameReplay *_replay, - bool isLocalGame, - IInterfaceSettingsProvider *interfaceSettings, - ICardPreferenceProvider *cardPreferences) - : AbstractGame(_parent) +Replay::Replay(QObject *_parent, const GameReplay *_replay, bool isLocalGame) : AbstractGame(_parent) { gameState = new GameState(this, 0, -1, isLocalGame, {}, false, false, -1, false); connect(gameMetaInfo, &GameMetaInfo::startedChanged, gameState, &GameState::onStartedChanged); - playerManager = new PlayerManager(this, -1, false, true, interfaceSettings, cardPreferences); + playerManager = new PlayerManager(this, -1, false, true); loadReplay(_replay); } diff --git a/cockatrice/src/game/replay.h b/cockatrice/src/game/replay.h new file mode 100644 index 000000000..cc995dbac --- /dev/null +++ b/cockatrice/src/game/replay.h @@ -0,0 +1,26 @@ +/** + * @file replay.h + * @ingroup GameLogic + * @ingroup Replay + */ +//! \todo Document this file. + +#ifndef COCKATRICE_REPLAY_H +#define COCKATRICE_REPLAY_H + +#include "abstract_game.h" + +#include + +class GameReplay; +class QObject; + +class Replay : public AbstractGame +{ + Q_OBJECT + +public: + explicit Replay(QObject *_parent, const GameReplay *_replay, bool isLocalGame); +}; + +#endif // COCKATRICE_REPLAY_H diff --git a/libcockatrice_game/libcockatrice/game/zones/card_zone_algorithms.h b/cockatrice/src/game/zones/card_zone_algorithms.h similarity index 81% rename from libcockatrice_game/libcockatrice/game/zones/card_zone_algorithms.h rename to cockatrice/src/game/zones/card_zone_algorithms.h index 35e96b86c..118a7d29d 100644 --- a/libcockatrice_game/libcockatrice/game/zones/card_zone_algorithms.h +++ b/cockatrice/src/game/zones/card_zone_algorithms.h @@ -5,9 +5,9 @@ namespace CardZoneAlgorithms { /** - * Shared insertion logic for zones where cards follow the standard pattern: - * clamp index, insert, clear identity if contents unknown, reset state. - * Visibility and parenting are handled by the graphics zone's onCardAdded(). + * Shared insertion logic for zones where cards become visible on add and follow + * the standard pattern: clamp index, insert, clear identity if contents unknown, + * reset state, show card. * * Zones with different post-add behavior (signal connections, positional resets, * hidden cards, or coordinate-based placement) should NOT use this — implement @@ -18,7 +18,8 @@ namespace CardZoneAlgorithms * * @tparam CardList Must provide: size() -> int, insert(int, CardType*), * getContentsKnown() -> bool - * @tparam CardType Must provide: setId(int), setCardRef(CardRefType), resetState(bool) + * @tparam CardType Must provide: setId(int), setCardRef(CardRefType), + * resetState(bool), setVisible(bool) * @param keepAnnotations Forwarded to card->resetState(). Stack-like zones preserve * annotations across zone transitions; hand-like zones clear them. */ @@ -36,6 +37,7 @@ void addCardToList(CardList &cards, CardType *card, int x, bool keepAnnotations) } card->resetState(keepAnnotations); + card->setVisible(true); } } // namespace CardZoneAlgorithms diff --git a/libcockatrice_game/libcockatrice/game/zones/card_zone_logic.cpp b/cockatrice/src/game/zones/card_zone_logic.cpp similarity index 79% rename from libcockatrice_game/libcockatrice/game/zones/card_zone_logic.cpp rename to cockatrice/src/game/zones/card_zone_logic.cpp index a160dcc1d..d997ab9ad 100644 --- a/libcockatrice_game/libcockatrice/game/zones/card_zone_logic.cpp +++ b/cockatrice/src/game/zones/card_zone_logic.cpp @@ -1,11 +1,13 @@ #include "card_zone_logic.h" +#include "../../client/translation.h" +#include "../../game_graphics/board/card_item.h" +#include "../../game_graphics/zones/card_zone.h" +#include "../../game_graphics/zones/view_zone.h" #include "../board/card_list.h" -#include "../board/card_state.h" #include "../player/player_actions.h" #include "../player/player_info.h" #include "../player/player_logic.h" -#include "../translation.h" #include "libcockatrice/card/database/card_database.h" #include "view_zone_logic.h" @@ -42,24 +44,19 @@ CardZoneLogic::CardZoneLogic(PlayerLogic *_player, &CardZoneLogic::refreshCardInfos); } -void CardZoneLogic::addCard(CardState *card, const bool reorganize, const int x, const int y) +void CardZoneLogic::addCard(CardItem *card, const bool reorganize, const int x, const int y) { if (!card) { - qCWarning(CardZoneLogicLog) << "CardZoneLogic::addCard() card is null; this shouldn't normally happen"; + qCWarning(CardZoneLog) << "CardZoneLogic::addCard() card is null; this shouldn't normally happen"; return; } - for (auto *viewLogic : views) { - if (viewLogic->prepareAddCard(x)) { - ServerInfo_Card cardInfo; - const CardRef &cardRef = card->getCardRef(); - cardInfo.set_name(cardRef.name.toStdString()); - cardInfo.set_provider_id(cardRef.providerId.toStdString()); - cardInfo.set_id(card->getId()); - cardInfo.set_face_down(card->getFaceDown()); - cardInfo.set_x(x); - cardInfo.set_y(y); - emit viewLogic->createCardRequested(cardInfo, reorganize); + for (auto *view : views) { + if (qobject_cast(view->getLogic())->prepareAddCard(x)) { + auto copy = new CardItem(player, nullptr, card->getCardRef(), card->getId()); + copy->setFaceDown(card->getFaceDown()); + + view->getLogic()->addCard(copy, reorganize, x, y); } } @@ -74,7 +71,7 @@ void CardZoneLogic::addCard(CardState *card, const bool reorganize, const int x, emit cardCountChanged(); } -CardState *CardZoneLogic::takeCard(int position, int cardId, bool toNewZone) +CardItem *CardZoneLogic::takeCard(int position, int cardId, bool toNewZone) { if (position == -1) { // position == -1 means either that the zone is indexed by card id @@ -93,11 +90,11 @@ CardState *CardZoneLogic::takeCard(int position, int cardId, bool toNewZone) return nullptr; } - for (auto *viewLogic : views) { - viewLogic->removeCard(position, toNewZone); + for (auto *view : views) { + qobject_cast(view->getLogic())->removeCard(position, toNewZone); } - CardState *c = cards.takeAt(position); + CardItem *c = cards.takeAt(position); c->setId(cardId); @@ -106,11 +103,11 @@ CardState *CardZoneLogic::takeCard(int position, int cardId, bool toNewZone) return c; } -CardState *CardZoneLogic::getCard(int cardId) +CardItem *CardZoneLogic::getCard(int cardId) { - CardState *c = cards.findCard(cardId); + CardItem *c = cards.findCard(cardId); if (!c) { - qCWarning(CardZoneLogicLog) << "CardZoneLogic::getCard: card id=" << cardId << "not found"; + qCWarning(CardZoneLog) << "CardZoneLogic::getCard: card id=" << cardId << "not found"; return nullptr; } // If the card's id is -1, this zone is invisible, @@ -122,10 +119,10 @@ CardState *CardZoneLogic::getCard(int cardId) return c; } -void CardZoneLogic::removeCard(CardState *card) +void CardZoneLogic::removeCard(CardItem *card) { if (!card) { - qCWarning(CardZoneLogicLog) << "CardZoneLogic::removeCard: card is null, this shouldn't normally happen"; + qCWarning(CardZoneLog) << "CardZoneLogic::removeCard: card is null, this shouldn't normally happen"; return; } @@ -138,8 +135,8 @@ void CardZoneLogic::removeCard(CardState *card) void CardZoneLogic::refreshCardInfos() { - for (const auto &cardState : cards) { - cardState->refreshCardInfo(); + for (const auto &cardItem : cards) { + cardItem->refreshCardInfo(); } } @@ -171,17 +168,17 @@ void CardZoneLogic::clearContents() const CardList toClear = cards; // Detach and notify attached cards and zones *before* deleting anything. - for (CardState *card : toClear) { + for (CardItem *card : toClear) { // If an incorrectly implemented server doesn't return attached cards to whom they belong before dropping a // player, we have to return them to avoid a crash. - const QList &attachedCards = card->getAttachedCards(); - for (CardState *attachedCard : attachedCards) { + const QList &attachedCards = card->getAttachedCards(); + for (CardItem *attachedCard : attachedCards) { emit attachedCard->getZone()->cardAdded(attachedCard); } } // Now request deletions after all manipulations are done. - for (CardState *card : toClear) { + for (CardItem *card : toClear) { player->deleteCard(card); } diff --git a/libcockatrice_game/libcockatrice/game/zones/card_zone_logic.h b/cockatrice/src/game/zones/card_zone_logic.h similarity index 73% rename from libcockatrice_game/libcockatrice/game/zones/card_zone_logic.h rename to cockatrice/src/game/zones/card_zone_logic.h index d3cd9121f..2e232b258 100644 --- a/libcockatrice_game/libcockatrice/game/zones/card_zone_logic.h +++ b/cockatrice/src/game/zones/card_zone_logic.h @@ -7,30 +7,28 @@ #ifndef COCKATRICE_CARD_ZONE_LOGIC_H #define COCKATRICE_CARD_ZONE_LOGIC_H +#include "../../client/translation.h" #include "../board/card_list.h" -#include "../translation.h" #include #include #include #include -#include #include +class CardItem; + inline Q_LOGGING_CATEGORY(CardZoneLogicLog, "card_zone_logic"); class PlayerLogic; -class ZoneViewZoneLogic; -class CardDragItem; +class ZoneViewZone; class CardZoneLogic : public QObject { Q_OBJECT signals: - void cardAdded(CardState *addedCard); - /** @brief Asks the graphics side to build the card item for @p cardInfo and add it to this zone. */ - void createCardRequested(const ServerInfo_Card &cardInfo, bool reorganize); + void cardAdded(CardItem *addedCard); void cardCountChanged(); void reorganizeCards(); void updateGraphics(); @@ -45,17 +43,16 @@ public: bool _contentsKnown, QObject *parent = nullptr); - void addCard(CardState *card, bool reorganize, int x, int y = -1); + void addCard(CardItem *card, bool reorganize, int x, int y = -1); // getCard() finds a card by id. - CardState *getCard(int cardId); - void removeCard(CardState *card); + CardItem *getCard(int cardId); + void removeCard(CardItem *card); // takeCard() finds a card by position and removes it from the zone and from all of its views. - virtual CardState *takeCard(int position, int cardId, bool canResize = true); + virtual CardItem *takeCard(int position, int cardId, bool canResize = true); - void rawInsertCard(CardState *card, int index) + void rawInsertCard(CardItem *card, int index) { cards.insert(index, card); - emit cardCountChanged(); } [[nodiscard]] const CardList &getCards() const @@ -66,7 +63,6 @@ public: void sortCards(const QList &options) { cards.sortBy(options); - emit cardCountChanged(); } [[nodiscard]] QString getName() const { @@ -81,7 +77,7 @@ public: { return cards.getContentsKnown(); } - QList &getViews() + QList &getViews() { return views; } @@ -113,12 +109,12 @@ protected: PlayerLogic *player; QString name; CardList cards; - QList views; + QList views; bool hasCardAttr; bool isShufflable; bool alwaysRevealTopCard; - virtual void addCardImpl(CardState *card, int x, int y) = 0; + virtual void addCardImpl(CardItem *card, int x, int y) = 0; }; #endif // COCKATRICE_CARD_ZONE_LOGIC_H diff --git a/libcockatrice_game/libcockatrice/game/zones/hand_zone_logic.cpp b/cockatrice/src/game/zones/hand_zone_logic.cpp similarity index 82% rename from libcockatrice_game/libcockatrice/game/zones/hand_zone_logic.cpp rename to cockatrice/src/game/zones/hand_zone_logic.cpp index 1d3f54929..cea17d031 100644 --- a/libcockatrice_game/libcockatrice/game/zones/hand_zone_logic.cpp +++ b/cockatrice/src/game/zones/hand_zone_logic.cpp @@ -1,6 +1,6 @@ #include "hand_zone_logic.h" -#include "../board/card_state.h" +#include "../../game_graphics/board/card_item.h" #include "card_zone_algorithms.h" class PlayerLogic; @@ -16,7 +16,7 @@ HandZoneLogic::HandZoneLogic(PlayerLogic *_player, { } -void HandZoneLogic::addCardImpl(CardState *card, int x, int /*y*/) +void HandZoneLogic::addCardImpl(CardItem *card, int x, int /*y*/) { CardZoneAlgorithms::addCardToList(cards, card, x, false); } diff --git a/libcockatrice_game/libcockatrice/game/zones/hand_zone_logic.h b/cockatrice/src/game/zones/hand_zone_logic.h similarity index 91% rename from libcockatrice_game/libcockatrice/game/zones/hand_zone_logic.h rename to cockatrice/src/game/zones/hand_zone_logic.h index f8756eafd..c7d63bc0d 100644 --- a/libcockatrice_game/libcockatrice/game/zones/hand_zone_logic.h +++ b/cockatrice/src/game/zones/hand_zone_logic.h @@ -26,7 +26,7 @@ public: QObject *parent = nullptr); protected: - void addCardImpl(CardState *card, int x, int y) override; + void addCardImpl(CardItem *card, int x, int y) override; }; #endif // COCKATRICE_HAND_ZONE_LOGIC_H diff --git a/libcockatrice_game/libcockatrice/game/zones/pile_zone_logic.cpp b/cockatrice/src/game/zones/pile_zone_logic.cpp similarity index 70% rename from libcockatrice_game/libcockatrice/game/zones/pile_zone_logic.cpp rename to cockatrice/src/game/zones/pile_zone_logic.cpp index e33d8fe79..40af25cc5 100644 --- a/libcockatrice_game/libcockatrice/game/zones/pile_zone_logic.cpp +++ b/cockatrice/src/game/zones/pile_zone_logic.cpp @@ -1,6 +1,10 @@ #include "pile_zone_logic.h" -#include "../board/card_state.h" +#include "../../game_graphics/board/card_item.h" +#include "../board/card_list.h" + +class PlayerLogic; +class QObject; PileZoneLogic::PileZoneLogic(PlayerLogic *_player, const QString &_name, @@ -12,14 +16,15 @@ PileZoneLogic::PileZoneLogic(PlayerLogic *_player, { } -void PileZoneLogic::addCardImpl(CardState *card, int x, int /*y*/) +void PileZoneLogic::addCardImpl(CardItem *card, int x, int /*y*/) { - connect(card, &CardState::cardPixmapUpdated, this, &PileZoneLogic::callUpdate); + connect(card, &CardItem::sigPixmapUpdated, this, &PileZoneLogic::callUpdate); // if x is negative set it to add at end if (x < 0 || x >= cards.size()) { x = cards.size(); } cards.insert(x, card); + card->setPos(0, 0); if (!contentsKnown()) { card->setCardRef({}); card->setId(-1); @@ -28,5 +33,6 @@ void PileZoneLogic::addCardImpl(CardState *card, int x, int /*y*/) cards.at(x + 1)->setCardRef({}); } } - card->resetState(false); + card->setVisible(false); + card->resetState(); } \ No newline at end of file diff --git a/libcockatrice_game/libcockatrice/game/zones/pile_zone_logic.h b/cockatrice/src/game/zones/pile_zone_logic.h similarity index 91% rename from libcockatrice_game/libcockatrice/game/zones/pile_zone_logic.h rename to cockatrice/src/game/zones/pile_zone_logic.h index 662b0377f..ed6841b75 100644 --- a/libcockatrice_game/libcockatrice/game/zones/pile_zone_logic.h +++ b/cockatrice/src/game/zones/pile_zone_logic.h @@ -31,7 +31,7 @@ public: QObject *parent = nullptr); protected: - void addCardImpl(CardState *card, int x, int y) override; + void addCardImpl(CardItem *card, int x, int y) override; }; #endif // COCKATRICE_PILE_ZONE_LOGIC_H diff --git a/libcockatrice_game/libcockatrice/game/zones/stack_zone_logic.cpp b/cockatrice/src/game/zones/stack_zone_logic.cpp similarity index 83% rename from libcockatrice_game/libcockatrice/game/zones/stack_zone_logic.cpp rename to cockatrice/src/game/zones/stack_zone_logic.cpp index ccf0d32f3..454274971 100644 --- a/libcockatrice_game/libcockatrice/game/zones/stack_zone_logic.cpp +++ b/cockatrice/src/game/zones/stack_zone_logic.cpp @@ -1,6 +1,6 @@ #include "stack_zone_logic.h" -#include "../board/card_state.h" +#include "../../game_graphics/board/card_item.h" #include "card_zone_algorithms.h" class PlayerLogic; @@ -16,7 +16,7 @@ StackZoneLogic::StackZoneLogic(PlayerLogic *_player, { } -void StackZoneLogic::addCardImpl(CardState *card, int x, int /*y*/) +void StackZoneLogic::addCardImpl(CardItem *card, int x, int /*y*/) { CardZoneAlgorithms::addCardToList(cards, card, x, true); } diff --git a/libcockatrice_game/libcockatrice/game/zones/stack_zone_logic.h b/cockatrice/src/game/zones/stack_zone_logic.h similarity index 91% rename from libcockatrice_game/libcockatrice/game/zones/stack_zone_logic.h rename to cockatrice/src/game/zones/stack_zone_logic.h index ac6c4617c..657d44ecf 100644 --- a/libcockatrice_game/libcockatrice/game/zones/stack_zone_logic.h +++ b/cockatrice/src/game/zones/stack_zone_logic.h @@ -26,7 +26,7 @@ public: QObject *parent = nullptr); protected: - void addCardImpl(CardState *card, int x, int y) override; + void addCardImpl(CardItem *card, int x, int y) override; }; #endif // COCKATRICE_STACK_ZONE_LOGIC_H diff --git a/libcockatrice_game/libcockatrice/game/zones/table_zone_logic.cpp b/cockatrice/src/game/zones/table_zone_logic.cpp similarity index 60% rename from libcockatrice_game/libcockatrice/game/zones/table_zone_logic.cpp rename to cockatrice/src/game/zones/table_zone_logic.cpp index 834794268..07e4a759b 100644 --- a/libcockatrice_game/libcockatrice/game/zones/table_zone_logic.cpp +++ b/cockatrice/src/game/zones/table_zone_logic.cpp @@ -1,9 +1,14 @@ #include "table_zone_logic.h" -#include "../board/card_state.h" +#include "../../game_graphics/board/card_item.h" +#include "../board/card_list.h" +#include "libcockatrice/card/card_info.h" #include +class PlayerLogic; +class QObject; + TableZoneLogic::TableZoneLogic(PlayerLogic *_player, const QString &_name, bool _hasCardAttr, @@ -14,7 +19,7 @@ TableZoneLogic::TableZoneLogic(PlayerLogic *_player, { } -void TableZoneLogic::addCardImpl(CardState *card, int _x, int _y) +void TableZoneLogic::addCardImpl(CardItem *card, int _x, int _y) { cards.append(card); if (!card->getFaceDown() && card->getPT().isEmpty()) { @@ -24,33 +29,15 @@ void TableZoneLogic::addCardImpl(CardState *card, int _x, int _y) card->setDoesntUntap(true); } card->setGridPoint(QPoint(_x, _y)); + card->setVisible(true); } -CardState *TableZoneLogic::takeCard(int position, int cardId, bool toNewZone) +CardItem *TableZoneLogic::takeCard(int position, int cardId, bool toNewZone) { - CardState *result = CardZoneLogic::takeCard(position, cardId); + CardItem *result = CardZoneLogic::takeCard(position, cardId); if (toNewZone) { emit contentSizeChanged(); } return result; -} - -int TableZoneLogic::clampValidTableRow(const int row) -{ - if (row < 0) { - return 0; - } - if (row >= ROW_COUNT) { - return ROW_COUNT - 1; - } - return row; -} - -int TableZoneLogic::tableRowToGridY(int tableRow) -{ - if (tableRow > 2) { - tableRow = 1; - } - return clampValidTableRow(2 - tableRow); -} +} \ No newline at end of file diff --git a/libcockatrice_game/libcockatrice/game/zones/table_zone_logic.h b/cockatrice/src/game/zones/table_zone_logic.h similarity index 57% rename from libcockatrice_game/libcockatrice/game/zones/table_zone_logic.h rename to cockatrice/src/game/zones/table_zone_logic.h index c828d8b91..8078bfd05 100644 --- a/libcockatrice_game/libcockatrice/game/zones/table_zone_logic.h +++ b/cockatrice/src/game/zones/table_zone_logic.h @@ -29,23 +29,8 @@ public: bool _contentsKnown, QObject *parent = nullptr); - /** @brief Number of rows in the table zone grid (0=creatures, 1=noncreatures, 2=lands). */ - static const int ROW_COUNT = 3; - - /** - * Clamps a grid row index into [0, ROW_COUNT - 1]. - */ - static int clampValidTableRow(const int row); - - /** - * Converts a card's logical table row (0=creatures, 1=noncreatures, 2=lands) - * to the corresponding grid Y coordinate. Cards with tableRow > 2 (e.g., - * instants/sorceries) default to the noncreatures row. - */ - static int tableRowToGridY(int tableRow); - protected: - void addCardImpl(CardState *card, int x, int y) override; + void addCardImpl(CardItem *card, int x, int y) override; /** * @brief Removes a card from view. @@ -53,9 +38,9 @@ protected: * @param position card position * @param cardId id of card to take * @param toNewZone Whether the destination of the card is not the same as the starting zone. Defaults to true - * @return CardState that has been removed + * @return CardItem that has been removed */ - CardState *takeCard(int position, int cardId, bool toNewZone = true) override; + CardItem *takeCard(int position, int cardId, bool toNewZone = true) override; }; #endif // COCKATRICE_TABLE_ZONE_LOGIC_H diff --git a/libcockatrice_game/libcockatrice/game/zones/view_zone_logic.cpp b/cockatrice/src/game/zones/view_zone_logic.cpp similarity index 81% rename from libcockatrice_game/libcockatrice/game/zones/view_zone_logic.cpp rename to cockatrice/src/game/zones/view_zone_logic.cpp index db1fa32c3..eb3b7715f 100644 --- a/libcockatrice_game/libcockatrice/game/zones/view_zone_logic.cpp +++ b/cockatrice/src/game/zones/view_zone_logic.cpp @@ -1,11 +1,10 @@ #include "view_zone_logic.h" -#include "../board/card_state.h" -#include "../player/player_actions.h" -#include "../player/player_logic.h" +#include "../../client/settings/cache_settings.h" +#include "../../game_graphics/board/card_item.h" +#include "../board/card_list.h" #include -#include #include class PlayerLogic; @@ -23,19 +22,13 @@ ZoneViewZoneLogic::ZoneViewZoneLogic(PlayerLogic *_player, bool _revealZone, bool _writeableRevealZone, bool _isReversed, - IInterfaceSettingsProvider *_interfaceSettings, QObject *parent) : CardZoneLogic(_player, _origZone->getName(), false, false, true, parent), origZone(_origZone), numberCards(_numberCards), revealZone(_revealZone), writeableRevealZone(_writeableRevealZone), - isReversed(_isReversed), interfaceSettings(_interfaceSettings) + isReversed(_isReversed) { } -bool ZoneViewZoneLogic::getCloseEmptyCardView() const -{ - return interfaceSettings ? interfaceSettings->getCloseEmptyCardView() : true; -} - /** * Checks if inserting a card at the given position requires an actual new card to be created and added to the view. * Also does any cardId updates that would be required if a card is inserted in that position. @@ -43,7 +36,7 @@ bool ZoneViewZoneLogic::getCloseEmptyCardView() const * Note that this method can end up modifying the cardIds despite returning false. * (for example, if the card is inserted into a hidden portion of the deck while the view is reversed) * - * Make sure to call this method once before calling addCard(), so that you skip creating the card and calling + * Make sure to call this method once before calling addCard(), so that you skip creating a new CardItem and calling * addCard() if it's not required. * * @param x The position to insert the card at. @@ -71,7 +64,7 @@ bool ZoneViewZoneLogic::prepareAddCard(int x) // autoclose check is done both here and in removeCard - if (cards.isEmpty() && !doInsert && getCloseEmptyCardView()) { + if (cards.isEmpty() && !doInsert && SettingsCache::instance().userInterface().getCloseEmptyCardView()) { emit closeView(); } @@ -82,7 +75,7 @@ bool ZoneViewZoneLogic::prepareAddCard(int x) * Make sure prepareAddCard() was called before calling addCard(). * This method assumes we already checked that the card is being inserted into the visible portion */ -void ZoneViewZoneLogic::addCardImpl(CardState *card, int x, int /*y*/) +void ZoneViewZoneLogic::addCardImpl(CardItem *card, int x, int /*y*/) { if (!isReversed) { // if x is negative set it to add at end @@ -151,14 +144,14 @@ void ZoneViewZoneLogic::removeCard(int position, bool toNewZone) return; } - CardState *card = cards.takeAt(position); - card->deleteView(); + CardItem *card = cards.takeAt(position); + card->deleteLater(); // The toNewZone check is to prevent the view from auto-closing if the view contains only a single card and that // card gets dragged within the view. // Another autoclose check is done in prepareAddCard so that the view autocloses if the last card was moved to an // unrevealed portion of the same zone. - if (cards.isEmpty() && getCloseEmptyCardView() && toNewZone) { + if (cards.isEmpty() && SettingsCache::instance().userInterface().getCloseEmptyCardView() && toNewZone) { emit closeView(); return; } @@ -167,18 +160,12 @@ void ZoneViewZoneLogic::removeCard(int position, bool toNewZone) reorganizeCards(); } -void ZoneViewZoneLogic::requestClose() -{ - emit closeView(); -} - void ZoneViewZoneLogic::clearCards() { for (auto card : cards) { - card->deleteView(); + card->deleteLater(); } cards.clear(); - emit cardCountChanged(); } void ZoneViewZoneLogic::setWriteableRevealZone(bool _writeableRevealZone) @@ -190,16 +177,4 @@ void ZoneViewZoneLogic::setWriteableRevealZone(bool _writeableRevealZone) emit removeFromViews(); } writeableRevealZone = _writeableRevealZone; -} - -PendingCommand *ZoneViewZoneLogic::prepareZoneDump() -{ - return getPlayer()->getPlayerActions()->prepareZoneDump(this, numberCards); -} - -void ZoneViewZoneLogic::sendZoneDump(PendingCommand *pendingCommand) -{ - if (pendingCommand != nullptr) { - getPlayer()->getPlayerActions()->sendGameCommand(pendingCommand); - } -} +} \ No newline at end of file diff --git a/libcockatrice_game/libcockatrice/game/zones/view_zone_logic.h b/cockatrice/src/game/zones/view_zone_logic.h similarity index 55% rename from libcockatrice_game/libcockatrice/game/zones/view_zone_logic.h rename to cockatrice/src/game/zones/view_zone_logic.h index a29e543a3..6fae301e4 100644 --- a/libcockatrice_game/libcockatrice/game/zones/view_zone_logic.h +++ b/cockatrice/src/game/zones/view_zone_logic.h @@ -12,8 +12,6 @@ class PlayerLogic; class QObject; -class PendingCommand; -class IInterfaceSettingsProvider; class ZoneViewZoneLogic : public CardZoneLogic { @@ -28,8 +26,6 @@ private: int numberCards; bool revealZone, writeableRevealZone; bool isReversed; - // Borrowed settings provider (owned by the application). Null outside the client, in which case views stay open. - IInterfaceSettingsProvider *interfaceSettings; public: enum CardAction @@ -45,25 +41,15 @@ public: bool _revealZone, bool _writeableRevealZone, bool _isReversed, - IInterfaceSettingsProvider *interfaceSettings = nullptr, QObject *parent = nullptr); bool prepareAddCard(int x); void removeCard(int position, bool toNewZone); void updateCardIds(CardAction action); - /** - * @brief Asks the graphics view showing this zone to close itself. - * - * Logic code has no handle on the view, so it goes through the logic object the view was built from. - */ - void requestClose(); - /** @brief Removes all cards from the view, without touching anything else. Used in replay rewind */ void clearCards(); - [[nodiscard]] bool getCloseEmptyCardView() const; - int getNumberCards() const { return numberCards; @@ -87,25 +73,8 @@ public: return origZone; } - /** - * @brief Builds the zone-dump command for this view without sending it. - * @return The pending command, or nullptr when there is no zone to dump. - * - * Keeps command construction in game/ so graphics views don't reach - * through the player into PlayerActions to set it up. The response can - * arrive synchronously (local games), so callers must connect to - * PendingCommand::finished before calling sendZoneDump(). - */ - PendingCommand *prepareZoneDump(); - - /** - * @brief Sends a command returned by prepareZoneDump(). - * @param pendingCommand The prepared command; nullptr is ignored. - */ - void sendZoneDump(PendingCommand *pendingCommand); - protected: - void addCardImpl(CardState *card, int x, int y) override; + void addCardImpl(CardItem *card, int x, int y) override; }; #endif // COCKATRICE_VIEW_ZONE_LOGIC_H diff --git a/cockatrice/src/game_graphics/board/abstract_card_drag_item.cpp b/cockatrice/src/game_graphics/board/abstract_card_drag_item.cpp index c707b4022..2e18fca2d 100644 --- a/cockatrice/src/game_graphics/board/abstract_card_drag_item.cpp +++ b/cockatrice/src/game_graphics/board/abstract_card_drag_item.cpp @@ -7,7 +7,6 @@ #include #include #include -#include #include #include #include @@ -52,20 +51,7 @@ AbstractCardDragItem::AbstractCardDragItem(AbstractCardItem *_item, update(); }); - // The source card can be destroyed mid-drag (e.g. moved by a server event). deleteLater() alone is not enough: - // a scene repaint can run before the deferred delete and paint the dead card. Detach from the scene immediately. - connect(_item, &QObject::destroyed, this, [this]() { - hide(); - if (QGraphicsScene *sc = scene()) { - sc->removeItem(this); - } - deleteLater(); - }); -} - -AbstractCardItem *AbstractCardDragItem::getItem() const -{ - return item.data(); + connect(item, &QObject::destroyed, this, &AbstractCardDragItem::deleteLater); } QPainterPath AbstractCardDragItem::shape() const @@ -79,10 +65,6 @@ QPainterPath AbstractCardDragItem::shape() const void AbstractCardDragItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { - if (item.isNull()) { - return; - } - item->paint(painter, option, widget); // adds a mask to the card so it looks like the card hasnt been placed yet diff --git a/cockatrice/src/game_graphics/board/abstract_card_drag_item.h b/cockatrice/src/game_graphics/board/abstract_card_drag_item.h index 80e40ff1d..18afdcbb8 100644 --- a/cockatrice/src/game_graphics/board/abstract_card_drag_item.h +++ b/cockatrice/src/game_graphics/board/abstract_card_drag_item.h @@ -14,7 +14,6 @@ #include #include #include -#include #include #include @@ -25,8 +24,7 @@ class AbstractCardDragItem : public QObject, public QGraphicsItem Q_OBJECT Q_INTERFACES(QGraphicsItem) protected: - /// Guarded pointer: the source card may be destroyed while this drag item still exists. - QPointer item; + AbstractCardItem *item; QPointF hotSpot; QList childDrags; @@ -46,8 +44,10 @@ public: } [[nodiscard]] QPainterPath shape() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; - /// @return the source card, or nullptr if it has already been destroyed. - [[nodiscard]] AbstractCardItem *getItem() const; + [[nodiscard]] AbstractCardItem *getItem() const + { + return item; + } [[nodiscard]] QPointF getHotSpot() const { return hotSpot; diff --git a/cockatrice/src/game_graphics/board/abstract_card_item.cpp b/cockatrice/src/game_graphics/board/abstract_card_item.cpp index 84e062cd7..cc121cfb2 100644 --- a/cockatrice/src/game_graphics/board/abstract_card_item.cpp +++ b/cockatrice/src/game_graphics/board/abstract_card_item.cpp @@ -3,7 +3,6 @@ #include "../../client/settings/cache_settings.h" #include "../../interface/card_localization.h" #include "../../interface/card_picture_loader/card_picture_loader.h" -#include "../../interface/theme_manager.h" #include "../card_dimensions.h" #include "../game_scene.h" #include "../z_values.h" @@ -35,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -43,23 +43,13 @@ class QSizeF; AbstractCardItem::AbstractCardItem(QGraphicsItem *parent, const CardRef &cardRef, PlayerLogic *_owner, int _id) - : ArrowTarget(_owner, parent), state(new CardState(this, nullptr, cardRef, _id)), tapAngle(0), - bgColor(Qt::transparent), isHovered(false), realZValue(0) + : ArrowTarget(_owner, parent), id(_id), cardRef(cardRef), tapped(false), facedown(false), tapAngle(0), + bgColor(Qt::transparent), isHovered(false), realZValue(0), pendingSelectionCollapse(false) { setCursor(Qt::OpenHandCursor); setFlag(ItemIsSelectable); setCacheMode(DeviceCoordinateCache); - connect(state, &CardState::cardPixmapUpdated, this, &AbstractCardItem::pixmapUpdated); - connect(state, &CardState::cardInfoChanged, this, &AbstractCardItem::onCardInfoChanged); - connect(state, &CardState::cardRefChanged, this, &AbstractCardItem::onCardRefChanged); - connect(state, &CardState::tappedChanged, this, &AbstractCardItem::onTappedChanged); - connect(state, &CardState::facedownChanged, this, [this] { update(); }); - connect(state, &CardState::colorChanged, this, [this] { - cacheBgColor(); - update(); - }); - connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::displayCardNamesChanged, this, [this] { update(); }); connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardLangChanged, this, @@ -77,7 +67,7 @@ AbstractCardItem::AbstractCardItem(QGraphicsItem *parent, const CardRef &cardRef AbstractCardItem::~AbstractCardItem() { - emit deleteCardInfoPopup(state->getCardRef().name); + emit deleteCardInfoPopup(cardRef.name); } QRectF AbstractCardItem::boundingRect() const @@ -100,20 +90,21 @@ void AbstractCardItem::pixmapUpdated() emit sigPixmapUpdated(); } -void AbstractCardItem::onCardInfoChanged() -{ - cacheBgColor(); - update(); -} - -void AbstractCardItem::onCardRefChanged(const CardRef &oldCardRef, const CardRef & /*newCardRef*/) -{ - emit deleteCardInfoPopup(oldCardRef.name); -} - void AbstractCardItem::refreshCardInfo() { - state->refreshCardInfo(); + exactCard = CardDatabaseManager::query()->getCard(cardRef); + + if (!exactCard && !cardRef.name.isEmpty()) { + CardInfo::UiAttributes attributes = {.tableRow = -1}; + auto info = CardInfo::newInstance(cardRef.name, "", true, {}, {}, {}, {}, attributes); + exactCard = ExactCard(info); + } + if (exactCard) { + connect(exactCard.getCardPtr().data(), &CardInfo::pixmapUpdated, this, &AbstractCardItem::pixmapUpdated); + } + + cacheBgColor(); + update(); } /** @@ -122,7 +113,7 @@ void AbstractCardItem::refreshCardInfo() */ const CardInfo &AbstractCardItem::getCardInfo() const { - return state->getCardInfo(); + return exactCard.getInfo(); } void AbstractCardItem::setRealZValue(qreal _zValue) @@ -155,7 +146,7 @@ void AbstractCardItem::transformPainter(QPainter *painter, const QSizeF &transla painter->rotate(angle); painter->translate(-translatedSize.width() / 2, -translatedSize.height() / 2); - QFont f = themeManager->appFont(AppFont::CardText); + QFont f; f.setPixelSize(fontSize * scale); painter->setFont(f); @@ -167,13 +158,13 @@ void AbstractCardItem::paintPicture(QPainter *painter, const QSizeF &translatedS QPixmap translatedPixmap; bool paintImage = true; - if (state->getFaceDown() || state->getCardRef().name.isEmpty()) { + if (facedown || cardRef.name.isEmpty()) { // never reveal card color, always paint the card back CardPictureLoader::getCardBackPixmap(translatedPixmap, translatedSize.toSize()); } else { // don't even spend time trying to load the picture if our size is too small if (translatedSize.width() > 10) { - CardPictureLoader::getPixmap(translatedPixmap, state->getCard(), translatedSize.toSize()); + CardPictureLoader::getPixmap(translatedPixmap, exactCard, translatedSize.toSize()); if (translatedPixmap.isNull()) { paintImage = false; } @@ -194,20 +185,19 @@ void AbstractCardItem::paintPicture(QPainter *painter, const QSizeF &translatedS painter->drawPath(shape()); } - if (translatedPixmap.isNull() || SettingsCache::instance().cardsDisplay().getDisplayCardNames() || - state->getFaceDown()) { + if (translatedPixmap.isNull() || SettingsCache::instance().cardsDisplay().getDisplayCardNames() || facedown) { painter->save(); transformPainter(painter, translatedSize, angle); painter->setPen(Qt::white); painter->setBackground(Qt::black); painter->setBackgroundMode(Qt::OpaqueMode); QString nameStr; - if (state->getFaceDown()) { - nameStr = "# " + QString::number(state->getId()); + if (facedown) { + nameStr = "# " + QString::number(id); } else { QString prefix = ""; if (SettingsCache::instance().debug().getShowCardId()) { - prefix = "#" + QString::number(state->getId()) + " "; + prefix = "#" + QString::number(id) + " "; } nameStr = prefix + CardLocalization::displayName(getCardInfo()); } @@ -245,6 +235,21 @@ void AbstractCardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem * painter->restore(); } +void AbstractCardItem::setCardRef(const CardRef &_cardRef) +{ + if (cardRef == _cardRef) { + return; + } + + emit deleteCardInfoPopup(cardRef.name); + if (exactCard) { + disconnect(exactCard.getCardPtr().data(), nullptr, this, nullptr); + } + cardRef = _cardRef; + + refreshCardInfo(); +} + void AbstractCardItem::setHovered(bool _hovered) { if (isHovered == _hovered) { @@ -270,17 +275,18 @@ void AbstractCardItem::setHovered(bool _hovered) void AbstractCardItem::setColor(const QString &_color) { - state->setColor(_color); + color = _color; + cacheBgColor(); + update(); } void AbstractCardItem::cacheBgColor() { QChar colorChar; - const QString cardColor = state->getColor(); - if (cardColor.isEmpty()) { - colorChar = state->getCardInfo().getColorChar(); + if (color.isEmpty()) { + colorChar = exactCard.getInfo().getColorChar(); } else { - colorChar = cardColor.at(0); + colorChar = color.at(0); } switch (colorChar.toLower().toLatin1()) { @@ -308,12 +314,17 @@ void AbstractCardItem::cacheBgColor() } } -void AbstractCardItem::onTappedChanged(bool newTapped, bool canAnimate) +void AbstractCardItem::setTapped(bool _tapped, bool canAnimate) { + if (tapped == _tapped) { + return; + } + + tapped = _tapped; if (SettingsCache::instance().cardsDisplay().getTapAnimation() && canAnimate) { static_cast(scene())->registerAnimationItem(this); } else { - tapAngle = newTapped ? 90 : 0; + tapAngle = tapped ? 90 : 0; setTransform(QTransform() .translate(CardDimensions::WIDTH_HALF_F, CardDimensions::HEIGHT_HALF_F) .rotate(tapAngle) @@ -327,6 +338,12 @@ bool AbstractCardItem::animationEvent() return false; } +void AbstractCardItem::setFaceDown(bool _facedown) +{ + facedown = _facedown; + update(); +} + void AbstractCardItem::mousePressEvent(QGraphicsSceneMouseEvent *event) { cancelPendingSelectionCollapse(); @@ -340,7 +357,7 @@ void AbstractCardItem::mousePressEvent(QGraphicsSceneMouseEvent *event) } } if ((event->modifiers() & Qt::AltModifier) && event->button() == Qt::LeftButton) { - emit cardShiftClicked(state->getCardRef().name); + emit cardShiftClicked(cardRef.name); } else if ((event->modifiers() & Qt::ControlModifier)) { setSelected(!isSelected()); } else if (!isSelected()) { @@ -354,7 +371,7 @@ void AbstractCardItem::mousePressEvent(QGraphicsSceneMouseEvent *event) if (event->button() == Qt::LeftButton) { setCursor(Qt::ClosedHandCursor); } else if (event->button() == Qt::MiddleButton) { - emit showCardInfoPopup(event->screenPos(), state->getCardRef()); + emit showCardInfoPopup(event->screenPos(), cardRef); } event->accept(); } @@ -388,7 +405,7 @@ void AbstractCardItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) } if (event->button() == Qt::MiddleButton) { - emit deleteCardInfoPopup(state->getCardRef().name); + emit deleteCardInfoPopup(cardRef.name); } // This function ensures the parent function doesn't mess around with our selection. diff --git a/cockatrice/src/game_graphics/board/abstract_card_item.h b/cockatrice/src/game_graphics/board/abstract_card_item.h index eee8ec743..e2b150ce8 100644 --- a/cockatrice/src/game_graphics/board/abstract_card_item.h +++ b/cockatrice/src/game_graphics/board/abstract_card_item.h @@ -16,7 +16,8 @@ #include #include #include -#include +#include +#include #include class PlayerLogic; @@ -28,8 +29,13 @@ class AbstractCardItem : public ArrowTarget, public IAnimatedItem { Q_OBJECT protected: - CardState *state; + ExactCard exactCard; + int id; + CardRef cardRef; + bool tapped; + bool facedown; int tapAngle; + QString color; QColor bgColor; private: @@ -39,9 +45,6 @@ private: int selectionCollapseGeneration = 0; ///< Guards the deferred collapse timer against stale firings private slots: void pixmapUpdated(); - void onCardInfoChanged(); - void onCardRefChanged(const CardRef &oldCardRef, const CardRef &newCardRef); - void onTappedChanged(bool newTapped, bool canAnimate); public slots: void refreshCardInfo(); @@ -77,38 +80,31 @@ public: QSizeF getTranslatedSize(QPainter *painter) const; void paintPicture(QPainter *painter, const QSizeF &translatedSize, int angle); void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; - [[nodiscard]] CardState *getState() const - { - return state; - } ExactCard getCard() const { - return state->getCard(); + return exactCard; } const CardInfo &getCardInfo() const; int getId() const { - return state->getId(); + return id; } void setId(int _id) { - state->setId(_id); + id = _id; } QString getName() const { - return state->getCardRef().name; + return cardRef.name; } QString getProviderId() const { - return state->getCardRef().providerId; - } - void setCardRef(const CardRef &_cardRef) - { - state->setCardRef(_cardRef); + return cardRef.providerId; } + void setCardRef(const CardRef &_cardRef); CardRef getCardRef() const { - return state->getCardRef(); + return cardRef; } qreal getRealZValue() const { @@ -120,33 +116,27 @@ public: { return isHovered; } - [[nodiscard]] QString getColor() const + QString getColor() const { - return state->getColor(); + return color; } void setColor(const QString &_color); bool getTapped() const { - return state->getTapped(); - } - void setTapped(bool _tapped, bool canAnimate = false) - { - state->setTapped(_tapped, canAnimate); + return tapped; } + void setTapped(bool _tapped, bool canAnimate = false); bool getFaceDown() const { - return state->getFaceDown(); - } - void setFaceDown(bool _facedown) - { - state->setFaceDown(_facedown); + return facedown; } + void setFaceDown(bool _facedown); void processHoverEvent(); /** @brief Drop a pending collapse and disarm any deferred collapse timer. */ void cancelPendingSelectionCollapse(); void deleteCardInfoPopup() { - emit deleteCardInfoPopup(state->getCardRef().name); + emit deleteCardInfoPopup(cardRef.name); } /** @brief Default: no per-tick animation. Subclasses override to animate. */ diff --git a/cockatrice/src/game_graphics/board/abstract_counter.cpp b/cockatrice/src/game_graphics/board/abstract_counter.cpp index 30ffde320..8500b9c51 100644 --- a/cockatrice/src/game_graphics/board/abstract_counter.cpp +++ b/cockatrice/src/game_graphics/board/abstract_counter.cpp @@ -2,6 +2,10 @@ #include "../../client/settings/cache_settings.h" #include "../../client/settings/shortcuts_settings.h" +#include "../../game/board/counter_state.h" +#include "../../game/player/player_actions.h" +#include "../../game/player/player_info.h" +#include "../../game/player/player_logic.h" #include "../../game_graphics/board/translate_counter_name.h" #include "../../interface/widgets/menus/tearoff_menu.h" @@ -19,10 +23,8 @@ #include #include #include -#include -#include -#include -#include +#include +#include #include #include @@ -149,7 +151,10 @@ void AbstractCounter::mousePressEvent(QGraphicsSceneMouseEvent *event) menu->exec(event->screenPos()); } } else { - player->getPlayerActions()->actIncrementCounter(id, event->button() == Qt::LeftButton ? 1 : -1); + Command_IncCounter cmd; + cmd.set_counter_id(id); + cmd.set_delta(event->button() == Qt::LeftButton ? 1 : -1); + player->getPlayerActions()->sendGameCommand(cmd); } event->accept(); } @@ -167,7 +172,10 @@ void AbstractCounter::hoverLeaveEvent(QGraphicsSceneHoverEvent *) void AbstractCounter::incrementCounter() { - player->getPlayerActions()->actIncrementCounter(id, static_cast(sender())->data().toInt()); + Command_IncCounter cmd; + cmd.set_counter_id(id); + cmd.set_delta(static_cast(sender())->data().toInt()); + player->getPlayerActions()->sendGameCommand(cmd); } void AbstractCounter::setCounter() @@ -191,7 +199,10 @@ void AbstractCounter::setCounter() } Expression exp(value); - player->getPlayerActions()->actSetCounter(id, static_cast(exp.parse(dlg.textValue()))); + Command_SetCounter cmd; + cmd.set_counter_id(id); + cmd.set_value(static_cast(exp.parse(dlg.textValue()))); + player->getPlayerActions()->sendGameCommand(cmd); } AbstractCounterDialog::AbstractCounterDialog(const QString &name, const QString &value, QWidget *parent) diff --git a/cockatrice/src/game_graphics/board/abstract_graphics_item.cpp b/cockatrice/src/game_graphics/board/abstract_graphics_item.cpp index 3a740aa98..50e80d359 100644 --- a/cockatrice/src/game_graphics/board/abstract_graphics_item.cpp +++ b/cockatrice/src/game_graphics/board/abstract_graphics_item.cpp @@ -1,7 +1,5 @@ #include "abstract_graphics_item.h" -#include "../../interface/theme_manager.h" - #include #include #include @@ -22,7 +20,7 @@ void AbstractGraphicsItem::paintNumberEllipse(int number, painter->save(); QString numStr = QString::number(number); - QFont font = themeManager->cardTextFont(); + QFont font("Serif"); font.setPixelSize(fontSize); font.setWeight(QFont::Bold); diff --git a/cockatrice/src/game_graphics/board/arrow_item.cpp b/cockatrice/src/game_graphics/board/arrow_item.cpp index f7df98ab5..c5a9b9c5e 100644 --- a/cockatrice/src/game_graphics/board/arrow_item.cpp +++ b/cockatrice/src/game_graphics/board/arrow_item.cpp @@ -2,6 +2,11 @@ #include "arrow_item.h" #include "../../client/settings/cache_settings.h" +#include "../../game/board/arrow_data.h" +#include "../../game/player/player_actions.h" +#include "../../game/player/player_info.h" +#include "../../game/player/player_logic.h" +#include "../../game/zones/card_zone_logic.h" #include "../game_scene.h" #include "../player/player_target.h" #include "../z_values.h" @@ -22,12 +27,12 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include #include +#include +#include #include #include #include @@ -421,19 +426,19 @@ void ArrowDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) CardZoneLogic *startZone = startCard->getZone(); - ArrowData arrow; - arrow.color = data->color; - arrow.startPlayerId = startZone->getPlayer()->getPlayerInfo()->getId(); - arrow.startZone = startZone->getName(); - arrow.startCardId = startCard->getId(); + Command_CreateArrow cmd; + cmd.mutable_arrow_color()->CopyFrom(convertQColorToColor(data->color)); + cmd.set_start_player_id(startZone->getPlayer()->getPlayerInfo()->getId()); + cmd.set_start_zone(startZone->getName().toStdString()); + cmd.set_start_card_id(startCard->getId()); if (auto *targetCard = qgraphicsitem_cast(targetItem)) { CardZoneLogic *targetZone = targetCard->getZone(); - arrow.targetPlayerId = targetZone->getPlayer()->getPlayerInfo()->getId(); - arrow.targetZone = targetZone->getName(); - arrow.targetCardId = targetCard->getId(); + cmd.set_target_player_id(targetZone->getPlayer()->getPlayerInfo()->getId()); + cmd.set_target_zone(targetZone->getName().toStdString()); + cmd.set_target_card_id(targetCard->getId()); } else if (auto *targetPlayer = qgraphicsitem_cast(targetItem)) { - arrow.targetPlayerId = targetPlayer->getOwner()->getPlayerInfo()->getId(); + cmd.set_target_player_id(targetPlayer->getOwner()->getPlayerInfo()->getId()); } else { delArrow(); return; @@ -442,9 +447,22 @@ void ArrowDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) // if the card is in hand then we will move the card to stack or table as part of drawing the arrow if (startZone->getName() == ZoneNames::HAND) { startCard->playCard(false); + CardInfoPtr ci = startCard->getCard().getCardPtr(); + bool playToStack = SettingsCache::instance().userInterface().getPlayToStack(); + if (ci && ((!playToStack && ci->getUiAttributes().tableRow == 3) || + (playToStack && ci->getUiAttributes().tableRow != 0 && + startCard->getZone()->getName() != ZoneNames::STACK))) { + cmd.set_start_zone(ZoneNames::STACK); + } else { + cmd.set_start_zone(playToStack ? ZoneNames::STACK : ZoneNames::TABLE); + } } - player->getPlayerActions()->createArrow(startCard->getState(), arrow, deleteInPhase); + if (deleteInPhase != 0) { + cmd.set_delete_in_phase(deleteInPhase); + } + + player->getPlayerActions()->sendGameCommand(cmd); } delArrow(); @@ -536,7 +554,7 @@ void ArrowAttachItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) auto *startCard = qgraphicsitem_cast(startItem); auto *targetCard = qgraphicsitem_cast(targetItem); if (startCard && targetCard) { - player->getPlayerActions()->attachCards(startCard->getState(), targetCard->getState()); + attachCards(startCard, targetCard); } } @@ -545,3 +563,23 @@ void ArrowAttachItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) child->mouseReleaseEvent(event); } } + +void ArrowAttachItem::attachCards(CardItem *startCard, const CardItem *targetCard) +{ + if (targetCard->getAttachedTo() || targetCard->getZone()->getName() != ZoneNames::TABLE) { + return; + } + + // move card onto table first if attaching from some other zone + if (startCard->getZone()->getName() != ZoneNames::TABLE) { + player->getPlayerActions()->playCardToTable(startCard, false); + } + + Command_AttachCard cmd; + cmd.set_start_zone(ZoneNames::TABLE); + cmd.set_card_id(startCard->getId()); + cmd.set_target_player_id(targetCard->getZone()->getPlayer()->getPlayerInfo()->getId()); + cmd.set_target_zone(targetCard->getZone()->getName().toStdString()); + cmd.set_target_card_id(targetCard->getId()); + player->getPlayerActions()->sendGameCommand(cmd); +} \ No newline at end of file diff --git a/cockatrice/src/game_graphics/board/arrow_item.h b/cockatrice/src/game_graphics/board/arrow_item.h index 64a48cd14..2395165fc 100644 --- a/cockatrice/src/game_graphics/board/arrow_item.h +++ b/cockatrice/src/game_graphics/board/arrow_item.h @@ -1,6 +1,7 @@ #ifndef ARROWITEM_H #define ARROWITEM_H +#include "../../game/board/arrow_data.h" #include "../animated_item.h" #include "arrow_target.h" #include "graphics_item_type.h" @@ -17,7 +18,6 @@ #include #include #include -#include #include class CardItem; @@ -131,6 +131,7 @@ private: PlayerLogic *player; QList childArrows; QMetaObject::Connection positionConnection; + void attachCards(CardItem *startCard, const CardItem *targetCard); public: explicit ArrowAttachItem(ArrowTarget *_startItem); diff --git a/cockatrice/src/game_graphics/board/card_drag_item.cpp b/cockatrice/src/game_graphics/board/card_drag_item.cpp index b263e8c92..265ea759c 100644 --- a/cockatrice/src/game_graphics/board/card_drag_item.cpp +++ b/cockatrice/src/game_graphics/board/card_drag_item.cpp @@ -130,9 +130,8 @@ void CardDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) sc->removeItem(this); QList dragItemList; - CardZoneLogic *startZone = static_cast(item.data())->getZone(); - if (currentZone && - !(static_cast(item.data())->getAttachedTo() && (startZone == currentZone->getLogic()))) { + CardZoneLogic *startZone = static_cast(item)->getZone(); + if (currentZone && !(static_cast(item)->getAttachedTo() && (startZone == currentZone->getLogic()))) { if (!occupied) { dragItemList.append(this); } @@ -140,7 +139,7 @@ void CardDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) for (int i = 0; i < childDrags.size(); i++) { CardDragItem *c = static_cast(childDrags[i]); if (!occupied && - !(static_cast(c->item.data())->getAttachedTo() && (startZone == currentZone->getLogic())) && + !(static_cast(c->item)->getAttachedTo() && (startZone == currentZone->getLogic())) && !c->occupied) { dragItemList.append(c); } diff --git a/cockatrice/src/game_graphics/board/card_item.cpp b/cockatrice/src/game_graphics/board/card_item.cpp index acd0764c9..1901a634f 100644 --- a/cockatrice/src/game_graphics/board/card_item.cpp +++ b/cockatrice/src/game_graphics/board/card_item.cpp @@ -1,6 +1,17 @@ #include "card_item.h" #include "../../client/settings/cache_settings.h" +#include "../../game/abstract_game.h" +#include "../../game/board/card_state.h" +#include "../../game/game_state.h" +#include "../../game/phase.h" +#include "../../game/player/player_actions.h" +#include "../../game/player/player_info.h" +#include "../../game/player/player_logic.h" +#include "../../game/player/player_manager.h" +#include "../../game/zones/card_zone_logic.h" +#include "../../game/zones/table_zone_logic.h" +#include "../../game/zones/view_zone_logic.h" #include "../card_dimensions.h" #include "../game_scene.h" #include "arrow_item.h" @@ -30,17 +41,6 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include @@ -53,9 +53,8 @@ CardItem::CardItem(PlayerLogic *_owner, const CardRef &cardRef, int _cardid, CardZoneLogic *_zone) - : AbstractCardItem(parent, cardRef, _owner, _cardid), dragItem(nullptr) + : AbstractCardItem(parent, cardRef, _owner, _cardid), state(new CardState(this, _zone)), dragItem(nullptr) { - state->setZone(_zone); owner->addCard(this); connect(&SettingsCache::instance().cardCounters(), &CardCounterSettings::colorChanged, this, [this](int counterId) { @@ -63,44 +62,25 @@ CardItem::CardItem(PlayerLogic *_owner, update(); } }); - - connect(state, &CardState::stateReset, this, [this] { - if (scene()) { - static_cast(scene())->unregisterAnimationItem(this); - } - update(); - }); - - // The retyped logic layer drives CardState setters directly (bypassing the CardItem wrappers that called - // update()), so repaint on every state change: attacking, annotation, doesntUntap, P/T and counters. - connect(state, &CardState::stateChanged, this, [this] { update(); }); - - connect(state, &CardState::viewDeleteRequested, this, &CardItem::deleteLater); } void CardItem::prepareDelete() { if (owner != nullptr) { - auto *gameScene = qobject_cast(scene()); - if (gameScene && gameScene->getActiveCard() == this) { + if (owner->getGame()->getActiveCard() == this) { emit owner->requestCardMenuUpdate(nullptr); - gameScene->setActiveCard(nullptr); + owner->getGame()->setActiveCard(nullptr); } owner = nullptr; } - const QList &attachedStates = state->getAttachedCards(); - while (!attachedStates.isEmpty()) { - auto *attachedItem = qobject_cast(attachedStates.first()->parent()); - if (attachedItem == nullptr) { - break; - } - attachedItem->setZone(nullptr); // so that it won't try to call reorganizeCards() - attachedItem->setAttachedTo(nullptr); + while (!attachedCards.isEmpty()) { + attachedCards.first()->setZone(nullptr); // so that it won't try to call reorganizeCards() + attachedCards.first()->setAttachedTo(nullptr); } if (state->getAttachedTo() != nullptr) { - state->getAttachedTo()->removeAttachedCard(state); + state->getAttachedTo()->removeAttachedCard(this); state->setAttachedTo(nullptr); } } @@ -147,7 +127,7 @@ void CardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, painter->save(); transformPainter(painter, translatedSize, tapAngle); - if (!getFaceDown() && state->getPT() == state->getCardInfo().getPowTough()) { + if (!getFaceDown() && state->getPT() == exactCard.getInfo().getPowTough()) { painter->setPen(Qt::white); } else { painter->setPen(QColor(255, 150, 0)); // dark orange @@ -229,13 +209,36 @@ void CardItem::setPT(const QString &_pt) void CardItem::setAttachedTo(CardItem *_attachedTo) { - CardState *newParent = _attachedTo == nullptr ? nullptr : _attachedTo->getState(); - state->setAttachedTo(newParent); + if (state->getAttachedTo() != nullptr) { + state->getAttachedTo()->removeAttachedCard(this); + } - // If the zone is being torn down, it might already be null by the time a card tries to un-attach all its attached - // cards - if (newParent != nullptr ? newParent->getZone() == nullptr : state->getZone() == nullptr) { - deleteLater(); + gridPoint.setX(-1); + state->setAttachedTo(_attachedTo); + if (state->getAttachedTo() != nullptr) { + // If the zone is being torn down, it might already be null by the time a card tries to un-attach all its + // attached cards + if (state->getAttachedTo()->getZone() == nullptr) { + deleteLater(); + } else { + emit state->getAttachedTo()->getZone()->cardAdded(this); + state->getAttachedTo()->addAttachedCard(this); + if (state->getZone() != state->getAttachedTo()->getZone()) { + state->getAttachedTo()->getZone()->reorganizeCards(); + } + } + } else { + // If the zone is being torn down, it might already be null by the time a card tries to un-attach all its + // attached cards + if (state->getZone() == nullptr) { + deleteLater(); + } else { + emit state->getZone()->cardAdded(this); + } + } + + if (state->getZone() != nullptr) { + state->getZone()->reorganizeCards(); } } @@ -245,6 +248,13 @@ void CardItem::setAttachedTo(CardItem *_attachedTo) void CardItem::resetState(bool keepAnnotations) { state->resetState(keepAnnotations); + attachedCards.clear(); + setTapped(false, false); + setDoesntUntap(false); + if (scene()) { + static_cast(scene())->unregisterAnimationItem(this); + } + update(); } void CardItem::processCardInfo(const ServerInfo_Card &_info) @@ -380,7 +390,7 @@ void CardItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) // Use the buttonDownPos to align the hot spot with the position when // the user originally clicked - createDragItem(state->getId(), event->buttonDownPos(Qt::LeftButton), event->scenePos(), forceFaceDown); + createDragItem(id, event->buttonDownPos(Qt::LeftButton), event->scenePos(), forceFaceDown); dragItem->grabMouse(); int childIndex = 0; @@ -423,11 +433,42 @@ void CardItem::playCard(bool faceDown) emit playSelected(this); } } else { - state->getZone()->getPlayer()->getPlayerActions()->playCard(state, faceDown); + state->getZone()->getPlayer()->getPlayerActions()->playCard(this, faceDown); } } } +QVariantList CardItem::parsePT(const QString &pt) +{ + QVariantList ptList = QVariantList(); + if (!pt.isEmpty()) { + int sep = pt.indexOf('/'); + if (sep == 0) { + ptList.append(QVariant(pt.mid(1))); // cut off starting '/' and take full string + } else { + int start = 0; + for (;;) { + QString item = pt.mid(start, sep - start); + if (item.isEmpty()) { + ptList.append(QVariant(QString())); + } else if (item[0] == '+') { + ptList.append(QVariant(item.mid(1).toInt())); // add as int + } else if (item[0] == '-') { + ptList.append(QVariant(item.toInt())); // add as int + } else { + ptList.append(QVariant(item)); // add as qstring + } + if (sep == -1) { + break; + } + start = sep + 1; + sep = pt.indexOf('/', start); + } + } + } + return ptList; +} + /** * @brief returns true if the zone is a unwritable reveal zone view (eg a card reveal window). Will return false if zone * is nullptr. @@ -452,7 +493,7 @@ void CardItem::handleClickedToPlay(bool shiftHeld) if (SettingsCache::instance().userInterface().getClickPlaysAllSelected()) { emit hideSelected(this); } else { - state->getZone()->removeCard(state); + state->getZone()->removeCard(this); } } else { playCard(shiftHeld); @@ -496,16 +537,16 @@ bool CardItem::animationEvent() { int rotation = ROTATION_DEGREES_PER_FRAME; bool animationIncomplete = true; - if (!state->getTapped()) { + if (!tapped) { rotation *= -1; } tapAngle += rotation; - if (state->getTapped() && (tapAngle > 90)) { + if (tapped && (tapAngle > 90)) { tapAngle = 90; animationIncomplete = false; } - if (!state->getTapped() && (tapAngle < 0)) { + if (!tapped && (tapAngle < 0)) { tapAngle = 0; animationIncomplete = false; } @@ -526,9 +567,7 @@ QVariant CardItem::itemChange(GraphicsItemChange change, const QVariant &value) bool selected = value.toBool(); if (selected) { - if (auto *gameScene = qobject_cast(scene())) { - gameScene->setActiveCard(this); - } + owner->getGame()->setActiveCard(this); } emit selectionChanged(this, selected); diff --git a/cockatrice/src/game_graphics/board/card_item.h b/cockatrice/src/game_graphics/board/card_item.h index 01dacc021..0737d7f9c 100644 --- a/cockatrice/src/game_graphics/board/card_item.h +++ b/cockatrice/src/game_graphics/board/card_item.h @@ -7,6 +7,7 @@ #ifndef CARDITEM_H #define CARDITEM_H +#include "../../game/board/card_state.h" #include "abstract_card_item.h" #include "graphics_item_type.h" @@ -15,7 +16,6 @@ #include #include #include -#include #include class CardDragItem; @@ -33,7 +33,11 @@ class CardItem : public AbstractCardItem { Q_OBJECT private: + CardState *state; + + QPoint gridPoint; CardDragItem *dragItem; + QList attachedCards; void prepareDelete(); void handleClickedToPlay(bool shiftHeld); @@ -56,6 +60,10 @@ public: CardZoneLogic *_zone = nullptr); void retranslateUi(); + [[nodiscard]] CardState *getState() const + { + return state; + } [[nodiscard]] CardZoneLogic *getZone() const { return state->getZone(); @@ -64,15 +72,15 @@ public: void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; [[nodiscard]] QPoint getGridPoint() const { - return state->getGridPoint(); + return gridPoint; } void setGridPoint(const QPoint &_gridPoint) { - state->setGridPoint(_gridPoint); + gridPoint = _gridPoint; } [[nodiscard]] QPoint getGridPos() const { - return state->getGridPoint(); + return gridPoint; } [[nodiscard]] PlayerLogic *getOwner() const { @@ -115,22 +123,22 @@ public: { state->setDestroyOnZoneChange(_destroy); } - [[nodiscard]] CardState *getAttachedTo() const + [[nodiscard]] CardItem *getAttachedTo() const { return state->getAttachedTo(); } void setAttachedTo(CardItem *_attachedTo); - void addAttachedCard(CardState *card) + void addAttachedCard(CardItem *card) { - state->addAttachedCard(card); + attachedCards.append(card); } - void removeAttachedCard(CardState *card) + void removeAttachedCard(CardItem *card) { - state->removeAttachedCard(card); + attachedCards.removeOne(card); } - [[nodiscard]] const QList &getAttachedCards() const + [[nodiscard]] const QList &getAttachedCards() const { - return state->getAttachedCards(); + return attachedCards; } void resetState(bool keepAnnotations = false); void processCardInfo(const ServerInfo_Card &_info); @@ -142,6 +150,26 @@ public: void drawAttachArrow(); void playCard(bool faceDown); + /** + * @brief Parses a string representing a p/t in order to extract the values from it. + * + * If the string contains '/', the string will be split at the '/' and each side will be parsed separately, + * which means the result list will have two elements. + * + * If '/' is not found, then the entire string is parsed together, which means the result list will + * have a single element. + * + * If either side of the split is empty, there will also only be a single element in the result list. + * + * This function will attempt to parse each substring as an int first, handling plus and minus prefixes. + * If successful, it will put the parsed value into the QVariant as an int. + * If failed, it will just put the substring into the QVariant as a QString. + * + * @param pt The p/t string + * @return A QVariantList that can contain one or two elements, where each QVariant can be either int or QString + */ + static QVariantList parsePT(const QString &pt); + protected: void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; diff --git a/cockatrice/src/game_graphics/board/counter_general.cpp b/cockatrice/src/game_graphics/board/counter_general.cpp index 23618e6bf..4a8bbd6a4 100644 --- a/cockatrice/src/game_graphics/board/counter_general.cpp +++ b/cockatrice/src/game_graphics/board/counter_general.cpp @@ -1,7 +1,6 @@ #include "counter_general.h" #include "../../interface/pixel_map_generator.h" -#include "../../interface/theme_manager.h" #include "abstract_graphics_item.h" #include @@ -42,7 +41,7 @@ void GeneralCounter::paint(QPainter *painter, const QStyleOptionGraphicsItem * / painter->drawPixmap(QPoint(0, 0), pixmap); if (value) { - QFont f = themeManager->cardTextFont(); + QFont f("Serif"); f.setPixelSize(qMax((int)(radius * scaleFactor), 10)); f.setWeight(QFont::Bold); painter->setPen(Qt::black); diff --git a/cockatrice/src/game_graphics/deckview/deck_view.cpp b/cockatrice/src/game_graphics/deckview/deck_view.cpp index f62d33335..630530792 100644 --- a/cockatrice/src/game_graphics/deckview/deck_view.cpp +++ b/cockatrice/src/game_graphics/deckview/deck_view.cpp @@ -77,7 +77,7 @@ void DeckViewCardDragItem::updatePosition(const QPointF &cursorScenePos) void DeckViewCardDragItem::handleDrop(DeckViewCardContainer *target) { - auto *card = static_cast(item.data()); + auto *card = static_cast(item); auto *start = static_cast(item->parentItem()); start->removeCard(card); target->addCard(card); @@ -240,8 +240,8 @@ void DeckViewCardContainer::paint(QPainter *painter, const QStyleOptionGraphicsI painter->drawLine(QPointF(0, separatorY), QPointF(width, separatorY)); painter->setPen(QColor(Qt::white)); - // Family comes from the DeckList theme role; pixel sizes/weights unchanged. - QFont f = themeManager->deckListFont(); + QFont f("Serif"); + f.setStyleHint(QFont::Serif); f.setPixelSize(24); f.setWeight(QFont::Bold); painter->setFont(f); @@ -292,8 +292,8 @@ QList> DeckViewCardContainer::getRowsAndCols() const int DeckViewCardContainer::getCardTypeTextWidth() const { - // Family comes from the DeckList theme role; pixel size/weight unchanged. - QFont f = themeManager->deckListFont(); + QFont f("Serif"); + f.setStyleHint(QFont::Serif); f.setPixelSize(16); f.setWeight(QFont::Bold); QFontMetrics fm(f); @@ -366,15 +366,6 @@ void DeckViewCardContainer::setWidth(qreal _width) DeckViewScene::DeckViewScene(QObject *parent) : QGraphicsScene(parent), locked(true), deck(0), optimalAspectRatio(1.0) { - // Zone headers read the DeckList role at paint time and cache their - // rendering, so touch every item to invalidate the caches and pick up the - // new family on font changes (containers cannot connect this themselves: - // QGraphicsItem is not a QObject). - connect(themeManager, &ThemeManager::fontsChanged, this, [this] { - for (auto *item : items()) { - item->update(); - } - }); } DeckViewScene::~DeckViewScene() diff --git a/cockatrice/src/game_graphics/deckview/deck_view_container.cpp b/cockatrice/src/game_graphics/deckview/deck_view_container.cpp index fe63d7a6f..90b3bea11 100644 --- a/cockatrice/src/game_graphics/deckview/deck_view_container.cpp +++ b/cockatrice/src/game_graphics/deckview/deck_view_container.cpp @@ -2,8 +2,13 @@ #include "../../client/settings/cache_settings.h" #include "../../client/settings/shortcuts_settings.h" +#include "../../game/abstract_game.h" +#include "../../game/game_event_handler.h" +#include "../../game/game_state.h" #include "../../interface/card_picture_loader/card_picture_loader.h" +#include "../../interface/deck_loader/deck_file_format.h" #include "../../interface/deck_loader/deck_loader.h" +#include "../../interface/deck_loader/loaded_deck.h" #include "../../interface/widgets/dialogs/dlg_load_deck.h" #include "../../interface/widgets/dialogs/dlg_load_deck_from_clipboard.h" #include "../../interface/widgets/dialogs/dlg_load_deck_from_website.h" @@ -28,12 +33,12 @@ #include #include #include -#include -#include #include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include @@ -71,8 +76,6 @@ void ToggleButton::setState(bool _state) DeckViewContainer::DeckViewContainer(int _playerId, TabGame *parent) : QWidget(nullptr), visualDeckStorageWidget(nullptr), parentGame(parent), playerId(_playerId) { - setObjectName("deckViewContainer"); - loadLocalButton = new QPushButton; loadRemoteButton = new QPushButton; loadFromClipboardButton = new QPushButton; @@ -82,14 +85,6 @@ DeckViewContainer::DeckViewContainer(int _playerId, TabGame *parent) forceStartGameButton = new QPushButton; sideboardLockButton = new ToggleButton; - loadLocalButton->setObjectName("loadLocalButton"); - loadRemoteButton->setObjectName("loadRemoteButton"); - loadFromClipboardButton->setObjectName("loadFromClipboardButton"); - readyStartButton->setObjectName("readyStartButton"); - forceStartGameButton->setObjectName("forceStartGameButton"); - unloadDeckButton->setObjectName("unloadDeckButton"); - sideboardLockButton->setObjectName("sideboardLockButton"); - connect(loadLocalButton, &QPushButton::clicked, this, &DeckViewContainer::loadLocalDeck); connect(loadRemoteButton, &QPushButton::clicked, this, &DeckViewContainer::loadRemoteDeck); connect(loadFromClipboardButton, &QPushButton::clicked, this, &DeckViewContainer::loadFromClipboard); @@ -319,7 +314,9 @@ void DeckViewContainer::loadDeckFromDeckList(const DeckList &deck) return; } - PendingCommand *pend = parentGame->getGame()->getGameEventHandler()->prepareDeckSelect(deckString); + Command_DeckSelect cmd; + cmd.set_deck(deckString.toStdString()); + PendingCommand *pend = parentGame->getGame()->getGameEventHandler()->prepareGameCommand(cmd); connect(pend, &PendingCommand::finished, this, &DeckViewContainer::deckSelectFinished); parentGame->getGame()->getGameEventHandler()->sendGameCommand(pend, playerId); @@ -348,7 +345,15 @@ void DeckViewContainer::resolveAndSendPlaymat() lastResolvedPlaymat = resolved; - PendingCommand *playmatPend = parentGame->getGame()->getGameEventHandler()->prepareSetPlaymat(resolved); + Command_SetPlaymat playmatCmd; + auto *pp = playmatCmd.mutable_playmat_params(); + pp->set_card_name(resolved.card.name.toStdString()); + pp->set_card_provider_id(resolved.card.providerId.toStdString()); + pp->set_margin_pct_l(resolved.params.marginPctL); + pp->set_margin_pct_r(resolved.params.marginPctR); + pp->set_vertical_offset(resolved.params.verticalOffset); + pp->set_zoom(resolved.params.zoom); + PendingCommand *playmatPend = parentGame->getGame()->getGameEventHandler()->prepareGameCommand(playmatCmd); const QString sentName = resolved.card.name; connect(playmatPend, &PendingCommand::finished, this, [this, sentName](const Response &r) { // Only RespFunctionNotAllowed signals a card art DENY rule. Older servers that predate @@ -379,7 +384,9 @@ void DeckViewContainer::loadRemoteDeck() { DlgLoadRemoteDeck dlg(parentGame->getGame()->getClientForPlayer(playerId), this); if (dlg.exec()) { - PendingCommand *pend = parentGame->getGame()->getGameEventHandler()->prepareDeckSelectId(dlg.getDeckId()); + Command_DeckSelect cmd; + cmd.set_deck_id(dlg.getDeckId()); + PendingCommand *pend = parentGame->getGame()->getGameEventHandler()->prepareGameCommand(cmd); connect(pend, &PendingCommand::finished, this, &DeckViewContainer::deckSelectFinished); parentGame->getGame()->getGameEventHandler()->sendGameCommand(pend, playerId); } @@ -439,17 +446,28 @@ void DeckViewContainer::forceStart() return; } - parentGame->getGame()->getGameEventHandler()->sendForceStart(playerId); + Command_ReadyStart cmd; + cmd.set_force_start(true); + cmd.set_ready(true); + parentGame->getGame()->getGameEventHandler()->sendGameCommand(cmd, playerId); } void DeckViewContainer::sideboardLockButtonClicked() { - parentGame->getGame()->getGameEventHandler()->sendSetSideboardLock(sideboardLockButton->getState(), playerId); + Command_SetSideboardLock cmd; + cmd.set_locked(sideboardLockButton->getState()); + + parentGame->getGame()->getGameEventHandler()->sendGameCommand(cmd, playerId); } void DeckViewContainer::sideboardPlanChanged() { - parentGame->getGame()->getGameEventHandler()->sendSetSideboardPlan(deckView->getSideboardPlan(), playerId); + Command_SetSideboardPlan cmd; + const QList &newPlan = deckView->getSideboardPlan(); + for (const auto &i : newPlan) { + cmd.add_move_list()->CopyFrom(i); + } + parentGame->getGame()->getGameEventHandler()->sendGameCommand(cmd, playerId); } /** @@ -461,7 +479,9 @@ void DeckViewContainer::sendReadyStartCommand(bool ready) resolveAndSendPlaymat(); } - parentGame->getGame()->getGameEventHandler()->sendReadyStart(ready, playerId); + Command_ReadyStart cmd; + cmd.set_ready(ready); + parentGame->getGame()->getGameEventHandler()->sendGameCommand(cmd, playerId); } /** diff --git a/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.cpp b/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.cpp index 75ede0ca8..90cbed9a1 100644 --- a/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.cpp +++ b/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.cpp @@ -14,7 +14,6 @@ class TabGame; TabbedDeckViewContainer::TabbedDeckViewContainer(int _playerId, TabGame *parent) : QTabWidget(nullptr), playerId(_playerId), parentGame(parent) { - setObjectName(QString("tabbedDeckView_%1").arg(_playerId)); setTabsClosable(true); connect(this, &QTabWidget::tabCloseRequested, this, &TabbedDeckViewContainer::closeTab); diff --git a/cockatrice/src/game_graphics/dialogs/dlg_annotation.cpp b/cockatrice/src/game_graphics/dialogs/dlg_annotation.cpp deleted file mode 100644 index c812f9c74..000000000 --- a/cockatrice/src/game_graphics/dialogs/dlg_annotation.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include "dlg_annotation.h" - -#include - -void AnnotationDialog::keyPressEvent(QKeyEvent *event) -{ - if (event->key() == Qt::Key_Return && event->modifiers() & Qt::ControlModifier) { - event->accept(); - accept(); - return; - } - QInputDialog::keyPressEvent(event); -} diff --git a/cockatrice/src/game_graphics/dialogs/dlg_annotation.h b/cockatrice/src/game_graphics/dialogs/dlg_annotation.h deleted file mode 100644 index 686377d3c..000000000 --- a/cockatrice/src/game_graphics/dialogs/dlg_annotation.h +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file dlg_annotation.h - * @ingroup GameDialogs - */ - -#ifndef COCKATRICE_DLG_ANNOTATION_H -#define COCKATRICE_DLG_ANNOTATION_H - -#include - -class AnnotationDialog : public QInputDialog -{ - Q_OBJECT - void keyPressEvent(QKeyEvent *e) override; - -public: - explicit AnnotationDialog(QWidget *parent = nullptr) : QInputDialog(parent) - { - } -}; - -#endif // COCKATRICE_DLG_ANNOTATION_H diff --git a/cockatrice/src/game_graphics/dialogs/dlg_create_token.h b/cockatrice/src/game_graphics/dialogs/dlg_create_token.h index 323e61829..a03a1046b 100644 --- a/cockatrice/src/game_graphics/dialogs/dlg_create_token.h +++ b/cockatrice/src/game_graphics/dialogs/dlg_create_token.h @@ -11,7 +11,6 @@ #include #include #include -#include #include class QLabel; @@ -26,6 +25,17 @@ class CardInfoPictureWidget; class QModelIndex; class QWidget; +struct TokenInfo +{ + QString name; + QString color; + QString pt; + QString annotation; + bool destroy = true; + bool faceDown = false; + QString providerId; +}; + class DlgCreateToken : public QDialog { Q_OBJECT diff --git a/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.h b/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.h index da2e70b0a..b9080bcc1 100644 --- a/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.h +++ b/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.h @@ -11,7 +11,6 @@ #include #include #include -#include #include class FilterString; @@ -22,6 +21,13 @@ class QLabel; class QSpinBox; class QWidget; +struct MoveTopCardsUntilOptions +{ + QStringList exprs = {}; + int numberOfHits = 1; + bool autoPlay = false; +}; + class DlgMoveTopCardsUntil : public QDialog { Q_OBJECT diff --git a/cockatrice/src/game_graphics/game_scene.cpp b/cockatrice/src/game_graphics/game_scene.cpp index 128899a13..cc3f9f1d3 100644 --- a/cockatrice/src/game_graphics/game_scene.cpp +++ b/cockatrice/src/game_graphics/game_scene.cpp @@ -1,11 +1,18 @@ #include "game_scene.h" #include "../client/settings/cache_settings.h" -#include "../interface/theme_manager.h" +#include "../game/abstract_game.h" +#include "../game/arrow_registry.h" +#include "../game/board/arrow_data.h" +#include "../game/player/player_actions.h" +#include "../game/player/player_event_handler.h" +#include "../game/player/player_info.h" +#include "../game/player/player_logic.h" +#include "../game/zones/card_zone_logic.h" +#include "../game/zones/view_zone_logic.h" #include "animated_item.h" #include "board/abstract_card_item.h" #include "board/arrow_item.h" -#include "board/arrow_registry.h" #include "board/card_item.h" #include "phases_toolbar.h" #include "player/menu/player_menu.h" @@ -33,16 +40,6 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include @@ -66,14 +63,6 @@ GameScene::GameScene(PhasesToolbar *_phasesToolbar, QObject *parent) addItem(phasesToolbar); connect(&SettingsCache::instance().userInterface(), &InterfaceSettings::minPlayersForMultiColumnLayoutChanged, this, &GameScene::rearrange); - // CardText items (P/T boxes, counters, player names) read the role at - // paint time and cache their rendering, so touch every item to invalidate - // the caches and pick up the new family on font changes. - connect(themeManager, &ThemeManager::fontsChanged, this, [this] { - for (auto *item : items()) { - item->update(); - } - }); rearrange(); } @@ -123,15 +112,6 @@ void GameScene::retranslateUi() } } -QList GameScene::selectedCardStates() const -{ - QList selectedStates; - for (auto *card : selectedCards()) { - selectedStates.append(card->getState()); - } - return selectedStates; -} - QList GameScene::selectedCards() const { QList selectedCards; @@ -144,67 +124,6 @@ QList GameScene::selectedCards() const return selectedCards; } -/** - * @brief Selects every card of @p zone for which @p filter holds. - * @param filter A predicate to filter which cards are selected. - */ -static void selectCardsInZone( - const CardZoneLogic *zone, - std::function filter = [](const CardItem *) { return true; }) -{ - if (!zone) { - return; - } - - for (auto *cardState : zone->getCards()) { - auto *cardItem = cardState == nullptr ? nullptr : qobject_cast(cardState->parent()); - if (cardItem && filter(cardItem)) { - cardItem->setSelected(true); - } - } -} - -void GameScene::selectAllInZone(const CardItem *card) -{ - if (!card) { - return; - } - - selectCardsInZone(card->getZone()); -} - -void GameScene::selectSameRow(const CardItem *card) -{ - if (!card) { - return; - } - - auto isSameRow = [card](const CardItem *cardItem) { - return qAbs(card->scenePos().y() - cardItem->scenePos().y()) < 50; - }; - selectCardsInZone(card->getZone(), isSameRow); -} - -void GameScene::selectSameColumn(const CardItem *card) -{ - if (!card) { - return; - } - - auto isSameColumn = [card](const CardItem *cardItem) { return cardItem->x() == card->x(); }; - selectCardsInZone(card->getZone(), isSameColumn); -} - -CardItem *GameScene::getActiveCard() const -{ - return activeCard; -} - -void GameScene::setActiveCard(CardItem *card) -{ - activeCard = card; -} - void GameScene::onCardSelectionChanged(AbstractCardItem *abstractCard, bool selected) { CardItem *card = qobject_cast(abstractCard); @@ -215,12 +134,12 @@ void GameScene::onCardSelectionChanged(AbstractCardItem *abstractCard, bool sele auto *owner = card->getOwner(); if (selected) { - owner->requestCardMenuUpdate(card->getState()); + owner->requestCardMenuUpdate(card); return; } if (selectedItems().isEmpty()) { - setActiveCard(nullptr); + owner->getGame()->setActiveCard(nullptr); owner->requestCardMenuUpdate(nullptr); } } @@ -239,9 +158,9 @@ void GameScene::onCardRightClicked(AbstractCardItem *abstractCard, QPoint screen return; } - setActiveCard(card); + card->getOwner()->getGame()->setActiveCard(card); - if (auto *menu = view->getPlayerMenu()->updateCardMenu(card->getState())) { + if (auto *menu = view->getPlayerMenu()->updateCardMenu(card)) { menu->popup(screenPos); } } @@ -254,7 +173,7 @@ void GameScene::playSelected(AbstractCardItem *card) if (!card->getOwner()) { return; } - card->getOwner()->getPlayerActions()->actPlay(selectedCardStates()); + card->getOwner()->getPlayerActions()->actPlay(selectedCards()); } void GameScene::playSelectedFaceDown(AbstractCardItem *card) @@ -265,7 +184,7 @@ void GameScene::playSelectedFaceDown(AbstractCardItem *card) if (!card->getOwner()) { return; } - card->getOwner()->getPlayerActions()->actPlayFacedown(selectedCardStates()); + card->getOwner()->getPlayerActions()->actPlayFacedown(selectedCards()); } void GameScene::hideSelected(AbstractCardItem *card) @@ -276,7 +195,7 @@ void GameScene::hideSelected(AbstractCardItem *card) if (!card->getOwner()) { return; } - card->getOwner()->getPlayerActions()->actHide(selectedCardStates()); + card->getOwner()->getPlayerActions()->actHide(selectedCards()); } /** @@ -311,8 +230,6 @@ void GameScene::addPlayer(PlayerLogic *player) [this, id = player->getPlayerInfo()->getId()]() { clearArrowsForPlayerLocally(id); }); connect(player->getPlayerEventHandler(), &PlayerEventHandler::cardZoneChanged, this, &GameScene::onCardZoneChanged); - connect(player->getPlayerEventHandler(), &PlayerEventHandler::cardViewRefreshRequested, this, - &GameScene::onCardViewRefreshRequested); rearrange(); } @@ -442,37 +359,6 @@ QList GameScene::collectActivePlayers(int &firstPlayerIndex) cons } } } - - // Lay out the table in seat order rather than id order. Players missing - // from the tracked order keep id order at the end. - QList seatOrder; - for (auto *pgItem : playerViews.values()) { - if (PlayerLogic *p = pgItem->getLogic()) { - seatOrder = p->getGame()->getGameState()->getSeatOrder(); - break; - } - } - if (!seatOrder.isEmpty()) { - std::sort(activePlayers.begin(), activePlayers.end(), [&](PlayerLogic *a, PlayerLogic *b) { - int indexA = seatOrder.indexOf(a->getPlayerInfo()->getId()); - int indexB = seatOrder.indexOf(b->getPlayerInfo()->getId()); - if (indexA == -1) { - indexA = seatOrder.size() + a->getPlayerInfo()->getId(); - } - if (indexB == -1) { - indexB = seatOrder.size() + b->getPlayerInfo()->getId(); - } - return indexA < indexB; - }); - // Recompute the local-player index after sorting. - firstPlayerIndex = 0; - for (int i = 0; i < activePlayers.size(); ++i) { - if (activePlayers[i]->getPlayerInfo()->getLocal()) { - firstPlayerIndex = i; - break; - } - } - } return activePlayers; } @@ -647,11 +533,7 @@ void GameScene::addArrow(QSharedPointer data) return; } - CardState *startCardState = startZone->getCard(data->startCardId); - if (!startCardState) { - return; - } - CardItem *startCard = qobject_cast(startCardState->parent()); + CardItem *startCard = startZone->getCard(data->startCardId); if (!startCard) { return; } @@ -662,8 +544,7 @@ void GameScene::addArrow(QSharedPointer data) } else { auto *zone = targetView->getLogic()->getZones().value(data->targetZone); if (zone) { - CardState *targetCardState = zone->getCard(data->targetCardId); - targetItem = targetCardState == nullptr ? nullptr : qobject_cast(targetCardState->parent()); + targetItem = zone->getCard(data->targetCardId); } } if (!targetItem) { @@ -691,15 +572,11 @@ void GameScene::requestArrowDeletion(int playerId, int arrowId) } } -void GameScene::onCardZoneChanged(CardState *card, bool sameZone) +void GameScene::onCardZoneChanged(CardItem *card, bool sameZone) { - auto *item = qobject_cast(card->parent()); - if (!item) { - return; - } QList toDelete; for (auto *arrow : arrowRegistry.all()) { - if (arrow->getStartItem() == item || arrow->getTargetItem() == item) { + if (arrow->getStartItem() == card || arrow->getTargetItem() == card) { if (sameZone) { arrow->updatePath(); } else { @@ -712,25 +589,6 @@ void GameScene::onCardZoneChanged(CardState *card, bool sameZone) } } -void GameScene::onCardViewRefreshRequested(CardState *card, bool zoneChanged, PlayerLogic *newOwner) -{ - auto *item = qobject_cast(card->parent()); - if (!item) { - return; - } - if (zoneChanged) { - item->deleteCardInfoPopup(); - } - item->deleteDragItem(); - if (zoneChanged) { - item->setBeingPointedAt(false); - item->setHovered(false); - } - if (newOwner) { - item->setOwner(newOwner); - } -} - void GameScene::clearArrowsForPlayer(int playerId) { for (int arrowId : arrowRegistry.idsForPlayer(playerId)) { diff --git a/cockatrice/src/game_graphics/game_scene.h b/cockatrice/src/game_graphics/game_scene.h index 0d4db70a8..c7cae1e76 100644 --- a/cockatrice/src/game_graphics/game_scene.h +++ b/cockatrice/src/game_graphics/game_scene.h @@ -1,9 +1,7 @@ #ifndef GAMESCENE_H #define GAMESCENE_H -#include "animated_item.h" -#include "board/arrow_item.h" -#include "board/arrow_registry.h" +#include "../game/arrow_registry.h" #include #include @@ -18,8 +16,6 @@ #include #include #include -#include -#include #include // IWYU pragma: keep @@ -43,7 +39,6 @@ class ZoneViewWidget; class CardZone; class AbstractCardItem; class CardItem; -class CardState; class ServerInfo_Card; class PhasesToolbar; class QBasicTimer; @@ -74,7 +69,6 @@ private: QList zoneViews; ///< Active zone view widgets QSize viewSize; ///< Current view size QPointer hoveredCard; ///< Currently hovered card - QPointer activeCard; ///< Card the currently open context menu targets QBasicTimer *animationTimer; ///< Timer for scene animations QHash animatedItems; ///< Items currently animating QHash @@ -113,22 +107,6 @@ public: /** @brief Gets all selected CardItems. */ QList selectedCards() const; - QList selectedCardStates() const; - - /** @brief Selects every card sharing the zone of @p card. */ - void selectAllInZone(const CardItem *card); - - /** @brief Selects the cards laid out in the same visual row as @p card. */ - void selectSameRow(const CardItem *card); - - /** @brief Selects the cards laid out in the same visual column as @p card. */ - void selectSameColumn(const CardItem *card); - - /** @brief Card the currently open context menu targets, or null. */ - CardItem *getActiveCard() const; - - /** @brief Sets the card the currently open context menu targets. */ - void setActiveCard(CardItem *card); /** * @brief Adds a player to the scene and stores their graphics item. @@ -283,15 +261,7 @@ public slots: /// Queues up arrow deletion but doesn't directly modify the scene void requestArrowDeletion(int playerId, int arrowId); - void onCardZoneChanged(CardState *card, bool sameZone); - /** - * @brief Refreshes the view of a card that the server just moved. - * - * @param card The card that moved. - * @param zoneChanged Whether the card crossed a zone boundary. - * @param newOwner The player the card now belongs to, or nullptr to leave the owner alone. - */ - void onCardViewRefreshRequested(CardState *card, bool zoneChanged, PlayerLogic *newOwner); + void onCardZoneChanged(CardItem *card, bool sameZone); protected: /** @brief Handles hover updates. */ diff --git a/cockatrice/src/game_graphics/game_view.cpp b/cockatrice/src/game_graphics/game_view.cpp index 7a5aa073a..cb59b3d7d 100644 --- a/cockatrice/src/game_graphics/game_view.cpp +++ b/cockatrice/src/game_graphics/game_view.cpp @@ -2,14 +2,12 @@ #include "../client/settings/cache_settings.h" #include "../client/settings/shortcuts_settings.h" -#include "../interface/theme_manager.h" #include "game_scene.h" #include #include #include #include -#include #include #include #include @@ -26,21 +24,6 @@ #include #include -namespace -{ -QFont deckOverlayFont(int pixelSize, bool bold) -{ - // The drag/total counters and the tally columns are in-game overlays, not - // deck list text: keep the monospace family the stylesheets used to set so - // digit widths stay stable as counts tick and `white-space: pre` lines up. - QFont font(QStringLiteral("monospace")); - font.setStyleHint(QFont::Monospace); - font.setPixelSize(pixelSize); - font.setBold(bold); - return font; -} -} // namespace - // QRubberBand calls raise() in showEvent() and changeEvent() to stay on top of siblings. // This subclass disables that behavior so dragCountLabel can appear above it. class SelectionRubberBand : public QRubberBand @@ -65,7 +48,6 @@ protected: GameView::GameView(GameScene *scene, QWidget *parent) : QGraphicsView(scene, parent), rubberBand(0) { - setObjectName("gameView"); setBackgroundBrush(QBrush(QColor(0, 0, 0))); setRenderHints(QPainter::TextAntialiasing | QPainter::Antialiasing); setViewportUpdateMode(BoundingRectViewportUpdate); @@ -93,14 +75,15 @@ GameView::GameView(GameScene *scene, QWidget *parent) : QGraphicsView(scene, par rubberBand = new SelectionRubberBand(QRubberBand::Rectangle, this); const QString baseProperties = "color: white; " + "font-family: monospace; " "background-color: rgba(0, 0, 0, 160); " "border-radius: 3px; " "padding: 1px 2px; " "white-space: pre;"; - const QString dragCountLabelStyle = baseProperties; - const QString totalCountLabelStyle = baseProperties; - const QString subtypeTallyLabelStyle = baseProperties; + const QString dragCountLabelStyle = baseProperties + "font-size: 14px; font-weight: bold;"; + const QString totalCountLabelStyle = baseProperties + "font-size: 16px; font-weight: bold;"; + const QString subtypeTallyLabelStyle = baseProperties + "font-size: 12px;"; dragCountLabel = new QLabel(this); dragCountLabel->setStyleSheet(dragCountLabelStyle); @@ -117,27 +100,6 @@ GameView::GameView(GameScene *scene, QWidget *parent) : QGraphicsView(scene, par tallyLayout->setContentsMargins(2, 2, 2, 2); tallyLayout->setSpacing(2); tallyContainer->hide(); - - applyDeckOverlayFonts(); -} - -void GameView::applyDeckOverlayFonts() -{ - dragCountLabel->setFont(deckOverlayFont(14, true)); - totalCountLabel->setFont(deckOverlayFont(16, true)); - tallyContainer->setFont(deckOverlayFont(12, false)); - for (int i = 0; i < tallyLayout->count(); ++i) { - if (auto *label = qobject_cast(tallyLayout->itemAt(i)->widget())) { - // Count column (odd positions) keeps the bold emphasis. - const bool count = i % 2 == 1; - label->setFont(deckOverlayFont(count ? 14 : 12, count)); - } - } - - // The container keeps the size computed from the previous fonts, so force - // rebuildTallyLabels() to re-measure it instead of reusing cachedTallyRows. - cachedTallyRows.clear(); - updateTotalSelectionCount(); } void GameView::resizeEvent(QResizeEvent *event) @@ -257,8 +219,9 @@ QSize GameView::rebuildTallyLabels(const QList &entries) { clearTallyLabels(); - const QString nameStyle = QStringLiteral("color: white; background: transparent;"); - const QString countStyle = QStringLiteral("color: white; background: transparent;"); + const QString nameStyle = QStringLiteral("color: white; font-size: 12px; background: transparent;"); + const QString countStyle = + QStringLiteral("color: white; font-size: 14px; font-weight: bold; background: transparent;"); int totalHeight = 0; int maxNameWidth = 0; @@ -268,13 +231,11 @@ QSize GameView::rebuildTallyLabels(const QList &entries) for (const TallyRow &entry : entries) { auto *nameLabel = new QLabel(entry.name, tallyContainer); nameLabel->setStyleSheet(nameStyle); - nameLabel->setFont(deckOverlayFont(12, false)); nameLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter); tallyLayout->addWidget(nameLabel, row, 0); auto *countLabel = new QLabel(entry.value, tallyContainer); countLabel->setStyleSheet(countStyle); - countLabel->setFont(deckOverlayFont(14, true)); countLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter); tallyLayout->addWidget(countLabel, row, 1); diff --git a/cockatrice/src/game_graphics/game_view.h b/cockatrice/src/game_graphics/game_view.h index 99a73a0a8..e57267734 100644 --- a/cockatrice/src/game_graphics/game_view.h +++ b/cockatrice/src/game_graphics/game_view.h @@ -50,7 +50,6 @@ private slots: void refreshShortcuts(); void updateTotalSelectionCount(const QSize &viewSize = QSize()); void setFocusDisabled(bool disabled); - void applyDeckOverlayFonts(); public slots: void updateSceneRect(const QRectF &rect); diff --git a/cockatrice/src/game_graphics/hand_counter.cpp b/cockatrice/src/game_graphics/hand_counter.cpp index b9ea2d554..9320c1295 100644 --- a/cockatrice/src/game_graphics/hand_counter.cpp +++ b/cockatrice/src/game_graphics/hand_counter.cpp @@ -1,5 +1,7 @@ #include "hand_counter.h" +#include "../game/board/card_list.h" +#include "../game/zones/card_zone_logic.h" #include "../interface/pixel_map_generator.h" #include @@ -12,8 +14,6 @@ #include #include #include -#include -#include #include class QGraphicsItem; diff --git a/cockatrice/src/game_graphics/log/message_log_widget.cpp b/cockatrice/src/game_graphics/log/message_log_widget.cpp index d526766af..4a9750fca 100644 --- a/cockatrice/src/game_graphics/log/message_log_widget.cpp +++ b/cockatrice/src/game_graphics/log/message_log_widget.cpp @@ -3,9 +3,17 @@ #include "../../client/settings/cache_settings.h" #include "../../client/settings/card_counter_settings.h" #include "../../client/sound_engine.h" +#include "../../client/translation.h" +#include "../../game/abstract_game.h" +#include "../../game/board/card_list.h" +#include "../../game/game_state.h" +#include "../../game/phase.h" +#include "../../game/player/player_event_handler.h" +#include "../../game/player/player_info.h" +#include "../../game/player/player_logic.h" +#include "../../game/player/player_manager.h" +#include "../../game/zones/card_zone_logic.h" #include "../../interface/card_localization.h" -#include "../../interface/theme_icon.h" -#include "../../interface/theme_manager.h" #include "../../interface/widgets/server/chat_view/chat_view.h" #include "../board/card_item.h" #include "../board/translate_counter_name.h" @@ -14,22 +22,8 @@ #include #include #include -#include -#include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include @@ -126,7 +120,6 @@ MessageLogWidget::getFromStr(CardZoneLogic *zone, QString cardName, int position void MessageLogWidget::containerProcessingDone() { currentContext = MessageContext_None; - contextJudgeName.clear(); messageSuffix = messagePrefix = QString(); } @@ -290,7 +283,7 @@ void MessageLogWidget::logDestroyCard(PlayerLogic *player, QString cardName) } void MessageLogWidget::logMoveCard(PlayerLogic *player, - CardState *card, + CardItem *card, CardZoneLogic *startZone, int oldX, CardZoneLogic *targetZone, @@ -612,20 +605,6 @@ void MessageLogWidget::logReverseTurn(PlayerLogic *player, bool reversed) .arg(reversed ? tr("reversed") : tr("normal"))); } -void MessageLogWidget::logTurnOrderChanged(QStringList playerNames, bool randomized) -{ - QStringList sanitizedNames; - for (const QString &name : playerNames) { - sanitizedNames.append(sanitizeHtml(name)); - } - const QString order = sanitizedNames.join(" -> "); - if (randomized) { - appendHtmlServerMessage(tr("Randomized turn order: %1.").arg(order)); - } else { - appendHtmlServerMessage(tr("New turn order set: %1.").arg(order)); - } -} - void MessageLogWidget::logRollDie(PlayerLogic *player, int sides, const QList &rolls) { if (rolls.length() == 1) { @@ -683,7 +662,7 @@ void MessageLogWidget::logSetActivePlayer(PlayerLogic *player) QString(tr("%1's turn.")).arg(player->getPlayerInfo()->getName()) + "
    "); } -void MessageLogWidget::logSetAnnotation(PlayerLogic *player, CardState *card, QString newAnnotation) +void MessageLogWidget::logSetAnnotation(PlayerLogic *player, CardItem *card, QString newAnnotation) { appendHtmlServerMessage( QString(tr("%1 sets annotation of %2 to %3.")) @@ -727,7 +706,7 @@ void MessageLogWidget::logSetCounter(PlayerLogic *player, QString counterName, i .arg(value - oldValue)); } -void MessageLogWidget::logSetDoesntUntap(PlayerLogic *player, CardState *card, bool doesntUntap) +void MessageLogWidget::logSetDoesntUntap(PlayerLogic *player, CardItem *card, bool doesntUntap) { QString str; if (doesntUntap) { @@ -738,7 +717,7 @@ void MessageLogWidget::logSetDoesntUntap(PlayerLogic *player, CardState *card, b appendHtmlServerMessage(str.arg(sanitizeHtml(player->getPlayerInfo()->getName())).arg(cardLink(card->getName()))); } -void MessageLogWidget::logSetPT(PlayerLogic *player, CardState *card, QString newPT) +void MessageLogWidget::logSetPT(PlayerLogic *player, CardItem *card, QString newPT) { if (currentContext == MessageContext_MoveCard) { return; @@ -776,7 +755,7 @@ void MessageLogWidget::logSetSideboardLock(PlayerLogic *player, bool locked) } } -void MessageLogWidget::logSetTapped(PlayerLogic *player, CardState *card, bool tapped) +void MessageLogWidget::logSetTapped(PlayerLogic *player, CardItem *card, bool tapped) { if (currentContext == MessageContext_MoveCard) { return; @@ -862,27 +841,8 @@ void MessageLogWidget::logUndoDrawFailed(PlayerLogic *player) void MessageLogWidget::setContextJudgeName(QString name) { - contextJudgeName = std::move(name); - refreshJudgeSuffix(); -} - -void MessageLogWidget::refreshJudgeSuffix() -{ - const QPixmap pixmap = loadThemedIcon(QStringLiteral("icons/scales")).pixmap(QSize(24, 24)); - if (!pixmap.isNull()) { - // Rich text cannot resolve `currentColor`; register a palette-rendered - // image so already-appended judge tags repaint on a theme switch. - document()->addResource(QTextDocument::ImageResource, QUrl(QStringLiteral("cockatrice:scales")), pixmap); - document()->markContentsDirty(0, document()->characterCount()); - } - - if (contextJudgeName.isEmpty()) { - return; - } - - messagePrefix = QStringLiteral("").arg(palette().color(QPalette::WindowText).name()); - messageSuffix = - QStringLiteral(" [ %1]").arg(sanitizeHtml(contextJudgeName)); + messagePrefix = QString(""); + messageSuffix = QString(" [ %1]").arg(sanitizeHtml(name)); } void MessageLogWidget::appendHtmlServerMessage(const QString &html, bool optionalIsBold, QString optionalFontColor) @@ -931,6 +891,4 @@ void MessageLogWidget::connectToPlayerEventHandler(PlayerEventHandler *playerEve MessageLogWidget::MessageLogWidget(TabSupervisor *_tabSupervisor, AbstractGame *_game, QWidget *parent) : ChatView(_tabSupervisor, _game, true, parent), currentContext(MessageContext_None) { - connect(themeManager, &ThemeManager::paletteChanged, this, &MessageLogWidget::refreshJudgeSuffix); - connect(themeManager, &ThemeManager::themeChanged, this, &MessageLogWidget::refreshJudgeSuffix); } diff --git a/cockatrice/src/game_graphics/log/message_log_widget.h b/cockatrice/src/game_graphics/log/message_log_widget.h index 3ec5ff93c..6800ba8ed 100644 --- a/cockatrice/src/game_graphics/log/message_log_widget.h +++ b/cockatrice/src/game_graphics/log/message_log_widget.h @@ -14,7 +14,6 @@ #include #include -class CardState; class AbstractGame; class CardItem; class GameEventContext; @@ -39,10 +38,8 @@ private: MessageContext currentContext; QString messagePrefix, messageSuffix; - QString contextJudgeName; static QPair getFromStr(CardZoneLogic *zone, QString cardName, int position, bool ownerChange); - void refreshJudgeSuffix(); public: void connectToPlayerEventHandler(PlayerEventHandler *player); @@ -79,7 +76,7 @@ public slots: void logLeaveSpectator(QString name, QString reason); void logNotReadyStart(PlayerLogic *player); void logMoveCard(PlayerLogic *player, - CardState *card, + CardItem *card, CardZoneLogic *startZone, int oldX, CardZoneLogic *targetZone, @@ -96,18 +93,17 @@ public slots: int amount, bool isLentToAnotherPlayer); void logReverseTurn(PlayerLogic *player, bool reversed); - void logTurnOrderChanged(QStringList playerNames, bool randomized); void logRollDie(PlayerLogic *player, int sides, const QList &rolls); void logSay(PlayerLogic *player, QString message); void logSetActivePhase(int phase); void logSetActivePlayer(PlayerLogic *player); - void logSetAnnotation(PlayerLogic *player, CardState *card, QString newAnnotation); + void logSetAnnotation(PlayerLogic *player, CardItem *card, QString newAnnotation); void logSetCardCounter(PlayerLogic *player, QString cardName, int counterId, int value, int oldValue); void logSetCounter(PlayerLogic *player, QString counterName, int value, int oldValue); - void logSetDoesntUntap(PlayerLogic *player, CardState *card, bool doesntUntap); - void logSetPT(PlayerLogic *player, CardState *card, QString newPT); + void logSetDoesntUntap(PlayerLogic *player, CardItem *card, bool doesntUntap); + void logSetPT(PlayerLogic *player, CardItem *card, QString newPT); void logSetSideboardLock(PlayerLogic *player, bool locked); - void logSetTapped(PlayerLogic *player, CardState *card, bool tapped); + void logSetTapped(PlayerLogic *player, CardItem *card, bool tapped); void logShuffle(PlayerLogic *player, CardZoneLogic *zone, int start, int end); void logSpectatorSay(const ServerInfo_User &spectator, QString message); void logUnattachCard(PlayerLogic *player, QString cardName); diff --git a/cockatrice/src/game_graphics/phases_toolbar.cpp b/cockatrice/src/game_graphics/phases_toolbar.cpp index bc05e8901..d0a3f74fd 100644 --- a/cockatrice/src/game_graphics/phases_toolbar.cpp +++ b/cockatrice/src/game_graphics/phases_toolbar.cpp @@ -14,6 +14,11 @@ #include #include #include +#include +#include +#include +#include +#include #include #include @@ -115,9 +120,9 @@ PhasesToolbar::PhasesToolbar(QGraphicsItem *parent) : QGraphicsItem(parent), width(100), height(100), ySpacing(1), symbolSize(8) { auto *aUntapAll = new QAction(this); - connect(aUntapAll, &QAction::triggered, this, &PhasesToolbar::untapAllRequested); + connect(aUntapAll, &QAction::triggered, this, &PhasesToolbar::actUntapAll); auto *aDrawCard = new QAction(this); - connect(aDrawCard, &QAction::triggered, this, &PhasesToolbar::drawCardRequested); + connect(aDrawCard, &QAction::triggered, this, &PhasesToolbar::actDrawCard); PhaseButton *untapButton = new PhaseButton("untap", this, aUntapAll); PhaseButton *upkeepButton = new PhaseButton("upkeep", this); @@ -139,7 +144,7 @@ PhasesToolbar::PhasesToolbar(QGraphicsItem *parent) } nextTurnButton = new PhaseButton("nextturn", this, nullptr, false); - connect(nextTurnButton, &PhaseButton::clicked, this, &PhasesToolbar::nextTurnRequested); + connect(nextTurnButton, &PhaseButton::clicked, this, &PhasesToolbar::actNextTurn); rearrangeButtons(); @@ -260,5 +265,31 @@ void PhasesToolbar::phaseButtonClicked() button->triggerDoubleClickAction(); } - emit setActivePhaseRequested(buttonList.indexOf(button)); + Command_SetActivePhase cmd; + cmd.set_phase(static_cast(buttonList.indexOf(button))); + + emit sendGameCommand(cmd, -1); +} + +void PhasesToolbar::actNextTurn() +{ + emit sendGameCommand(Command_NextTurn(), -1); +} + +void PhasesToolbar::actUntapAll() +{ + Command_SetCardAttr cmd; + cmd.set_zone(ZoneNames::TABLE); + cmd.set_attribute(AttrTapped); + cmd.set_attr_value("0"); + + emit sendGameCommand(cmd, -1); +} + +void PhasesToolbar::actDrawCard() +{ + Command_DrawCards cmd; + cmd.set_number(1); + + emit sendGameCommand(cmd, -1); } diff --git a/cockatrice/src/game_graphics/phases_toolbar.h b/cockatrice/src/game_graphics/phases_toolbar.h index 0565f1351..376775284 100644 --- a/cockatrice/src/game_graphics/phases_toolbar.h +++ b/cockatrice/src/game_graphics/phases_toolbar.h @@ -17,6 +17,14 @@ class QAction; class QTimer; +namespace google +{ +namespace protobuf +{ +class Message; +} +} // namespace google + class PhaseButton : public QObject, public QGraphicsItem { Q_OBJECT @@ -87,16 +95,11 @@ public slots: void triggerPhaseAction(int phase); private slots: void phaseButtonClicked(); + void actNextTurn(); + void actUntapAll(); + void actDrawCard(); signals: - /** @name Intent signals - * The view reports what the user asked for; GameEventHandler builds the commands. - * @{ - */ - void setActivePhaseRequested(int phase); - void nextTurnRequested(); - void untapAllRequested(); - void drawCardRequested(); - /** @} */ + void sendGameCommand(const ::google::protobuf::Message &command, int playerId); protected: void paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/) override; diff --git a/libcockatrice_game/libcockatrice/game/player/card_menu_action_type.h b/cockatrice/src/game_graphics/player/card_menu_action_type.h similarity index 95% rename from libcockatrice_game/libcockatrice/game/player/card_menu_action_type.h rename to cockatrice/src/game_graphics/player/card_menu_action_type.h index e5c4cd84e..4cae22716 100644 --- a/libcockatrice_game/libcockatrice/game/player/card_menu_action_type.h +++ b/cockatrice/src/game_graphics/player/card_menu_action_type.h @@ -1,6 +1,6 @@ /** * @file card_menu_action_type.h - * @ingroup GameLogicPlayers + * @ingroup GameMenusPlayers */ //! \todo Document this file. diff --git a/cockatrice/src/game_graphics/player/menu/card_menu.cpp b/cockatrice/src/game_graphics/player/menu/card_menu.cpp index 9f00c0cba..137ec2ed1 100644 --- a/cockatrice/src/game_graphics/player/menu/card_menu.cpp +++ b/cockatrice/src/game_graphics/player/menu/card_menu.cpp @@ -3,8 +3,16 @@ #include "../../../client/settings/cache_settings.h" #include "../../../client/settings/card_counter_settings.h" #include "../../../client/settings/shortcuts_settings.h" +#include "../../../game/abstract_game.h" +#include "../../../game/player/player_info.h" +#include "../../../game/player/player_manager.h" +#include "../../../game/zones/card_zone_logic.h" #include "../../board/card_item.h" +#include "../../game/player/player_actions.h" +#include "../../game/player/player_logic.h" +#include "../../game/zones/view_zone_logic.h" #include "../../game_scene.h" +#include "../card_menu_action_type.h" #include "../player_graphics_item.h" #include "libcockatrice/card/card_info.h" #include "libcockatrice/card/database/card_database_querier.h" @@ -27,14 +35,6 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include @@ -67,7 +67,7 @@ static QAction *makeAction(QObject *parent, Slot &&slot, bool checkable = false, return a; } -CardMenu::CardMenu(PlayerGraphicsItem *_player, CardItem *_card, bool _shortcutsActive) +CardMenu::CardMenu(PlayerGraphicsItem *_player, const CardItem *_card, bool _shortcutsActive) : player(_player), card(_card), shortcutsActive(_shortcutsActive) { const QList &players = player->getLogic()->getGame()->getPlayerManager()->getPlayers().values(); @@ -86,7 +86,7 @@ CardMenu::CardMenu(PlayerGraphicsItem *_player, CardItem *_card, bool _shortcuts auto *gameScene = player->getGameScene(); // Single selection resolver used by all lambdas — called at trigger time - auto sel = [gameScene]() { return gameScene->selectedCardStates(); }; + auto sel = [gameScene]() { return gameScene->selectedCards(); }; // Unified dispatcher for card menu actions auto invoke = [actions, sel](CardMenuActionType type) { @@ -108,18 +108,18 @@ CardMenu::CardMenu(PlayerGraphicsItem *_player, CardItem *_card, bool _shortcuts aHide = makeAction(this, [actions, sel]() { actions->actHide(sel()); }); aReduceLifeByPower = makeAction(this, [actions, sel]() { actions->actReduceLifeByPower(sel()); }); - // Actions bound to the card this menu was opened for, not to the current selection + // Actions that use activeCard, not selection — direct connection aAttach = new QAction(this); aDrawArrow = new QAction(this); aSelectAll = new QAction(this); aSelectRow = new QAction(this); aSelectColumn = new QAction(this); - connect(aAttach, &QAction::triggered, this, &CardMenu::attachCard); - connect(aDrawArrow, &QAction::triggered, this, &CardMenu::drawArrow); - connect(aSelectAll, &QAction::triggered, this, [this, gameScene]() { gameScene->selectAllInZone(card); }); - connect(aSelectRow, &QAction::triggered, this, [this, gameScene]() { gameScene->selectSameRow(card); }); - connect(aSelectColumn, &QAction::triggered, this, [this, gameScene]() { gameScene->selectSameColumn(card); }); + connect(aAttach, &QAction::triggered, actions, &PlayerActions::actAttach); + connect(aDrawArrow, &QAction::triggered, actions, &PlayerActions::actDrawArrow); + connect(aSelectAll, &QAction::triggered, actions, &PlayerActions::actSelectAll); + connect(aSelectRow, &QAction::triggered, actions, &PlayerActions::actSelectRow); + connect(aSelectColumn, &QAction::triggered, actions, &PlayerActions::actSelectColumn); aRevealToAll = new QAction(this); @@ -337,7 +337,7 @@ void CardMenu::createHandOrCustomZoneMenu(bool canModifyCard) initContextualPlayersMenu(revealMenu, aRevealToAll); connect(revealMenu, &QMenu::triggered, this, [this](QAction *action) { - player->getLogic()->getPlayerActions()->actReveal(player->getGameScene()->selectedCardStates(), action); + player->getLogic()->getPlayerActions()->actReveal(player->getGameScene()->selectedCards(), action); }); addSeparator(); @@ -441,7 +441,6 @@ void CardMenu::addRelatedCardActions() if (relatedCards.isEmpty()) { return; } - auto *playerActions = player->getLogic()->getPlayerActions(); addSeparator(); int index = 0; @@ -485,10 +484,9 @@ void CardMenu::addRelatedCardActions() } auto *createRelated = new QAction(text, this); - const int relatedIndex = index++; - connect(createRelated, &QAction::triggered, this, [this, playerActions, relatedIndex] { - playerActions->actCreateRelatedCard(card->getState(), relatedIndex); - }); + createRelated->setData(QVariant(index++)); + connect(createRelated, &QAction::triggered, player->getLogic()->getPlayerActions(), + &PlayerActions::actCreateRelatedCard); addAction(createRelated); } @@ -497,26 +495,12 @@ void CardMenu::addRelatedCardActions() createRelatedCards->setShortcuts( SettingsCache::instance().shortcuts().getShortcut("Player/aCreateRelatedTokens")); } - connect(createRelatedCards, &QAction::triggered, this, - [this, playerActions] { playerActions->actCreateAllRelatedCards(card->getState()); }); + connect(createRelatedCards, &QAction::triggered, player->getLogic()->getPlayerActions(), + &PlayerActions::actCreateAllRelatedCards); addAction(createRelatedCards); } } -void CardMenu::attachCard() -{ - if (card) { - card->drawAttachArrow(); - } -} - -void CardMenu::drawArrow() -{ - if (card) { - card->drawArrow(Qt::red); - } -} - void CardMenu::retranslateUi() { aSelectAll->setText(tr("&Select All")); diff --git a/cockatrice/src/game_graphics/player/menu/card_menu.h b/cockatrice/src/game_graphics/player/menu/card_menu.h index 2c80483b1..337d77b3e 100644 --- a/cockatrice/src/game_graphics/player/menu/card_menu.h +++ b/cockatrice/src/game_graphics/player/menu/card_menu.h @@ -27,7 +27,7 @@ signals: void cardInfoRequested(const CardRef &cardRef); public: - explicit CardMenu(PlayerGraphicsItem *player, CardItem *card, bool shortcutsActive); + explicit CardMenu(PlayerGraphicsItem *player, const CardItem *card, bool shortcutsActive); void removePlayer(PlayerLogic *playerToRemove); void createTableMenu(bool canModifyCard); void createStackMenu(bool canModifyCard); @@ -53,13 +53,11 @@ public: private: PlayerGraphicsItem *player; - CardItem *card; + const CardItem *card; QList> playersInfo; bool shortcutsActive; void addRelatedCardActions(); - void attachCard(); - void drawArrow(); void retranslateUi(); void initContextualPlayersMenu(QMenu *menu, QAction *allPlayersAction); void setShortcutsActive(); diff --git a/cockatrice/src/game_graphics/player/menu/custom_zone_menu.cpp b/cockatrice/src/game_graphics/player/menu/custom_zone_menu.cpp index 87a0d1540..e16ebc112 100644 --- a/cockatrice/src/game_graphics/player/menu/custom_zone_menu.cpp +++ b/cockatrice/src/game_graphics/player/menu/custom_zone_menu.cpp @@ -1,13 +1,13 @@ #include "custom_zone_menu.h" +#include "../../../game/player/player_info.h" +#include "../../game/player/player_logic.h" #include "../../game_scene.h" #include "../player_graphics_item.h" #include #include #include -#include -#include CustomZoneMenu::CustomZoneMenu(PlayerGraphicsItem *_player) : player(_player) { diff --git a/cockatrice/src/game_graphics/player/menu/grave_menu.cpp b/cockatrice/src/game_graphics/player/menu/grave_menu.cpp index 001a4d0cf..580d2642e 100644 --- a/cockatrice/src/game_graphics/player/menu/grave_menu.cpp +++ b/cockatrice/src/game_graphics/player/menu/grave_menu.cpp @@ -2,7 +2,13 @@ #include "../../../client/settings/cache_settings.h" #include "../../../client/settings/shortcuts_settings.h" +#include "../../../game/player/player_info.h" +#include "../../../game/player/player_manager.h" +#include "../../../game/zones/pile_zone_logic.h" #include "../../../interface/widgets/menus/tearoff_menu.h" +#include "../../game/abstract_game.h" +#include "../../game/player/player_actions.h" +#include "../../game/player/player_logic.h" #include "../player_graphics_item.h" #include @@ -13,12 +19,6 @@ #include #include #include -#include -#include -#include -#include -#include -#include #include class QWidget; diff --git a/cockatrice/src/game_graphics/player/menu/hand_menu.cpp b/cockatrice/src/game_graphics/player/menu/hand_menu.cpp index e992f3ff5..141542cb4 100644 --- a/cockatrice/src/game_graphics/player/menu/hand_menu.cpp +++ b/cockatrice/src/game_graphics/player/menu/hand_menu.cpp @@ -2,7 +2,14 @@ #include "../../../client/settings/cache_settings.h" #include "../../../client/settings/shortcuts_settings.h" +#include "../../../game/board/card_list.h" +#include "../../../game/player/player_info.h" +#include "../../../game/player/player_manager.h" +#include "../../../game/zones/hand_zone_logic.h" #include "../../../interface/widgets/menus/tearoff_menu.h" +#include "../../game/abstract_game.h" +#include "../../game/player/player_actions.h" +#include "../../game/player/player_logic.h" #include "../player_graphics_item.h" #include @@ -13,13 +20,6 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include #include class QWidget; diff --git a/cockatrice/src/game_graphics/player/menu/library_menu.cpp b/cockatrice/src/game_graphics/player/menu/library_menu.cpp index 5f90c3760..aa389006e 100644 --- a/cockatrice/src/game_graphics/player/menu/library_menu.cpp +++ b/cockatrice/src/game_graphics/player/menu/library_menu.cpp @@ -2,7 +2,14 @@ #include "../../../client/settings/cache_settings.h" #include "../../../client/settings/shortcuts_settings.h" +#include "../../../game/board/card_list.h" +#include "../../../game/player/player_info.h" +#include "../../../game/player/player_manager.h" +#include "../../../game/zones/pile_zone_logic.h" #include "../../../interface/widgets/menus/tearoff_menu.h" +#include "../../game/abstract_game.h" +#include "../../game/player/player_actions.h" +#include "../../game/player/player_logic.h" #include "../player_graphics_item.h" #include @@ -16,13 +23,6 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include class QWidget; diff --git a/cockatrice/src/game_graphics/player/menu/move_menu.cpp b/cockatrice/src/game_graphics/player/menu/move_menu.cpp index b81c4619b..2991100ec 100644 --- a/cockatrice/src/game_graphics/player/menu/move_menu.cpp +++ b/cockatrice/src/game_graphics/player/menu/move_menu.cpp @@ -2,13 +2,13 @@ #include "../../../client/settings/cache_settings.h" #include "../../../client/settings/shortcuts_settings.h" +#include "../../game/player/player_actions.h" +#include "../../game/player/player_logic.h" #include "../../game_scene.h" +#include "../card_menu_action_type.h" #include "../player_graphics_item.h" #include -#include -#include -#include MoveMenu::MoveMenu(PlayerGraphicsItem *player) : QMenu(tr("Move to")) { @@ -30,7 +30,7 @@ MoveMenu::MoveMenu(PlayerGraphicsItem *player) : QMenu(tr("Move to")) auto invoke = [player](CardMenuActionType type) { return [type, player]() { - player->getLogic()->getPlayerActions()->cardMenuAction(player->getGameScene()->selectedCardStates(), type); + player->getLogic()->getPlayerActions()->cardMenuAction(player->getGameScene()->selectedCards(), type); }; }; diff --git a/cockatrice/src/game_graphics/player/menu/player_menu.cpp b/cockatrice/src/game_graphics/player/menu/player_menu.cpp index 582586ac2..44b184cfe 100644 --- a/cockatrice/src/game_graphics/player/menu/player_menu.cpp +++ b/cockatrice/src/game_graphics/player/menu/player_menu.cpp @@ -2,6 +2,10 @@ #include "../../../client/settings/cache_settings.h" #include "../../../client/settings/shortcuts_settings.h" +#include "../../../game/abstract_game.h" +#include "../../../game/player/player_info.h" +#include "../../../game/player/player_logic.h" +#include "../../../game/player/player_manager.h" #include "../../../game_graphics/zones/hand_zone.h" #include "../../../game_graphics/zones/pile_zone.h" #include "../../../game_graphics/zones/table_zone.h" @@ -22,10 +26,6 @@ #include #include -#include -#include -#include -#include PlayerMenu::PlayerMenu(PlayerGraphicsItem *_player) : QObject(_player), player(_player) { @@ -87,24 +87,22 @@ void PlayerMenu::setMenusForGraphicItems() } } -QMenu *PlayerMenu::updateCardMenu(CardState *card) +QMenu *PlayerMenu::updateCardMenu(const CardItem *card) { if (!card) { emit cardMenuUpdated(nullptr); return nullptr; } - auto *cardItem = qobject_cast(card->parent()); - // If is spectator (as spectators don't need card menus), return // only update the menu if the card is actually selected if ((player->getLogic()->getGame()->getPlayerManager()->isSpectator() && !player->getLogic()->getGame()->getPlayerManager()->isJudge()) || - cardItem == nullptr || player->getGameScene()->getActiveCard() != cardItem) { + player->getLogic()->getGame()->getActiveCard() != card) { return nullptr; } - CardMenu *menu = new CardMenu(player, cardItem, shortcutsActive); + CardMenu *menu = new CardMenu(player, card, shortcutsActive); connect(menu, &CardMenu::cardInfoRequested, this, &PlayerMenu::cardInfoRequested); emit cardMenuUpdated(menu); diff --git a/cockatrice/src/game_graphics/player/menu/player_menu.h b/cockatrice/src/game_graphics/player/menu/player_menu.h index e21a689de..97dd2fc56 100644 --- a/cockatrice/src/game_graphics/player/menu/player_menu.h +++ b/cockatrice/src/game_graphics/player/menu/player_menu.h @@ -14,7 +14,7 @@ #include #include -class CardState; +class CardItem; class CardMenu; class PlayerGraphicsItem; class AbstractPlayerComponent; @@ -43,7 +43,7 @@ signals: public slots: void setMenusForGraphicItems(); - QMenu *updateCardMenu(CardState *card); + QMenu *updateCardMenu(const CardItem *card); private slots: void refreshShortcuts(); diff --git a/cockatrice/src/game_graphics/player/menu/pt_menu.cpp b/cockatrice/src/game_graphics/player/menu/pt_menu.cpp index e6c65fcfb..b4f852b43 100644 --- a/cockatrice/src/game_graphics/player/menu/pt_menu.cpp +++ b/cockatrice/src/game_graphics/player/menu/pt_menu.cpp @@ -2,12 +2,12 @@ #include "../../../client/settings/cache_settings.h" #include "../../../client/settings/shortcuts_settings.h" +#include "../../game/player/player_actions.h" +#include "../../game/player/player_logic.h" #include "../../game_scene.h" #include "../player_graphics_item.h" #include -#include -#include PtMenu::PtMenu(PlayerGraphicsItem *player) : QMenu(tr("Power / toughness")) { @@ -15,35 +15,34 @@ PtMenu::PtMenu(PlayerGraphicsItem *player) : QMenu(tr("Power / toughness")) aIncP = new QAction(this); connect(aIncP, &QAction::triggered, playerActions, - [player, playerActions] { playerActions->actIncP(player->getGameScene()->selectedCardStates()); }); + [player, playerActions] { playerActions->actIncP(player->getGameScene()->selectedCards()); }); aDecP = new QAction(this); connect(aDecP, &QAction::triggered, playerActions, - [player, playerActions] { playerActions->actDecP(player->getGameScene()->selectedCardStates()); }); + [player, playerActions] { playerActions->actDecP(player->getGameScene()->selectedCards()); }); aIncT = new QAction(this); connect(aIncT, &QAction::triggered, playerActions, - [player, playerActions] { playerActions->actIncT(player->getGameScene()->selectedCardStates()); }); + [player, playerActions] { playerActions->actIncT(player->getGameScene()->selectedCards()); }); aDecT = new QAction(this); connect(aDecT, &QAction::triggered, playerActions, - [player, playerActions] { playerActions->actDecT(player->getGameScene()->selectedCardStates()); }); + [player, playerActions] { playerActions->actDecT(player->getGameScene()->selectedCards()); }); aIncPT = new QAction(this); connect(aIncPT, &QAction::triggered, playerActions, - [player, playerActions] { playerActions->actIncPT(player->getGameScene()->selectedCardStates()); }); + [player, playerActions] { playerActions->actIncPT(player->getGameScene()->selectedCards()); }); aDecPT = new QAction(this); connect(aDecPT, &QAction::triggered, playerActions, - [player, playerActions] { playerActions->actDecPT(player->getGameScene()->selectedCardStates()); }); + [player, playerActions] { playerActions->actDecPT(player->getGameScene()->selectedCards()); }); aFlowP = new QAction(this); connect(aFlowP, &QAction::triggered, playerActions, - [player, playerActions] { playerActions->actFlowP(player->getGameScene()->selectedCardStates()); }); + [player, playerActions] { playerActions->actFlowP(player->getGameScene()->selectedCards()); }); aFlowT = new QAction(this); connect(aFlowT, &QAction::triggered, playerActions, - [player, playerActions] { playerActions->actFlowT(player->getGameScene()->selectedCardStates()); }); + [player, playerActions] { playerActions->actFlowT(player->getGameScene()->selectedCards()); }); aSetPT = new QAction(this); - connect(aSetPT, &QAction::triggered, playerActions, [player, playerActions] { - playerActions->actRequestSetPTDialog(player->getGameScene()->selectedCardStates()); - }); + connect(aSetPT, &QAction::triggered, playerActions, + [player, playerActions] { playerActions->actRequestSetPTDialog(player->getGameScene()->selectedCards()); }); aResetPT = new QAction(this); connect(aResetPT, &QAction::triggered, playerActions, - [player, playerActions] { playerActions->actResetPT(player->getGameScene()->selectedCardStates()); }); + [player, playerActions] { playerActions->actResetPT(player->getGameScene()->selectedCards()); }); addAction(aIncP); addAction(aDecP); diff --git a/cockatrice/src/game_graphics/player/menu/rfg_menu.cpp b/cockatrice/src/game_graphics/player/menu/rfg_menu.cpp index 415d4a2ef..98514280f 100644 --- a/cockatrice/src/game_graphics/player/menu/rfg_menu.cpp +++ b/cockatrice/src/game_graphics/player/menu/rfg_menu.cpp @@ -1,6 +1,10 @@ #include "rfg_menu.h" +#include "../../../game/player/player_info.h" +#include "../../../game/zones/pile_zone_logic.h" #include "../../../interface/widgets/menus/tearoff_menu.h" +#include "../../game/player/player_actions.h" +#include "../../game/player/player_logic.h" #include "../player_graphics_item.h" #include @@ -8,10 +12,6 @@ #include #include #include -#include -#include -#include -#include #include class QWidget; diff --git a/cockatrice/src/game_graphics/player/menu/say_menu.cpp b/cockatrice/src/game_graphics/player/menu/say_menu.cpp index 486508da9..d467c6469 100644 --- a/cockatrice/src/game_graphics/player/menu/say_menu.cpp +++ b/cockatrice/src/game_graphics/player/menu/say_menu.cpp @@ -1,14 +1,14 @@ #include "say_menu.h" #include "../../../client/settings/cache_settings.h" +#include "../../game/player/player_actions.h" +#include "../../game/player/player_logic.h" #include "../player_graphics_item.h" #include #include #include #include -#include -#include #include SayMenu::SayMenu(PlayerGraphicsItem *_player) : player(_player) diff --git a/cockatrice/src/game_graphics/player/menu/sideboard_menu.cpp b/cockatrice/src/game_graphics/player/menu/sideboard_menu.cpp index e601a0e09..1eef3604f 100644 --- a/cockatrice/src/game_graphics/player/menu/sideboard_menu.cpp +++ b/cockatrice/src/game_graphics/player/menu/sideboard_menu.cpp @@ -2,13 +2,13 @@ #include "../../../client/settings/cache_settings.h" #include "../../../client/settings/shortcuts_settings.h" +#include "../../../game/player/player_info.h" +#include "../../game/player/player_actions.h" +#include "../../game/player/player_logic.h" #include "../player_graphics_item.h" #include #include -#include -#include -#include SideboardMenu::SideboardMenu(PlayerGraphicsItem *player, QMenu *playerMenu) : QMenu(playerMenu) { diff --git a/cockatrice/src/game_graphics/player/menu/utility_menu.cpp b/cockatrice/src/game_graphics/player/menu/utility_menu.cpp index 3b8affff5..7c18b3f4c 100644 --- a/cockatrice/src/game_graphics/player/menu/utility_menu.cpp +++ b/cockatrice/src/game_graphics/player/menu/utility_menu.cpp @@ -2,6 +2,9 @@ #include "../../../client/settings/cache_settings.h" #include "../../../client/settings/shortcuts_settings.h" +#include "../../../game/player/player_info.h" +#include "../../game/player/player_actions.h" +#include "../../game/player/player_logic.h" #include "../../game_scene.h" #include "../player_graphics_item.h" #include "libcockatrice/card/card_info.h" @@ -11,9 +14,6 @@ #include #include #include -#include -#include -#include UtilityMenu::UtilityMenu(PlayerGraphicsItem *_player, QMenu *playerMenu) : QMenu(playerMenu), player(_player) { @@ -44,7 +44,7 @@ UtilityMenu::UtilityMenu(PlayerGraphicsItem *_player, QMenu *playerMenu) : QMenu aIncrementAllCardCounters = new QAction(this); connect(aIncrementAllCardCounters, &QAction::triggered, playerActions, [this]() { player->getLogic()->getPlayerActions()->actIncrementAllCardCounters( - player->getGameScene()->selectedCardStates()); + player->getGameScene()->selectedCards()); }); createPredefinedTokenMenu = new QMenu(QString()); diff --git a/cockatrice/src/game_graphics/player/player_dialogs.cpp b/cockatrice/src/game_graphics/player/player_dialogs.cpp index a5baa8ca8..74f5de601 100644 --- a/cockatrice/src/game_graphics/player/player_dialogs.cpp +++ b/cockatrice/src/game_graphics/player/player_dialogs.cpp @@ -2,10 +2,11 @@ #include "../../client/settings/cache_settings.h" #include "../../client/settings/card_counter_settings.h" +#include "../../game/player/player_actions.h" +#include "../../game/player/player_logic.h" #include "../../interface/widgets/utility/get_text_with_max.h" #include "../board/abstract_counter.h" #include "../board/card_item.h" -#include "../dialogs/dlg_annotation.h" #include "../dialogs/dlg_create_token.h" #include "../dialogs/dlg_move_top_cards_until.h" #include "../dialogs/dlg_roll_dice.h" @@ -16,8 +17,6 @@ #include #include #include -#include -#include #include PlayerDialogs::PlayerDialogs(PlayerGraphicsItem *_player, PlayerActions *_playerActions) @@ -35,7 +34,7 @@ PlayerDialogs::PlayerDialogs(PlayerGraphicsItem *_player, PlayerActions *_player &PlayerDialogs::onShuffleBottomDialogRequested); connect(playerActions, &PlayerActions::requestMulliganDialog, this, &PlayerDialogs::onMulliganDialogRequested); - connect(playerActions, &PlayerActions::startingHandSizeChosen, this, &PlayerDialogs::onStartingHandSizeChosen); + connect(playerActions, &PlayerActions::requestDrawCardsDialog, this, &PlayerDialogs::onDrawCardsDialogRequested); connect(playerActions, &PlayerActions::requestMoveTopCardsToDialog, this, @@ -127,11 +126,6 @@ void PlayerDialogs::onMulliganDialogRequested(int startSize, int handSize, int d } } -void PlayerDialogs::onStartingHandSizeChosen(int number) -{ - SettingsCache::instance().userInterface().setStartingHandSize(number); -} - void PlayerDialogs::onDrawCardsDialogRequested(int defaultNumberTopCards, int deckSize) { bool ok; @@ -202,7 +196,7 @@ void PlayerDialogs::onRollDieDialogRequested() playerActions->actRollDie(dlg.getDieSideCount(), dlg.getDiceToRollCount()); } -void PlayerDialogs::onCreateRelatedFromRelationDialogRequested(const CardState *sourceCard, +void PlayerDialogs::onCreateRelatedFromRelationDialogRequested(const CardItem *sourceCard, const CardRelation *cardRelation) { if (sourceCard == nullptr || cardRelation == nullptr) { @@ -257,14 +251,14 @@ void PlayerDialogs::onMoveCardXCardsFromTopDialogRequested(int defaultNumberTopC number -= 1; // indexes start at 0 if (ok) { - playerActions->actMoveCardXCardsFromTop(player->getGameScene()->selectedCardStates(), number); + playerActions->actMoveCardXCardsFromTop(player->getGameScene()->selectedCards(), number); } } void PlayerDialogs::onSetPTDialogRequested(const QString &oldPT) { bool ok; - auto cards = player->getGameScene()->selectedCardStates(); + auto cards = player->getGameScene()->selectedCards(); emit requestDialogSemaphore(true); QString pt = getTextWithMax(dialogParent(), tr("Change power/toughness"), tr("Change stats to:"), QLineEdit::Normal, oldPT, &ok); @@ -279,7 +273,7 @@ void PlayerDialogs::onSetPTDialogRequested(const QString &oldPT) void PlayerDialogs::onSetAnnotationDialogRequested(const QString &oldAnnotation) { - auto cards = player->getGameScene()->selectedCardStates(); + auto cards = player->getGameScene()->selectedCards(); emit requestDialogSemaphore(true); AnnotationDialog *dialog = new AnnotationDialog(dialogParent()); dialog->setOptions(QInputDialog::UsePlainTextEditForTextInput); @@ -297,7 +291,7 @@ void PlayerDialogs::onSetAnnotationDialogRequested(const QString &oldAnnotation) void PlayerDialogs::onSetCardCounterDialogRequested(int counterId, const QString &oldValueForDlg) { - auto cards = player->getGameScene()->selectedCardStates(); + auto cards = player->getGameScene()->selectedCards(); emit requestDialogSemaphore(true); auto &cardCounterSettings = SettingsCache::instance().cardCounters(); diff --git a/cockatrice/src/game_graphics/player/player_dialogs.h b/cockatrice/src/game_graphics/player/player_dialogs.h index 4ac443f3c..86d7282a2 100644 --- a/cockatrice/src/game_graphics/player/player_dialogs.h +++ b/cockatrice/src/game_graphics/player/player_dialogs.h @@ -17,7 +17,6 @@ class CardItem; class CardRelation; -class CardState; class PlayerActions; class QWidget; struct MoveTopCardsUntilOptions; @@ -53,13 +52,12 @@ public slots: bool faceDown); void onDrawBottomCardsDialogRequested(int defaultNumberBottomCards, int maxCards); void onRollDieDialogRequested(); - void onCreateRelatedFromRelationDialogRequested(const CardState *sourceCard, const CardRelation *cardRelation); + void onCreateRelatedFromRelationDialogRequested(const CardItem *sourceCard, const CardRelation *cardRelation); void onCreateTokenDialogRequested(const QStringList &predefinedTokens); void onMoveCardXCardsFromTopDialogRequested(int defaultNumberTopCardsToPlaceBelow, int deckSize); void onSetPTDialogRequested(const QString &oldPT); void onSetAnnotationDialogRequested(const QString &oldAnnotation); void onSetCardCounterDialogRequested(int counterId, const QString &oldValueForDlg); - void onStartingHandSizeChosen(int number); private: PlayerGraphicsItem *player; diff --git a/cockatrice/src/game_graphics/player/player_graphics_item.cpp b/cockatrice/src/game_graphics/player/player_graphics_item.cpp index 0805dbb5b..419816087 100644 --- a/cockatrice/src/game_graphics/player/player_graphics_item.cpp +++ b/cockatrice/src/game_graphics/player/player_graphics_item.cpp @@ -1,6 +1,15 @@ #include "player_graphics_item.h" #include "../../client/settings/cache_settings.h" +#include "../../game/board/counter_state.h" +#include "../../game/player/player_actions.h" +#include "../../game/player/player_info.h" +#include "../../game/player/player_logic.h" +#include "../../game/zones/card_zone_logic.h" +#include "../../game/zones/hand_zone_logic.h" +#include "../../game/zones/pile_zone_logic.h" +#include "../../game/zones/stack_zone_logic.h" +#include "../../game/zones/table_zone_logic.h" #include "../../interface/card_picture_loader/card_picture_loader.h" #include "../../interface/widgets/cards/art_crop_attribution.h" #include "../../interface/widgets/cards/card_art_utils.h" @@ -36,15 +45,6 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include @@ -177,22 +177,6 @@ void PlayerGraphicsItem::initializeZones() void PlayerGraphicsItem::onCustomZoneAdded(QString customZoneName) { - // Custom zones have no board view, but their cards still need a graphics owner. - // Without one, PileZone::onCardAdded never runs and cards moved from the table - // or hand into a custom zone stay drawn at their old spot. Give them a hidden - // pile zone so added cards are reparented to (0, 0) and hidden. - CardZoneLogic *logic = player->getZone(customZoneName); - if (auto *pileLogic = qobject_cast(logic)) { - auto *hiddenZone = new PileZone(pileLogic, this); - hiddenZone->setVisible(false); - hiddenZone->setPos(0, 0); - zoneGraphicsItems.insert(customZoneName, hiddenZone); - // Hide any cards that arrived before the graphics item existed. - for (CardState *state : pileLogic->getCards()) { - hiddenZone->onCardAdded(state); - } - return; - } zoneGraphicsItems.insert(customZoneName, nullptr); // Custom zone view goes here, if we ever implement it. } diff --git a/cockatrice/src/game_graphics/player/player_list_widget.cpp b/cockatrice/src/game_graphics/player/player_list_widget.cpp index 6895e7db8..7b358010f 100644 --- a/cockatrice/src/game_graphics/player/player_list_widget.cpp +++ b/cockatrice/src/game_graphics/player/player_list_widget.cpp @@ -1,7 +1,6 @@ #include "player_list_widget.h" #include "../../interface/pixel_map_generator.h" -#include "../../interface/theme_icon.h" #include "../../interface/widgets/server/user/user_context_menu.h" #include "libcockatrice/protocol/pb/serverinfo_user.pb.h" #include "user_level.h" @@ -68,13 +67,13 @@ PlayerListWidget::PlayerListWidget(TabSupervisor *_tabSupervisor, QWidget *parent) : QTreeWidget(parent), tabSupervisor(_tabSupervisor), client(_client), game(_game), gameStarted(false) { - readyIcon = loadThemedIcon(QStringLiteral("icons/ready_start")); - notReadyIcon = loadThemedIcon(QStringLiteral("icons/not_ready_start")); - concededIcon = loadThemedIcon(QStringLiteral("icons/conceded")); - playerIcon = loadThemedIcon(QStringLiteral("icons/player")); - judgeIcon = loadThemedIcon(QStringLiteral("icons/scales")); - spectatorIcon = loadThemedIcon(QStringLiteral("icons/spectator")); - lockIcon = loadThemedIcon(QStringLiteral("icons/lock")); + readyIcon = themePixmap(QStringLiteral("icons/ready_start")); + notReadyIcon = themePixmap(QStringLiteral("icons/not_ready_start")); + concededIcon = themePixmap(QStringLiteral("icons/conceded")); + playerIcon = loadColorAdjustedPixmap("theme:icons/player"); + judgeIcon = loadColorAdjustedPixmap("theme:icons/scales"); + spectatorIcon = loadColorAdjustedPixmap("theme:icons/spectator"); + lockIcon = themePixmap(QStringLiteral("icons/lock")); if (tabSupervisor) { itemDelegate = new PlayerListItemDelegate(this); diff --git a/cockatrice/src/game_graphics/player/player_target.cpp b/cockatrice/src/game_graphics/player/player_target.cpp index 0d10ba4ab..24734cd42 100644 --- a/cockatrice/src/game_graphics/player/player_target.cpp +++ b/cockatrice/src/game_graphics/player/player_target.cpp @@ -1,8 +1,9 @@ #include "player_target.h" #include "../../client/settings/cache_settings.h" +#include "../../game/player/player_info.h" +#include "../../game/player/player_logic.h" #include "../../interface/pixel_map_generator.h" -#include "../../interface/theme_manager.h" #include "../board/abstract_counter.h" #include "../board/abstract_graphics_item.h" #include "../board/arrow_target.h" @@ -29,8 +30,6 @@ #include #include #include -#include -#include #include #include #include @@ -77,7 +76,7 @@ void PlayerCounter::paint(QPainter *painter, const QStyleOptionGraphicsItem * /* QRectF translatedRect = path.controlPointRect(); QSize translatedSize = translatedRect.size().toSize(); - QFont font = themeManager->cardTextFont(); + QFont font("Serif"); font.setWeight(QFont::Bold); font.setPixelSize(qMax(qRound(translatedSize.height() / 1.3), 9)); painter->setFont(font); @@ -227,7 +226,7 @@ void PlayerTarget::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*o name = name.mid(0, 10) + "..."; } - QFont font = themeManager->appFont(AppFont::CardText); + QFont font; font.setPixelSize(qMax(qRound(translatedNameRect.height() / 1.5), 9)); painter->setFont(font); painter->setPen(Qt::white); diff --git a/cockatrice/src/game_graphics/pq_cockatrice_event_player.cpp b/cockatrice/src/game_graphics/pq_cockatrice_event_player.cpp deleted file mode 100644 index c6376ef75..000000000 --- a/cockatrice/src/game_graphics/pq_cockatrice_event_player.cpp +++ /dev/null @@ -1,628 +0,0 @@ -#include "pq_cockatrice_event_player.h" - -#include "../../interface/widgets/tabs/tab_game.h" -#include "board/card_item.h" -#include "game_scene.h" -#include "game_view.h" -#include "zones/card_zone.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -Q_LOGGING_CATEGORY(PQ_COCKATRICE_EVENT_PLAYER, "cockatrice.guiTest.eventPlayer") - -namespace -{ -/** - * Strips Qt's mnemonic markers so a test can name a menu entry by the label the - * user sees ("Turn Over" rather than "T&urn Over"). - */ -QString normalizeActionText(const QString &text) -{ - QString normalized = text; - normalized.remove('&'); - return normalized.simplified(); -} - -/** - * Maps a printable character onto the key a US keyboard would report for it, so - * typing produces the same QKeyEvents a recording would. - */ -Qt::Key keyForCharacter(QChar character) -{ - if (character.isLetter()) { - return static_cast(Qt::Key_A + (character.toUpper().unicode() - 'A')); - } - if (character.isDigit()) { - return static_cast(Qt::Key_0 + (character.unicode() - '0')); - } - switch (character.unicode()) { - case ' ': - return Qt::Key_Space; - case '\n': - return Qt::Key_Return; - case '\t': - return Qt::Key_Tab; - case '-': - return Qt::Key_Minus; - case '_': - return Qt::Key_Underscore; - case '/': - return Qt::Key_Slash; - case ',': - return Qt::Key_Comma; - case '.': - return Qt::Key_Period; - case '\'': - return Qt::Key_Apostrophe; - case ';': - return Qt::Key_Semicolon; - case ':': - return Qt::Key_Colon; - case '"': - return Qt::Key_QuoteDbl; - case '&': - return Qt::Key_Ampersand; - case '(': - return Qt::Key_ParenLeft; - case ')': - return Qt::Key_ParenRight; - case '[': - return Qt::Key_BracketLeft; - case ']': - return Qt::Key_BracketRight; - default: - return Qt::Key_unknown; - } -} - -/** Depth-first search for the first model index whose label matches @p text. */ -QModelIndex findModelIndexByText(const QAbstractItemModel *model, const QString &text, const QModelIndex &parent = {}) -{ - for (int row = 0; row < model->rowCount(parent); ++row) { - const QModelIndex index = model->index(row, 0, parent); - if (index.data(Qt::DisplayRole).toString() == text) { - return index; - } - const QModelIndex child = findModelIndexByText(model, text, index); - if (child.isValid()) { - return child; - } - } - return {}; -} - -bool needsShift(QChar character) -{ - if (character.isUpper()) { - return true; - } - return QStringLiteral("_:\"&()").contains(character); -} -} // namespace - -pqCockatriceEventPlayer::pqCockatriceEventPlayer(QObject *parent) : pqWidgetEventPlayer(parent) -{ -} - -bool pqCockatriceEventPlayer::playEvent(QObject *object, const QString &command, const QString &arguments, bool &error) -{ - // A known command that fails is a handled-but-failed event: QtTesting logs - // "Unhandled event" when playEvent returns false, so report through `error` - // (the contract playExpectProperty already follows) and still return true. - const auto run = [&error](bool ok) { - if (!ok) { - error = true; - } - return true; - }; - - if (command == "clickCard") { - return run(playClickCard(object, arguments)); - } else if (command == "flipCard") { - return run(playFlipCard(object, arguments)); - } else if (command == "cardAction") { - return run(playCardAction(object, arguments)); - } else if (command == "moveCard") { - return run(playMoveCard(object, arguments)); - } else if (command == "drawArrow") { - return run(playDrawArrow(object, arguments)); - } else if (command == "createToken") { - return run(playCreateToken(object, arguments)); - } else if (command == "selectItem") { - return run(playSelectItem(object, arguments)); - } else if (command == "typeText") { - return run(playTypeText(object, arguments)); - } else if (command == "expectProperty") { - return playExpectProperty(object, arguments, error); - } - return false; -} - -QGraphicsItem * -pqCockatriceEventPlayer::findCardInScene(QGraphicsScene *scene, const QString &cardName, const QString &zoneName) -{ - for (QGraphicsItem *gi : scene->items()) { - if (gi->type() != typeCard) { - continue; - } - auto *card = static_cast(gi); - if (!card->getZone() || card->getZone()->getName() != zoneName) { - continue; - } - QString actualName = card->getName(); - if (actualName == cardName || actualName.endsWith(" " + cardName)) { - return card; - } - } - return nullptr; -} - -QGraphicsItem *pqCockatriceEventPlayer::findZoneInScene(QGraphicsScene *scene, const QString &zoneName) -{ - for (QGraphicsItem *gi : scene->items()) { - if (gi->type() != typeZone) { - continue; - } - auto *zone = static_cast(gi); - if (zone->getLogic() && zone->getLogic()->getName() == zoneName) { - return zone; - } - } - return nullptr; -} - -QAction *pqCockatriceEventPlayer::findActionInMenu(QMenu *menu, const QString &actionText) -{ - if (!menu || actionText.isEmpty()) { - return nullptr; - } - for (QAction *action : menu->actions()) { - if (action->isSeparator()) { - continue; - } - if (normalizeActionText(action->text()).contains(actionText, Qt::CaseInsensitive)) { - return action; - } - if (QMenu *subMenu = action->menu()) { - if (QAction *found = findActionInMenu(subMenu, actionText)) { - return found; - } - } - } - return nullptr; -} - -QMenu *pqCockatriceEventPlayer::visiblePopupMenu() -{ - for (QWidget *w : QApplication::topLevelWidgets()) { - auto *menu = qobject_cast(w); - if (menu && menu->isVisible()) { - return menu; - } - } - return nullptr; -} - -QPoint pqCockatriceEventPlayer::viewportPoint(QGraphicsView *view, const QGraphicsItem *item) -{ - return view->mapFromScene(item->sceneBoundingRect().center()); -} -void pqCockatriceEventPlayer::sendMouseEvent(QGraphicsView *view, - QEvent::Type type, - const QPoint &pos, - Qt::MouseButton button, - Qt::MouseButtons buttons) -{ - QMouseEvent event(type, pos, view->viewport()->mapToGlobal(pos), button, buttons, Qt::NoModifier); - qApp->notify(view->viewport(), &event); -} - -bool pqCockatriceEventPlayer::playClickCard(QObject *object, const QString &arguments) -{ - auto *gv = qobject_cast(object); - if (!gv) { - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "clickCard: target widget is not a QGraphicsView"; - return false; - } - - QStringList parts = arguments.split(','); - if (parts.size() < 2) { - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "clickCard: arguments must be 'cardName,zoneName', got:" << arguments; - return false; - } - - QGraphicsScene *scene = gv->scene(); - if (!scene) { - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "clickCard: no scene on the QGraphicsView"; - return false; - } - - auto *target = findCardInScene(scene, parts[0].trimmed(), parts[1].trimmed()); - if (!target) { - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) - << "clickCard: card" << parts[0].trimmed() << "not found in zone" << parts[1].trimmed(); - return false; - } - - const QPoint pos = viewportPoint(gv, target); - // A double click is the play gesture from hand: press/release, then the - // double-click event and its release, exactly as a recording produces it. - sendMouseEvent(gv, QEvent::MouseButtonPress, pos, Qt::LeftButton, Qt::LeftButton); - sendMouseEvent(gv, QEvent::MouseButtonRelease, pos, Qt::LeftButton, Qt::LeftButton); - sendMouseEvent(gv, QEvent::MouseButtonDblClick, pos, Qt::LeftButton, Qt::LeftButton); - sendMouseEvent(gv, QEvent::MouseButtonRelease, pos, Qt::LeftButton, Qt::LeftButton); - - return true; -} - -bool pqCockatriceEventPlayer::playFlipCard(QObject *object, const QString &arguments) -{ - auto *gv = qobject_cast(object); - if (!gv) { - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "flipCard: target widget is not a QGraphicsView"; - return false; - } - - QStringList parts = arguments.split(','); - if (parts.size() < 2) { - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "flipCard: arguments must be 'cardName,zoneName', got:" << arguments; - return false; - } - - QGraphicsScene *scene = gv->scene(); - if (!scene) { - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "flipCard: no scene"; - return false; - } - - auto *card = qgraphicsitem_cast(findCardInScene(scene, parts[0].trimmed(), parts[1].trimmed())); - if (!card) { - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) - << "flipCard: card" << parts[0].trimmed() << "not found in zone" << parts[1].trimmed(); - return false; - } - - return invokeCardMenuAction("flipCard", gv, card, QStringLiteral("Turn Over")); -} - -bool pqCockatriceEventPlayer::playCardAction(QObject *object, const QString &arguments) -{ - auto *gv = qobject_cast(object); - if (!gv) { - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "cardAction: target widget is not a QGraphicsView"; - return false; - } - - QStringList parts = arguments.split(','); - if (parts.size() < 3) { - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) - << "cardAction: arguments must be 'cardName,zoneName,actionText', got:" << arguments; - return false; - } - - QGraphicsScene *scene = gv->scene(); - if (!scene) { - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "cardAction: no scene"; - return false; - } - - auto *card = qgraphicsitem_cast(findCardInScene(scene, parts[0].trimmed(), parts[1].trimmed())); - if (!card) { - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) - << "cardAction: card" << parts[0].trimmed() << "not found in zone" << parts[1].trimmed(); - return false; - } - - return invokeCardMenuAction("cardAction", gv, card, parts.mid(2).join(',').trimmed()); -} - -bool pqCockatriceEventPlayer::invokeCardMenuAction(const char *command, - QGraphicsView *view, - CardItem *card, - const QString &actionText) -{ - const QPoint pos = viewportPoint(view, card); - sendMouseEvent(view, QEvent::MouseButtonPress, pos, Qt::RightButton, Qt::RightButton); - sendMouseEvent(view, QEvent::MouseButtonRelease, pos, Qt::RightButton, Qt::NoButton); - qApp->processEvents(); - - QMenu *menu = visiblePopupMenu(); - if (!menu) { - qCWarning(PQ_COCKATRICE_EVENT_PLAYER) << command << ": no popup menu appeared after right-click"; - return false; - } - - QAction *action = findActionInMenu(menu, actionText); - if (!action) { - qCWarning(PQ_COCKATRICE_EVENT_PLAYER) << command << ": no context menu action matching" << actionText; - menu->close(); - return false; - } - - action->trigger(); - menu->close(); - qApp->processEvents(); - return true; -} - -bool pqCockatriceEventPlayer::playMoveCard(QObject *object, const QString &arguments) -{ - auto *gv = qobject_cast(object); - if (!gv) { - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "moveCard: target widget is not a QGraphicsView"; - return false; - } - - QStringList parts = arguments.split(','); - if (parts.size() < 3) { - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) - << "moveCard: arguments must be 'cardName,srcZoneName,dstZoneName', got:" << arguments; - return false; - } - - const QString cardName = parts[0].trimmed(); - const QString srcZoneName = parts[1].trimmed(); - const QString dstZoneName = parts[2].trimmed(); - - QGraphicsScene *scene = gv->scene(); - if (!scene) { - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "moveCard: no scene"; - return false; - } - - auto *card = findCardInScene(scene, cardName, srcZoneName); - if (!card) { - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "moveCard: card" << cardName << "not found in zone" << srcZoneName; - return false; - } - - auto *dstZone = findZoneInScene(scene, dstZoneName); - if (!dstZone) { - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "moveCard: destination zone" << dstZoneName << "not found"; - return false; - } - - const QPoint srcPos = viewportPoint(gv, card); - const QPoint dstPos = viewportPoint(gv, dstZone); - - // A drag has to travel past Qt's start distance before the scene turns it - // into a card drag item, otherwise the move is interpreted as a click. - const int dragDistance = 2 * QApplication::startDragDistance() + 10; - const QPoint pastDragStart = srcPos + QPoint(dragDistance, 0); - - sendMouseEvent(gv, QEvent::MouseButtonPress, srcPos, Qt::LeftButton, Qt::LeftButton); - sendMouseEvent(gv, QEvent::MouseMove, pastDragStart, Qt::LeftButton, Qt::LeftButton); - qApp->processEvents(); - sendMouseEvent(gv, QEvent::MouseMove, dstPos, Qt::LeftButton, Qt::LeftButton); - qApp->processEvents(); - sendMouseEvent(gv, QEvent::MouseButtonRelease, dstPos, Qt::LeftButton, Qt::NoButton); - qApp->processEvents(); - - return true; -} - -bool pqCockatriceEventPlayer::playDrawArrow(QObject *object, const QString &arguments) -{ - auto *gv = qobject_cast(object); - if (!gv) { - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "drawArrow: target widget is not a QGraphicsView"; - return false; - } - - QStringList parts = arguments.split(','); - if (parts.size() < 4) { - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) - << "drawArrow: arguments must be 'srcCard,srcZone,dstCard,dstZone', got:" << arguments; - return false; - } - - const QString srcCardName = parts[0].trimmed(); - const QString srcZoneName = parts[1].trimmed(); - const QString dstCardName = parts[2].trimmed(); - const QString dstZoneName = parts[3].trimmed(); - - QGraphicsScene *scene = gv->scene(); - if (!scene) { - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "drawArrow: no scene"; - return false; - } - - auto *srcCard = findCardInScene(scene, srcCardName, srcZoneName); - if (!srcCard) { - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) - << "drawArrow: source card" << srcCardName << "not found in zone" << srcZoneName; - return false; - } - - auto *dstCard = findCardInScene(scene, dstCardName, dstZoneName); - if (!dstCard) { - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) - << "drawArrow: dest card" << dstCardName << "not found in zone" << dstZoneName; - return false; - } - - const QPoint srcPos = viewportPoint(gv, srcCard); - const QPoint dstPos = viewportPoint(gv, dstCard); - - const int dragDistance = 2 * QApplication::startDragDistance() + 10; - const QPoint pastDragStart = srcPos + QPoint(dragDistance, 0); - - sendMouseEvent(gv, QEvent::MouseButtonPress, srcPos, Qt::RightButton, Qt::RightButton); - sendMouseEvent(gv, QEvent::MouseMove, pastDragStart, Qt::RightButton, Qt::RightButton); - qApp->processEvents(); - sendMouseEvent(gv, QEvent::MouseMove, dstPos, Qt::RightButton, Qt::RightButton); - sendMouseEvent(gv, QEvent::MouseButtonRelease, dstPos, Qt::RightButton, Qt::NoButton); - qApp->processEvents(); - - return true; -} - -bool pqCockatriceEventPlayer::playCreateToken(QObject *object, const QString &arguments) -{ - auto *gv = qobject_cast(object); - if (!gv) { - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "createToken: target widget is not a QGraphicsView"; - return false; - } - - QStringList parts = arguments.split(','); - if (parts.size() < 3) { - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "createToken: arguments must be 'name,color,pt', got:" << arguments; - return false; - } - - QString tokenName = parts[0].trimmed(); - QString tokenColor = parts[1].trimmed(); - QString tokenPt = parts[2].trimmed(); - - TabGame *tabGame = nullptr; - QWidget *w = gv; - while (w) { - tabGame = qobject_cast(w); - if (tabGame) { - break; - } - w = w->parentWidget(); - } - if (!tabGame) { - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "createToken: TabGame not found"; - return false; - } - - AbstractGame *game = tabGame->getGame(); - if (!game) { - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "createToken: no game"; - return false; - } - - int activePlayerId = game->getGameState()->getActivePlayer(); - PlayerLogic *player = game->getPlayerManager()->getActiveLocalPlayer(activePlayerId); - if (!player) { - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "createToken: no active local player"; - return false; - } - - TokenInfo info; - info.name = tokenName; - info.color = tokenColor; - info.pt = tokenPt; - info.destroy = true; - info.faceDown = false; - - player->getPlayerActions()->actCreateToken(info); - - for (int i = 0; i < 10; ++i) { - qApp->processEvents(); - } - - return true; -} - -bool pqCockatriceEventPlayer::playSelectItem(QObject *object, const QString &arguments) -{ - const QString text = arguments.trimmed(); - if (text.isEmpty()) { - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "selectItem: needs the label of the item to select"; - return false; - } - - if (auto *tree = qobject_cast(object)) { - QTreeWidgetItemIterator item(tree); - while (*item) { - if ((*item)->text(0) == text) { - tree->setCurrentItem(*item); - qApp->processEvents(); - return true; - } - ++item; - } - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "selectItem: no tree item labelled" << text; - return false; - } - - if (auto *view = qobject_cast(object)) { - const QModelIndex index = findModelIndexByText(view->model(), text); - if (!index.isValid()) { - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "selectItem: no item labelled" << text; - return false; - } - view->setCurrentIndex(index); - qApp->processEvents(); - return true; - } - - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "selectItem: target is neither a tree widget nor an item view"; - return false; -} - -bool pqCockatriceEventPlayer::playTypeText(QObject *object, const QString &arguments) -{ - auto *widget = qobject_cast(object); - if (!widget) { - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "typeText: target is not a QWidget"; - return false; - } - - for (const QChar character : arguments) { - const Qt::Key key = keyForCharacter(character); - const Qt::KeyboardModifiers modifiers = needsShift(character) ? Qt::ShiftModifier : Qt::NoModifier; - QKeyEvent press(QEvent::KeyPress, key, modifiers, QString(character)); - QKeyEvent release(QEvent::KeyRelease, key, modifiers, QString(character)); - qApp->notify(widget, &press); - qApp->notify(widget, &release); - } - qApp->processEvents(); - - return true; -} - -bool pqCockatriceEventPlayer::playExpectProperty(QObject *object, const QString &arguments, bool &error) -{ - if (!object) { - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "expectProperty: no target object"; - error = true; - return true; - } - - QStringList parts = arguments.split(','); - if (parts.size() < 2) { - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) - << "expectProperty: arguments must be 'propertyName,expectedValue', got:" << arguments; - error = true; - return true; - } - - const QString propertyName = parts[0].trimmed(); - const QString expected = parts.mid(1).join(','); - - const QVariant actual = object->property(propertyName.toUtf8().constData()); - if (!actual.isValid()) { - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) - << "expectProperty:" << object->objectName() << "has no property" << propertyName; - error = true; - return true; - } - - if (actual.toString() != expected) { - qCCritical(PQ_COCKATRICE_EVENT_PLAYER) << "expectProperty:" << object->objectName() << propertyName << "is" - << actual.toString() << "but the test expected" << expected; - error = true; - return true; - } - - return true; -} diff --git a/cockatrice/src/game_graphics/pq_cockatrice_event_player.h b/cockatrice/src/game_graphics/pq_cockatrice_event_player.h deleted file mode 100644 index 89d88af77..000000000 --- a/cockatrice/src/game_graphics/pq_cockatrice_event_player.h +++ /dev/null @@ -1,91 +0,0 @@ -#ifndef PQ_COCKATRICE_EVENT_PLAYER_H -#define PQ_COCKATRICE_EVENT_PLAYER_H - -#include "pqWidgetEventPlayer.h" - -#include - -class CardItem; -class QAction; -class QGraphicsItem; -class QGraphicsScene; -class QGraphicsView; -class QMenu; - -/** - * Custom event player for Cockatrice game interactions. - * - * Card commands are resolution independent: the card is looked up in the - * QGraphicsScene by name and zone, then mouse events are sent at the card's - * current viewport position. That keeps recordings usable across screen sizes - * and window geometries. - * - * Commands: - * clickCard "cardName,zoneName" - * left press/release + double click — plays a card from hand, taps a - * permanent, opens the deck view entry, depending on the zone - * flipCard "cardName,zoneName" - * right-click → "Turn Over" (shorthand for cardAction) - * cardAction "cardName,zoneName,actionText" - * right-click the card and trigger the first context menu action whose - * label contains actionText; submenus are searched as well, so - * "Add counter (A)" works - * moveCard "cardName,srcZoneName,dstZoneName" - * left-drag the card onto the destination zone — plays a card, moves it - * to the graveyard/exile, puts it back into hand, ... - * drawArrow "srcCard,srcZone,dstCard,dstZone" - * right-drag an arrow from one card to another - * createToken "name,color,pt" - * create a token through the active local player, as the table context - * menu's "Create token" dialog would - * selectItem "item text" - * selects the first item of a tree/list widget whose label matches, for - * navigating the settings navigation tree or similar label-driven views - * typeText "some text" - * types the text into the widget one key event at a time — use it for - * deck lists and search boxes instead of one event per character - * expectProperty "propertyName,expectedValue" - * assertion: playback fails unless object->property(propertyName) - * equals expectedValue — for example "count,2" on the tab widget - */ -class pqCockatriceEventPlayer : public pqWidgetEventPlayer -{ - Q_OBJECT - typedef pqWidgetEventPlayer Superclass; - -public: - explicit pqCockatriceEventPlayer(QObject *parent = nullptr); - - using Superclass::playEvent; - - bool playEvent(QObject *object, const QString &command, const QString &arguments, bool &error) override; - -private: - bool playClickCard(QObject *object, const QString &arguments); - bool playFlipCard(QObject *object, const QString &arguments); - bool playCardAction(QObject *object, const QString &arguments); - bool playMoveCard(QObject *object, const QString &arguments); - bool playDrawArrow(QObject *object, const QString &arguments); - bool playCreateToken(QObject *object, const QString &arguments); - bool playSelectItem(QObject *object, const QString &arguments); - bool playTypeText(QObject *object, const QString &arguments); - bool playExpectProperty(QObject *object, const QString &arguments, bool &error); - - /** @brief Triggers the context menu entry @p actionText after right-clicking @p card. */ - bool invokeCardMenuAction(const char *command, QGraphicsView *view, CardItem *card, const QString &actionText); - - static QGraphicsItem *findCardInScene(QGraphicsScene *scene, const QString &cardName, const QString &zoneName); - static QGraphicsItem *findZoneInScene(QGraphicsScene *scene, const QString &zoneName); - static QAction *findActionInMenu(QMenu *menu, const QString &actionText); - static QMenu *visiblePopupMenu(); - - /** @brief Viewport position of the item's centre, as the mouse events have to be sent. */ - static QPoint viewportPoint(QGraphicsView *view, const QGraphicsItem *item); - static void sendMouseEvent(QGraphicsView *view, - QEvent::Type type, - const QPoint &pos, - Qt::MouseButton button, - Qt::MouseButtons buttons); -}; - -#endif // PQ_COCKATRICE_EVENT_PLAYER_H diff --git a/cockatrice/src/game_graphics/tally/stats_tally.cpp b/cockatrice/src/game_graphics/tally/stats_tally.cpp index 2bce9fdfd..28e280c02 100644 --- a/cockatrice/src/game_graphics/tally/stats_tally.cpp +++ b/cockatrice/src/game_graphics/tally/stats_tally.cpp @@ -16,7 +16,7 @@ static int sumPowers(const QList &cards) // calculate total power; int total = 0; for (auto card : cards) { - QVariantList parsed = CardState::parsePT(card->getPT()); + QVariantList parsed = CardItem::parsePT(card->getPT()); if (!parsed.isEmpty()) { int power = parsed.first().toInt(); // toInt will default to 0 if it's not an int total += qMax(power, 0); @@ -44,7 +44,7 @@ static int sumToughness(const QList &cards) { int total = 0; for (auto card : cards) { - QVariantList parsed = CardState::parsePT(card->getPT()); + QVariantList parsed = CardItem::parsePT(card->getPT()); if (parsed.size() == 2) { int toughness = parsed.at(1).toInt(); // toInt will default to 0 if it's not an int total += qMax(toughness, 0); diff --git a/cockatrice/src/game_graphics/zones/card_zone.cpp b/cockatrice/src/game_graphics/zones/card_zone.cpp index fd3b5849f..d09bb588c 100644 --- a/cockatrice/src/game_graphics/zones/card_zone.cpp +++ b/cockatrice/src/game_graphics/zones/card_zone.cpp @@ -1,13 +1,13 @@ #include "card_zone.h" +#include "../../game/board/card_list.h" +#include "../../game/zones/card_zone_logic.h" #include "../board/abstract_graphics_item.h" #include "../board/card_item.h" #include #include #include -#include -#include #include class QGraphicsItem; @@ -18,60 +18,23 @@ CardZone::CardZone(CardZoneLogic *_logic, QGraphicsItem *parent) : AbstractGraphicsItem(parent), menu(nullptr), doubleClickAction(0), logic(_logic) { connect(logic, &CardZoneLogic::retranslateUi, this, &CardZone::retranslateUi); - // Invalidation is connected before any consumer so a handler that reads cardItems() - // during the same signal emission always sees a stale flag and rebuilds. - connect(logic, &CardZoneLogic::cardAdded, this, &CardZone::invalidateItems); - connect(logic, &CardZoneLogic::cardCountChanged, this, &CardZone::invalidateItems); - connect(logic, &CardZoneLogic::reorganizeCards, this, &CardZone::invalidateItems); connect(logic, &CardZoneLogic::cardAdded, this, &CardZone::onCardAdded); - connect(logic, &CardZoneLogic::createCardRequested, this, &CardZone::onCreateCardRequested); connect(logic, &CardZoneLogic::setGraphicsVisibility, this, [this](bool v) { this->setVisible(v); }); connect(logic, &CardZoneLogic::updateGraphics, this, [this]() { update(); }); connect(logic, &CardZoneLogic::reorganizeCards, this, &CardZone::reorganizeCards); } -void CardZone::invalidateItems() +void CardZone::onCardAdded(CardItem *addedCard) { - itemsDirty = true; -} - -const QList &CardZone::cardItems() const -{ - if (itemsDirty) { - items.clear(); - for (auto *cardState : getLogic()->getCards()) { - if (auto *cardItem = qobject_cast(cardState->parent())) { - items.append(cardItem); - } - } - itemsDirty = false; - } - return items; -} - -void CardZone::onCardAdded(CardState *addedCard) -{ - auto *addedItem = addedCard == nullptr ? nullptr : qobject_cast(addedCard->parent()); - if (addedItem == nullptr) { - return; - } - addedItem->setParentItem(this); - addedItem->setVisible(true); - addedItem->update(); -} - -void CardZone::onCreateCardRequested(const ServerInfo_Card &cardInfo, bool reorganize) -{ - CardRef cardRef = {QString::fromStdString(cardInfo.name()), QString::fromStdString(cardInfo.provider_id())}; - auto *card = new CardItem(getLogic()->getPlayer(), nullptr, cardRef, cardInfo.id()); - card->processCardInfo(cardInfo); - getLogic()->addCard(card->getState(), reorganize, cardInfo.x(), cardInfo.y()); + addedCard->setParentItem(this); + addedCard->setVisible(true); + addedCard->update(); } void CardZone::retranslateUi() { - for (auto *card : cardItems()) { - card->retranslateUi(); + for (int i = 0; i < getLogic()->getCards().size(); ++i) { + getLogic()->getCards()[i]->retranslateUi(); } } diff --git a/cockatrice/src/game_graphics/zones/card_zone.h b/cockatrice/src/game_graphics/zones/card_zone.h index ea77cb057..def3eee14 100644 --- a/cockatrice/src/game_graphics/zones/card_zone.h +++ b/cockatrice/src/game_graphics/zones/card_zone.h @@ -16,17 +16,13 @@ class CardDragItem; class CardItem; -class CardState; class CardZoneLogic; class QAction; class QGraphicsItem; class QMenu; class QPoint; -class ServerInfo_Card; template class QList; -class CardItem; - inline Q_LOGGING_CATEGORY(CardZoneLog, "card_zone"); /** @@ -59,9 +55,7 @@ public slots: * Virtual so subclasses (e.g. SelectZone) can override parenting behavior — the Qt signal * connection in CardZone's constructor dispatches through the vtable. */ - virtual void onCardAdded(CardState *addedCard); - /** @brief Builds the card item for @p cardInfo and hands it to this zone's logic. */ - void onCreateCardRequested(const ServerInfo_Card &cardInfo, bool reorganize); + virtual void onCardAdded(CardItem *addedCard); public: enum @@ -82,15 +76,6 @@ public: return logic; } - /** - * @brief The CardItems backing getLogic()->getCards(), in zone order. - * - * Game logic talks about cards as states; this is the graphics side's view of the same list. - * It is rebuilt on demand after any content change, so views never reach into the logic's - * container themselves and never observe a stale one. - */ - [[nodiscard]] const QList &cardItems() const; - void setMenu(QMenu *_menu, QAction *_doubleClickAction = 0) { menu = _menu; @@ -98,12 +83,7 @@ public: } private: - /** @brief Marks the cached card items stale. Connected to every content-changing signal. */ - void invalidateItems(); - CardZoneLogic *logic; - mutable QList items; - mutable bool itemsDirty = true; }; #endif diff --git a/cockatrice/src/game_graphics/zones/hand_zone.cpp b/cockatrice/src/game_graphics/zones/hand_zone.cpp index 31758c455..3e527c081 100644 --- a/cockatrice/src/game_graphics/zones/hand_zone.cpp +++ b/cockatrice/src/game_graphics/zones/hand_zone.cpp @@ -1,6 +1,11 @@ #include "hand_zone.h" #include "../../client/settings/cache_settings.h" +#include "../../game/player/player_actions.h" +#include "../../game/player/player_info.h" +#include "../../game/player/player_logic.h" +#include "../../game/zones/card_zone_logic.h" +#include "../../game/zones/hand_zone_logic.h" #include "../../interface/theme_manager.h" #include "../board/card_drag_item.h" #include "../board/card_item.h" @@ -13,11 +18,7 @@ #include #include #include -#include -#include -#include -#include -#include +#include #include #include @@ -47,8 +48,8 @@ void HandZone::handleDropEvent(const QList &dragItems, QPoint point = dropPoint + scenePos().toPoint(); int x = -1; if (SettingsCache::instance().userInterface().getHorizontalHand()) { - for (x = 0; x < cardItems().size(); x++) { - if (point.x() < cardItems().at(x)->scenePos().x()) { + for (x = 0; x < getLogic()->getCards().size(); x++) { + if (point.x() < static_cast(getLogic()->getCards().at(x))->scenePos().x()) { break; } } @@ -57,13 +58,19 @@ void HandZone::handleDropEvent(const QList &dragItems, x = calcDropIndexFromY(dropPoint.y(), !sameZone); } - QList cards; - cards.reserve(dragItems.size()); - for (const CardDragItem *item : dragItems) { - cards.append(CardMoveRequest{item->getId()}); + Command_MoveCard cmd; + cmd.set_start_player_id(startZone->getPlayer()->getPlayerInfo()->getId()); + cmd.set_start_zone(startZone->getName().toStdString()); + cmd.set_target_player_id(getLogic()->getPlayer()->getPlayerInfo()->getId()); + cmd.set_target_zone(getLogic()->getName().toStdString()); + cmd.set_x(x); + cmd.set_y(-1); + + for (int i = 0; i < dragItems.size(); ++i) { + cmd.mutable_cards_to_move()->add_card()->set_card_id(dragItems[i]->getId()); } - getLogic()->getPlayer()->getPlayerActions()->moveCards(startZone, getLogic(), x, -1, cards); + getLogic()->getPlayer()->getPlayerActions()->sendGameCommand(cmd); } QRectF HandZone::boundingRect() const @@ -83,23 +90,23 @@ void HandZone::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*optio void HandZone::reorganizeCards() { - if (!cardItems().isEmpty()) { - const int cardCount = cardItems().size(); + if (!getLogic()->getCards().isEmpty()) { + const int cardCount = getLogic()->getCards().size(); if (SettingsCache::instance().userInterface().getHorizontalHand()) { bool leftJustified = SettingsCache::instance().userInterface().getLeftJustified(); - qreal cardWidth = cardItems().at(0)->boundingRect().width(); + qreal cardWidth = getLogic()->getCards().at(0)->boundingRect().width(); const int xPadding = leftJustified ? cardWidth * 1.4 : 5; qreal totalWidth = leftJustified ? boundingRect().width() - (1 * xPadding) - 5 : boundingRect().width() - 2 * xPadding; if (cardCount == 1) { - CardItem *c = cardItems().at(0); + CardItem *c = getLogic()->getCards().at(0); qreal xPosition = leftJustified ? xPadding : xPadding + (totalWidth - cardWidth) / 2; c->setPos(xPosition, 5); c->setRealZValue(0); } else { for (int i = 0; i < cardCount; i++) { - CardItem *c = cardItems().at(i); + CardItem *c = getLogic()->getCards().at(i); // If the total width of the cards is smaller than the available width, // the cards do not need to overlap and are displayed in the center of the area. if (cardWidth * cardCount > totalWidth) { @@ -124,7 +131,7 @@ void HandZone::reorganizeCards() void HandZone::sortHand(const QList &options) { - if (cardItems().isEmpty()) { + if (getLogic()->getCards().isEmpty()) { return; } diff --git a/cockatrice/src/game_graphics/zones/hand_zone.h b/cockatrice/src/game_graphics/zones/hand_zone.h index ed8f1e8d5..5c91d684d 100644 --- a/cockatrice/src/game_graphics/zones/hand_zone.h +++ b/cockatrice/src/game_graphics/zones/hand_zone.h @@ -7,10 +7,10 @@ #ifndef HANDZONE_H #define HANDZONE_H +#include "../../game/board/card_list.h" #include "select_zone.h" #include -#include #include class HandZoneLogic; diff --git a/cockatrice/src/game_graphics/zones/pile_zone.cpp b/cockatrice/src/game_graphics/zones/pile_zone.cpp index 08af241b6..77a87a4af 100644 --- a/cockatrice/src/game_graphics/zones/pile_zone.cpp +++ b/cockatrice/src/game_graphics/zones/pile_zone.cpp @@ -1,6 +1,12 @@ #include "pile_zone.h" #include "../../client/settings/cache_settings.h" +#include "../../game/board/card_list.h" +#include "../../game/player/player_actions.h" +#include "../../game/player/player_info.h" +#include "../../game/player/player_logic.h" +#include "../../game/zones/card_zone_logic.h" +#include "../../game/zones/pile_zone_logic.h" #include "../board/card_drag_item.h" #include "../board/card_item.h" #include "../card_dimensions.h" @@ -18,12 +24,7 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include #include #include #include @@ -66,35 +67,36 @@ void PileZone::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*optio { painter->drawPath(shape()); - if (!cardItems().isEmpty()) { - cardItems().at(0)->paintPicture(painter, cardItems().at(0)->getTranslatedSize(painter), 90); + if (!getLogic()->getCards().isEmpty()) { + getLogic()->getCards().at(0)->paintPicture(painter, getLogic()->getCards().at(0)->getTranslatedSize(painter), + 90); } painter->translate(CardDimensions::WIDTH_HALF_F, CardDimensions::HEIGHT_HALF_F); painter->rotate(-90); painter->translate(-CardDimensions::WIDTH_HALF_F, -CardDimensions::HEIGHT_HALF_F); - paintNumberEllipse(cardItems().size(), 28, Qt::white, -1, -1, painter); + paintNumberEllipse(getLogic()->getCards().size(), 28, Qt::white, -1, -1, painter); } void PileZone::handleDropEvent(const QList &dragItems, CardZoneLogic *startZone, const QPoint &) { - QList cards; - cards.reserve(dragItems.size()); - for (const CardDragItem *item : dragItems) { - cards.append(CardMoveRequest{item->getId(), item->isForceFaceDown()}); + Command_MoveCard cmd; + cmd.set_start_player_id(startZone->getPlayer()->getPlayerInfo()->getId()); + cmd.set_start_zone(startZone->getName().toStdString()); + cmd.set_target_player_id(getLogic()->getPlayer()->getPlayerInfo()->getId()); + cmd.set_target_zone(getLogic()->getName().toStdString()); + cmd.set_x(0); + cmd.set_y(0); + + for (int i = 0; i < dragItems.size(); ++i) { + auto cardToMove = cmd.mutable_cards_to_move()->add_card(); + cardToMove->set_card_id(dragItems[i]->getId()); + if (dragItems[i]->isForceFaceDown()) { + cardToMove->set_face_down(true); + } } - getLogic()->getPlayer()->getPlayerActions()->moveCards(startZone, getLogic(), 0, 0, cards); -} - -void PileZone::onCardAdded(CardState *addedCard) -{ - CardZone::onCardAdded(addedCard); - auto *addedItem = addedCard == nullptr ? nullptr : qobject_cast(addedCard->parent()); - if (addedItem) { - addedItem->setPos(0, 0); - addedItem->setVisible(false); - } + getLogic()->getPlayer()->getPlayerActions()->sendGameCommand(cmd); } void PileZone::reorganizeCards() @@ -124,14 +126,15 @@ void PileZone::mouseMoveEvent(QGraphicsSceneMouseEvent *event) return; } - if (cardItems().isEmpty()) { + if (getLogic()->getCards().isEmpty()) { return; } bool forceFaceDown = event->modifiers().testFlag(Qt::ShiftModifier); bool bottomCard = event->modifiers().testFlag(Qt::ControlModifier); - CardItem *card = bottomCard ? cardItems().last() : cardItems().first(); - const int cardid = getLogic()->contentsKnown() ? card->getId() : (bottomCard ? cardItems().size() - 1 : 0); + CardItem *card = bottomCard ? getLogic()->getCards().last() : getLogic()->getCards().first(); + const int cardid = + getLogic()->contentsKnown() ? card->getId() : (bottomCard ? getLogic()->getCards().size() - 1 : 0); CardDragItem *drag = card->createDragItem(cardid, event->pos(), event->scenePos(), forceFaceDown); drag->grabMouse(); setCursor(Qt::OpenHandCursor); @@ -144,8 +147,8 @@ void PileZone::mouseReleaseEvent(QGraphicsSceneMouseEvent * /*event*/) void PileZone::hoverEnterEvent(QGraphicsSceneHoverEvent *event) { - if (!cardItems().isEmpty()) { - cardItems()[0]->processHoverEvent(); + if (!getLogic()->getCards().isEmpty()) { + getLogic()->getCards()[0]->processHoverEvent(); } QGraphicsItem::hoverEnterEvent(event); } diff --git a/cockatrice/src/game_graphics/zones/pile_zone.h b/cockatrice/src/game_graphics/zones/pile_zone.h index fa510ad52..b2d8d0cd2 100644 --- a/cockatrice/src/game_graphics/zones/pile_zone.h +++ b/cockatrice/src/game_graphics/zones/pile_zone.h @@ -33,7 +33,6 @@ public: [[nodiscard]] QPainterPath shape() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; void reorganizeCards() override; - void onCardAdded(CardState *addedCard) override; void handleDropEvent(const QList &dragItems, CardZoneLogic *startZone, const QPoint &dropPoint) override; diff --git a/cockatrice/src/game_graphics/zones/select_zone.cpp b/cockatrice/src/game_graphics/zones/select_zone.cpp index ccac9decc..d69ec32f5 100644 --- a/cockatrice/src/game_graphics/zones/select_zone.cpp +++ b/cockatrice/src/game_graphics/zones/select_zone.cpp @@ -1,6 +1,8 @@ #include "select_zone.h" #include "../../client/settings/cache_settings.h" +#include "../../game/board/card_list.h" +#include "../../game/zones/card_zone_logic.h" #include "../board/card_item.h" #include "../game_scene.h" @@ -15,8 +17,6 @@ #include #include #include -#include -#include #include #include #include @@ -85,7 +85,7 @@ SelectZone *SelectZone::findOwningSelectZone(const QGraphicsItem *card) SelectZone::StackLayoutParams SelectZone::buildStackParams(qreal minOffset) const { - const auto &cards = cardItems(); + const auto &cards = getLogic()->getCards(); if (cards.isEmpty()) { return {0, boundingRect().height(), 0.0, 0.0, minOffset}; } @@ -97,7 +97,7 @@ SelectZone::StackLayoutParams SelectZone::buildStackParams(qreal minOffset) cons int SelectZone::calcDropIndexFromY(qreal dropY, bool allowCountExpand, qreal minOffset) const { - const auto &cards = cardItems(); + const auto &cards = getLogic()->getCards(); if (cards.isEmpty()) { return 0; } @@ -115,7 +115,7 @@ void SelectZone::restoreStaleEscapedCards() if (!cardClipContainer) { return; } - for (auto *card : cardItems()) { + for (auto *card : getLogic()->getCards()) { // A card parented to the zone (instead of the clip container) should // only occur while it is actively hovered. If hover cleanup was // missed, reparent it back so clipping resumes. @@ -127,7 +127,7 @@ void SelectZone::restoreStaleEscapedCards() void SelectZone::layoutCardsVertically(const StackLayoutParams ¶ms) { - const auto &cards = cardItems(); + const auto &cards = getLogic()->getCards(); if (cards.isEmpty() || params.cardCount <= 0) { return; } @@ -162,9 +162,9 @@ SelectZone::~SelectZone() if (cardClipContainer) { // Reparent any hover-escaped cards back to the clip container so Qt's // parent-child tree is consistent for destruction. setParentItem() does - // not invalidate cardItems() — it only moves the item in the graphics - // tree, it never changes the zone's contents. - for (auto *card : cardItems()) { + // not invalidate getLogic()->getCards() (it modifies the graphics tree, + // not the zone's logical card list). + for (auto *card : getLogic()->getCards()) { if (card && card->parentItem() == this) { card->setParentItem(cardClipContainer); } @@ -172,13 +172,12 @@ SelectZone::~SelectZone() } } -void SelectZone::onCardAdded(CardState *addedCard) +void SelectZone::onCardAdded(CardItem *addedCard) { - auto *addedItem = addedCard == nullptr ? nullptr : qobject_cast(addedCard->parent()); - if (cardClipContainer && addedItem) { - addedItem->setParentItem(cardClipContainer); - addedItem->setVisible(true); - addedItem->update(); + if (cardClipContainer && addedCard) { + addedCard->setParentItem(cardClipContainer); + addedCard->setVisible(true); + addedCard->update(); } else { CardZone::onCardAdded(addedCard); } @@ -248,7 +247,7 @@ void SelectZone::mouseMoveEvent(QGraphicsSceneMouseEvent *event) } QRectF selectionRect = QRectF(selectionOrigin, pos).normalized(); - for (auto card : cardItems()) { + for (auto card : getLogic()->getCards()) { if (card->getAttachedTo() && card->getAttachedTo()->getZone() != getLogic()) { continue; } diff --git a/cockatrice/src/game_graphics/zones/select_zone.h b/cockatrice/src/game_graphics/zones/select_zone.h index 8c81f0dbf..8a56949e3 100644 --- a/cockatrice/src/game_graphics/zones/select_zone.h +++ b/cockatrice/src/game_graphics/zones/select_zone.h @@ -35,7 +35,7 @@ public: SelectZone(CardZoneLogic *logic, QGraphicsItem *parent = nullptr); ~SelectZone() override; - void onCardAdded(CardState *addedCard) override; + void onCardAdded(CardItem *addedCard) override; /** * @brief Temporarily reparents a card from the clip container to this zone so hover scaling is visible beyond clip diff --git a/cockatrice/src/game_graphics/zones/stack_zone.cpp b/cockatrice/src/game_graphics/zones/stack_zone.cpp index d46a4bd94..de1ff8ba9 100644 --- a/cockatrice/src/game_graphics/zones/stack_zone.cpp +++ b/cockatrice/src/game_graphics/zones/stack_zone.cpp @@ -1,5 +1,11 @@ #include "stack_zone.h" +#include "../../game/board/card_list.h" +#include "../../game/player/player_actions.h" +#include "../../game/player/player_info.h" +#include "../../game/player/player_logic.h" +#include "../../game/zones/card_zone_logic.h" +#include "../../game/zones/stack_zone_logic.h" #include "../../interface/theme_manager.h" #include "../board/card_drag_item.h" #include "../board/card_item.h" @@ -13,12 +19,7 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include #include #include @@ -72,21 +73,31 @@ void StackZone::handleDropEvent(const QList &dragItems, int index = calcDropIndexFromY(dropPoint.y(), !sameZone, MIN_CARD_VISIBLE); if (sameZone) { // Same-zone no-op: don't move a card onto itself - const auto &cards = cardItems(); + const auto &cards = getLogic()->getCards(); if (!cards.isEmpty() && cards.at(index)->getId() == dragItems.at(0)->getId()) { return; } } - QList cards; - cards.reserve(dragItems.size()); + Command_MoveCard cmd; + cmd.set_start_player_id(startZone->getPlayer()->getPlayerInfo()->getId()); + cmd.set_start_zone(startZone->getName().toStdString()); + cmd.set_target_player_id(getLogic()->getPlayer()->getPlayerInfo()->getId()); + cmd.set_target_zone(getLogic()->getName().toStdString()); + cmd.set_x(index); + cmd.set_y(0); + for (const CardDragItem *item : dragItems) { if (item) { - cards.append(CardMoveRequest{item->getId(), item->isForceFaceDown()}); + auto *cardToMove = cmd.mutable_cards_to_move()->add_card(); + cardToMove->set_card_id(item->getId()); + if (item->isForceFaceDown()) { + cardToMove->set_face_down(true); + } } } - getLogic()->getPlayer()->getPlayerActions()->moveCards(startZone, getLogic(), index, 0, cards); + getLogic()->getPlayer()->getPlayerActions()->sendGameCommand(cmd); } void StackZone::setHeight(qreal newHeight) @@ -102,7 +113,7 @@ void StackZone::setHeight(qreal newHeight) void StackZone::reorganizeCards() { - if (!cardItems().isEmpty()) { + if (!getLogic()->getCards().isEmpty()) { const auto params = buildStackParams(MIN_CARD_VISIBLE); layoutCardsVertically(params); } diff --git a/cockatrice/src/game_graphics/zones/table_zone.cpp b/cockatrice/src/game_graphics/zones/table_zone.cpp index 0dffab353..b704b79e0 100644 --- a/cockatrice/src/game_graphics/zones/table_zone.cpp +++ b/cockatrice/src/game_graphics/zones/table_zone.cpp @@ -1,6 +1,12 @@ #include "table_zone.h" #include "../../client/settings/cache_settings.h" +#include "../../game/board/card_list.h" +#include "../../game/player/player_actions.h" +#include "../../game/player/player_info.h" +#include "../../game/player/player_logic.h" +#include "../../game/zones/card_zone_logic.h" +#include "../../game/zones/table_zone_logic.h" #include "../../interface/theme_manager.h" #include "../board/abstract_card_item.h" #include "../board/card_drag_item.h" @@ -26,12 +32,8 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include #include #include #include @@ -60,8 +62,7 @@ TableZone::TableZone(TableZoneLogic *_logic, bool _mirrored, QGraphicsItem *pare updateBg(); - height = MARGIN_TOP + MARGIN_BOTTOM + TableZoneLogic::ROW_COUNT * CardDimensions::HEIGHT + - (TableZoneLogic::ROW_COUNT - 1) * PADDING_Y; + height = MARGIN_TOP + MARGIN_BOTTOM + TABLEROWS * CardDimensions::HEIGHT + (TABLEROWS - 1) * PADDING_Y; width = MIN_WIDTH; currentMinimumWidth = width; @@ -207,20 +208,29 @@ void TableZone::handleDropEventByGrid(const QList &dragItems, CardZoneLogic *startZone, const QPoint &gridPoint) { - QList cards; - cards.reserve(dragItems.size()); - for (const CardDragItem *item : dragItems) { - CardMoveRequest card{item->getId(), item->isForceFaceDown()}; + Command_MoveCard cmd; + cmd.set_start_player_id(startZone->getPlayer()->getPlayerInfo()->getId()); + cmd.set_start_zone(startZone->getName().toStdString()); + cmd.set_target_player_id(getLogic()->getPlayer()->getPlayerInfo()->getId()); + cmd.set_target_zone(getLogic()->getName().toStdString()); + cmd.set_x(gridPoint.x()); + cmd.set_y(gridPoint.y()); + + for (const auto &item : dragItems) { + CardToMove *ctm = cmd.mutable_cards_to_move()->add_card(); + ctm->set_card_id(item->getId()); + if (item->isForceFaceDown()) { + ctm->set_face_down(true); + } if (startZone->getName() != getLogic()->getName() && !item->isForceFaceDown()) { - const auto &cardInfo = item->getItem()->getCard(); - if (cardInfo) { - card.pt = cardInfo.getInfo().getPowTough(); + const auto &card = item->getItem()->getCard(); + if (card) { + ctm->set_pt(card.getInfo().getPowTough().toStdString()); } } - cards.append(card); } - startZone->getPlayer()->getPlayerActions()->moveCards(startZone, getLogic(), gridPoint.x(), gridPoint.y(), cards); + startZone->getPlayer()->getPlayerActions()->sendGameCommand(cmd); } void TableZone::reorganizeCards() @@ -228,8 +238,8 @@ void TableZone::reorganizeCards() // Calculate card stack widths so mapping functions work properly computeCardStackWidths(); - for (int i = 0; i < cardItems().size(); ++i) { - QPoint gridPoint = cardItems()[i]->getGridPos(); + for (int i = 0; i < getLogic()->getCards().size(); ++i) { + QPoint gridPoint = getLogic()->getCards()[i]->getGridPos(); if (gridPoint.x() == -1) { continue; } @@ -238,24 +248,21 @@ void TableZone::reorganizeCards() qreal x = mapPoint.x(); qreal y = mapPoint.y(); - int numberAttachedCards = cardItems()[i]->getAttachedCards().size(); + int numberAttachedCards = getLogic()->getCards()[i]->getAttachedCards().size(); qreal actualX = x + numberAttachedCards * STACKED_CARD_OFFSET_X; qreal actualY = y; if (numberAttachedCards) { actualY += 15; } - cardItems()[i]->setPos(actualX, actualY); - cardItems()[i]->setRealZValue(ZValues::tableCardZValue(actualX, actualY)); + getLogic()->getCards()[i]->setPos(actualX, actualY); + getLogic()->getCards()[i]->setRealZValue(ZValues::tableCardZValue(actualX, actualY)); - QListIterator attachedCardIterator(cardItems()[i]->getAttachedCards()); + QListIterator attachedCardIterator(getLogic()->getCards()[i]->getAttachedCards()); int j = 0; while (attachedCardIterator.hasNext()) { ++j; - CardItem *attachedCard = qobject_cast(attachedCardIterator.next()->parent()); - if (attachedCard == nullptr) { - continue; - } + CardItem *attachedCard = attachedCardIterator.next(); qreal childX = actualX - j * STACKED_CARD_OFFSET_X; qreal childY = y + 5; attachedCard->setPos(childX, childY); @@ -269,18 +276,35 @@ void TableZone::reorganizeCards() void TableZone::toggleTapped() { - QList selectedCards; - for (auto *item : scene()->selectedItems()) { - auto *card = qgraphicsitem_cast(item); - if (card && card->getZone()->getName() == ZoneNames::TABLE) { - selectedCards.append(card->getState()); + QList selectedItemsRaw = scene()->selectedItems(); + QList selectedItems; + + auto isCardOnTable = [](const QGraphicsItem *item) { + if (auto card = qgraphicsitem_cast(item)) { + return card->getZone()->getName() == ZoneNames::TABLE; + } + return false; + }; + + std::copy_if(selectedItemsRaw.begin(), selectedItemsRaw.end(), std::back_inserter(selectedItems), isCardOnTable); + + bool tapAll = std::any_of(selectedItems.begin(), selectedItems.end(), [](const QGraphicsItem *item) { + return !qgraphicsitem_cast(item)->getTapped(); + }); + QList cmdList; + for (const auto &selectedItem : selectedItems) { + CardItem *temp = qgraphicsitem_cast(selectedItem); + if (temp->getTapped() != tapAll) { + Command_SetCardAttr *cmd = new Command_SetCardAttr; + cmd->set_zone(getLogic()->getName().toStdString()); + cmd->set_card_id(temp->getId()); + cmd->set_attribute(AttrTapped); + cmd->set_attr_value(tapAll ? "1" : "0"); + cmdList.append(cmd); } } - - const bool tapAll = std::any_of(selectedCards.begin(), selectedCards.end(), - [](const CardState *card) { return !card->getTapped(); }); - - getLogic()->getPlayer()->getPlayerActions()->actToggleTapped(getLogic()->getName(), selectedCards, tapAll); + getLogic()->getPlayer()->getPlayerActions()->sendGameCommand( + getLogic()->getPlayer()->getPlayerActions()->prepareGameCommand(cmdList)); } void TableZone::resizeToContents() @@ -288,9 +312,9 @@ void TableZone::resizeToContents() int xMax = 0; // Find rightmost card position, which includes the left margin amount. - for (int i = 0; i < cardItems().size(); ++i) { - if (cardItems()[i]->pos().x() > xMax) { - xMax = (int)cardItems()[i]->pos().x(); + for (int i = 0; i < getLogic()->getCards().size(); ++i) { + if (getLogic()->getCards()[i]->pos().x() > xMax) { + xMax = (int)getLogic()->getCards()[i]->pos().x(); } } @@ -311,9 +335,9 @@ void TableZone::resizeToContents() CardItem *TableZone::getCardFromGrid(const QPoint &gridPoint) const { - for (int i = 0; i < cardItems().size(); i++) { - if (cardItems().at(i)->getGridPoint() == gridPoint) { - return cardItems().at(i); + for (int i = 0; i < getLogic()->getCards().size(); i++) { + if (getLogic()->getCards().at(i)->getGridPoint() == gridPoint) { + return getLogic()->getCards().at(i); } } return 0; @@ -330,8 +354,8 @@ void TableZone::computeCardStackWidths() // Each card stack is three grid points worth of card locations. // First pass: compute the number of cards at each card stack. QMap cardStackCount; - for (int i = 0; i < cardItems().size(); ++i) { - const QPoint &gridPoint = cardItems()[i]->getGridPos(); + for (int i = 0; i < getLogic()->getCards().size(); ++i) { + const QPoint &gridPoint = getLogic()->getCards()[i]->getGridPos(); if (gridPoint.x() == -1) { continue; } @@ -342,8 +366,8 @@ void TableZone::computeCardStackWidths() // Second pass: compute the width at each card stack. cardStackWidth.clear(); - for (int i = 0; i < cardItems().size(); ++i) { - const QPoint &gridPoint = cardItems()[i]->getGridPos(); + for (int i = 0; i < getLogic()->getCards().size(); ++i) { + const QPoint &gridPoint = getLogic()->getCards()[i]->getGridPos(); if (gridPoint.x() == -1) { continue; } @@ -351,8 +375,8 @@ void TableZone::computeCardStackWidths() const int key = getCardStackMapKey(gridPoint.x() / 3, gridPoint.y()); const int stackCount = cardStackCount.value(key, 0); if (stackCount == 1) { - cardStackWidth.insert(key, CardDimensions::WIDTH + - cardItems()[i]->getAttachedCards().size() * STACKED_CARD_OFFSET_X); + cardStackWidth.insert(key, CardDimensions::WIDTH + getLogic()->getCards()[i]->getAttachedCards().size() * + STACKED_CARD_OFFSET_X); } else { cardStackWidth.insert(key, CardDimensions::WIDTH + (stackCount - 1) * STACKED_CARD_OFFSET_X); } @@ -373,7 +397,7 @@ QPointF TableZone::mapFromGrid(QPoint gridPoint) const } if (isInverted()) { - gridPoint.setY(TableZoneLogic::ROW_COUNT - 1 - gridPoint.y()); + gridPoint.setY(TABLEROWS - 1 - gridPoint.y()); } // Start with margin plus stacked card offset @@ -399,10 +423,10 @@ QPoint TableZone::mapToGrid(const QPointF &mapPoint) const const int gridPointHeight = CardDimensions::HEIGHT + PADDING_Y; int gridPointY = (y + PADDING_Y / 2) / gridPointHeight; - gridPointY = TableZoneLogic::clampValidTableRow(gridPointY); + gridPointY = clampValidTableRow(gridPointY); if (isInverted()) { - gridPointY = TableZoneLogic::ROW_COUNT - 1 - gridPointY; + gridPointY = TABLEROWS - 1 - gridPointY; } // Calculating the x-coordinate of the grid space requires adding up the @@ -447,3 +471,22 @@ QPointF TableZone::closestGridPoint(const QPointF &point) } return mapFromGrid(gridPoint); } + +int TableZone::clampValidTableRow(const int row) +{ + if (row < 0) { + return 0; + } + if (row >= TABLEROWS) { + return TABLEROWS - 1; + } + return row; +} + +int TableZone::tableRowToGridY(int tableRow) +{ + if (tableRow > 2) { + tableRow = 1; + } + return clampValidTableRow(2 - tableRow); +} diff --git a/cockatrice/src/game_graphics/zones/table_zone.h b/cockatrice/src/game_graphics/zones/table_zone.h index 8aa4936ad..ccd1d8e81 100644 --- a/cockatrice/src/game_graphics/zones/table_zone.h +++ b/cockatrice/src/game_graphics/zones/table_zone.h @@ -17,7 +17,6 @@ #include #include #include -#include #include class CardDragItem; @@ -26,6 +25,7 @@ class CardZoneLogic; class QColor; class QGraphicsItem; class QPainter; +class TableZoneLogic; template class QList; /** @@ -42,6 +42,8 @@ signals: void sizeChanged(); private: + static const int TABLEROWS = 3; + /* Margins between table edges and cards, paddings between cards */ @@ -179,6 +181,15 @@ public: QPointF closestGridPoint(const QPointF &point) override; + static int clampValidTableRow(const int row); + + /** + * Converts a card's logical table row (0=creatures, 1=noncreatures, 2=lands) + * to the corresponding grid Y coordinate. Cards with tableRow > 2 (e.g., + * instants/sorceries) default to the noncreatures row. + */ + static int tableRowToGridY(int tableRow); + /** Resizes the TableZone in case CardItems are within or outside of the TableZone constraints. diff --git a/cockatrice/src/game_graphics/zones/view_zone.cpp b/cockatrice/src/game_graphics/zones/view_zone.cpp index be2e471d4..a2aa124dc 100644 --- a/cockatrice/src/game_graphics/zones/view_zone.cpp +++ b/cockatrice/src/game_graphics/zones/view_zone.cpp @@ -1,6 +1,11 @@ #include "view_zone.h" #include "../../client/settings/cache_settings.h" +#include "../../game/player/player_actions.h" +#include "../../game/player/player_info.h" +#include "../../game/player/player_logic.h" +#include "../../game/zones/card_zone_logic.h" +#include "../../game/zones/view_zone_logic.h" #include "../board/card_drag_item.h" #include "../board/card_item.h" #include "../card_dimensions.h" @@ -21,11 +26,8 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include #include #include #include @@ -40,23 +42,21 @@ class QGraphicsItem; ZoneViewZone::ZoneViewZone(ZoneViewZoneLogic *_logic, QGraphicsItem *parent) : SelectZone(_logic, parent), bRect(QRectF()), minRows(0), groupBy(CardList::NoSort), sortBy(CardList::NoSort) { - auto *viewLogic = qobject_cast(getLogic()); - if (!(viewLogic->getRevealZone() && !viewLogic->getWriteableRevealZone())) { - viewLogic->getOriginalZone()->getViews().append(viewLogic); + if (!(qobject_cast(getLogic())->getRevealZone() && + !qobject_cast(getLogic())->getWriteableRevealZone())) { + qobject_cast(getLogic())->getOriginalZone()->getViews().append(this); } connect(_logic, &ZoneViewZoneLogic::closeView, this, &ZoneViewZone::close); } void ZoneViewZone::addToViews() { - auto *viewLogic = qobject_cast(getLogic()); - viewLogic->getOriginalZone()->getViews().append(viewLogic); + qobject_cast(getLogic())->getOriginalZone()->getViews().append(this); } void ZoneViewZone::removeFromViews() { - auto *viewLogic = qobject_cast(getLogic()); - viewLogic->getOriginalZone()->getViews().removeOne(viewLogic); + qobject_cast(getLogic())->getOriginalZone()->getViews().removeOne(this); } /** @@ -66,9 +66,9 @@ void ZoneViewZone::removeFromViews() void ZoneViewZone::close() { emit closed(); - auto *viewLogic = qobject_cast(getLogic()); - if (!(viewLogic->getRevealZone() && !viewLogic->getWriteableRevealZone())) { - viewLogic->getOriginalZone()->getViews().removeOne(viewLogic); + if (!(qobject_cast(getLogic())->getRevealZone() && + !qobject_cast(getLogic())->getWriteableRevealZone())) { + qobject_cast(getLogic())->getOriginalZone()->getViews().removeOne(this); } deleteLater(); } @@ -95,27 +95,28 @@ void ZoneViewZone::initializeCards(const QList &cardLis auto copy = new CardItem(getLogic()->getPlayer(), this, cardRef, card->id()); copy->setFaceDown(card->face_down()); - getLogic()->addCard(copy->getState(), false, i); + getLogic()->addCard(copy, false, i); } reorganizeCards(); } else if (!qobject_cast(getLogic())->getOriginalZone()->contentsKnown()) { - auto *viewLogic = qobject_cast(getLogic()); - PendingCommand *pend = viewLogic->prepareZoneDump(); - if (pend != nullptr) { - // A local game answers synchronously, so the handler has to be connected before the - // command is sent or the response would be delivered to nobody. - connect(pend, &PendingCommand::finished, this, &ZoneViewZone::zoneDumpReceived); - viewLogic->sendZoneDump(pend); - } + Command_DumpZone cmd; + cmd.set_player_id(getLogic()->getPlayer()->getPlayerInfo()->getId()); + cmd.set_zone_name(getLogic()->getName().toStdString()); + cmd.set_number_cards(numberCards); + cmd.set_is_reversed(qobject_cast(getLogic())->getIsReversed()); + + PendingCommand *pend = getLogic()->getPlayer()->getPlayerActions()->prepareGameCommand(cmd); + connect(pend, &PendingCommand::finished, this, &ZoneViewZone::zoneDumpReceived); + getLogic()->getPlayer()->getPlayerActions()->sendGameCommand(pend); } else { const CardList &c = qobject_cast(getLogic())->getOriginalZone()->getCards(); int number = numberCards == -1 ? c.size() : (numberCards < c.size() ? numberCards : c.size()); for (int i = 0; i < number; i++) { - CardState *card = c.at(i); + CardItem *card = c.at(i); auto copy = new CardItem(getLogic()->getPlayer(), this, card->getCardRef(), card->getId()); copy->setFaceDown(card->getFaceDown()); - getLogic()->addCard(copy->getState(), false, i); + getLogic()->addCard(copy, false, i); } reorganizeCards(); } @@ -131,7 +132,7 @@ void ZoneViewZone::zoneDumpReceived(const Response &r) auto cardProviderId = QString::fromStdString(cardInfo.provider_id()); auto card = new CardItem(getLogic()->getPlayer(), this, {cardName, cardProviderId}, cardInfo.id(), getLogic()); card->setFaceDown(cardInfo.face_down()); - getLogic()->rawInsertCard(card->getState(), i); + getLogic()->rawInsertCard(card, i); } qobject_cast(getLogic())->updateCardIds(ZoneViewZoneLogic::INITIALIZE); @@ -145,11 +146,11 @@ void ZoneViewZone::zoneDumpReceived(const Response &r) void ZoneViewZone::reorganizeCards() { // filter cards - CardList cardsToDisplay = CardList(getLogic()->contentsKnown()); - for (auto card : cardItems()) { + CardList cardsToDisplay = CardList(getLogic()->getCards().getContentsKnown()); + for (auto card : getLogic()->getCards()) { if (filterString.check(card->getCard().getCardPtr())) { card->show(); - cardsToDisplay.append(card->getState()); + cardsToDisplay.append(card); } else { card->hide(); } @@ -217,8 +218,7 @@ ZoneViewZone::GridSize ZoneViewZone::positionCardsForDisplay(CardList &cards, Ca const auto extractor = CardList::getExtractorFor(pileOption); for (int i = 0; i < cardCount; i++) { - CardState *c = cards.at(i); - CardItem *cItem = qobject_cast(c->parent()); + CardItem *c = cards.at(i); QString columnProp = extractor(c); if (i) { // if not the first card @@ -233,8 +233,8 @@ ZoneViewZone::GridSize ZoneViewZone::positionCardsForDisplay(CardList &cards, Ca lastColumnProp = columnProp; qreal x = col * CardDimensions::WIDTH_F; qreal y = row * CardDimensions::HEIGHT_F / 3; - cItem->setPos(HORIZONTAL_PADDING + x, VERTICAL_PADDING + y); - cItem->setRealZValue(i); + c->setPos(HORIZONTAL_PADDING + x, VERTICAL_PADDING + y); + c->setRealZValue(i); longestRow = qMax(row, longestRow); } @@ -259,11 +259,11 @@ ZoneViewZone::GridSize ZoneViewZone::positionCardsForDisplay(CardList &cards, Ca qCDebug(ViewZoneLog) << "reorganizeCards: rows=" << rows << "cols=" << cols; for (int i = 0; i < cardCount; i++) { - auto *cItem = qobject_cast(cards.at(i)->parent()); + CardItem *c = cards.at(i); qreal x = (i / rows) * CardDimensions::WIDTH_F; qreal y = (i % rows) * CardDimensions::HEIGHT_F / 3; - cItem->setPos(HORIZONTAL_PADDING + x, VERTICAL_PADDING + y); - cItem->setRealZValue(i); + c->setPos(HORIZONTAL_PADDING + x, VERTICAL_PADDING + y); + c->setRealZValue(i); } return GridSize{rows, qMax(cols, 1)}; @@ -301,13 +301,24 @@ void ZoneViewZone::handleDropEvent(const QList &dragItems, CardZoneLogic *startZone, const QPoint & /*dropPoint*/) { - QList cards; - cards.reserve(dragItems.size()); + Command_MoveCard cmd; + cmd.set_start_player_id(startZone->getPlayer()->getPlayerInfo()->getId()); + cmd.set_start_zone(startZone->getName().toStdString()); + cmd.set_target_player_id(getLogic()->getPlayer()->getPlayerInfo()->getId()); + cmd.set_target_zone(getLogic()->getName().toStdString()); + cmd.set_x(0); + cmd.set_y(0); + cmd.set_is_reversed(qobject_cast(getLogic())->getIsReversed()); + for (int i = 0; i < dragItems.size(); ++i) { - cards.append(CardMoveRequest{dragItems[i]->getId(), dragItems[i]->isForceFaceDown()}); + auto cardToMove = cmd.mutable_cards_to_move()->add_card(); + cardToMove->set_card_id(dragItems[i]->getId()); + if (dragItems[i]->isForceFaceDown()) { + cardToMove->set_face_down(true); + } } - getLogic()->getPlayer()->getPlayerActions()->moveCards(startZone, getLogic(), 0, 0, cards); + getLogic()->getPlayer()->getPlayerActions()->sendGameCommand(cmd); } void ZoneViewZone::setGeometry(const QRectF &rect) diff --git a/cockatrice/src/game_graphics/zones/view_zone.h b/cockatrice/src/game_graphics/zones/view_zone.h index f91b24834..4032da760 100644 --- a/cockatrice/src/game_graphics/zones/view_zone.h +++ b/cockatrice/src/game_graphics/zones/view_zone.h @@ -7,6 +7,7 @@ #ifndef ZONEVIEWERZONE_H #define ZONEVIEWERZONE_H +#include "../../game/board/card_list.h" #include "select_zone.h" #include @@ -16,7 +17,6 @@ #include #include #include -#include #include #include diff --git a/cockatrice/src/game_graphics/zones/view_zone_widget.cpp b/cockatrice/src/game_graphics/zones/view_zone_widget.cpp index 3c6cf9d02..8c82d6401 100644 --- a/cockatrice/src/game_graphics/zones/view_zone_widget.cpp +++ b/cockatrice/src/game_graphics/zones/view_zone_widget.cpp @@ -1,9 +1,14 @@ #include "view_zone_widget.h" #include "../../client/settings/cache_settings.h" +#include "../../client/translation.h" #include "../../filters/syntax_help.h" +#include "../../game/board/card_list.h" +#include "../../game/player/player_actions.h" +#include "../../game/player/player_logic.h" +#include "../../game/zones/card_zone_logic.h" +#include "../../game/zones/view_zone_logic.h" #include "../../interface/pixel_map_generator.h" -#include "../../interface/theme_icon.h" #include "../card_dimensions.h" #include "../z_values.h" #include "libcockatrice/utility/macros.h" @@ -40,12 +45,7 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include #include #include #include @@ -94,8 +94,8 @@ ZoneViewWidget::ZoneViewWidget(PlayerLogic *_player, searchEdit.setFocusPolicy(Qt::ClickFocus); searchEdit.setPlaceholderText(tr("Search by card name (or search expressions)")); searchEdit.setClearButtonEnabled(true); - searchEdit.addAction(loadThemedIcon(QStringLiteral("icons/search")), QLineEdit::LeadingPosition); - auto help = searchEdit.addAction(loadThemedIcon(QStringLiteral("icons/info")), QLineEdit::TrailingPosition); + searchEdit.addAction(loadColorAdjustedPixmap("theme:icons/search"), QLineEdit::LeadingPosition); + auto help = searchEdit.addAction(themePixmap(QStringLiteral("icons/info")), QLineEdit::TrailingPosition); connect(help, &QAction::triggered, this, [this] { createSearchSyntaxHelpWindow(&searchEdit); }); @@ -178,10 +178,9 @@ ZoneViewWidget::ZoneViewWidget(PlayerLogic *_player, vbox->addItem(zoneHBox); - zone = - new ZoneViewZone(new ZoneViewZoneLogic(player, _origZone, numberCards, _revealZone, _writeableRevealZone, - _isReversed, &SettingsCache::instance().userInterface(), zoneContainer), - zoneContainer); + zone = new ZoneViewZone(new ZoneViewZoneLogic(player, _origZone, numberCards, _revealZone, _writeableRevealZone, + _isReversed, zoneContainer), + zoneContainer); connect(zone, &ZoneViewZone::wheelEventReceived, scrollBarProxy, &ScrollableGraphicsProxyWidget::recieveWheelEvent); retranslateUi(); @@ -571,7 +570,7 @@ void ZoneViewWidget::closeEvent(QCloseEvent *event) // manually call zone->close in order to remove it from the origZones views zone->close(); if (shuffleCheckBox.isChecked()) { - player->getPlayerActions()->actShuffle(); + player->getPlayerActions()->sendGameCommand(Command_Shuffle()); } zoneDeleted(); event->accept(); diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp index 2d35538d2..4f77c7096 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp @@ -238,7 +238,6 @@ void CardPictureLoader::imageLoaded(const ExactCard &card, const QImage &image) }); card.emitPixmapUpdated(); - emit getInstance().pixmapLoaded(card); } void CardPictureLoader::deleteAllLocalOverrides(const ExactCard &card) diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader.h index 0c73e5d59..c6d91570b 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_loader.h +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader.h @@ -146,14 +146,6 @@ signals: /** @brief Emitted after the worker has finished clearing the network and redirect caches. */ void networkCacheCleared(); - /** - * @brief Emitted once an image has been loaded and put into the pixmap cache. - * - * Views that paint cards from the loader without owning a widget per card can - * listen to this to repaint the rows whose picture just became available. - */ - void pixmapLoaded(const ExactCard &card); - private slots: /** * @brief Triggered when the user changes the picture download settings. diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.cpp index a731d067a..3b26c8033 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.cpp +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.cpp @@ -11,7 +11,6 @@ #include #include #include -#include class ExactCard; @@ -39,94 +38,32 @@ void CardPictureLoaderStatusBar::cleanOldEntries() if (!loadLog || !loadLog->popup) { return; } - - const QDateTime now = QDateTime::currentDateTime(); - // Removing an entry mutates the log, so walk a copy of it. - const QList entries = logEntries; - for (CardPictureLoaderRequestStatusDisplayWidget *statusDisplayWidget : entries) { + for (CardPictureLoaderRequestStatusDisplayWidget *statusDisplayWidget : + loadLog->popup->findChildren()) { statusDisplayWidget->queryElapsedSeconds(); - if (!statusDisplayWidget->getFinished()) { - continue; - } - if (QDateTime::fromString(statusDisplayWidget->getStartTime()).secsTo(now) > LOG_ENTRY_LIFETIME_SECS) { - removeLogEntry(statusDisplayWidget); + if (statusDisplayWidget->getFinished() && + QDateTime::fromString(statusDisplayWidget->getStartTime()).secsTo(QDateTime::currentDateTime()) > 10) { + loadLog->removeSettingsWidget(statusDisplayWidget); + progressBar->setMaximum(progressBar->maximum() - 1); + progressBar->setValue(progressBar->value() - 1); } } } void CardPictureLoaderStatusBar::addQueuedImageLoad(const QUrl &url, const ExactCard &card, const QString &setName) { - if (logEntries.size() >= MAX_LOG_ENTRIES) { - trimLog(); - } - - auto *entry = new CardPictureLoaderRequestStatusDisplayWidget(loadLog, url, card, setName); - loadLog->addSettingsWidget(entry); - logEntries.append(entry); - entriesByUrl.insert(entry->getUrl(), entry); + loadLog->addSettingsWidget(new CardPictureLoaderRequestStatusDisplayWidget(loadLog, url, card, setName)); progressBar->setMaximum(progressBar->maximum() + 1); } void CardPictureLoaderStatusBar::addSuccessfulImageLoad(const QUrl &url) { - const QList entries = entriesByUrl.values(url.toString()); - if (entries.isEmpty()) { - // The entry may already have been dropped from the log; the download - // itself still succeeded, there is just nothing left to mark. - return; - } - - int finishedEntries = 0; - for (CardPictureLoaderRequestStatusDisplayWidget *statusDisplayWidget : entries) { - if (statusDisplayWidget->getFinished()) { - continue; - } - statusDisplayWidget->queryElapsedSeconds(); - statusDisplayWidget->setFinished(); - ++finishedEntries; - } - - // The bar counts the entries currently in the log, so only entries that are - // still listed move it. - progressBar->setValue(progressBar->value() + finishedEntries); -} - -void CardPictureLoaderStatusBar::trimLog() -{ - if (logEntries.isEmpty()) { - return; - } - - // Prefer evicting an entry that has already finished; only fall back to an - // in-flight request when the whole log is still pending. - CardPictureLoaderRequestStatusDisplayWidget *toRemove = nullptr; - for (CardPictureLoaderRequestStatusDisplayWidget *entry : logEntries) { - if (entry->getFinished()) { - toRemove = entry; - break; + progressBar->setValue(progressBar->value() + 1); + for (CardPictureLoaderRequestStatusDisplayWidget *statusDisplayWidget : + loadLog->popup->findChildren()) { + if (statusDisplayWidget->getUrl() == url.toString()) { + statusDisplayWidget->queryElapsedSeconds(); + statusDisplayWidget->setFinished(); } } - - removeLogEntry(toRemove != nullptr ? toRemove : logEntries.constFirst()); -} - -void CardPictureLoaderStatusBar::removeLogEntry(CardPictureLoaderRequestStatusDisplayWidget *entry) -{ - if (entry == nullptr) { - return; - } - - logEntries.removeOne(entry); - entriesByUrl.remove(entry->getUrl(), entry); - - // The progress bar's maximum counts the entries currently in the log and - // its value the finished ones, so dropping an entry moves both counters back. - // Move the value first: a maximum of 0 turns the bar into a busy indicator and - // resets its value. - if (entry->getFinished()) { - progressBar->setValue(qMax(0, progressBar->value() - 1)); - } - progressBar->setMaximum(qMax(0, progressBar->maximum() - 1)); - - loadLog->removeSettingsWidget(entry); -} +} \ No newline at end of file diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.h index 7f614e28f..2ba386c42 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.h +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_status_bar.h @@ -1,13 +1,10 @@ #ifndef PICTURE_LOADER_STATUS_BAR_H #define PICTURE_LOADER_STATUS_BAR_H -#include -#include #include #include #include -class CardPictureLoaderRequestStatusDisplayWidget; class ExactCard; class QHBoxLayout; class QProgressBar; @@ -24,20 +21,11 @@ class SettingsButtonWidget; * - Shows overall progress of image downloads. * - Maintains a log of individual requests via a popup (SettingsButtonWidget). * - Cleans up finished request entries automatically after a delay. - * - * The log is a diagnostic view, not a queue: it keeps at most MAX_LOG_ENTRIES - * entries and indexes them by URL, so a burst of requests stays O(1) per event - * instead of scanning every entry the popup holds. */ class CardPictureLoaderStatusBar : public QWidget { Q_OBJECT public: - /** Entries kept in the log; older ones are evicted as new requests arrive. */ - static constexpr int MAX_LOG_ENTRIES = 50; - /** Seconds a finished entry stays in the log before it is cleaned up. */ - static constexpr int LOG_ENTRY_LIFETIME_SECS = 10; - /** * @brief Constructs a status bar with progress bar and log button. * @param parent Parent widget @@ -67,28 +55,10 @@ public slots: void cleanOldEntries(); private: - /** - * @brief Evicts the oldest finished entry (or the oldest entry if none finished) - * until the log fits within MAX_LOG_ENTRIES. - */ - void trimLog(); - - /** - * @brief Removes one entry from the log, its URL index and the popup, and keeps - * the progress bar counters in step with the entries that remain. - * @param entry Entry to remove - */ - void removeLogEntry(CardPictureLoaderRequestStatusDisplayWidget *entry); - QHBoxLayout *layout; ///< Horizontal layout containing progress bar and log button QProgressBar *progressBar; ///< Progress bar showing overall download progress SettingsButtonWidget *loadLog; ///< Popup log showing individual request statuses QTimer *cleaner; ///< Timer for periodically cleaning old log entries - QList logEntries; ///< Logged requests, oldest first - // A URL can back several live entries: a request parked for a deferred retry is re-queued while - // its first entry is still pending, so a completion must finish every entry for that URL. - QMultiHash - entriesByUrl; ///< Log entries indexed by their URL for O(1) completion lookup }; #endif // PICTURE_LOADER_STATUS_BAR_H diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_file_format.cpp b/cockatrice/src/interface/deck_loader/deck_file_format.cpp similarity index 100% rename from libcockatrice_deck_list/libcockatrice/deck_list/deck_file_format.cpp rename to cockatrice/src/interface/deck_loader/deck_file_format.cpp diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_file_format.h b/cockatrice/src/interface/deck_loader/deck_file_format.h similarity index 100% rename from libcockatrice_deck_list/libcockatrice/deck_list/deck_file_format.h rename to cockatrice/src/interface/deck_loader/deck_file_format.h diff --git a/cockatrice/src/interface/deck_loader/deck_loader.cpp b/cockatrice/src/interface/deck_loader/deck_loader.cpp index c8fa2a6f8..d413a6c04 100644 --- a/cockatrice/src/interface/deck_loader/deck_loader.cpp +++ b/cockatrice/src/interface/deck_loader/deck_loader.cpp @@ -1,6 +1,5 @@ #include "deck_loader.h" -#include "../theme_manager.h" #include "libcockatrice/card/card_info.h" #include "libcockatrice/card/database/card_database_querier.h" #include "libcockatrice/deck_list/tree/abstract_deck_list_card_node.h" @@ -39,7 +38,6 @@ #include #include #include -#include #include #include #include @@ -373,12 +371,8 @@ bool DeckLoader::saveToStream_Plain(QTextStream &out, saveToStream_DeckHeader(out, deckList); } - // Plain deck readers expect the main deck before the sideboard. Reorder a - // copy so native saves and the relative order of other zones stay intact. - auto zones = deckList.getZoneNodes(); - std::stable_partition(zones.begin(), zones.end(), - [](const auto *zone) { return zone->getName() == DECK_ZONE_MAIN; }); - for (auto zoneNode : zones) { + // loop zones + for (auto zoneNode : deckList.getZoneNodes()) { saveToStream_DeckZone(out, zoneNode, addComments, addSetNameAndNumber); // end of zone @@ -585,8 +579,6 @@ void DeckLoader::printDeckListNode(QTextCursor *cursor, const InnerDecklistNode if (!cards.isEmpty()) { QTextBlockFormat blockFormat; QTextCharFormat charFormat; - // Family comes from the DeckList theme role; sizes/weights unchanged. - charFormat.setFontFamilies({themeManager->deckListFont().family()}); charFormat.setFontPointSize(11); charFormat.setFontWeight(QFont::Bold); cursor->insertBlock(blockFormat, charFormat); @@ -600,7 +592,6 @@ void DeckLoader::printDeckListNode(QTextCursor *cursor, const InnerDecklistNode const AbstractDecklistCardNode *card = cards[i]; QTextCharFormat cellCharFormat; - cellCharFormat.setFontFamilies({themeManager->deckListFont().family()}); cellCharFormat.setFontPointSize(9); QTextTableCell cell = table->cellAt(i, 0); @@ -622,7 +613,6 @@ void DeckLoader::printDeckListNode(QTextCursor *cursor, const InnerDecklistNode QTextBlockFormat blockFormat; QTextCharFormat charFormat; - charFormat.setFontFamilies({themeManager->deckListFont().family()}); charFormat.setFontPointSize(14); charFormat.setFontWeight(QFont::Bold); @@ -650,18 +640,14 @@ void DeckLoader::printDeckList(QPrinter *printer, const DeckList &deckList) { QTextDocument doc; - // Family comes from the DeckList theme role; the print sizes/weights below stay unchanged. - // Print output is a one-shot snapshot and intentionally does not subscribe - // to fontsChanged (there is no live view to repaint); reprinting picks up - // the current role font. - QFont font = themeManager->deckListFont(); + QFont font("Serif"); + font.setStyleHint(QFont::Serif); doc.setDefaultFont(font); QTextCursor cursor(&doc); QTextBlockFormat headerBlockFormat; QTextCharFormat headerCharFormat; - headerCharFormat.setFontFamilies({themeManager->deckListFont().family()}); headerCharFormat.setFontPointSize(16); headerCharFormat.setFontWeight(QFont::Bold); diff --git a/cockatrice/src/interface/deck_loader/deck_loader.h b/cockatrice/src/interface/deck_loader/deck_loader.h index 39a12bed4..16402b14b 100644 --- a/cockatrice/src/interface/deck_loader/deck_loader.h +++ b/cockatrice/src/interface/deck_loader/deck_loader.h @@ -7,14 +7,13 @@ #ifndef DECK_LOADER_H #define DECK_LOADER_H +#include "deck_file_format.h" +#include "loaded_deck.h" + #include #include -#include #include #include -#include -#include -#include #include #include diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/loaded_deck.cpp b/cockatrice/src/interface/deck_loader/loaded_deck.cpp similarity index 100% rename from libcockatrice_deck_list/libcockatrice/deck_list/loaded_deck.cpp rename to cockatrice/src/interface/deck_loader/loaded_deck.cpp diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/loaded_deck.h b/cockatrice/src/interface/deck_loader/loaded_deck.h similarity index 100% rename from libcockatrice_deck_list/libcockatrice/deck_list/loaded_deck.h rename to cockatrice/src/interface/deck_loader/loaded_deck.h diff --git a/cockatrice/src/interface/intents/intent_login.cpp b/cockatrice/src/interface/intents/intent_login.cpp index 8cc574cb0..0d8390015 100644 --- a/cockatrice/src/interface/intents/intent_login.cpp +++ b/cockatrice/src/interface/intents/intent_login.cpp @@ -27,9 +27,9 @@ void IntentGetLoginCredentials::onPreconditionSatisfied() ServersSettings &servers = SettingsCache::instance().servers(); const int index = servers.findServerIndex(context->hostname, context->port); - if (const auto server = servers.getServer(index)) { - context->username = server->username; - context->password = server->password; + if (index >= 0) { + context->username = servers.getValue(QString("username%1").arg(index), "server", "server_details").toString(); + context->password = servers.getValue(QString("password%1").arg(index), "server", "server_details").toString(); emitFinished(); } else { emitFailed(tr("No saved credentials for this server")); @@ -69,8 +69,9 @@ void IntentGetLoginCredentials::onPreconditionNotSatisfied() // it with the raw hostname when addNewServer updates the entry in place. QString saveName = context->hostname; const int existingIndex = servers.findServerIndex(context->hostname, context->port); - if (const auto existing = servers.getServer(existingIndex)) { - saveName = existing->saveName; + if (existingIndex >= 0) { + saveName = + servers.getValue(QString("saveName%1").arg(existingIndex), "server", "server_details").toString(); if (saveName.isEmpty()) { saveName = context->hostname; } diff --git a/cockatrice/src/interface/intents/intent_open_local_deck.cpp b/cockatrice/src/interface/intents/intent_open_local_deck.cpp index 20704a551..5b673d106 100644 --- a/cockatrice/src/interface/intents/intent_open_local_deck.cpp +++ b/cockatrice/src/interface/intents/intent_open_local_deck.cpp @@ -1,14 +1,14 @@ #include "intent_open_local_deck.h" +#include "../deck_loader/deck_file_format.h" #include "../deck_loader/deck_loader.h" +#include "../deck_loader/loaded_deck.h" #include "../widgets/tabs/tab_supervisor.h" #include "intent_wait_for_database_load.h" #include "libcockatrice/card/database/card_database.h" #include "libcockatrice/card/database/card_database_loader.h" #include -#include -#include #include IntentOpenLocalDeck::IntentOpenLocalDeck(TabSupervisor *_tabSupervisor, const QString &_file) diff --git a/cockatrice/src/interface/intents/intent_open_shared_deck.h b/cockatrice/src/interface/intents/intent_open_shared_deck.h index 2d9dc5528..afce2370f 100644 --- a/cockatrice/src/interface/intents/intent_open_shared_deck.h +++ b/cockatrice/src/interface/intents/intent_open_shared_deck.h @@ -1,6 +1,7 @@ #ifndef COCKATRICE_INTENT_OPEN_SHARED_DECK_H #define COCKATRICE_INTENT_OPEN_SHARED_DECK_H +#include "../deck_loader/loaded_deck.h" #include "contexts/context_open_deck.h" #include "intent.h" @@ -8,7 +9,6 @@ #include #include #include -#include #include #include diff --git a/cockatrice/src/interface/intents/url_parser.cpp b/cockatrice/src/interface/intents/url_parser.cpp index e0b7bb2fb..1e482a4f1 100644 --- a/cockatrice/src/interface/intents/url_parser.cpp +++ b/cockatrice/src/interface/intents/url_parser.cpp @@ -418,10 +418,12 @@ void IntentUrlParser::restoreToPreviousServer(const PendingIntentChain &chain) ServersSettings &servers = SettingsCache::instance().servers(); const int index = servers.findServerIndex(chain.previousServerHost, chain.previousServerPort); - const auto server = servers.getServer(index); - if (server && servers.hasLoginData(chain.previousServerHost, chain.previousServerPort)) { - client->connectToServer(chain.previousServerHost, chain.previousServerPort.toUInt(), server->username, - server->password); + if (index >= 0 && servers.hasLoginData(chain.previousServerHost, chain.previousServerPort)) { + const QString username = + servers.getValue(QString("username%1").arg(index), "server", "server_details").toString(); + const QString password = + servers.getValue(QString("password%1").arg(index), "server", "server_details").toString(); + client->connectToServer(chain.previousServerHost, chain.previousServerPort.toUInt(), username, password); return; } client->disconnectFromServer(); @@ -436,9 +438,11 @@ void IntentUrlParser::restoreToPreviousServer(const PendingIntentChain &chain) // when credentials are saved, otherwise stay offline. ServersSettings &servers = SettingsCache::instance().servers(); const int index = servers.findServerIndex(chain.previousServerHost, chain.previousServerPort); - const auto server = servers.getServer(index); - if (server && servers.hasLoginData(chain.previousServerHost, chain.previousServerPort)) { - client->connectToServer(chain.previousServerHost, chain.previousServerPort.toUInt(), server->username, - server->password); + if (index >= 0 && servers.hasLoginData(chain.previousServerHost, chain.previousServerPort)) { + const QString username = + servers.getValue(QString("username%1").arg(index), "server", "server_details").toString(); + const QString password = + servers.getValue(QString("password%1").arg(index), "server", "server_details").toString(); + client->connectToServer(chain.previousServerHost, chain.previousServerPort.toUInt(), username, password); } } diff --git a/cockatrice/src/interface/palette_editor/color_button.cpp b/cockatrice/src/interface/palette_editor/color_button.cpp index ae9bd6297..a7db23d31 100644 --- a/cockatrice/src/interface/palette_editor/color_button.cpp +++ b/cockatrice/src/interface/palette_editor/color_button.cpp @@ -1,7 +1,5 @@ #include "color_button.h" -#include "../theme_manager.h" - #include #include #include @@ -23,7 +21,6 @@ ColorButton::ColorButton(QWidget *parent) : QToolButton(parent) setCursor(Qt::PointingHandCursor); setToolTip(tr("Click to pick a color")); connect(this, &QToolButton::clicked, this, &ColorButton::pickColor); - connect(themeManager, &ThemeManager::fontsChanged, this, &ColorButton::updateSwatch); } void ColorButton::setColor(const QColor &c) @@ -76,8 +73,7 @@ void ColorButton::updateSwatch() // Hex label — black or white for contrast int luma = 0.299 * color.red() + 0.587 * color.green() + 0.114 * color.blue(); painter.setPen((luma > 128 && color.alpha() > 80) ? QColor(0, 0, 0, 180) : QColor(255, 255, 255, 200)); - // Family comes from the InterfaceDefault theme role; the 8px size stays caller-side. - QFont f = themeManager->appFont(AppFont::InterfaceDefault); + QFont f = font(); f.setPixelSize(8); painter.setFont(f); painter.drawText(rect(), Qt::AlignCenter, color.name().toUpper()); diff --git a/cockatrice/src/interface/palette_editor/font_grid_widget.cpp b/cockatrice/src/interface/palette_editor/font_grid_widget.cpp deleted file mode 100644 index 44ad59551..000000000 --- a/cockatrice/src/interface/palette_editor/font_grid_widget.cpp +++ /dev/null @@ -1,136 +0,0 @@ -#include "font_grid_widget.h" - -#include "../theme_manager.h" - -#include -#include -#include -#include -#include -#include -#include -#include - -static constexpr int MIN_FONT_SIZE = 6; -static constexpr int MAX_FONT_SIZE = 72; -static constexpr int FALLBACK_FONT_SIZE = 10; - -static const QMap APP_FONT_DESCRIPTIONS = { - {AppFont::InterfaceDefault, QT_TR_NOOP("Default font for menus, dialogs and widgets")}, - {AppFont::ChatLog, QT_TR_NOOP("Font for chat messages and logs")}, - {AppFont::CardText, QT_TR_NOOP("Font for text rendered on cards")}, - {AppFont::DeckList, QT_TR_NOOP("Font for deck lists and the deck editor")}, -}; - -static QString roleDisplayName(AppFont::Role role) -{ - switch (role) { - case AppFont::InterfaceDefault: - return FontGridWidget::tr("Interface default"); - case AppFont::ChatLog: - return FontGridWidget::tr("Chat log"); - case AppFont::CardText: - return FontGridWidget::tr("Card text"); - case AppFont::DeckList: - return FontGridWidget::tr("Deck list"); - default: - return QString(); - } -} - -FontGridWidget::FontGridWidget(QWidget *parent) : QWidget(parent) -{ - auto *grid = new QGridLayout(this); - grid->setSpacing(3); - grid->setContentsMargins(12, 8, 12, 8); - grid->setColumnStretch(0, 0); - grid->setColumnStretch(1, 1); - grid->setColumnStretch(2, 0); - - QMetaEnum fontEnum = QMetaEnum::fromType(); - for (int i = 0; i < fontEnum.keyCount(); ++i) { - auto role = static_cast(fontEnum.value(i)); - - auto *label = new QLabel(this); - grid->addWidget(label, i, 0); - - auto *familyCombo = new QFontComboBox(this); - grid->addWidget(familyCombo, i, 1); - connect(familyCombo, &QFontComboBox::currentFontChanged, this, [this] { emit fontsChanged(); }); - - auto *sizeSpin = new QSpinBox(this); - sizeSpin->setRange(MIN_FONT_SIZE, MAX_FONT_SIZE); - grid->addWidget(sizeSpin, i, 2); - connect(sizeSpin, &QSpinBox::valueChanged, this, [this] { emit fontsChanged(); }); - - label->setBuddy(familyCombo); - - fontRows[role] = {label, familyCombo, sizeSpin}; - } - - retranslateUi(); -} - -void FontGridWidget::loadFonts(const FontConfig &cfg) -{ - // Suppress fontsChanged while materializing fallback rows so the initial - // load never reads as a user edit (mirrors paletteGrid blocking). - blockSignals(true); - QMetaEnum fontEnum = QMetaEnum::fromType(); - for (int i = 0; i < fontEnum.keyCount(); ++i) { - auto role = static_cast(fontEnum.value(i)); - const FontRow &row = fontRows[role]; - - // Roles absent from the file resolve the same way the runtime does: an unset - // role falls back to the config's InterfaceDefault, and only then to the - // startup font. appFont() would return the live preview instead, so Reset and - // a first load must not measure against it. - const QFont fallback = cfg.fonts.value(AppFont::InterfaceDefault, themeManager->defaultAppFont(role)); - const QFont font = cfg.fonts.value(role, fallback); - row.familyCombo->setCurrentFont(font); - - int size = font.pointSize(); - if (size <= 0) { - size = qApp->font().pointSize(); - } - if (size <= 0) { - size = FALLBACK_FONT_SIZE; - } - row.sizeSpin->setValue(qBound(MIN_FONT_SIZE, size, MAX_FONT_SIZE)); - } - blockSignals(false); -} - -FontConfig FontGridWidget::currentFontConfig() const -{ - FontConfig cfg; - QMetaEnum fontEnum = QMetaEnum::fromType(); - for (int i = 0; i < fontEnum.keyCount(); ++i) { - auto role = static_cast(fontEnum.value(i)); - const FontRow &row = fontRows.value(role); - - // Canonical family + point size only: a fresh QFont carries default - // (non-bold, non-italic) weight/style, so nothing combo-side leaks in. - QFont font(row.familyCombo->currentFont().family()); - font.setPointSize(row.sizeSpin->value()); - cfg.fonts[role] = font; - } - return cfg; -} - -void FontGridWidget::retranslateUi() -{ - QMetaEnum fontEnum = QMetaEnum::fromType(); - for (int i = 0; i < fontEnum.keyCount(); ++i) { - auto role = static_cast(fontEnum.value(i)); - const FontRow &row = fontRows.value(role); - - row.label->setText(roleDisplayName(role)); - row.label->setToolTip(tr(APP_FONT_DESCRIPTIONS.value(role, ""))); - row.familyCombo->setToolTip(tr(APP_FONT_DESCRIPTIONS.value(role, ""))); - row.familyCombo->setAccessibleName(roleDisplayName(role)); - row.sizeSpin->setToolTip(tr("Point size for %1").arg(roleDisplayName(role))); - row.sizeSpin->setAccessibleName(tr("Point size for %1").arg(roleDisplayName(role))); - row.sizeSpin->setSuffix(tr(" pt")); - } -} diff --git a/cockatrice/src/interface/palette_editor/font_grid_widget.h b/cockatrice/src/interface/palette_editor/font_grid_widget.h deleted file mode 100644 index 8c80306d3..000000000 --- a/cockatrice/src/interface/palette_editor/font_grid_widget.h +++ /dev/null @@ -1,43 +0,0 @@ -#ifndef COCKATRICE_FONT_GRID_WIDGET_H -#define COCKATRICE_FONT_GRID_WIDGET_H - -#include "../theme_config.h" - -#include -#include -#include - -class QFontComboBox; -class QGridLayout; -class QLabel; -class QSpinBox; - -// Per-role font editors — one (family, point size) row per AppFont::Role. -// Owns the load/read round-trip for FontConfig but has no file I/O, mirroring -// PaletteGridWidget. Only family and point size are edited; weight and italic -// stay caller-side concerns and are stripped when reading back. -class FontGridWidget : public QWidget -{ - Q_OBJECT -public: - explicit FontGridWidget(QWidget *parent = nullptr); - - void loadFonts(const FontConfig &cfg); - FontConfig currentFontConfig() const; - void retranslateUi(); - -signals: - void fontsChanged(); - -private: - struct FontRow - { - QLabel *label = nullptr; - QFontComboBox *familyCombo = nullptr; - QSpinBox *sizeSpin = nullptr; - }; - - QMap fontRows; -}; - -#endif // COCKATRICE_FONT_GRID_WIDGET_H diff --git a/cockatrice/src/interface/palette_editor/palette_editor_dialog.cpp b/cockatrice/src/interface/palette_editor/palette_editor_dialog.cpp index 5bcfbb251..b6271291d 100644 --- a/cockatrice/src/interface/palette_editor/palette_editor_dialog.cpp +++ b/cockatrice/src/interface/palette_editor/palette_editor_dialog.cpp @@ -2,7 +2,6 @@ #include "../theme_config.h" #include "../theme_manager.h" -#include "font_grid_widget.h" #include "palette_generator.h" #include "palette_grid_widget.h" #include "quick_setup_panel.h" @@ -42,7 +41,6 @@ PaletteEditorDialog::PaletteEditorDialog(const QString &_themeDirPath, const QSt // Load both scheme configs upfront so switching is instant loadSchemes(); - loadFonts(); loadedScheme = themeManager->isDarkMode(themeDirPath) ? "Dark" : "Light"; @@ -127,33 +125,6 @@ void PaletteEditorDialog::setupUi() paletteGrid->setVisible(false); root->addWidget(paletteGrid, 1); - // Font section — sibling to the palette grid, sharing its collapsible - // advanced area pattern. Fonts are shared per theme, not split by scheme. - fontToggleButton = new QPushButton(this); - fontToggleButton->setCheckable(true); - fontToggleButton->setChecked(false); - fontToggleButton->setFlat(true); - fontToggleButton->setStyleSheet("QPushButton { text-align: left; padding: 5px 12px; font-weight: bold; }" - "QPushButton:checked { }"); - root->addWidget(fontToggleButton); - - fontSeparator = makeSeparator(); - fontSeparator->setVisible(false); - root->addWidget(fontSeparator); - - fontSection = new QWidget; - auto *fontSectionLayout = new QVBoxLayout(fontSection); - fontSectionLayout->setContentsMargins(0, 0, 0, 0); - fontSectionLayout->setSpacing(0); - fontNoteLabel = new QLabel(fontSection); - fontNoteLabel->setContentsMargins(12, 4, 12, 0); - fontNoteLabel->setWordWrap(true); - fontSectionLayout->addWidget(fontNoteLabel); - fontGrid = new FontGridWidget(fontSection); - fontSectionLayout->addWidget(fontGrid); - fontSection->setVisible(false); - root->addWidget(fontSection); - // Footer root->addWidget(makeSeparator()); footer = new QWidget; @@ -186,10 +157,6 @@ void PaletteEditorDialog::setupUi() connect(autoApplyTimer, &QTimer::timeout, this, &PaletteEditorDialog::onApply); connect(quickSetupPanel, &QuickSetupPanel::valueChanged, this, &PaletteEditorDialog::onGenerateFromAccent); connect(paletteGrid, &PaletteGridWidget::paletteChanged, this, [this] { autoApplyTimer->start(); }); - connect(fontGrid, &FontGridWidget::fontsChanged, this, [this] { - fontsDirty = true; - autoApplyTimer->start(); - }); connect(revertButton, &QPushButton::clicked, this, &PaletteEditorDialog::onRevertToDefault); connect(resetBtn, &QPushButton::clicked, this, &PaletteEditorDialog::onReset); connect(saveBtn, &QPushButton::clicked, this, &PaletteEditorDialog::onSave); @@ -199,32 +166,15 @@ void PaletteEditorDialog::setupUi() paletteGridToggleButton->setText(open ? tr("▼ Edit Palette") : tr("▶ Edit Palette")); paletteGridSeparator->setVisible(open); paletteGrid->setVisible(open); - updateAdvancedHeight(); - }); - connect(fontToggleButton, &QPushButton::toggled, this, [this](bool open) { - fontToggleButton->setText(open ? tr("▼ Edit Fonts") : tr("▶ Edit Fonts")); - fontSeparator->setVisible(open); - fontSection->setVisible(open); - updateAdvancedHeight(); - }); -} -void PaletteEditorDialog::updateAdvancedHeight() -{ - int height = 220; - if (paletteGridToggleButton->isChecked()) { - height += 460; - } - if (fontToggleButton->isChecked()) { - height += 200; - } - setMinimumHeight(height); - - if (paletteGrid->isVisible() || fontSection->isVisible()) { - resize(width(), height); - } else { - adjustSize(); // shrinks to fit just the visible content - } + if (open) { + setMinimumHeight(680); + resize(width(), 680); + } else { + setMinimumHeight(220); + adjustSize(); // shrinks to fit just the visible content + } + }); } void PaletteEditorDialog::retranslateUi() @@ -239,16 +189,12 @@ void PaletteEditorDialog::retranslateUi() editingLabel->setText(tr("Editing:")); paletteGridToggleButton->setText(tr("▶ Edit Palette")); paletteGridToggleButton->setToolTip(tr("Show or hide the per-role colour grid for manual tweaks")); - fontToggleButton->setText(fontSection->isVisible() ? tr("▼ Edit Fonts") : tr("▶ Edit Fonts")); - fontToggleButton->setToolTip(tr("Show or hide the per-purpose font settings for this theme")); - fontNoteLabel->setText(tr("Fonts belong to theme %1 (shared by Light and Dark schemes)").arg(themeName)); - fontGrid->retranslateUi(); revertButton->setText(tr("↺ Revert to theme default")); resetBtn->setText(tr("Reset")); saveBtn->setText(tr("Save")); - resetBtn->setToolTip(tr("Discard unsaved edits and restore the last saved palette and fonts")); - saveBtn->setToolTip(tr("Write palette-%1.toml and fonts.toml, then reload the theme").arg(loadedScheme.toLower())); + resetBtn->setToolTip(tr("Discard unsaved edits and restore the last saved palette")); + saveBtn->setToolTip(tr("Write palette-%1.toml and reload the theme").arg(loadedScheme.toLower())); if (saveDir.isEmpty() || !ThemeManager::isDirReallyWritable(saveDir)) { saveBtn->setEnabled(false); @@ -282,13 +228,6 @@ void PaletteEditorDialog::loadSchemes() } } -void PaletteEditorDialog::loadFonts() -{ - savedFontConfig = ThemeManager::loadDefaultFontConfig(themeDirPath, themeName); - fontGrid->loadFonts(savedFontConfig); - fontsDirty = false; -} - void PaletteEditorDialog::seedAccentFromScheme(const QString &scheme) { QColor seed = workingConfig.value(scheme).colors.value(QPalette::Active).value(QPalette::Highlight); @@ -319,9 +258,6 @@ void PaletteEditorDialog::onGenerateFromAccent(const QColor &accent, int intensi void PaletteEditorDialog::onApply() { themeManager->previewPalette(paletteGrid->currentPaletteConfig(), loadedScheme); - if (fontsDirty) { - themeManager->previewFonts(fontGrid->currentFontConfig()); - } } void PaletteEditorDialog::onSave() @@ -372,20 +308,6 @@ void PaletteEditorDialog::onSave() savedConfig[it.key()] = it.value(); } - // Persist the shared per-theme fonts when they changed. - if (fontsDirty) { - const FontConfig fontCfg = fontGrid->currentFontConfig(); - if (fontCfg != savedFontConfig) { - if (!ThemeManager::saveFontConfig(saveDir, fontCfg)) { - QMessageBox::warning(this, tr("Save failed"), - tr("Could not write %1 to:\n%2").arg(FontConfig::fileName(), saveDir)); - return; - } - savedFontConfig = fontCfg; - } - fontsDirty = false; - } - themeManager->reloadCurrentTheme(); accept(); } @@ -394,12 +316,6 @@ void PaletteEditorDialog::onReset() { workingConfig[loadedScheme] = savedConfig[loadedScheme]; paletteGrid->loadPalette(savedConfig[loadedScheme]); - // Restore the live theme before re-reading the grid: loadFonts resolves - // unset roles, and the preview has currentFonts pointing at the edited - // config until the theme is reloaded. - themeManager->reloadCurrentTheme(); - fontGrid->loadFonts(savedFontConfig); - fontsDirty = false; seedAccentFromScheme(loadedScheme); } @@ -434,27 +350,6 @@ void PaletteEditorDialog::onRevertToDefault() workingConfig[loadedScheme] = def; paletteGrid->loadPalette(def); seedAccentFromScheme(loadedScheme); - - // Revert the shared per-theme fonts the same way: delete the user-written - // fonts.toml so the theme falls back to its shipped default, then reflect - // the resolved fonts in the editor. - QFile::remove(QDir(saveDir).absoluteFilePath(FontConfig::fileName())); - - // Reload the live theme so the font revert takes effect immediately. - themeManager->reloadCurrentTheme(); - - const FontConfig fontDef = ThemeManager::loadDefaultFontConfig(themeDirPath, themeName); - savedFontConfig = fontDef; - fontGrid->loadFonts(fontDef); - fontsDirty = false; -} - -void PaletteEditorDialog::reject() -{ - // Discard any unsaved live preview (palette and fonts) so closing without - // Save restores the active theme instead of leaking the preview globally. - themeManager->reloadCurrentTheme(); - QDialog::reject(); } void PaletteEditorDialog::changeEvent(QEvent *e) diff --git a/cockatrice/src/interface/palette_editor/palette_editor_dialog.h b/cockatrice/src/interface/palette_editor/palette_editor_dialog.h index 5e47536b5..e29a70cb0 100644 --- a/cockatrice/src/interface/palette_editor/palette_editor_dialog.h +++ b/cockatrice/src/interface/palette_editor/palette_editor_dialog.h @@ -15,7 +15,6 @@ class QComboBox; class QDialogButtonBox; class QPushButton; class PaletteGridWidget; -class FontGridWidget; class QuickSetupPanel; class QFrame; class QWidget; @@ -26,7 +25,6 @@ class PaletteEditorDialog : public QDialog public: explicit PaletteEditorDialog(const QString &themeDirPath, const QString &themeName, QWidget *parent = nullptr); void loadSchemes(); - void reject() override; private slots: void onSave(); @@ -40,10 +38,8 @@ private: void setupUi(); void retranslateUi(); void refreshChromePalettes(); - void updateAdvancedHeight(); void loadScheme(const QString &scheme); // snapshot current, switch, load void seedAccentFromScheme(const QString &scheme); - void loadFonts(); // shared per theme, not split by light/dark // Sub-widgets QWidget *header; @@ -53,11 +49,6 @@ private: PaletteGridWidget *paletteGrid = nullptr; QPushButton *paletteGridToggleButton = nullptr; QFrame *paletteGridSeparator = nullptr; - FontGridWidget *fontGrid = nullptr; - QPushButton *fontToggleButton = nullptr; - QFrame *fontSeparator = nullptr; - QWidget *fontSection = nullptr; - QLabel *fontNoteLabel = nullptr; QWidget *footer; QComboBox *schemeComboBox = nullptr; QDialogButtonBox *buttonBox = nullptr; @@ -77,18 +68,10 @@ private: QMap workingConfig; QMap savedConfig; - // Fonts are shared per theme (fonts.toml, not split by light/dark), so a - // single saved config suffices; the live edits are read from fontGrid. - FontConfig savedFontConfig; - // Set only by user-driven fontsChanged after the initial load completes. - // Gates both previewFonts and the fonts.toml write so a palette-only Save - // never materializes fallback fonts to disk. - bool fontsDirty = false; - QTimer *autoApplyTimer = nullptr; protected: void changeEvent(QEvent *e) override; }; -#endif // COCKATRICE_PALETTE_EDITOR_DIALOG_H +#endif // COCKATRICE_PALETTE_EDITOR_DIALOG_H \ No newline at end of file diff --git a/cockatrice/src/interface/palette_editor/palette_grid_widget.cpp b/cockatrice/src/interface/palette_editor/palette_grid_widget.cpp index 392f01d0d..463c4038d 100644 --- a/cockatrice/src/interface/palette_editor/palette_grid_widget.cpp +++ b/cockatrice/src/interface/palette_editor/palette_grid_widget.cpp @@ -76,18 +76,6 @@ PaletteGridWidget::PaletteGridWidget(QWidget *parent) : QWidget(parent) layout = QtUtils::makeLayout(this); layout->addWidget(scroll); - - connect(themeManager, &ThemeManager::fontsChanged, this, &PaletteGridWidget::applyInterfaceDefaultFont); -} - -void PaletteGridWidget::applyInterfaceDefaultFont() -{ - // The editor's own chrome follows the InterfaceDefault theme role; bold stays caller-side. - for (auto *label : headerLabels) { - QFont headerFont = themeManager->appFont(AppFont::InterfaceDefault); - headerFont.setBold(true); - label->setFont(headerFont); - } } void PaletteGridWidget::buildGrid(QWidget *host) @@ -113,8 +101,7 @@ void PaletteGridWidget::buildGrid(QWidget *host) auto *label = new QLabel(groupHeaders[col], host); label->setAlignment(Qt::AlignCenter); label->setToolTip(groupTips[col]); - // Family comes from the InterfaceDefault theme role; bold stays caller-side. - label->setFont(QtUtils::boldFont(themeManager->appFont(AppFont::InterfaceDefault))); + label->setFont(QtUtils::boldFont(label->font())); label->setAutoFillBackground(true); label->setContentsMargins(4, 4, 4, 4); grid->addWidget(label, 0, col + 1); @@ -159,7 +146,7 @@ void PaletteGridWidget::buildGrid(QWidget *host) auto *appHeader = new QLabel(tr("App colors"), host); appHeader->setToolTip(tr("Application-specific colors layered on top of the Qt palette")); - appHeader->setFont(QtUtils::boldFont(themeManager->appFont(AppFont::InterfaceDefault))); + appHeader->setFont(QtUtils::boldFont(appHeader->font())); appHeader->setAutoFillBackground(true); appHeader->setContentsMargins(4, 4, 4, 4); grid->addWidget(appHeader, appHeaderRow, 0, 1, 4); diff --git a/cockatrice/src/interface/palette_editor/palette_grid_widget.h b/cockatrice/src/interface/palette_editor/palette_grid_widget.h index 7c527a064..f1ff41ec2 100644 --- a/cockatrice/src/interface/palette_editor/palette_grid_widget.h +++ b/cockatrice/src/interface/palette_editor/palette_grid_widget.h @@ -34,10 +34,6 @@ private: void changeEvent(QEvent *e); void refreshChromePalettes(); -private slots: - void applyInterfaceDefaultFont(); - -private: QMap> colorButtons; QMap appColorButtons; QScrollArea *scroll; diff --git a/cockatrice/src/interface/palette_editor/quick_setup_panel.cpp b/cockatrice/src/interface/palette_editor/quick_setup_panel.cpp index 00eac3253..04f98dcc3 100644 --- a/cockatrice/src/interface/palette_editor/quick_setup_panel.cpp +++ b/cockatrice/src/interface/palette_editor/quick_setup_panel.cpp @@ -1,6 +1,5 @@ #include "quick_setup_panel.h" -#include "../theme_manager.h" #include "color_button.h" #include @@ -29,15 +28,10 @@ QuickSetupPanel::QuickSetupPanel(QWidget *parent) : QWidget(parent) labelLow = new QLabel(this); labelHigh = new QLabel(this); - // Family comes from the InterfaceDefault theme role; the *0.82 size stays caller-side. - auto applySmallFont = [this]() { - QFont small = themeManager->appFont(AppFont::InterfaceDefault); - small.setPointSizeF(small.pointSizeF() * 0.82); - labelLow->setFont(small); - labelHigh->setFont(small); - }; - applySmallFont(); - connect(themeManager, &ThemeManager::fontsChanged, this, applySmallFont); + QFont small = labelLow->font(); + small.setPointSizeF(small.pointSizeF() * 0.82); + labelLow->setFont(small); + labelHigh->setFont(small); QPalette dimmed = labelLow->palette(); dimmed.setColor(QPalette::WindowText, qApp->palette().color(QPalette::Mid)); labelLow->setPalette(dimmed); diff --git a/cockatrice/src/interface/pixel_map_generator.cpp b/cockatrice/src/interface/pixel_map_generator.cpp index 037293af9..2f5c4b6dd 100644 --- a/cockatrice/src/interface/pixel_map_generator.cpp +++ b/cockatrice/src/interface/pixel_map_generator.cpp @@ -1,7 +1,6 @@ #include "pixel_map_generator.h" #include "libcockatrice/network/server/remote/user_level.h" -#include "theme_icon.h" #include "theme_manager.h" #include @@ -16,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -436,19 +436,33 @@ QIcon UserLevelPixmapGenerator::generateIconWithColorOverride(int height, QMap UserLevelPixmapGenerator::iconCache; -QPixmap DropdownIconPixmapGenerator::generatePixmap(int height, bool expanded) +QPixmap LockPixmapGenerator::generatePixmap(int height) { - const QString key = QString::number(expanded) + ":" + QString::number(height); + + int key = height; if (pmCache.contains(key)) { return pmCache.value(key); } - // Render through the themed icon engine: it keeps the glyph's aspect ratio, - // follows the palette, and renders at the device pixel ratio instead of - // handing a DPR-1 bitmap to a label that would upscale and blur it on a 2x - // display. - const QString prefix = QStringLiteral("icons/") + (expanded ? "dropdown_expanded" : "dropdown_collapsed"); - const QPixmap pixmap = loadThemedIcon(prefix).pixmap(QSize(height, height), qApp->devicePixelRatio()); + QPixmap pixmap = tryLoadImage(QStringLiteral("theme:") + themeManager->assetPath(QStringLiteral("icons/lock")), + QSize(height, height), true); + pmCache.insert(key, pixmap); + return pixmap; +} + +QMap LockPixmapGenerator::pmCache; + +QPixmap DropdownIconPixmapGenerator::generatePixmap(int height, bool expanded) +{ + QString key = QString::number(expanded) + ":" + QString::number(height); + if (pmCache.contains(key)) { + return pmCache.value(key); + } + + QString name = expanded ? "dropdown_expanded" : "dropdown_collapsed"; + QPixmap pixmap = tryLoadImage(QStringLiteral("theme:") + themeManager->assetPath(QStringLiteral("icons/") + name), + QSize(height, height), true); + pmCache.insert(key, pixmap); return pixmap; } @@ -506,11 +520,30 @@ QPixmap ManaSymbolPixmapGenerator::generatePixmap(const QString &symbol, const Q QHash ManaSymbolPixmapGenerator::masterCache; QHash ManaSymbolPixmapGenerator::scaledCache; +QPixmap loadColorAdjustedPixmap(const QString &name) +{ + // Prefer an authored scheme-qualified variant when one exists for this asset. + const QString variant = themeManager->schemeVariantPath(QStringView(name).mid(QStringLiteral("theme:").size())); + if (!variant.isEmpty()) { + return QPixmap(QStringLiteral("theme:") + variant); + } + + // Legacy fallback: runtime-invert for dark mode when no authored variant. + if (qApp->palette().windowText().color().lightness() > 200) { + QImage img(name); + img.invertPixels(); + QPixmap result; + result.convertFromImage(img); + return result; + } else { + return QPixmap(name); + } +} + QPixmap themePixmap(QStringView prefix) { const QString resolved = themeManager->assetPath(prefix); - const QPixmap sentinel = loadSentinelSvgPixmap(resolved); - return sentinel.isNull() ? QPixmap(QStringLiteral("theme:") + resolved) : sentinel; + return QPixmap(QStringLiteral("theme:") + resolved); } void clearPixmapGeneratorCaches() @@ -520,6 +553,7 @@ void clearPixmapGeneratorCaches() PingPixmapGenerator::clear(); CountryPixmapGenerator::clear(); UserLevelPixmapGenerator::clear(); + LockPixmapGenerator::clear(); DropdownIconPixmapGenerator::clear(); ManaSymbolPixmapGenerator::clear(); } diff --git a/cockatrice/src/interface/pixel_map_generator.h b/cockatrice/src/interface/pixel_map_generator.h index 951f4231b..7c01bb332 100644 --- a/cockatrice/src/interface/pixel_map_generator.h +++ b/cockatrice/src/interface/pixel_map_generator.h @@ -106,6 +106,19 @@ public: } }; +class LockPixmapGenerator +{ +private: + static QMap pmCache; + +public: + static QPixmap generatePixmap(int height); + static void clear() + { + pmCache.clear(); + } +}; + class DropdownIconPixmapGenerator { private: @@ -147,11 +160,13 @@ public: } }; -// Returns a "theme:" asset (with no file extension in prefix), preferring the +QPixmap loadColorAdjustedPixmap(const QString &name); + +// Loads a "theme:" asset (with no file extension in prefix), preferring the // scheme-qualified variant (prefix-dark / prefix-light, resolved via -// ThemeManager::assetPath) and falling back to the plain asset. Token-driven -// SVGs resolve their `currentColor` sentinel from the palette. Use for -// scheme-sensitive pixmaps like backgrounds, the card back, and the app logo. +// ThemeManager::assetPath) and falling back to the plain asset. Callers load +// the returned path directly. Use for scheme-sensitive pixmaps like +// backgrounds, the card back, and the app logo. QPixmap themePixmap(QStringView prefix); // Clears every PixmapGenerator's static cache so scheme variants are diff --git a/cockatrice/src/interface/recording.cpp b/cockatrice/src/interface/recording.cpp deleted file mode 100644 index 2b11255f9..000000000 --- a/cockatrice/src/interface/recording.cpp +++ /dev/null @@ -1,102 +0,0 @@ -#include "recording.h" - -#include "pqEventTypes.h" - -#include -#include -#include -#include - -XMLEventObserver::XMLEventObserver(QObject *parent) : pqEventObserver(parent) -{ -} - -XMLEventObserver::~XMLEventObserver() = default; - -void XMLEventObserver::setStream(QTextStream *stream) -{ - if (xmlStream) { - xmlStream->writeEndElement(); - xmlStream->writeEndDocument(); - xmlStream.reset(); - } - if (Stream) { - *Stream << xmlString; - } - xmlString.clear(); - pqEventObserver::setStream(stream); - if (Stream) { - xmlStream.reset(new QXmlStreamWriter(&xmlString)); - xmlStream->setAutoFormatting(true); - xmlStream->writeStartDocument(); - xmlStream->writeStartElement(QStringLiteral("events")); - } -} - -void XMLEventObserver::onRecordEvent(const QString &widget, - const QString &command, - const QString &arguments, - const int &eventType) -{ - if (!xmlStream) { - return; - } - - xmlStream->writeStartElement(QStringLiteral("event")); - xmlStream->writeAttribute(QStringLiteral("widget"), widget); - if (eventType == pqEventTypes::ACTION_EVENT) { - xmlStream->writeAttribute(QStringLiteral("command"), command); - } else { // pqEventTypes::CHECK_EVENT - xmlStream->writeAttribute(QStringLiteral("property"), command); - } - xmlStream->writeAttribute(QStringLiteral("arguments"), arguments); - xmlStream->writeEndElement(); -} - -XMLEventSource::XMLEventSource(QObject *parent) : pqEventSource(parent) -{ -} - -XMLEventSource::~XMLEventSource() = default; - -void XMLEventSource::setContent(const QString &xmlFileName) -{ - xmlStream.reset(); - - QFile xml(xmlFileName); - if (!xml.open(QIODevice::ReadOnly)) { - qCWarning(RecordingLog) << "Could not read test file" << xmlFileName; - return; - } - - xmlStream.reset(new QXmlStreamReader(xml.readAll())); -} - -int XMLEventSource::getNextEvent(QString &widget, QString &command, QString &arguments, int &eventType) -{ - if (!xmlStream) { - return DONE; - } - - while (!xmlStream->atEnd()) { - if (xmlStream->readNext() != QXmlStreamReader::StartElement || xmlStream->name() != QStringLiteral("event")) { - continue; - } - - const QXmlStreamAttributes attributes = xmlStream->attributes(); - eventType = pqEventTypes::ACTION_EVENT; - widget = attributes.value(QStringLiteral("widget")).toString(); - command = attributes.value(QStringLiteral("command")).toString(); - if (command.isEmpty()) { - // A recorded check event carries a property instead of a command. - command = attributes.value(QStringLiteral("property")).toString(); - } - arguments = attributes.value(QStringLiteral("arguments")).toString(); - return SUCCESS; - } - - if (xmlStream->hasError()) { - qCWarning(RecordingLog) << "Malformed test file:" << xmlStream->errorString(); - } - return DONE; -} diff --git a/cockatrice/src/interface/recording.h b/cockatrice/src/interface/recording.h deleted file mode 100644 index a5d813ea9..000000000 --- a/cockatrice/src/interface/recording.h +++ /dev/null @@ -1,54 +0,0 @@ -#ifndef COCKATRICE_RECORDING_H -#define COCKATRICE_RECORDING_H - -#include "pqEventObserver.h" -#include "pqEventSource.h" - -#include -#include - -inline Q_LOGGING_CATEGORY(RecordingLog, "recording"); - -class QXmlStreamReader; -class QXmlStreamWriter; - -/** - * @brief Writes a session recording as an XML test file. - * - * The events are buffered in memory and flushed to the stream when recording - * ends, because the stream is handed over once the file name is known. - */ -class XMLEventObserver : public pqEventObserver -{ - QScopedPointer xmlStream; - QString xmlString; - -public: - explicit XMLEventObserver(QObject *parent); - ~XMLEventObserver() override; - -protected: - void setStream(QTextStream *stream) override; - void onRecordEvent(const QString &widget, - const QString &command, - const QString &arguments, - const int &eventType) override; -}; - -/** - * @brief Plays the events of an XML test file back, one at a time. - */ -class XMLEventSource : public pqEventSource -{ - QScopedPointer xmlStream; - -public: - explicit XMLEventSource(QObject *parent); - ~XMLEventSource() override; - -protected: - void setContent(const QString &xmlFileName) override; - int getNextEvent(QString &widget, QString &command, QString &arguments, int &eventType) override; -}; - -#endif // COCKATRICE_RECORDING_H diff --git a/cockatrice/src/interface/theme_config.cpp b/cockatrice/src/interface/theme_config.cpp index 54143d7d3..652e322c8 100644 --- a/cockatrice/src/interface/theme_config.cpp +++ b/cockatrice/src/interface/theme_config.cpp @@ -304,150 +304,4 @@ QPalette PaletteConfig::apply(QPalette base) const } return base; -} - -bool FontConfig::hasFonts() const -{ - return !fonts.isEmpty(); -} - -QString FontConfig::toToml() const -{ - QMetaEnum roleEnum = QMetaEnum::fromType(); - - QString entries; - - for (auto it = fonts.cbegin(); it != fonts.cend(); ++it) { - const char *roleName = roleEnum.valueToKey(it.key()); - - if (!roleName) { - continue; - } - - QString family = it.value().family().trimmed(); - int pointSize = it.value().pointSize(); - - if (family.isEmpty() || pointSize <= 0) { - continue; - } - - entries += QString("%1 = \"%2, %3\"\n").arg(QString(roleName), -20).arg(family).arg(pointSize); - } - - if (entries.isEmpty()) { - return {}; - } - - return "[Fonts]\n" + entries + "\n"; -} - -QString FontConfig::fileName() -{ - return "fonts.toml"; -} - -FontConfig FontConfig::fromFile(const QString &filePath) -{ - FontConfig cfg; - - QFile f(filePath); - - if (!f.open(QIODevice::ReadOnly | QIODevice::Text)) { - return cfg; - } - - QMetaEnum roleEnum = QMetaEnum::fromType(); - - QString currentSection; - - QTextStream in(&f); - - while (!in.atEnd()) { - QString line = in.readLine().trimmed(); - - if (line.isEmpty() || line.startsWith('#') || line.startsWith(';')) { - continue; - } - - if (line.startsWith('[') && line.endsWith(']')) { - currentSection = line.mid(1, line.length() - 2).trimmed(); - continue; - } - - if (currentSection.compare("Fonts", Qt::CaseInsensitive) != 0) { - continue; - } - - int eq = line.indexOf('='); - - if (eq < 0) { - continue; - } - - QString key = line.left(eq).trimmed(); - QString value = line.mid(eq + 1).trimmed(); - - // Strip inline comments if preceded by whitespace - for (int i = 1; i < value.size(); ++i) { - if ((value[i] == '#' || value[i] == ';') && value[i - 1].isSpace()) { - value = value.left(i).trimmed(); - break; - } - } - - // Strip surrounding quotes, if any - if (value.size() >= 2 && - ((value.startsWith('"') && value.endsWith('"')) || (value.startsWith('\'') && value.endsWith('\'')))) { - value = value.mid(1, value.size() - 2).trimmed(); - } - - int comma = value.lastIndexOf(','); - - if (comma < 0) { - continue; - } - - QString family = value.left(comma).trimmed(); - - // Tolerate a partially-quoted family, e.g. "Inter", 10 - if (family.size() >= 2 && - ((family.startsWith('"') && family.endsWith('"')) || (family.startsWith('\'') && family.endsWith('\'')))) { - family = family.mid(1, family.size() - 2).trimmed(); - } - - bool ok = false; - int pointSize = value.mid(comma + 1).trimmed().toInt(&ok); - - if (!ok || family.isEmpty() || pointSize <= 0) { - continue; - } - - if (key.startsWith("AppFont::")) { - key = key.mid(QStringLiteral("AppFont::").size()); - } - - int roleInt = roleEnum.keyToValue(key.toUtf8().constData()); - - if (roleInt < 0) { - continue; - } - - // Canonical family + point size only: a fresh QFont carries default - // (non-bold, non-italic) weight/style, so nothing caller-side leaks in. - // No validation against installed fonts; Qt substitution applies. - QFont font(family); - font.setPointSize(pointSize); - cfg.fonts[static_cast(roleInt)] = font; - } - - return cfg; -} - -FontConfig FontConfig::fromThemeDir(const QString &themeDirPath) -{ - if (themeDirPath.isEmpty()) { - return {}; - } - - return fromFile(QDir(themeDirPath).absoluteFilePath(fileName())); -} +} \ No newline at end of file diff --git a/cockatrice/src/interface/theme_config.h b/cockatrice/src/interface/theme_config.h index 84601a2bf..8b91613f5 100644 --- a/cockatrice/src/interface/theme_config.h +++ b/cockatrice/src/interface/theme_config.h @@ -2,7 +2,6 @@ #define COCKATRICE_THEME_CONFIG_H #include -#include #include #include #include @@ -24,23 +23,6 @@ enum Role Q_ENUM_NS(Role) } // namespace AppColor -// Application-specific font roles, one configurable family + point size per -// purpose. Stored in a shared fonts.toml under a [Fonts] section (one file per -// theme, not split by light/dark). Only family and point size are stored; -// weight/italic are stripped on load and stay caller-side concerns. -namespace AppFont -{ -Q_NAMESPACE -enum Role -{ - InterfaceDefault, - ChatLog, - CardText, - DeckList, -}; -Q_ENUM_NS(Role) -} // namespace AppFont - struct ThemeConfig { QString colorScheme; @@ -78,33 +60,4 @@ struct PaletteConfig QPalette apply(QPalette base) const; }; -/** @brief Per-purpose font configuration, stored as family + point size only. - * - * Serialized to a shared fonts.toml file with a [Fonts] section, e.g. - * @code - * [Fonts] - * InterfaceDefault = "Inter, 10" - * @endcode - */ -struct FontConfig -{ - QMap fonts; - - bool operator==(const FontConfig &rhs) const - { - return fonts == rhs.fonts; - } - bool operator!=(const FontConfig &rhs) const - { - return !(*this == rhs); - } - bool hasFonts() const; - QString toToml() const; - - static QString fileName(); - - static FontConfig fromFile(const QString &filePath); - static FontConfig fromThemeDir(const QString &themeDirPath); -}; - -#endif // COCKATRICE_THEME_CONFIG_H +#endif // COCKATRICE_THEME_CONFIG_H \ No newline at end of file diff --git a/cockatrice/src/interface/theme_icon.cpp b/cockatrice/src/interface/theme_icon.cpp deleted file mode 100644 index 161c436ca..000000000 --- a/cockatrice/src/interface/theme_icon.cpp +++ /dev/null @@ -1,300 +0,0 @@ -#include "theme_icon.h" - -#include "libcockatrice/utility/svg_recolor.h" -#include "theme_manager.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace -{ -/** - * @brief Palette color that replaces `currentColor`, following the icon mode. - */ -QByteArray sentinelColor(QIcon::Mode mode, QPalette::ColorRole role) -{ - const QPalette::ColorGroup group = mode == QIcon::Disabled ? QPalette::Disabled : QPalette::Active; - const QPalette::ColorRole effective = - mode == QIcon::Selected && role == QPalette::WindowText ? QPalette::HighlightedText : role; - return qApp->palette().color(group, effective).name(QColor::HexRgb).toLatin1(); -} - -/** - * @brief Reads an SVG through the `theme:` search path. - */ -QByteArray readSvg(const QString &resolvedPath) -{ - QFile file(QStringLiteral("theme:") + resolvedPath); - if (!file.open(QIODevice::ReadOnly)) { - return {}; - } - return file.readAll(); -} - -/** - * @brief Renders SVG bytes, scaled to @p size when one is given. - * - * An empty size means the asset's intrinsic size; @p devicePixelRatio only - * applies in that case so HiDPI callers still get a crisp glyph. - */ -QPixmap renderSvg(const QByteArray &data, const QSize &size, qreal devicePixelRatio) -{ - QSvgRenderer renderer(data); - if (!renderer.isValid()) { - return {}; - } - - QSize renderSize = size; - if (renderSize.isEmpty()) { - renderSize = renderer.defaultSize(); - renderSize = - QSize(qRound(renderSize.width() * devicePixelRatio), qRound(renderSize.height() * devicePixelRatio)); - } - if (!renderSize.isValid() || renderSize.isEmpty()) { - return {}; - } - - QPixmap pixmap(renderSize); - pixmap.fill(Qt::transparent); - QPainter painter(&pixmap); - renderer.render(&painter); - return pixmap; -} - -bool hasSentinel(const QByteArray &svg) -{ - return !svg.isEmpty() && QString::fromUtf8(svg).contains(QStringLiteral("currentColor"), Qt::CaseInsensitive); -} - -QString cacheKey(const QString &path, const QByteArray &variant, const QSize &size, qreal devicePixelRatio) -{ - return path + QLatin1Char('|') + QString::fromLatin1(variant) + QLatin1Char('|') + QString::number(size.width()) + - QLatin1Char('x') + QString::number(size.height()) + QLatin1Char('@') + QString::number(devicePixelRatio); -} - -/** - * @brief QIcon engine rendering a `theme:` SVG with `currentColor` resolved on demand. - * - * Qt's SVG renderer has no ambient color, so the sentinel is substituted from - * the current palette on every pixmap request. Asset resolution, the file bytes - * and the intrinsic size are cached until the theme changes: a repaint then - * does no file I/O at all. The render cache is keyed by resolved path and pixel - * size plus a variant: the palette color for sentinel SVGs, the icon mode for - * assets that carry their own colors. A palette change therefore produces new - * keys instead of reusing art built under the previous palette, and the - * non-sentinel path (raster overrides, plain SVGs) is cached like any other. - */ -class ThemeSvgIconEngine final : public QObject, public QIconEngine -{ -public: - ThemeSvgIconEngine(QString _prefix, QPalette::ColorRole _role) : prefix(std::move(_prefix)), role(_role) - { - if (themeManager) { - // A theme switch changes the resolved asset (scheme-qualified - // variants, raster overrides) and a palette change invalidates - // every cached colour, so both drop the caches instead of - // re-reading theme.cfg and the assets on every repaint. - connect(themeManager, &ThemeManager::themeChanged, this, &ThemeSvgIconEngine::invalidate); - connect(themeManager, &ThemeManager::paletteChanged, this, &ThemeSvgIconEngine::invalidate); - } - } - - QIconEngine *clone() const override - { - return new ThemeSvgIconEngine(prefix, role); - } - - void paint(QPainter *painter, const QRect &rect, QIcon::Mode mode, QIcon::State) override - { - const qreal devicePixelRatio = painter->device() ? painter->device()->devicePixelRatioF() : 1.0; - const QSize logicalSize = fitToSize(rect.size()); - if (logicalSize.isEmpty()) { - return; - } - const QSize pixelSize(qRound(logicalSize.width() * devicePixelRatio), - qRound(logicalSize.height() * devicePixelRatio)); - const QPixmap pixmap = render(pixelSize, devicePixelRatio, mode); - if (!pixmap.isNull()) { - // QRect::center() would floor and drop the last row/column of a - // 16x16 glyph; the center has to be fractional so glyphs stay - // unshifted and unsclipped in item views. - const QSizeF contentSize = pixmap.deviceIndependentSize(); - const QRectF targetRect( - QRectF(rect).center() - QPointF(contentSize.width() / 2.0, contentSize.height() / 2.0), contentSize); - painter->drawPixmap(targetRect, pixmap, QRectF(pixmap.rect())); - } - } - - QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State) override - { - return render(fitToSize(size), 1.0, mode); - } - - QPixmap scaledPixmap(const QSize &size, QIcon::Mode mode, QIcon::State, qreal scale) override - { - const QSize logicalSize = fitToSize(size); -#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0) - const QSize pixelSize(qRound(logicalSize.width() * scale), qRound(logicalSize.height() * scale)); -#else - // Qt < 6.8 passes the device-dependent size to the engine. - const QSize pixelSize = logicalSize; -#endif - return render(pixelSize, scale, mode); - } - - QSize actualSize(const QSize &size, QIcon::Mode, QIcon::State) override - { - return fitToSize(size); - } - -private: - void invalidate() - { - hasResolvedAsset = false; - hasIntrinsicSize = false; - cache.clear(); - } - - void ensureResolved() const - { - if (hasResolvedAsset && (!themeManager || themeManager->getCurrentThemePath() == resolvedThemePath)) { - return; - } - resolvedThemePath = themeManager ? themeManager->getCurrentThemePath() : QString(); - resolvedPath = themeManager ? themeManager->assetPath(prefix) : QString(); - resolvedAssetIsSvg = resolvedPath.endsWith(QStringLiteral(".svg"), Qt::CaseInsensitive); - resolvedSvg = resolvedAssetIsSvg ? readSvg(resolvedPath) : QByteArray(); - resolvedHasSentinel = hasSentinel(resolvedSvg); - hasResolvedAsset = true; - hasIntrinsicSize = false; - } - - QSize intrinsicSize() const - { - ensureResolved(); - if (!hasIntrinsicSize) { - if (resolvedAssetIsSvg) { - QSvgRenderer renderer(resolvedSvg); - intrinsicSizeCache = renderer.isValid() ? renderer.defaultSize() : QSize(); - } else { - // A theme may override a glyph with a raster; take its real - // aspect ratio instead of assuming the 24x24 SVG default, so - // actualSize() and the rendered pixmap agree. - QImageReader reader(QStringLiteral("theme:") + resolvedPath); - intrinsicSizeCache = reader.size(); - } - if (intrinsicSizeCache.isEmpty()) { - intrinsicSizeCache = QSize(24, 24); - } - hasIntrinsicSize = true; - } - return intrinsicSizeCache; - } - - QSize fitToSize(const QSize &size) const - { - if (size.isEmpty()) { - return size; - } - return intrinsicSize().scaled(size, Qt::KeepAspectRatio); - } - - QPixmap fromAsset(const QSize &pixelSize, QIcon::Mode mode) const - { - QPixmap pixmap(QStringLiteral("theme:") + resolvedPath); - if (!pixelSize.isEmpty() && pixmap.size() != pixelSize) { - pixmap = pixmap.scaled(pixelSize, Qt::KeepAspectRatio, Qt::SmoothTransformation); - } - if (mode == QIcon::Disabled && !pixmap.isNull()) { - pixmap = QApplication::style()->generatedIconPixmap(QIcon::Disabled, pixmap, nullptr); - } - return pixmap; - } - - QPixmap render(const QSize &pixelSize, qreal devicePixelRatio, QIcon::Mode mode) const - { - ensureResolved(); - - // Same cache for both paths: sentinel art varies by palette color, art - // with its own colors varies by mode (Disabled is generated). A color - // variant is never a bare digit, so the two key spaces cannot collide. - const QByteArray variant = - resolvedHasSentinel ? sentinelColor(mode, role) : QByteArray::number(static_cast(mode)); - const QString key = cacheKey(resolvedPath, variant, pixelSize, devicePixelRatio); - const auto cached = cache.constFind(key); - if (cached != cache.constEnd()) { - return cached.value(); - } - - QPixmap pixmap; - if (resolvedHasSentinel) { - pixmap = renderSvg(resolveSvgColorSentinel(resolvedSvg, variant), pixelSize, devicePixelRatio); - } else { - // Authored art carries its own colors: use Qt's normal loader so - // raster overrides and non-SVG assets keep working. - pixmap = fromAsset(pixelSize, mode); - } - if (!pixmap.isNull()) { - // Set the ratio before caching: assigning it to a cached pixmap - // afterwards detaches (deep-copies) it on every paint. - pixmap.setDevicePixelRatio(devicePixelRatio); - } - if (cache.size() >= 64) { - cache.clear(); - } - cache.insert(key, pixmap); - return pixmap; - } - - QString prefix; - QPalette::ColorRole role; - mutable QHash cache; - mutable QString resolvedPath; - mutable QString resolvedThemePath; - mutable QByteArray resolvedSvg; - mutable QSize intrinsicSizeCache; - mutable bool resolvedAssetIsSvg = false; - mutable bool resolvedHasSentinel = false; - mutable bool hasResolvedAsset = false; - mutable bool hasIntrinsicSize = false; -}; -} // namespace - -QIcon loadThemedIcon(QStringView prefix, QPalette::ColorRole role) -{ - return QIcon(new ThemeSvgIconEngine(prefix.toString(), role)); -} - -QPixmap loadSentinelSvgPixmap(const QString &resolvedPath, QPalette::ColorRole role, const QSize &size) -{ - if (!resolvedPath.endsWith(QStringLiteral(".svg"), Qt::CaseInsensitive)) { - return {}; - } - - const QByteArray svg = readSvg(resolvedPath); - if (!hasSentinel(svg)) { - return {}; - } - - const QByteArray color = qApp->palette().color(role).name(QColor::HexRgb).toLatin1(); - return renderSvg(resolveSvgColorSentinel(svg, color), size, 1.0); -} diff --git a/cockatrice/src/interface/theme_icon.h b/cockatrice/src/interface/theme_icon.h deleted file mode 100644 index e26015ea1..000000000 --- a/cockatrice/src/interface/theme_icon.h +++ /dev/null @@ -1,50 +0,0 @@ -/** - * @file theme_icon.h - * @ingroup Interface - */ - -#ifndef THEME_ICON_H -#define THEME_ICON_H - -#include -#include -#include -#include -#include -#include - -/** - * @brief Builds a palette-aware icon from a `theme:` asset. - * - * SVG glyphs may use the `currentColor` sentinel. A plain QPixmap snapshot - * cannot follow palette changes, so this returns a QIcon whose engine resolves - * the sentinel from the current palette every time it is asked for a pixmap. - * Icons therefore stay legible when the user switches between light and dark - * themes without recreating any actions or buttons. - * - * @param prefix Asset prefix relative to the `theme:` search path, with no file - * extension (for example `icons/search`), matching themePixmap(). - * @param role Palette role whose color replaces the sentinel. Selected glyphs - * use HighlightedText unless a role other than WindowText is given. - * @return An icon that follows the application palette. - */ -QIcon loadThemedIcon(QStringView prefix, QPalette::ColorRole role = QPalette::WindowText); - -/** - * @brief Renders a resolved theme SVG when it carries the `currentColor` sentinel. - * - * Non-SVG assets and SVGs without the sentinel return a null pixmap so callers - * can fall back to their usual loading path (including legacy inversion). - * - * @param resolvedPath Asset path relative to the `theme:` search path, as - * returned by ThemeManager::assetPath (includes extension). - * @param role Palette role whose color replaces the sentinel. - * @param size Pixel size to render at; an empty size uses the SVG's intrinsic size. - * @return The recolored pixmap, or a null pixmap when the asset is not a - * sentinel-carrying SVG. - */ -QPixmap loadSentinelSvgPixmap(const QString &resolvedPath, - QPalette::ColorRole role = QPalette::WindowText, - const QSize &size = {}); - -#endif // THEME_ICON_H diff --git a/cockatrice/src/interface/theme_manager.cpp b/cockatrice/src/interface/theme_manager.cpp index f120af8e4..893cdc795 100644 --- a/cockatrice/src/interface/theme_manager.cpp +++ b/cockatrice/src/interface/theme_manager.cpp @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include @@ -128,10 +127,8 @@ static QString usableDefaultStyle(const QString &style) ThemeManager::ThemeManager(QObject *parent) : QObject(parent) { defaultStyleName = usableDefaultStyle(qApp->style()->objectName()); - // Capture the untouched application palette and font before any theme is - // applied. + // Capture the untouched application palette before any theme is applied. defaultPalette = qApp->palette(); - defaultFont = qApp->font(); ensureThemeDirectoryExists(); #if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)) connect(QGuiApplication::styleHints(), &QStyleHints::colorSchemeChanged, this, [this] { @@ -443,46 +440,6 @@ PaletteConfig ThemeManager::loadDefaultPaletteConfig(const QString &themeDirPath return cfg; } -FontConfig ThemeManager::loadFontConfig(const QString &themeDirPath) -{ - if (themeDirPath.isEmpty()) { - return {}; - } - return FontConfig::fromThemeDir(themeDirPath); -} - -FontConfig ThemeManager::loadDefaultFontConfig(const QString &themeDirPath, const QString &themeName) -{ - FontConfig cfg = FontConfig::fromThemeDir(themeDirPath); - if (!cfg.hasFonts()) { - // The shipped fonts.toml may live in the system theme directory rather - // than the resolved (user) theme directory, so built-in themes still - // get their curated fonts. - cfg = FontConfig::fromThemeDir(QDir(systemThemesBasePath()).absoluteFilePath(themeName)); - } - return cfg; -} - -bool ThemeManager::saveFontConfig(const QString &themeDirPath, const FontConfig &cfg) -{ - if (themeDirPath.isEmpty()) { - return false; - } - - QDir dir(themeDirPath); - if (!dir.exists()) { - dir.mkpath("."); - } - - QFile f(dir.absoluteFilePath(FontConfig::fileName())); - if (!f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) { - return false; - } - - QTextStream(&f) << cfg.toToml(); - return true; -} - bool ThemeManager::commitPalette(const QString &themeDirPath, const QString &colorScheme, const PaletteConfig &cfg) { if (!savePaletteConfig(themeDirPath, colorScheme, cfg)) { @@ -531,24 +488,6 @@ void ThemeManager::previewPalette(const PaletteConfig &cfg, const QString &schem applyStyleAndPalette(themeName, themeCfg, cfg, scheme); } -void ThemeManager::previewFonts(const FontConfig &cfg) -{ - currentFonts = cfg; - - // QApplication::setFont already sends a font change to every widget, so a - // repolish pass is not needed for fonts (unlike the palette path). - const auto it = cfg.fonts.constFind(AppFont::InterfaceDefault); - if (it != cfg.fonts.constEnd()) { - qApp->setFont(it.value()); - } else { - // A config without InterfaceDefault means "no override": restore the - // startup font instead of leaving the last preview applied. - qApp->setFont(defaultFont); - } - - emit fontsChanged(); -} - void ThemeManager::applyStyleAndPalette(const QString &themeName, const ThemeConfig &themeCfg, const PaletteConfig &palCfg, @@ -652,56 +591,6 @@ QColor ThemeManager::appColor(AppColor::Role role) const return accent; } -QFont ThemeManager::appFont(AppFont::Role role) const -{ - const auto it = currentFonts.fonts.constFind(role); - if (it != currentFonts.fonts.constEnd()) { - return it.value(); - } - - // Role fallbacks preserve the pre-theme defaults when no fonts.toml is - // present: an unset role resolves to the application font. Surfaces that - // hardcoded a different family ask for it explicitly: counter painters - // through cardTextFont(), the deck view headers and printed deck list - // through deckListFont(), the report dialogs through - // report_utils::reportLogFont(). Only the family basis is fixed there; - // sizes stay caller-side. - return qApp->font(); -} - -bool ThemeManager::hasAppFont(AppFont::Role role) const -{ - return currentFonts.fonts.contains(role); -} - -QFont ThemeManager::cardTextFont() const -{ - if (hasAppFont(AppFont::CardText)) { - return appFont(AppFont::CardText); - } - QFont serifFont(QStringLiteral("Serif")); - serifFont.setStyleHint(QFont::Serif); - return serifFont; -} - -QFont ThemeManager::deckListFont() const -{ - if (hasAppFont(AppFont::DeckList)) { - return appFont(AppFont::DeckList); - } - QFont serifFont(QStringLiteral("Serif")); - serifFont.setStyleHint(QFont::Serif); - return serifFont; -} - -QFont ThemeManager::defaultAppFont(AppFont::Role /*role*/) const -{ - // No per-role scaling and no preview: an unset role resolves to the font - // captured at startup, which is what the theme falls back to once the - // editor closes. - return defaultFont; -} - void ThemeManager::themeChangedSlot() { QString themeName = SettingsCache::instance().getThemeName(); @@ -753,19 +642,6 @@ void ThemeManager::themeChangedSlot() applyStyleAndPalette(themeName, themeCfg, palette, activeScheme); - // ── Load fonts: shared per theme, no light/dark split ─────────────────── - FontConfig fonts = loadDefaultFontConfig(dirPath, themeName); - currentFonts = fonts; - const auto fontIt = currentFonts.fonts.constFind(AppFont::InterfaceDefault); - if (fontIt != currentFonts.fonts.constEnd()) { - qApp->setFont(fontIt.value()); - } else { - // No theme font: restore the pristine application font captured at - // startup, so a reverted preview cannot leak into the live theme. - qApp->setFont(defaultFont); - } - emit fontsChanged(); - QStringList resources; if (!dirPath.isEmpty()) { resources << dir.absolutePath(); diff --git a/cockatrice/src/interface/theme_manager.h b/cockatrice/src/interface/theme_manager.h index ffe1043b5..c1ab65685 100644 --- a/cockatrice/src/interface/theme_manager.h +++ b/cockatrice/src/interface/theme_manager.h @@ -11,7 +11,6 @@ #include #include -#include #include #include #include @@ -48,15 +47,10 @@ private: // palette is applied. Used as the base when a theme supplies no palette, so // switching away from a custom palette restores the original colours. QPalette defaultPalette; - // Pristine application font captured at startup, before any theme font is - // applied. Restored when a theme (or a preview) supplies no InterfaceDefault - // font, so switching away from a themed font cannot leave it behind. - QFont defaultFont; QString currentThemePath; std::array brushes; QStringMap availableThemes; QMap currentAppColors; - FontConfig currentFonts; /* Internal cache for multiple backgrounds */ @@ -111,9 +105,6 @@ public: // Load/save per-scheme palette colors static PaletteConfig loadPaletteConfig(const QString &themeDirPath, const QString &colorScheme); static bool savePaletteConfig(const QString &themeDirPath, const QString &colorScheme, const PaletteConfig &cfg); - // Load/save shared per-theme fonts (fonts.toml, not split by scheme) - static FontConfig loadFontConfig(const QString &themeDirPath); - static bool saveFontConfig(const QString &themeDirPath, const FontConfig &cfg); // Resolve prefix to a scheme-qualified "theme:" path. Existence is probed // internally across the formats themes may ship (.png/.jpg/.svg), so // callers load the returned path directly. Prefers "-" @@ -132,9 +123,6 @@ public: // theme directory when it is absent from the resolved (user) directory. static PaletteConfig loadDefaultPaletteConfig(const QString &themeDirPath, const QString &themeName, const QString &colorScheme); - // Load the theme's shipped default fonts, falling back to the system theme - // directory when fonts.toml is absent from the resolved (user) directory. - static FontConfig loadDefaultFontConfig(const QString &themeDirPath, const QString &themeName); /** @brief Writes cfg to disk as the theme's palette-.toml and updates the * theme's stored colour scheme to match. Shared by PaletteEditorDialog::onSave * and FirstRunWizard's theme step so the two "generate + keep" paths can't drift. */ @@ -144,31 +132,10 @@ public: void reloadCurrentTheme(); void previewPalette(const PaletteConfig &cfg, const QString &scheme); - void previewFonts(const FontConfig &cfg); // Resolves an application color role: the theme's stored [AppColors] value // when present, otherwise a palette-accent-derived fallback. QColor appColor(AppColor::Role role) const; - /** @brief Resolves an application font role: the theme's stored [Fonts] - * value when present, otherwise the application font. Roles that - * had a historical hardcoded family ask for it through - * cardTextFont() and deckListFont() instead. */ - QFont appFont(AppFont::Role role) const; - /** @brief Whether the active theme defines this role in fonts.toml. */ - bool hasAppFont(AppFont::Role role) const; - /** @brief The CardText role with its historical Serif fallback. Used by the - * counter painters, which were Serif before the role existed. */ - QFont cardTextFont() const; - /** @brief The DeckList role with its historical Serif fallback. Used by the - * two surfaces that hardcoded Serif before the role existed (the - * deck view zone headers and the printed deck list); every other - * DeckList reader falls back to the application font. */ - QFont deckListFont() const; - /** @brief Resolves an application font role against the startup font only, - * ignoring any previewed config in currentFonts. Editors that show - * "what this role resolves to" must use this, because appFont() - * reflects a live preview while the editor is open. */ - QFont defaultAppFont(AppFont::Role role) const; QBrush &getBgBrush(Role zone); QBrush getExtraBgBrush(Role zone, int zoneId = 0); @@ -177,7 +144,6 @@ protected slots: signals: void themeChanged(); void paletteChanged(); - void fontsChanged(); }; extern ThemeManager *themeManager; diff --git a/cockatrice/src/interface/widgets/cards/art_crop_attribution.cpp b/cockatrice/src/interface/widgets/cards/art_crop_attribution.cpp index 8475a0ed9..c4b347047 100644 --- a/cockatrice/src/interface/widgets/cards/art_crop_attribution.cpp +++ b/cockatrice/src/interface/widgets/cards/art_crop_attribution.cpp @@ -1,6 +1,5 @@ #include "art_crop_attribution.h" -#include "../../theme_manager.h" #include "libcockatrice/card/printing/printing_info.h" #include @@ -36,10 +35,7 @@ QRectF paintArtAttribution(QPainter &painter, painter.save(); - // Family comes from the CardText theme role; the incoming painter size - // stays the basis for the scale factor exactly as before. QFont font = painter.font(); - font.setFamily(themeManager->appFont(AppFont::CardText).family()); font.setPointSizeF(qMax(6.0, font.pointSizeF() * scale)); painter.setFont(font); diff --git a/cockatrice/src/interface/widgets/cards/card_art_utils.cpp b/cockatrice/src/interface/widgets/cards/card_art_utils.cpp index a7e633ad2..ebf79282e 100644 --- a/cockatrice/src/interface/widgets/cards/card_art_utils.cpp +++ b/cockatrice/src/interface/widgets/cards/card_art_utils.cpp @@ -2,8 +2,6 @@ #include "libcockatrice/card/card_info.h" -#include -#include #include #include #include @@ -20,23 +18,4 @@ QPixmap rotateSidewaysLayoutArt(const QPixmap &art, const ExactCard &card) transform.rotate(90); return art.transformed(transform, Qt::SmoothTransformation); } - -QPixmap cropCardArt(const QPixmap &art, const ExactCard &card) -{ - if (art.isNull()) { - return {}; - } - - const QPixmap source = rotateSidewaysLayoutArt(art, card); - const bool landscape = card.getInfo().getUiAttributes().landscapeOrientation; - const QSize size = source.size(); - const int marginX = size.width() * 0.07; - // Landscape name boxes extend below 5% of the upright image. Remove the - // whole box here, rather than relying on the banner's narrow viewport to - // hide it: the same saved offset is also used by the taller profile popup. - const int topMargin = size.height() * (landscape ? 0.15 : 0.11); - const int bottomMargin = size.height() * 0.45; - const QRect crop(marginX, topMargin, size.width() - 2 * marginX, size.height() - topMargin - bottomMargin); - return source.copy(crop.intersected(source.rect())); -} -} // namespace CardArtUtils +} // namespace CardArtUtils \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/cards/card_art_utils.h b/cockatrice/src/interface/widgets/cards/card_art_utils.h index ac3b82380..5c331a12c 100644 --- a/cockatrice/src/interface/widgets/cards/card_art_utils.h +++ b/cockatrice/src/interface/widgets/cards/card_art_utils.h @@ -20,13 +20,6 @@ namespace CardArtUtils * @return @p art rotated 90° clockwise for sideways-layout cards, else @p art. */ QPixmap rotateSidewaysLayoutArt(const QPixmap &art, const ExactCard &card); - -/** - * Return the upright artwork used by banner previews, user rows and profile - * popups. The crop excludes conventional name and rules boxes before callers apply - * their saved pan and zoom, so a taller popup cannot expose the card frame. - */ -QPixmap cropCardArt(const QPixmap &art, const ExactCard &card); } // namespace CardArtUtils -#endif // CARD_ART_UTILS_H +#endif // CARD_ART_UTILS_H \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp index 8f02ebcde..0d94e7209 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp @@ -43,6 +43,11 @@ #include #include +static constexpr qreal MTG_CARD_ASPECT_RATIO = 1.396; +// static constexpr qreal YUGIOH_CARD_ASPECT_RATIO = 1.457; +static constexpr qreal ASPECT_RATIO = MTG_CARD_ASPECT_RATIO; + +static constexpr int BASE_WIDTH = 200; static constexpr int BASE_HEIGHT = 200; static constexpr int ENLARGED_PIXMAP_OFFSET = 10; @@ -157,11 +162,12 @@ void CardInfoPictureWidget::resizeEvent(QResizeEvent *event) */ void CardInfoPictureWidget::setScaleFactor(const int scale) { - const QSize newSize = sizeForScaleFactor(scale); + const int newWidth = BASE_WIDTH * scale / 100; + const int newHeight = static_cast(newWidth * ASPECT_RATIO); scaleFactor = scale; - setFixedSize(newSize); + setFixedSize(newWidth, newHeight); updatePixmap(); emit cardScaleFactorChanged(scale); @@ -260,13 +266,8 @@ void CardInfoPictureWidget::paintEvent(QPaintEvent *event) */ QSize CardInfoPictureWidget::sizeHint() const { - return sizeForScaleFactor(scaleFactor); -} - -QSize CardInfoPictureWidget::sizeForScaleFactor(int scaleFactor) -{ - const int width = BASE_WIDTH * scaleFactor / 100; - return {width, static_cast(width * ASPECT_RATIO)}; + return {static_cast(BASE_WIDTH * scaleFactor / 100.0), + static_cast(BASE_WIDTH * scaleFactor / 100.0 * ASPECT_RATIO)}; } /** diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h index 0eb731d92..8d2d63736 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h @@ -28,11 +28,6 @@ class CardInfoPictureWidget : public QWidget Q_OBJECT public: - /// Width of a card picture at 100 % scale, in pixels. - static constexpr int BASE_WIDTH = 200; - /// Height / width of a card picture. - static constexpr qreal ASPECT_RATIO = 1.396; - explicit CardInfoPictureWidget(QWidget *parent = nullptr, bool hoverToZoomEnabled = false, bool raiseOnEnter = false); @@ -42,12 +37,6 @@ public: } [[nodiscard]] QSize sizeHint() const override; - /** - * @brief The size a card picture has at @p scaleFactor percent. - * @param scaleFactor Percentage of BASE_WIDTH, as set by the card size slider. - */ - [[nodiscard]] static QSize sizeForScaleFactor(int scaleFactor); - public slots: void setCard(const ExactCard &card); void setScaleFactor(int scale); // New slot for scaling diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.cpp index 56fe0bda4..04fe9ab69 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.cpp @@ -1,7 +1,5 @@ #include "card_info_picture_with_text_overlay_widget.h" -#include "../../theme_manager.h" - #include #include #include @@ -45,7 +43,6 @@ CardInfoPictureWithTextOverlayWidget::CardInfoPictureWithTextOverlayWidget(QWidg fontSize(fontSize), textAlignment(alignment), highlighted(false) { this->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - connect(themeManager, &ThemeManager::fontsChanged, this, &CardInfoPictureWithTextOverlayWidget::applyCardTextFont); } /** @@ -100,13 +97,6 @@ void CardInfoPictureWithTextOverlayWidget::setTextAlignment(const Qt::Alignment update(); } -void CardInfoPictureWithTextOverlayWidget::applyCardTextFont() -{ - // The overlay paint reads the CardText role font at paint time, so a - // theme font change only needs a repaint here. - update(); -} - void CardInfoPictureWithTextOverlayWidget::setHighlighted(bool _highlighted) { if (highlighted == _highlighted) { @@ -178,10 +168,8 @@ void CardInfoPictureWithTextOverlayWidget::paintEvent(QPaintEvent *event) return; } - // Calculate the optimal font size. The family comes from the CardText - // theme role; the fontSize member stays the starting size and the - // shrink-to-fit logic below is unchanged. - QFont font = themeManager->appFont(AppFont::CardText); + // Calculate the optimal font size + QFont font = painter.font(); int optimalFontSize = fontSize; // Start with the user-defined font size const QFontMetrics baseMetrics(font); int textWidth = pixmapRect.width(); @@ -296,7 +284,7 @@ QSize CardInfoPictureWithTextOverlayWidget::minimumSizeHint() const const QSize pixmapSize = pixmap.isNull() ? QSize(0, 0) : pixmap.size(); // Get the font metrics for the overlay text - QFont font = themeManager->appFont(AppFont::CardText); + QFont font; font.setPointSize(fontSize); const QFontMetrics fontMetrics(font); diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.h b/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.h index 41019f543..6c547dc13 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.h @@ -47,9 +47,6 @@ protected: void mousePressEvent(QMouseEvent *event) override; [[nodiscard]] QSize minimumSizeHint() const override; -private slots: - void applyCardTextFont(); - private: void drawOutlinedText(QPainter &painter, const QRect &textRect, diff --git a/cockatrice/src/interface/widgets/cards/card_picture_delegate.cpp b/cockatrice/src/interface/widgets/cards/card_picture_delegate.cpp deleted file mode 100644 index 781c767ef..000000000 --- a/cockatrice/src/interface/widgets/cards/card_picture_delegate.cpp +++ /dev/null @@ -1,83 +0,0 @@ -#include "card_picture_delegate.h" - -#include "../../../client/settings/cache_settings.h" -#include "../../card_picture_loader/card_picture_loader.h" -#include "card_art_utils.h" -#include "card_database_visual_display_model.h" -#include "libcockatrice/card/printing/exact_card.h" -#include "libcockatrice/settings/cards_display_settings.h" - -#include -#include -#include -#include -#include -#include - -CardPictureDelegate::CardPictureDelegate(CardDatabaseVisualDisplayModel *_model, QObject *parent) - : QStyledItemDelegate(parent), model(_model) -{ -} - -void CardPictureDelegate::setCardSize(const QSize &size) -{ - if (cardSize == size) { - return; - } - - cardSize = size; -} - -void CardPictureDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const -{ - if (model == nullptr) { - return; - } - - const ExactCard card = model->cardAt(index.row()); - if (!card) { - return; - } - - // The grid cell is the card plus SPACING; give the picture the rest. - const int inset = SPACING / 2; - const QRect cardArea = option.rect.adjusted(inset, inset, -inset, -inset); - - QPixmap pixmap; - CardPictureLoader::getCardBackLoadingInProgressPixmap(pixmap, cardArea.size()); - CardPictureLoader::getPixmap(pixmap, card, cardArea.size()); - - if (pixmap.isNull()) { - return; - } - - if (SettingsCache::instance().cardsDisplay().getAutoRotateSidewaysLayoutCards()) { - pixmap = CardArtUtils::rotateSidewaysLayoutArt(pixmap, card); - } - - // Fit the picture into the cell and center it, like CardInfoPictureWidget does. - const QSize pictureSize = pixmap.deviceIndependentSize().toSize().scaled(cardArea.size(), Qt::KeepAspectRatio); - const QRect pictureRect(cardArea.center().x() - pictureSize.width() / 2, - cardArea.center().y() - pictureSize.height() / 2, pictureSize.width(), - pictureSize.height()); - - const qreal radius = SettingsCache::instance().cardsDisplay().getRoundCardCorners() - ? 0.05 * static_cast(pictureRect.width()) - : 0.0; - - painter->save(); - painter->setRenderHint(QPainter::Antialiasing); - painter->setRenderHint(QPainter::SmoothPixmapTransform); - QPainterPath shape; - shape.addRoundedRect(pictureRect, radius, radius); - painter->setClipPath(shape); - // Source rect is in device pixels, target in logical ones: drawPixmap scales - // between them without the device pixel ratio being applied twice. - painter->drawPixmap(pictureRect, pixmap, QRectF(pixmap.rect())); - painter->restore(); -} - -QSize CardPictureDelegate::sizeHint(const QStyleOptionViewItem & /*option*/, const QModelIndex & /*index*/) const -{ - return cardSize + QSize(SPACING, SPACING); -} diff --git a/cockatrice/src/interface/widgets/cards/card_picture_delegate.h b/cockatrice/src/interface/widgets/cards/card_picture_delegate.h deleted file mode 100644 index 31e673624..000000000 --- a/cockatrice/src/interface/widgets/cards/card_picture_delegate.h +++ /dev/null @@ -1,45 +0,0 @@ -/** - * @file card_picture_delegate.h - * @ingroup CardWidgets - * @brief Paints a card picture for a visual card grid item. - */ - -#ifndef CARD_PICTURE_DELEGATE_H -#define CARD_PICTURE_DELEGATE_H - -#include -#include -#include - -class CardDatabaseVisualDisplayModel; - -/** - * @brief Draws the card of a CardDatabaseVisualDisplayModel row as a picture. - * - * The delegate only paints rows the view asks for, so a grid of the whole card - * database stays cheap: no widget per card and no pixmap loaded for items that - * are off screen. Card images come from CardPictureLoader, which caches them and - * loads missing ones asynchronously. - */ -class CardPictureDelegate : public QStyledItemDelegate -{ - Q_OBJECT - -public: - /// Gap left around a card picture inside its grid cell, in pixels. - static constexpr int SPACING = 4; - - explicit CardPictureDelegate(CardDatabaseVisualDisplayModel *_model, QObject *parent = nullptr); - - /// The picture size inside a grid cell. The cell is this size plus SPACING. - void setCardSize(const QSize &size); - - void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; - [[nodiscard]] QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override; - -private: - CardDatabaseVisualDisplayModel *model; - QSize cardSize; -}; - -#endif // CARD_PICTURE_DELEGATE_H diff --git a/cockatrice/src/interface/widgets/cards/card_size_widget.cpp b/cockatrice/src/interface/widgets/cards/card_size_widget.cpp index ac1ab9cb1..ab1840591 100644 --- a/cockatrice/src/interface/widgets/cards/card_size_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_size_widget.cpp @@ -2,7 +2,6 @@ #include "../general/layout_containers/flow_widget.h" -#include #include #include #include @@ -34,8 +33,8 @@ CardSizeWidget::CardSizeWidget(QWidget *parent, FlowWidget *_flowWidget, int def cardSizeLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); cardSizeSlider = new QSlider(Qt::Horizontal, this); - cardSizeSlider->setRange(MIN_CARD_SIZE, MAX_CARD_SIZE); ///< Slider range for card size adjustment. - cardSizeSlider->setValue(defaultValue); ///< Initial slider value. + cardSizeSlider->setRange(50, 250); ///< Slider range for card size adjustment. + cardSizeSlider->setValue(defaultValue); ///< Initial slider value. cardSizeLayout->addWidget(cardSizeLabel); cardSizeLayout->addWidget(cardSizeSlider); @@ -74,26 +73,13 @@ QSlider *CardSizeWidget::getSlider() const void CardSizeWidget::enableCtrlScrollResize(QWidget *host) { - const auto watchScrollArea = [this](QAbstractScrollArea *scrollArea) { - if (scrollArea == nullptr) { - return; - } - if (QWidget *viewport = scrollArea->viewport()) { - viewport->installEventFilter(this); - } - if (auto *contentScrollArea = qobject_cast(scrollArea)) { - if (QWidget *content = contentScrollArea->widget()) { - content->installEventFilter(this); - } - } - }; - host->installEventFilter(this); - watchScrollArea(qobject_cast(host)); - const auto scrollAreas = host->findChildren(); - for (QAbstractScrollArea *scrollArea : scrollAreas) { - watchScrollArea(scrollArea); + const auto scrollAreas = host->findChildren(); + for (QScrollArea *scrollArea : scrollAreas) { + if (QWidget *content = scrollArea->widget()) { + content->installEventFilter(this); + } } } diff --git a/cockatrice/src/interface/widgets/cards/card_size_widget.h b/cockatrice/src/interface/widgets/cards/card_size_widget.h index fced90d33..7de97a5e9 100644 --- a/cockatrice/src/interface/widgets/cards/card_size_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_size_widget.h @@ -24,10 +24,6 @@ class CardSizeWidget : public QWidget Q_OBJECT public: - /// Range of the card size slider, as a percentage of the base card width. - static constexpr int MIN_CARD_SIZE = 50; - static constexpr int MAX_CARD_SIZE = 250; - explicit CardSizeWidget(QWidget *parent, FlowWidget *flowWidget = nullptr, int defaultValue = 100); [[nodiscard]] QSlider *getSlider() const; @@ -35,9 +31,8 @@ public: * @brief Resizes the cards when the user Ctrl + scrolls over @p host or any of its descendants. * * Installs this widget as an event filter on the given host widget. If the host contains a - * scroll area the filter is also installed on the scroll area's content widget, and on the - * viewport of every scroll area base (QListView, QTableView, ...), so the resize intercepts - * the wheel event before the scroll area would scroll the view. + * scroll area the filter is also installed on the scroll area's content widget, so the resize + * intercepts the wheel event before the scroll area would scroll the view. */ void enableCtrlScrollResize(QWidget *host); diff --git a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp index 3ec2053b1..d7eef6c18 100644 --- a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp @@ -69,7 +69,6 @@ DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent, updateZoneCardCount(); connect(deckListModel, &QAbstractItemModel::rowsInserted, this, &DeckCardZoneDisplayWidget::onCategoryAddition); - connect(deckListModel, &QAbstractItemModel::layoutChanged, this, &DeckCardZoneDisplayWidget::displayCards); if (selectionModel) { connect(selectionModel, &QItemSelectionModel::selectionChanged, this, &DeckCardZoneDisplayWidget::onSelectionChanged); @@ -175,9 +174,6 @@ void DeckCardZoneDisplayWidget::displayCards() for (const QPersistentModelIndex &persistent : rows) { constructAppropriateWidget(persistent); - // Reuse existing widgets when a model sort moves their persistent rows. - // This preserves collapsed groups and card selection during live edits. - cardGroupLayout->insertWidget(persistent.row(), indexToWidgetMap.value(persistent)); } } diff --git a/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.cpp index c8571ab08..730043d95 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.cpp @@ -1,6 +1,6 @@ #include "abstract_analytics_panel_widget.h" -#include "../../theme_icon.h" +#include "../../pixel_map_generator.h" #include "../general/display/banner_widget.h" #include "deck_list_statistics_analyzer.h" @@ -28,7 +28,7 @@ AbstractAnalyticsPanelWidget::AbstractAnalyticsPanelWidget(QWidget *parent, Deck // config button configureButton = new QPushButton(this); - configureButton->setIcon(loadThemedIcon(QStringLiteral("icons/settings"))); + configureButton->setIcon(themePixmap(QStringLiteral("icons/cogwheel"))); configureButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); connect(configureButton, &QPushButton::clicked, this, &AbstractAnalyticsPanelWidget::applyConfigFromDialog); bannerAndSettingsLayout->addWidget(configureButton, 0); diff --git a/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp b/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp index df2a645f1..85dba6468 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp @@ -1,6 +1,5 @@ #include "resizable_panel.h" -#include "../interface/theme_manager.h" #include "abstract_analytics_panel_widget.h" #include "libcockatrice/utility/qt_utils.h" @@ -13,7 +12,6 @@ #include #include #include -#include #include #include #include @@ -95,17 +93,9 @@ ResizablePanel::ResizablePanel(const QString &_typeId, AbstractAnalyticsPanelWid dragButton->setStyleSheet(QString("QPushButton { " "background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 %1, stop:1 %2); " - "border: none; color: %3; }" + "border: none; color: %3; font-size: 10px; }" "QPushButton:hover { background: %4; }") .arg(mid.name(), dark.name(), placeholderText.name(), midLight.name())); - // Family comes from the InterfaceDefault theme role; the 10px size stays caller-side. - auto applyDragFont = [this]() { - QFont dragFont = themeManager->appFont(AppFont::InterfaceDefault); - dragFont.setPixelSize(10); - dragButton->setFont(dragFont); - }; - applyDragFont(); - connect(themeManager, &ThemeManager::fontsChanged, this, applyDragFont); resizeHandle->setStyleSheet(QString("QWidget { background: qlineargradient(x1:0, y1:0, x2:0, y2:1, " "stop:0 %1, stop:1 %2); }") diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp index f25e6c0ff..7ed398535 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp @@ -3,7 +3,7 @@ #include "../../../client/settings/cache_settings.h" #include "../../../filters/syntax_help.h" #include "../../key_signals.h" -#include "../../theme_icon.h" +#include "../../pixel_map_generator.h" #include "../utility/custom_line_edit.h" #include "card_database_display_model.h" #include "card_database_model.h" @@ -40,8 +40,8 @@ DeckEditorDatabaseDisplayWidget::DeckEditorDatabaseDisplayWidget(QWidget *parent searchEdit->setObjectName("searchEdit"); searchEdit->setPlaceholderText(tr("Search by card name (or search expressions)")); searchEdit->setClearButtonEnabled(true); - searchEdit->addAction(loadThemedIcon(QStringLiteral("icons/search")), QLineEdit::LeadingPosition); - auto help = searchEdit->addAction(loadThemedIcon(QStringLiteral("icons/info")), QLineEdit::TrailingPosition); + searchEdit->addAction(loadColorAdjustedPixmap("theme:icons/search"), QLineEdit::LeadingPosition); + auto help = searchEdit->addAction(themePixmap(QStringLiteral("icons/info")), QLineEdit::TrailingPosition); setFocusProxy(searchEdit); setFocusPolicy(Qt::ClickFocus); @@ -83,13 +83,13 @@ DeckEditorDatabaseDisplayWidget::DeckEditorDatabaseDisplayWidget(QWidget *parent &DeckEditorDatabaseDisplayWidget::onRelatedCardClicked); aAddCard = new QAction(QString(), this); - aAddCard->setIcon(loadThemedIcon(QStringLiteral("icons/arrow_right"))); + aAddCard->setIcon(themePixmap(QStringLiteral("icons/arrow_right_green"))); connect(aAddCard, &QAction::triggered, this, &DeckEditorDatabaseDisplayWidget::actAddCardToMainDeck); auto *tbAddCard = new QToolButton(this); tbAddCard->setDefaultAction(aAddCard); aAddCardToSideboard = new QAction(QString(), this); - aAddCardToSideboard->setIcon(loadThemedIcon(QStringLiteral("icons/arrow_right_sideboard"))); + aAddCardToSideboard->setIcon(themePixmap(QStringLiteral("icons/arrow_right_blue"))); connect(aAddCardToSideboard, &QAction::triggered, this, &DeckEditorDatabaseDisplayWidget::actAddCardToSideboard); auto *tbAddCardToSideboard = new QToolButton(this); tbAddCardToSideboard->setDefaultAction(aAddCardToSideboard); diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp index 47d2a1aae..37dd57459 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp @@ -3,7 +3,7 @@ #include "../../../client/settings/cache_settings.h" #include "../../../client/settings/shortcuts_settings.h" #include "../../key_signals.h" -#include "../../theme_icon.h" +#include "../../pixel_map_generator.h" #include "../playmat/playmat_settings_dialog.h" #include "../quick_settings/settings_button_widget.h" #include "../tabs/abstract_tab_deck_editor.h" @@ -49,7 +49,6 @@ #include #include #include -#include #include #include #include @@ -188,17 +187,10 @@ void DeckEditorDeckDockWidget::createDeckDock() formatLabel = new QLabel(this); formatComboBox = new QComboBox(this); - formatComboBox->setObjectName("deckFormatComboBox"); formatComboBox->addItem(tr("Loading Database...")); formatComboBox->setEnabled(false); // Disable until loaded commanderBracketWidget = new CommanderBracketWidget(this); - connect(formatComboBox, QOverload::of(&QComboBox::currentIndexChanged), this, [this](int index) { - formatComboBox->setPlaceholderText(QString()); - formatComboBox->setToolTip(QString()); - deckStateManager->setFormat(index >= 0 ? formatComboBox->itemData(index).toString() : QString()); - commanderBracketWidget->setDeck(deckStateManager->getDeckListShared()); - }); commentsLabel = new QLabel(); commentsLabel->setObjectName("commentsLabel"); @@ -248,25 +240,25 @@ void DeckEditorDeckDockWidget::createDeckDock() &DeckEditorDeckDockWidget::applyActiveGroupCriteria); aIncrement = new QAction(QString(), this); - aIncrement->setIcon(loadThemedIcon(QStringLiteral("icons/increment"))); + aIncrement->setIcon(themePixmap(QStringLiteral("icons/increment"))); connect(aIncrement, &QAction::triggered, this, &DeckEditorDeckDockWidget::actIncrementSelection); auto *tbIncrement = new QToolButton(this); tbIncrement->setDefaultAction(aIncrement); aDecrement = new QAction(QString(), this); - aDecrement->setIcon(loadThemedIcon(QStringLiteral("icons/decrement"))); + aDecrement->setIcon(themePixmap(QStringLiteral("icons/decrement"))); connect(aDecrement, &QAction::triggered, this, &DeckEditorDeckDockWidget::actDecrementSelection); auto *tbDecrement = new QToolButton(this); tbDecrement->setDefaultAction(aDecrement); aRemoveCard = new QAction(QString(), this); - aRemoveCard->setIcon(loadThemedIcon(QStringLiteral("icons/remove_row"))); + aRemoveCard->setIcon(themePixmap(QStringLiteral("icons/remove_row"))); connect(aRemoveCard, &QAction::triggered, this, &DeckEditorDeckDockWidget::actRemoveCard); auto *tbRemoveCard = new QToolButton(this); tbRemoveCard->setDefaultAction(aRemoveCard); aSwapCard = new QAction(QString(), this); - aSwapCard->setIcon(loadThemedIcon(QStringLiteral("icons/swap"))); + aSwapCard->setIcon(themePixmap(QStringLiteral("icons/swap"))); connect(aSwapCard, &QAction::triggered, this, &DeckEditorDeckDockWidget::actSwapSelection); auto *tbSwapCard = new QToolButton(this); tbSwapCard->setDefaultAction(aSwapCard); @@ -363,9 +355,6 @@ void DeckEditorDeckDockWidget::initializeFormats() { QStringList allFormats = CardDatabaseManager::query()->getAllFormatsWithCount().keys(); - // Rebuilding the list is a view update, not a user edit. In particular, - // clear() emits currentIndexChanged(-1), which must not clear the deck. - const QSignalBlocker blocker(formatComboBox); formatComboBox->clear(); // Remove "Loading Database..." formatComboBox->setEnabled(true); @@ -375,25 +364,28 @@ void DeckEditorDeckDockWidget::initializeFormats() formatComboBox->addItem(formatName, formatName); // store the raw key in itemData } - syncFormatSelection(); + QString format = deckStateManager->getMetadata().gameFormat; + if (!format.isEmpty()) { + formatComboBox->setCurrentIndex(formatComboBox->findData(format)); + } else { + // Ensure no selection is visible initially + formatComboBox->setCurrentIndex(-1); + } + connect(formatComboBox, QOverload::of(&QComboBox::currentIndexChanged), this, [this](int index) { + QString formatKey; + if (index >= 0) { + formatKey = formatComboBox->itemData(index).toString(); + deckStateManager->setFormat(formatKey); + } else { + deckStateManager->setFormat(""); // clear format if deselected + } + + commanderBracketWidget->setDeck(deckStateManager->getDeckListShared()); + }); commanderBracketWidget->setDeck(deckStateManager->getDeckListShared()); } -void DeckEditorDeckDockWidget::syncFormatSelection() -{ - if (!formatComboBox->isEnabled()) { - return; - } - const QSignalBlocker blocker(formatComboBox); - const QString format = deckStateManager->getMetadata().gameFormat; - const int index = format.isEmpty() ? -1 : formatComboBox->findData(format); - const QString unavailable = index < 0 && !format.isEmpty() ? tr("Unavailable: %1").arg(format) : QString(); - formatComboBox->setPlaceholderText(unavailable); - formatComboBox->setToolTip(unavailable); - formatComboBox->setCurrentIndex(index); -} - ExactCard DeckEditorDeckDockWidget::getCurrentCard() { QModelIndex current = deckView->selectionModel()->currentIndex(); @@ -604,7 +596,9 @@ void DeckEditorDeckDockWidget::syncDisplayWidgetsToModel() updatePlaymatLabel(); updateHash(); - syncFormatSelection(); + formatComboBox->blockSignals(true); + formatComboBox->setCurrentIndex(formatComboBox->findData(deckStateManager->getMetadata().gameFormat)); + formatComboBox->blockSignals(false); commanderBracketWidget->setDeck(deckStateManager->getDeckListShared()); @@ -768,6 +762,18 @@ void DeckEditorDeckDockWidget::actSwapSelection() update(); } +void DeckEditorDeckDockWidget::actDecrementCard(const ExactCard &card, QString zoneName) +{ + if (!card) { + return; + } + if (card.getInfo().getIsToken()) { + zoneName = DECK_ZONE_TOKENS; + } + + deckStateManager->decrementCard(card, zoneName); +} + void DeckEditorDeckDockWidget::actDecrementSelection() { auto selectedRows = getSelectedCardNodeSourceIndices(); @@ -1048,7 +1054,6 @@ void DeckEditorDeckDockWidget::retranslateUi() commentsLabel->setText(tr("&Comments:")); activeGroupCriteriaLabel->setText(tr("Group by:")); formatLabel->setText(tr("Format:")); - syncFormatSelection(); commanderBracketWidget->retranslateUi(); hashLabel1->setText(tr("Hash:")); diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h index 02910e390..97ab8823e 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h @@ -70,6 +70,7 @@ public slots: void syncDisplayWidgetsToModel(); void actAddCard(const ExactCard &card, const QString &zoneName); void actIncrementSelection(); + void actDecrementCard(const ExactCard &card, QString zoneName); void actDecrementSelection(); void actSwapCard(const ExactCard &card, const QString &zoneName); void actSwapSelection(); @@ -110,7 +111,6 @@ private: DeckListModel *getModel() const; [[nodiscard]] QModelIndexList getSelectedCardNodeSourceIndices() const; void offsetCountAtIndex(const QModelIndex &idx, bool isIncrement); - void syncFormatSelection(); void addMoveToZoneMenu(QMenu *menu, const QModelIndex &sourceCardIndex, const QString ¤tBoardName); void addChangeBoardMenu(QMenu *menu, const QString &zoneName); diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp index 8122d1847..adeb5c3e1 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp @@ -5,7 +5,7 @@ #include "../../../filters/filter_builder.h" #include "../../../filters/filter_tree_model.h" #include "../../key_signals.h" -#include "../../theme_icon.h" +#include "../../pixel_map_generator.h" #include "../tabs/abstract_tab_deck_editor.h" #include "libcockatrice/filters/filter_card.h" @@ -64,11 +64,11 @@ void DeckEditorFilterDockWidget::createFiltersDock() connect(filterBuilder, &FilterBuilder::add, filterModel, &FilterTreeModel::addFilter); aClearFilterOne = new QAction(QString(), this); - aClearFilterOne->setIcon(loadThemedIcon(QStringLiteral("icons/decrement"))); + aClearFilterOne->setIcon(themePixmap(QStringLiteral("icons/decrement"))); connect(aClearFilterOne, &QAction::triggered, this, &DeckEditorFilterDockWidget::actClearFilterOne); aClearFilterAll = new QAction(QString(), this); - aClearFilterAll->setIcon(loadThemedIcon(QStringLiteral("icons/clearsearch"))); + aClearFilterAll->setIcon(themePixmap(QStringLiteral("icons/clearsearch"))); connect(aClearFilterAll, &QAction::triggered, this, &DeckEditorFilterDockWidget::actClearFilterAll); auto *filterDelOne = new QToolButton(); diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp index a1914e1b5..209dc7273 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp @@ -1,6 +1,6 @@ #include "deck_list_history_manager_widget.h" -#include "../../theme_icon.h" +#include "../../pixel_map_generator.h" #include "../quick_settings/settings_button_widget.h" #include "deck_state_manager.h" #include "libcockatrice/deck_list/deck_list_history_manager.h" @@ -32,7 +32,7 @@ DeckListHistoryManagerWidget::DeckListHistoryManagerWidget(DeckStateManager *_de layout = new QHBoxLayout(this); aUndo = new QAction(QString(), this); - aUndo->setIcon(loadThemedIcon(QStringLiteral("icons/arrow_undo"))); + aUndo->setIcon(themePixmap(QStringLiteral("icons/arrow_undo"))); aUndo->setShortcut(QKeySequence::Undo); aUndo->setShortcutContext(Qt::ApplicationShortcut); connect(aUndo, &QAction::triggered, this, &DeckListHistoryManagerWidget::doUndo); @@ -41,7 +41,7 @@ DeckListHistoryManagerWidget::DeckListHistoryManagerWidget(DeckStateManager *_de undoButton->setDefaultAction(aUndo); aRedo = new QAction(QString(), this); - aRedo->setIcon(loadThemedIcon(QStringLiteral("icons/arrow_redo"))); + aRedo->setIcon(themePixmap(QStringLiteral("icons/arrow_redo"))); aRedo->setShortcut(QKeySequence::Redo); aRedo->setShortcutContext(Qt::ApplicationShortcut); connect(aRedo, &QAction::triggered, this, &DeckListHistoryManagerWidget::doRedo); @@ -53,7 +53,7 @@ DeckListHistoryManagerWidget::DeckListHistoryManagerWidget(DeckStateManager *_de layout->addWidget(redoButton); historyButton = new SettingsButtonWidget(this); - historyButton->setButtonIcon(loadThemedIcon(QStringLiteral("icons/arrow_history"))); + historyButton->setButtonIcon(themePixmap(QStringLiteral("icons/arrow_history"))); historyLabel = new QLabel(this); diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.cpp index a9c9cad7a..1e1aefe58 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.cpp @@ -1,7 +1,5 @@ #include "deck_list_style_proxy.h" -#include "../../theme_manager.h" - #include #include #include @@ -10,16 +8,6 @@ #include #include -DeckListStyleProxy::DeckListStyleProxy(QObject *parent) : QIdentityProxyModel(parent) -{ - // FontRole data reads the DeckList role live; rebroadcast so attached - // views re-query instead of waiting for an incidental repaint. - connect(themeManager, &ThemeManager::fontsChanged, this, [this] { - emit layoutAboutToBeChanged(); - emit layoutChanged(); - }); -} - QVariant DeckListStyleProxy::data(const QModelIndex &index, int role) const { QModelIndex src = mapToSource(index); @@ -32,8 +20,7 @@ QVariant DeckListStyleProxy::data(const QModelIndex &index, int role) const bool isCard = src.data(DeckRoles::IsCardRole).toBool(); if (role == Qt::FontRole && !isCard) { - // Family comes from the DeckList theme role; bold stays caller-side. - QFont f = themeManager->appFont(AppFont::DeckList); + QFont f; f.setBold(true); return f; } diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.h b/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.h index 3149da6de..e4d1de4f4 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.h +++ b/cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.h @@ -8,7 +8,7 @@ class DeckListStyleProxy : public QIdentityProxyModel { Q_OBJECT public: - explicit DeckListStyleProxy(QObject *parent = nullptr); + using QIdentityProxyModel::QIdentityProxyModel; [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override; }; diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp index cbf9dd3c4..d4715c8d5 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp @@ -1,6 +1,7 @@ #include "deck_state_manager.h" #include "../../../client/settings/cache_settings.h" +#include "../../deck_loader/loaded_deck.h" #include "deck_list_model.h" #include "libcockatrice/card/card_info.h" #include "libcockatrice/card/database/card_database_querier.h" @@ -17,7 +18,6 @@ #include #include #include -#include #include #include #include @@ -211,15 +211,15 @@ QModelIndex DeckStateManager::addCard(const ExactCard &card, const QString &zone return {}; } - QString targetZone = card.getInfo().getIsToken() ? DECK_ZONE_TOKENS : zoneName; + QString zone = card.getInfo().getIsToken() ? DECK_ZONE_TOKENS : zoneName; CardSetPtr set = card.getPrinting().getSet(); QString setName = set ? set->getCorrectedShortName() : ""; QString reason = - tr("Added (%1): %2 (%3) %4").arg(targetZone, card.getName(), setName, card.getPrinting().getProperty("num")); + tr("Added (%1): %2 (%3) %4").arg(zone, card.getName(), setName, card.getPrinting().getProperty("num")); - QModelIndex idx = modifyDeck(reason, [&card, &targetZone](auto model) { return model->addCard(card, targetZone); }); + QModelIndex idx = modifyDeck(reason, [&card, &zone](auto model) { return model->addCard(card, zone); }); if (idx.isValid()) { emit focusIndexChanged(idx, true); @@ -234,22 +234,10 @@ QModelIndex DeckStateManager::decrementCard(const ExactCard &card, const QString return {}; } - QString targetZone = zoneName; - QString providerId = card.getPrinting().getUuid(); QString collectorNumber = card.getPrinting().getProperty("num"); - QModelIndex idx = deckListModel->findCard(card.getName(), targetZone, providerId, collectorNumber); - - // Tokens are usually added to the token zone, but it is possible for imported/hand-edited - // decks to contain them in the main or sideboards. This is why we only try to remove the - // token from the token zone if it does not exist in the given zone, allowing us to still - // remove it from there. - if (!idx.isValid() && card.getInfo().getIsToken() && targetZone != DECK_ZONE_TOKENS) { - targetZone = DECK_ZONE_TOKENS; - idx = deckListModel->findCard(card.getName(), targetZone, providerId, collectorNumber); - } - + QModelIndex idx = deckListModel->findCard(card.getName(), zoneName, providerId, collectorNumber); if (!idx.isValid()) { return {}; } @@ -261,7 +249,7 @@ QModelIndex DeckStateManager::decrementCard(const ExactCard &card, const QString } // old index is no longer safe since rows could have been removed - QModelIndex newIdx = deckListModel->findCard(card.getName(), targetZone, providerId, collectorNumber); + QModelIndex newIdx = deckListModel->findCard(card.getName(), zoneName, providerId, collectorNumber); if (newIdx.isValid()) { emit focusIndexChanged(newIdx, true); } diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.h b/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.h index 0612147eb..98876947b 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.h +++ b/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.h @@ -1,7 +1,7 @@ #ifndef COCKATRICE_DECK_STATE_MANAGER_H #define COCKATRICE_DECK_STATE_MANAGER_H -#include "deck_list_model.h" +#include "../../deck_loader/loaded_deck.h" #include #include @@ -10,7 +10,6 @@ #include #include #include -#include #include class DeckListHistoryManager; @@ -188,18 +187,17 @@ public: ///@} /** - * @brief Adds the given card to the given zone. Tokens always go to DECK_ZONE_TOKENS, ignoring the given zone. + * @brief Adds the given card to the given zone. * Saves the operation to history if successful. * * @param card The card to add - * @param zoneName The zone to add the card to if the card is not a token + * @param zoneName The zone to add the card to * @return The index of the added card */ QModelIndex addCard(const ExactCard &card, const QString &zoneName); /** * @brief Removes 1 copy of the given card from the given zone. - * If the card is a token and is not in the given zone, then it is removed from DECK_ZONE_TOKENS instead. * Saves the operation to history if successful. * * @param card The card to remove diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp index daee5f1f9..1f567989e 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp @@ -1,7 +1,7 @@ #include "dlg_connect.h" #include "../../../client/settings/cache_settings.h" -#include "../../theme_icon.h" +#include "../../pixel_map_generator.h" #include "../server/handle_public_servers.h" #include "../server/user/user_info_connection.h" #include "libcockatrice/utility/macros.h" @@ -33,12 +33,11 @@ class QWidget; DlgConnect::DlgConnect(QWidget *parent) : QDialog(parent) { - setObjectName("connectDialog"); previousHostButton = new QRadioButton(tr("Known Hosts"), this); previousHosts = new QComboBox(this); btnDeleteServer = new QPushButton(this); - btnDeleteServer->setIcon(loadThemedIcon(QStringLiteral("icons/remove_row"))); + btnDeleteServer->setIcon(themePixmap(QStringLiteral("icons/remove_row"))); btnDeleteServer->setToolTip(tr("Delete the currently selected saved server")); btnDeleteServer->setFixedWidth(30); @@ -46,7 +45,7 @@ DlgConnect::DlgConnect(QWidget *parent) : QDialog(parent) hps = new HandlePublicServers(this); btnRefreshServers = new QPushButton(this); - btnRefreshServers->setIcon(loadThemedIcon(QStringLiteral("icons/sync"))); + btnRefreshServers->setIcon(themePixmap(QStringLiteral("icons/sync"))); btnRefreshServers->setToolTip(tr("Refresh the server list with known public servers")); btnRefreshServers->setFixedWidth(30); @@ -86,11 +85,6 @@ DlgConnect::DlgConnect(QWidget *parent) : QDialog(parent) passwordLabel->setBuddy(passwordEdit); passwordEdit->setEchoMode(QLineEdit::Password); - hostEdit->setObjectName("connectHostEdit"); - portEdit->setObjectName("connectPortEdit"); - playernameEdit->setObjectName("connectPlayernameEdit"); - passwordEdit->setObjectName("connectPasswordEdit"); - savePasswordCheckBox = new QCheckBox(tr("&Save password")); autoConnectCheckBox = new QCheckBox(tr("A&uto connect")); @@ -121,7 +115,7 @@ DlgConnect::DlgConnect(QWidget *parent) : QDialog(parent) updateDisplayInfo(previousHosts->currentText()); btnForgotPassword = new QPushButton(this); - btnForgotPassword->setIcon(loadThemedIcon(QStringLiteral("icons/forgot_password"))); + btnForgotPassword->setIcon(themePixmap(QStringLiteral("icons/forgot_password"))); btnForgotPassword->setToolTip(tr("Reset Password")); btnForgotPassword->setFixedWidth(30); connect(btnForgotPassword, &QPushButton::released, this, &DlgConnect::actForgotPassword); @@ -296,13 +290,11 @@ void DlgConnect::updateDisplayInfo(const QString &saveName) playernameEdit->setFocus(); savePasswordCheckBox->setChecked(savePasswordStatus); storedVerifier.clear(); - savedVerifier.clear(); if (savePasswordStatus) { const QString stored = _data.at(4); if (stored.startsWith("$")) { storedVerifier = stored; - savedVerifier = stored; passwordEdit->clear(); passwordEdit->setPlaceholderText(tr("Password saved")); } else { @@ -339,7 +331,6 @@ void DlgConnect::newHostSelected(bool state) passwordEdit->clear(); passwordEdit->setPlaceholderText(QString()); storedVerifier.clear(); - savedVerifier.clear(); saveEdit->clear(); saveEdit->setPlaceholderText(tr("Unique Server Name")); saveEdit->setDisabled(false); @@ -355,19 +346,9 @@ void DlgConnect::passwordSaved(QT_STATE_CHANGED_T state) Q_UNUSED(state); if (savePasswordCheckBox->isChecked()) { autoConnectCheckBox->setEnabled(true); - // Re-ticking keeps a password the user has started typing; otherwise restore the saved - // login this dialog was opened with, so unticking and changing your mind is harmless. - if (passwordEdit->text().isEmpty()) { - storedVerifier = savedVerifier; - passwordEdit->setPlaceholderText(savedVerifier.isEmpty() ? QString() : tr("Password saved")); - } } else { autoConnectCheckBox->setChecked(false); autoConnectCheckBox->setEnabled(false); - // Unticking means the password typed below is sent for this connection: stop sending the - // saved verifier instead, and stop claiming a password is saved. - storedVerifier.clear(); - passwordEdit->setPlaceholderText(QString()); } } @@ -375,11 +356,10 @@ void DlgConnect::actOk() { ServersSettings &servers = SettingsCache::instance().servers(); - // Never write a newly typed plaintext password to disk when a verifier is available: the - // typed value is used for this connection and a fresh verifier is persisted after a - // successful login. Without any verifier we keep the previous (plaintext legacy) behavior. - const QString verifierToSave = storedVerifier.isEmpty() ? savedVerifier : storedVerifier; - const QString passwordToSave = verifierToSave.isEmpty() ? passwordEdit->text() : verifierToSave; + // Never write a newly typed plaintext password to disk when a verifier is already stored: + // the typed value is used for this connection and a fresh verifier is persisted after a + // successful login. Without a stored verifier we keep the previous (plaintext legacy) behavior. + const QString passwordToSave = storedVerifier.isEmpty() ? passwordEdit->text() : storedVerifier; if (newHostButton->isChecked()) { if (saveEdit->text().isEmpty()) { diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_connect.h b/cockatrice/src/interface/widgets/dialogs/dlg_connect.h index dad3623f5..bef5f136e 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_connect.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_connect.h @@ -98,10 +98,6 @@ private: QPushButton *btnConnect, *btnForgotPassword, *btnRefreshServers, *btnDeleteServer; QMap> savedHostList; HandlePublicServers *hps; - //! \brief Saved "$scrypt$..." verifier as loaded for the selected profile, kept so that - //! re-ticking "Save password" after unticking restores it. - QString savedVerifier; - //! \brief Verifier in effect for this connection: empty while "Save password" is unticked. QString storedVerifier; const QString placeHolderText = tr("Downloading..."); }; diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp index 5659b3388..31841b9cd 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp @@ -1,6 +1,7 @@ #include "dlg_convert_deck_to_cod_format.h" #include "../../../client/settings/cache_settings.h" +#include "../../deck_loader/deck_file_format.h" #include #include @@ -11,7 +12,6 @@ #include #include #include -#include #include #include diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp index ada4237f7..104b695e6 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp @@ -116,17 +116,14 @@ void DlgCreateGame::sharedCtor() shareDecklistsOnLoadCheckBox = new QCheckBox(tr("Open decklists in lobby")); - shufflePlayersCheckBox = new QCheckBox(tr("Randomize turn order (seats) on each game start")); - createGameAsJudgeCheckBox = new QCheckBox(tr("Create game as judge")); auto *gameSetupOptionsLayout = new QGridLayout; gameSetupOptionsLayout->addWidget(startingLifeTotalLabel, 0, 0); gameSetupOptionsLayout->addWidget(startingLifeTotalEdit, 0, 1); - gameSetupOptionsLayout->addWidget(shareDecklistsOnLoadCheckBox, 1, 0, 1, 2); - gameSetupOptionsLayout->addWidget(shufflePlayersCheckBox, 2, 0, 1, 2); + gameSetupOptionsLayout->addWidget(shareDecklistsOnLoadCheckBox, 1, 0); if (room && room->getUserInfo()->user_level() & ServerInfo_User::IsJudge) { - gameSetupOptionsLayout->addWidget(createGameAsJudgeCheckBox, 3, 0, 1, 2); + gameSetupOptionsLayout->addWidget(createGameAsJudgeCheckBox, 2, 0); } else { createGameAsJudgeCheckBox->setChecked(false); createGameAsJudgeCheckBox->setHidden(true); @@ -187,7 +184,6 @@ DlgCreateGame::DlgCreateGame(TabRoom *_room, const QMap &_gameType createGameAsSpectatorCheckBox->setChecked(SettingsCache::instance().game().getCreateGameAsSpectator()); startingLifeTotalEdit->setValue(SettingsCache::instance().game().getDefaultStartingLifeTotal()); shareDecklistsOnLoadCheckBox->setChecked(SettingsCache::instance().game().getShareDecklistsOnLoad()); - shufflePlayersCheckBox->setChecked(SettingsCache::instance().game().getShufflePlayers()); if (!rememberGameSettings->isChecked()) { actReset(); @@ -221,7 +217,6 @@ DlgCreateGame::DlgCreateGame(const ServerInfo_Game &gameInfo, const QMapsetEnabled(false); startingLifeTotalEdit->setEnabled(false); shareDecklistsOnLoadCheckBox->setEnabled(false); - shufflePlayersCheckBox->setEnabled(false); descriptionEdit->setText(QString::fromStdString(gameInfo.description())); maxPlayersEdit->setValue(gameInfo.max_players()); @@ -232,7 +227,6 @@ DlgCreateGame::DlgCreateGame(const ServerInfo_Game &gameInfo, const QMapsetChecked(gameInfo.spectators_can_chat()); spectatorsSeeEverythingCheckBox->setChecked(gameInfo.spectators_omniscient()); shareDecklistsOnLoadCheckBox->setChecked(gameInfo.share_decklists_on_load()); - shufflePlayersCheckBox->setChecked(gameInfo.shuffle_players()); QSet types; for (int i = 0; i < gameInfo.game_types_size(); ++i) { @@ -270,7 +264,6 @@ void DlgCreateGame::actReset() startingLifeTotalEdit->setValue(20); shareDecklistsOnLoadCheckBox->setChecked(false); - shufflePlayersCheckBox->setChecked(false); createGameAsJudgeCheckBox->setChecked(false); QMapIterator gameTypeCheckBoxIterator(gameTypeCheckBoxes); @@ -301,7 +294,6 @@ void DlgCreateGame::actOK() cmd.set_join_as_spectator(createGameAsSpectatorCheckBox->isChecked()); cmd.set_starting_life_total(startingLifeTotalEdit->value()); cmd.set_share_decklists_on_load(shareDecklistsOnLoadCheckBox->isChecked()); - cmd.set_shuffle_players(shufflePlayersCheckBox->isChecked()); auto _gameTypes = QString(); QMapIterator gameTypeCheckBoxIterator(gameTypeCheckBoxes); @@ -326,7 +318,6 @@ void DlgCreateGame::actOK() SettingsCache::instance().game().setCreateGameAsSpectator(createGameAsSpectatorCheckBox->isChecked()); SettingsCache::instance().game().setDefaultStartingLifeTotal(startingLifeTotalEdit->value()); SettingsCache::instance().game().setShareDecklistsOnLoad(shareDecklistsOnLoadCheckBox->isChecked()); - SettingsCache::instance().game().setShufflePlayers(shufflePlayersCheckBox->isChecked()); SettingsCache::instance().game().setGameTypes(_gameTypes); } PendingCommand *pend = room->prepareRoomCommand(cmd); diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_create_game.h b/cockatrice/src/interface/widgets/dialogs/dlg_create_game.h index 58356c9b6..71b09997c 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_create_game.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_create_game.h @@ -51,7 +51,6 @@ private: QCheckBox *spectatorsAllowedCheckBox, *spectatorsNeedPasswordCheckBox, *spectatorsCanTalkCheckBox, *spectatorsSeeEverythingCheckBox, *createGameAsJudgeCheckBox, *createGameAsSpectatorCheckBox; QCheckBox *shareDecklistsOnLoadCheckBox; - QCheckBox *shufflePlayersCheckBox; QDialogButtonBox *buttonBox; QPushButton *clearButton; QCheckBox *rememberGameSettings; diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp index b06481c4b..cbf61a394 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp @@ -1,6 +1,6 @@ #include "dlg_edit_tokens.h" -#include "../../theme_icon.h" +#include "../../pixel_map_generator.h" #include "../interface/widgets/utility/get_text_with_max.h" #include "card_database_display_model.h" #include "libcockatrice/card/card_info.h" @@ -40,7 +40,6 @@ class QWidget; DlgEditTokens::DlgEditTokens(QWidget *parent) : QDialog(parent), currentCard(nullptr) { - setObjectName("editTokensDialog"); nameLabel = new QLabel(tr("&Name:")); nameEdit = new QLineEdit; nameEdit->setMaxLength(MAX_NAME_LENGTH); @@ -108,10 +107,10 @@ DlgEditTokens::DlgEditTokens(QWidget *parent) : QDialog(parent), currentCard(nul &DlgEditTokens::tokenSelectionChanged); QAction *aAddToken = new QAction(tr("Add token"), this); - aAddToken->setIcon(loadThemedIcon(QStringLiteral("icons/increment"))); + aAddToken->setIcon(themePixmap(QStringLiteral("icons/increment"))); connect(aAddToken, &QAction::triggered, this, &DlgEditTokens::actAddToken); QAction *aRemoveToken = new QAction(tr("Remove token"), this); - aRemoveToken->setIcon(loadThemedIcon(QStringLiteral("icons/decrement"))); + aRemoveToken->setIcon(themePixmap(QStringLiteral("icons/decrement"))); connect(aRemoveToken, &QAction::triggered, this, &DlgEditTokens::actRemoveToken); auto *databaseToolBar = new QToolBar; diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp index c1d0676ca..2c0fd3f6f 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp @@ -28,16 +28,12 @@ class QWidget; */ AbstractDlgDeckTextEdit::AbstractDlgDeckTextEdit(QWidget *parent) : QDialog(parent) { - setObjectName("dlgDeckTextEdit"); - contentsEdit = new QPlainTextEdit; - contentsEdit->setObjectName("contentsEdit"); refreshButton = new QPushButton(tr("&Refresh")); connect(refreshButton, &QPushButton::clicked, this, &AbstractDlgDeckTextEdit::actRefresh); auto *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); - buttonBox->setObjectName("buttonBox"); buttonBox->addButton(refreshButton, QDialogButtonBox::ActionRole); connect(buttonBox, &QDialogButtonBox::accepted, this, &AbstractDlgDeckTextEdit::actOK); connect(buttonBox, &QDialogButtonBox::rejected, this, &AbstractDlgDeckTextEdit::reject); diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.h b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.h index 6cf6021b0..f3cbb7b62 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.h @@ -10,10 +10,8 @@ #include "libcockatrice/deck_list/deck_list.h" -#include #include #include -#include #include class QPlainTextEdit; diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp index 04b0db2e3..1c1ada302 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include @@ -34,7 +33,6 @@ class QWidget; -static const QStringList SUPPORTED_PROVIDERS = {"Archidekt", "Deckstats", "ManaBox", "Moxfield", "TappedOut"}; DlgLoadDeckFromWebsite::DlgLoadDeckFromWebsite(QWidget *parent) : QDialog(parent) { nam = NetworkManagerFactory::create(this); @@ -43,7 +41,6 @@ DlgLoadDeckFromWebsite::DlgLoadDeckFromWebsite(QWidget *parent) : QDialog(parent setLayout(layout); instructionLabel = new QLabel(this); - instructionLabel->setWordWrap(true); layout->addWidget(instructionLabel); urlEdit = new QLineEdit(this); @@ -67,8 +64,8 @@ DlgLoadDeckFromWebsite::DlgLoadDeckFromWebsite(QWidget *parent) : QDialog(parent void DlgLoadDeckFromWebsite::retranslateUi() { - instructionLabel->setText(tr("Paste a link to a decklist site here to import it.") + "\n" + - tr("Supported services: %1").arg(SUPPORTED_PROVIDERS.join(", "))); + instructionLabel->setText(tr("Paste a link to a decklist site here to import it.\n(Archidekt, Deckstats, Moxfield, " + "and TappedOut are supported.)")); } bool DlgLoadDeckFromWebsite::testValidUrl() @@ -87,8 +84,8 @@ void DlgLoadDeckFromWebsite::accept() if (!jsonParser && info.provider != DeckProvider::Deckstats && info.provider != DeckProvider::TappedOut) { qCWarning(DlgLoadDeckFromWebsiteLog) << "No parser found for provider"; QMessageBox::warning(this, tr("Load Deck from Website"), - tr("No parser available for this deck provider.") + "\n" + - tr("Supported services: %1").arg(SUPPORTED_PROVIDERS.join(", "))); + tr("No parser available for this deck provider.\n (Archidekt, Deckstats, Moxfield, " + "and TappedOut are supported.)")); QDialog::reject(); return; } @@ -155,7 +152,6 @@ void DlgLoadDeckFromWebsite::accept() "https://archidekt.com/decks/9999999\n" "https://deckstats.net/decks/99999/9999999-your-deck-name/en\n" "https://moxfield.com/decks/XYZxx-XYZ99Yyy-xyzXzzz\n" - "https://manabox.app/decks/XYZxxa-YZ99Yyyx_yzXzzz\n" "https://tappedout.net/mtg-decks/your-deck-name/")); QDialog::reject(); } @@ -168,9 +164,7 @@ QSharedPointer DlgLoadDeckFromWebsite::createParserForProvider( return QSharedPointer(new ArchidektJsonParser()); case DeckProvider::Moxfield: return QSharedPointer(new MoxfieldJsonParser()); - case DeckProvider::Manabox: - return QSharedPointer(new ManaboxJsonParser()); default: return QSharedPointer(nullptr); } -} +} \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.cpp index 3ebb5c093..858deb751 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.cpp @@ -16,11 +16,8 @@ class QWidget; DlgLocalGameOptions::DlgLocalGameOptions(QWidget *parent) : QDialog(parent) { - setObjectName("localGameDialog"); - numberPlayersLabel = new QLabel(tr("Players:"), this); numberPlayersEdit = new QSpinBox(this); - numberPlayersEdit->setObjectName("numberPlayersEdit"); numberPlayersEdit->setMinimum(1); numberPlayersEdit->setMaximum(8); numberPlayersEdit->setValue(1); @@ -31,12 +28,10 @@ DlgLocalGameOptions::DlgLocalGameOptions(QWidget *parent) : QDialog(parent) generalGrid->addWidget(numberPlayersLabel, 0, 0); generalGrid->addWidget(numberPlayersEdit, 0, 1); generalGroupBox = new QGroupBox(tr("General"), this); - generalGroupBox->setObjectName("generalGroupBox"); generalGroupBox->setLayout(generalGrid); startingLifeTotalLabel = new QLabel(tr("Starting life total:"), this); startingLifeTotalEdit = new QSpinBox(this); - startingLifeTotalEdit->setObjectName("startingLifeTotalEdit"); startingLifeTotalEdit->setMinimum(-999999999); startingLifeTotalEdit->setMaximum(999999999); startingLifeTotalEdit->setValue(20); @@ -47,14 +42,11 @@ DlgLocalGameOptions::DlgLocalGameOptions(QWidget *parent) : QDialog(parent) gameSetupGrid->addWidget(startingLifeTotalLabel, 0, 0); gameSetupGrid->addWidget(startingLifeTotalEdit, 0, 1); gameSetupOptionsGroupBox = new QGroupBox(tr("Game setup options"), this); - gameSetupOptionsGroupBox->setObjectName("gameSetupOptionsGroupBox"); gameSetupOptionsGroupBox->setLayout(gameSetupGrid); rememberSettingsCheckBox = new QCheckBox(tr("Remember settings"), this); - rememberSettingsCheckBox->setObjectName("rememberSettingsCheckBox"); buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this); - buttonBox->setObjectName("buttonBox"); connect(buttonBox, &QDialogButtonBox::accepted, this, &DlgLocalGameOptions::actOK); connect(buttonBox, &QDialogButtonBox::rejected, this, &DlgLocalGameOptions::reject); diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp index c6e640a9f..dbfe38e26 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp @@ -1,7 +1,7 @@ #include "dlg_manage_sets.h" #include "../../../client/settings/cache_settings.h" -#include "../../theme_icon.h" +#include "../../pixel_map_generator.h" #include "../interface/card_picture_loader/card_picture_loader.h" #include "../interface/widgets/utility/custom_line_edit.h" #include "libcockatrice/card/database/card_database.h" @@ -48,7 +48,6 @@ WndSets::WndSets(QWidget *parent) : QMainWindow(parent) { - setObjectName("manageSetsWindow"); setOrderIsSorted = false; // left toolbar @@ -58,28 +57,28 @@ WndSets::WndSets(QWidget *parent) : QMainWindow(parent) setsEditToolBar->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); aTop = new QAction(QString(), this); - aTop->setIcon(loadThemedIcon(QStringLiteral("icons/arrow_to_top"))); + aTop->setIcon(themePixmap(QStringLiteral("icons/arrow_top_green"))); aTop->setToolTip(tr("Move selected set to the top")); aTop->setEnabled(false); connect(aTop, &QAction::triggered, this, &WndSets::actTop); setsEditToolBar->addAction(aTop); aUp = new QAction(QString(), this); - aUp->setIcon(loadThemedIcon(QStringLiteral("icons/arrow_up"))); + aUp->setIcon(themePixmap(QStringLiteral("icons/arrow_up_green"))); aUp->setToolTip(tr("Move selected set up")); aUp->setEnabled(false); connect(aUp, &QAction::triggered, this, &WndSets::actUp); setsEditToolBar->addAction(aUp); aDown = new QAction(QString(), this); - aDown->setIcon(loadThemedIcon(QStringLiteral("icons/arrow_down"))); + aDown->setIcon(themePixmap(QStringLiteral("icons/arrow_down_green"))); aDown->setToolTip(tr("Move selected set down")); aDown->setEnabled(false); connect(aDown, &QAction::triggered, this, &WndSets::actDown); setsEditToolBar->addAction(aDown); aBottom = new QAction(QString(), this); - aBottom->setIcon(loadThemedIcon(QStringLiteral("icons/arrow_to_bottom"))); + aBottom->setIcon(themePixmap(QStringLiteral("icons/arrow_bottom_green"))); aBottom->setToolTip(tr("Move selected set to the bottom")); aBottom->setEnabled(false); connect(aBottom, &QAction::triggered, this, &WndSets::actBottom); @@ -89,7 +88,7 @@ WndSets::WndSets(QWidget *parent) : QMainWindow(parent) searchField = new LineEditUnfocusable; searchField->setObjectName("searchEdit"); searchField->setPlaceholderText(tr("Search by set name, code, type, or release date")); - searchField->addAction(loadThemedIcon(QStringLiteral("icons/search")), LineEditUnfocusable::LeadingPosition); + searchField->addAction(themePixmap(QStringLiteral("icons/search")), LineEditUnfocusable::LeadingPosition); searchField->setClearButtonEnabled(true); setFocusProxy(searchField); @@ -222,7 +221,6 @@ WndSets::WndSets(QWidget *parent) : QMainWindow(parent) WndSets::~WndSets() { - disconnect(view->header(), &QHeaderView::geometriesChanged, this, &WndSets::saveHeaderState); } void WndSets::closeEvent(QCloseEvent * /*ev*/) diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.cpp index a7387a068..2a2758ba5 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.cpp @@ -1,13 +1,11 @@ #include "dlg_my_reports.h" -#include "../interface/theme_manager.h" #include "../utility/report_utils.h" #include "abstract_client.h" #include "libcockatrice/protocol/pb/response.pb.h" #include "libcockatrice/protocol/pb/serverinfo_report.pb.h" #include -#include #include #include #include @@ -26,6 +24,7 @@ #include #include #include +#include #include #include @@ -70,8 +69,7 @@ DlgMyReports::DlgMyReports(AbstractClient *_client, QWidget *parent) auto *chatGroup = new QGroupBox(tr("Chat Log Context")); chatLogEdit = new QTextEdit; chatLogEdit->setReadOnly(true); - applyChatLogFont(); - connect(themeManager, &ThemeManager::fontsChanged, this, &DlgMyReports::applyChatLogFont); + chatLogEdit->setFont(QtUtils::monospaceFont()); auto *chatLayout = new QVBoxLayout(chatGroup); chatLayout->setContentsMargins(4, 4, 4, 4); chatLayout->addWidget(chatLogEdit); @@ -124,11 +122,6 @@ DlgMyReports::DlgMyReports(AbstractClient *_client, QWidget *parent) refreshList(); } -void DlgMyReports::applyChatLogFont() -{ - chatLogEdit->setFont(report_utils::reportLogFont()); -} - void DlgMyReports::refreshList() { selectedReportIdBeforeRefresh = selectedReportId; diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.h b/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.h index 90772f051..dc9f90d2d 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.h @@ -29,7 +29,6 @@ private slots: void reportDetailsResponse(const Response &response); void addComment(); void addCommentResponse(const Response &response); - void applyChatLogFont(); private: void loadReportDetails(const ServerInfo_Report &report); diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp index 09afee32d..9e32e87d1 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp @@ -1,7 +1,7 @@ #include "dlg_register.h" #include "../../../client/settings/cache_settings.h" -#include "../../theme_icon.h" +#include "../../pixel_map_generator.h" #include "../server/handle_public_servers.h" #include "../server/user/user_info_connection.h" @@ -34,7 +34,7 @@ DlgRegister::DlgRegister(QWidget *parent) : QDialog(parent) previousHosts = new QComboBox(this); btnDeleteServer = new QPushButton(this); - btnDeleteServer->setIcon(loadThemedIcon(QStringLiteral("icons/remove_row"))); + btnDeleteServer->setIcon(themePixmap(QStringLiteral("icons/remove_row"))); btnDeleteServer->setToolTip(tr("Delete the currently selected saved server")); btnDeleteServer->setFixedWidth(30); @@ -42,7 +42,7 @@ DlgRegister::DlgRegister(QWidget *parent) : QDialog(parent) hps = new HandlePublicServers(this); btnRefreshServers = new QPushButton(this); - btnRefreshServers->setIcon(loadThemedIcon(QStringLiteral("icons/sync"))); + btnRefreshServers->setIcon(themePixmap(QStringLiteral("icons/sync"))); btnRefreshServers->setToolTip(tr("Refresh the server list with known public servers")); btnRefreshServers->setFixedWidth(30); diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_report_user.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_report_user.cpp index c7c32469b..3ef45020b 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_report_user.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_report_user.cpp @@ -1,13 +1,10 @@ #include "dlg_report_user.h" -#include "../interface/theme_manager.h" -#include "../utility/report_utils.h" #include "abstract_client.h" #include "libcockatrice/protocol/pb/response.pb.h" #include #include -#include #include #include #include @@ -94,8 +91,7 @@ DlgReportUser::DlgReportUser(AbstractClient *_client, auto *chatLayout = new QVBoxLayout(chatGroup); chatLogEdit = new QTextEdit; chatLogEdit->setReadOnly(true); - applyChatLogFont(); - connect(themeManager, &ThemeManager::fontsChanged, this, &DlgReportUser::applyChatLogFont); + chatLogEdit->setFont(QtUtils::monospaceFont()); if (!_autoChatLog.isEmpty()) { chatLogEdit->setPlainText(_autoChatLog); } else { @@ -124,11 +120,6 @@ DlgReportUser::DlgReportUser(AbstractClient *_client, layout->addWidget(buttonBox); } -void DlgReportUser::applyChatLogFont() -{ - chatLogEdit->setFont(report_utils::reportLogFont()); -} - void DlgReportUser::actSubmit() { const QString description = descriptionEdit->toPlainText().trimmed(); diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_report_user.h b/cockatrice/src/interface/widgets/dialogs/dlg_report_user.h index 0f2fa5080..c7fce055d 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_report_user.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_report_user.h @@ -27,7 +27,6 @@ public: private slots: void actSubmit(); void reportResponse(const Response &response); - void applyChatLogFont(); private: static QString categoryLabel(const QString &key); diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp index 3602e67c6..ab870a2c8 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp @@ -73,8 +73,6 @@ DlgSettings::DlgSettings(QWidget *parent) : QDialog(parent) resize(calculateDialogSize(hostSize, available.size(), minimum)); setSizeGripEnabled(true); - setObjectName("settingsDialog"); - connect(&SettingsCache::instance().personal(), &PersonalSettings::langChanged, this, &DlgSettings::updateLanguage); settingsView = new SettingsView(this); @@ -84,7 +82,6 @@ DlgSettings::DlgSettings(QWidget *parent) : QDialog(parent) buttonBox->addStretch(); okButton = new QPushButton; okButton->setDefault(true); - okButton->setObjectName("settingsOkButton"); connect(okButton, &QPushButton::clicked, this, &DlgSettings::close); buttonBox->addWidget(okButton); diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp index 49bacd081..d29aee27f 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp @@ -2,7 +2,6 @@ #include "../deck_share/shared_deck_preview_widget.h" #include "../general/layout_containers/flow_widget.h" -#include "../interface/theme_manager.h" #include #include @@ -36,14 +35,9 @@ DlgSharedDecksPreview::DlgSharedDecksPreview(QWidget *parent, // QLabels render AutoText and markup would otherwise be shown as rich text. auto *titleLabel = new QLabel(tr("Share: %1").arg((shareName.isEmpty() ? tr("Untitled") : shareName).toHtmlEscaped()), this); - // Family comes from the InterfaceDefault theme role; the +2 size and bold stay caller-side. - auto applyTitleFont = [titleLabel]() { - QFont titleFont = QtUtils::boldFont(themeManager->appFont(AppFont::InterfaceDefault)); - titleFont.setPointSize(titleFont.pointSize() + 2); - titleLabel->setFont(titleFont); - }; - applyTitleFont(); - connect(themeManager, &ThemeManager::fontsChanged, this, applyTitleFont); + QFont titleFont = QtUtils::boldFont(titleLabel->font()); + titleFont.setPointSize(titleFont.pointSize() + 2); + titleLabel->setFont(titleFont); mainLayout->addWidget(titleLabel); if (!serverText.isEmpty()) { diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp index c1df0c963..511ff1c7d 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp @@ -28,7 +28,6 @@ DlgTipOfTheDay::DlgTipOfTheDay(QWidget *parent) : QDialog(parent) { - setObjectName("tipOfTheDayDialog"); successfulInit = false; QString xmlPath = "theme:tips/tips_of_the_day.xml"; tipDatabase = new TipsOfTheDay(xmlPath, this); diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_turn_order.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_turn_order.cpp deleted file mode 100644 index 8814f89db..000000000 --- a/cockatrice/src/interface/widgets/dialogs/dlg_turn_order.cpp +++ /dev/null @@ -1,136 +0,0 @@ -#include "dlg_turn_order.h" - -#include -#include -#include -#include -#include -#include -#include - -DlgTurnOrder::DlgTurnOrder(const QStringList &_playerNames, QWidget *parent) - : QDialog(parent), randomizeRequested(false) -{ - listWidget = new QListWidget(this); - listWidget->addItems(_playerNames); - listWidget->setCurrentRow(0); - connect(listWidget, &QListWidget::currentRowChanged, this, &DlgTurnOrder::selectionChanged); - - moveUpButton = new QPushButton(this); - connect(moveUpButton, &QPushButton::clicked, this, &DlgTurnOrder::actMoveUp); - moveDownButton = new QPushButton(this); - connect(moveDownButton, &QPushButton::clicked, this, &DlgTurnOrder::actMoveDown); - randomizeButton = new QPushButton(this); - connect(randomizeButton, &QPushButton::clicked, this, &DlgTurnOrder::actRandomize); - - // Shown in place of the list while the server is asked to randomize: the - // order is chosen server side, so there is nothing to preview here. - hintLabel = new QLabel(this); - hintLabel->setWordWrap(true); - hintLabel->setAlignment(Qt::AlignCenter); - - auto *buttonColumn = new QVBoxLayout; - buttonColumn->addWidget(moveUpButton); - buttonColumn->addWidget(moveDownButton); - buttonColumn->addWidget(randomizeButton); - buttonColumn->addStretch(); - - auto *listLayout = new QHBoxLayout; - listLayout->addWidget(listWidget); - listLayout->addWidget(hintLabel, 1); - listLayout->addLayout(buttonColumn); - - auto *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); - connect(buttonBox, &QDialogButtonBox::accepted, this, &DlgTurnOrder::actOk); - connect(buttonBox, &QDialogButtonBox::rejected, this, &DlgTurnOrder::reject); - - auto *mainLayout = new QVBoxLayout; - mainLayout->addLayout(listLayout); - mainLayout->addWidget(buttonBox); - setLayout(mainLayout); - - updateButtons(); - - updateMode(); - setMinimumWidth(300); -} - -void DlgTurnOrder::retranslateUi() -{ - setWindowTitle(tr("Set turn order")); - moveUpButton->setText(tr("Move up")); - moveDownButton->setText(tr("Move down")); - randomizeButton->setText(randomizeRequested ? tr("Set order manually") : tr("Randomize")); - hintLabel->setText(tr("The server will randomize the turn order.")); -} - -QStringList DlgTurnOrder::order() const -{ - QStringList playerNames; - for (int i = 0; i < listWidget->count(); ++i) { - playerNames.append(listWidget->item(i)->text()); - } - return playerNames; -} - -void DlgTurnOrder::moveSelected(int delta) -{ - const int row = listWidget->currentRow(); - const int newRow = row + delta; - if (row < 0 || newRow < 0 || newRow >= listWidget->count()) { - return; - } - - QListWidgetItem *item = listWidget->takeItem(row); - listWidget->insertItem(newRow, item); - listWidget->setCurrentRow(newRow); - updateButtons(); -} - -void DlgTurnOrder::updateMode() -{ - listWidget->setVisible(!randomizeRequested); - hintLabel->setVisible(randomizeRequested); - moveUpButton->setVisible(!randomizeRequested); - moveDownButton->setVisible(!randomizeRequested); - retranslateUi(); -} - -void DlgTurnOrder::updateButtons() -{ - const int row = listWidget->currentRow(); - const int count = listWidget->count(); - const bool manualOrder = !randomizeRequested; - moveUpButton->setEnabled(manualOrder && row > 0); - moveDownButton->setEnabled(manualOrder && row >= 0 && row < count - 1); -} - -void DlgTurnOrder::actMoveUp() -{ - moveSelected(-1); -} - -void DlgTurnOrder::actMoveDown() -{ - moveSelected(1); -} - -void DlgTurnOrder::actRandomize() -{ - // Randomizing is a request to the server, not a local shuffle: showing a - // preview would let the host re-open the dialog until the order looks - // favourable for them. - randomizeRequested = !randomizeRequested; - updateMode(); - updateButtons(); -} - -void DlgTurnOrder::actOk() -{ - accept(); -} - -void DlgTurnOrder::selectionChanged() -{ - updateButtons(); -} diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_turn_order.h b/cockatrice/src/interface/widgets/dialogs/dlg_turn_order.h deleted file mode 100644 index 44d8203b9..000000000 --- a/cockatrice/src/interface/widgets/dialogs/dlg_turn_order.h +++ /dev/null @@ -1,51 +0,0 @@ -/** - * @file dlg_turn_order.h - * @ingroup GameDialogs - */ -//! \todo Document this file. - -#ifndef DLG_TURN_ORDER_H -#define DLG_TURN_ORDER_H - -#include -#include - -class QLabel; -class QListWidget; -class QPushButton; - -class DlgTurnOrder : public QDialog -{ - Q_OBJECT -private: - QListWidget *listWidget; - QLabel *hintLabel; - QPushButton *moveUpButton; - QPushButton *moveDownButton; - QPushButton *randomizeButton; - bool randomizeRequested; - - void moveSelected(int delta); - void updateMode(); - void updateButtons(); - -private slots: - void actMoveUp(); - void actMoveDown(); - void actRandomize(); - void actOk(); - void selectionChanged(); - -public: - explicit DlgTurnOrder(const QStringList &_playerNames, QWidget *parent = nullptr); - - void retranslateUi(); - - [[nodiscard]] bool isRandomizeRequested() const - { - return randomizeRequested; - } - [[nodiscard]] QStringList order() const; -}; - -#endif diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp index 11dcd7e27..ca55c7b41 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp @@ -42,7 +42,6 @@ static const QString UPDATE_INSTALLER_OVERRIDE = "Cockatrice-Update-Override.exe DlgUpdate::DlgUpdate(QWidget *parent) : QDialog(parent) { - setObjectName("updateDialog"); // Handle layout statusLabel = new QLabel(this); diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp index e75cf352a..d55e800a1 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp @@ -18,7 +18,6 @@ class QWidget; DlgViewLog::DlgViewLog(QWidget *parent) : QDialog(parent) { - setObjectName("viewLogDialog"); logArea = new QPlainTextEdit; logArea->setReadOnly(true); diff --git a/cockatrice/src/interface/widgets/dialogs/settings_view.cpp b/cockatrice/src/interface/widgets/dialogs/settings_view.cpp index b1a80c86b..d22a8d0b3 100644 --- a/cockatrice/src/interface/widgets/dialogs/settings_view.cpp +++ b/cockatrice/src/interface/widgets/dialogs/settings_view.cpp @@ -6,8 +6,7 @@ #include "settings_view.h" #include "../../../client/settings/cache_settings.h" -#include "../../theme_icon.h" -#include "../interface/theme_manager.h" +#include "../../pixel_map_generator.h" #include "../settings_page/abstract_settings_page.h" #include "../settings_page/appearance_settings_page.h" #include "../settings_page/deck_editor_settings_page.h" @@ -120,8 +119,6 @@ QWidget *fromWidgetId(WidgetId id) SettingsView::SettingsView(QWidget *parent) : QWidget(parent), currentTabIndex(0), searchActive(false) { - setObjectName("settingsView"); - setupUi(); connect(&SettingsCache::instance().personal(), &PersonalSettings::langChanged, this, &SettingsView::retranslateUi); @@ -135,17 +132,15 @@ void SettingsView::setupUi() // Search bar searchEdit = new QLineEdit; searchEdit->setClearButtonEnabled(true); - searchEdit->addAction(loadThemedIcon(QStringLiteral("icons/search")), QLineEdit::LeadingPosition); + searchEdit->addAction(themePixmap(QStringLiteral("icons/search")), QLineEdit::LeadingPosition); searchEdit->installEventFilter(this); connect(searchEdit, &QLineEdit::textChanged, this, &SettingsView::onSearchTextChanged); - searchEdit->setObjectName("settingsSearchEdit"); auto *searchLayout = new QHBoxLayout; searchLayout->addWidget(searchEdit); // Pages stacked widget pagesWidget = new QStackedWidget; - pagesWidget->setObjectName("pagesWidget"); auto *generalPage = new GeneralSettingsPage; auto *appearancePage = new AppearanceSettingsPage; @@ -204,17 +199,12 @@ void SettingsView::setupUi() searchDelegate->setPageIcons(icons); searchResultsView->viewport()->update(); }); - // The search delegate reads the InterfaceDefault role at paint time, so a - // font change only needs a repaint, mirroring the theme change above. - connect(themeManager, &ThemeManager::fontsChanged, searchResultsView, - [this] { searchResultsView->viewport()->update(); }); // Build search index after pages are created buildSearchIndex(); // Pages container (stacked widget + search results overlay) pagesContainer = new QWidget; - pagesContainer->setObjectName("pagesContainer"); auto *containerLayout = new QStackedLayout; containerLayout->setStackingMode(QStackedLayout::StackAll); containerLayout->addWidget(pagesWidget); @@ -254,7 +244,6 @@ void SettingsView::setupUi() void SettingsView::setupNavTree() { navTree = new QTreeWidget; - navTree->setObjectName("navTree"); navTree->setHeaderHidden(true); navTree->setRootIsDecorated(true); navTree->setIconSize(QSize(24, 24)); diff --git a/cockatrice/src/interface/widgets/general/display/banner_widget.cpp b/cockatrice/src/interface/widgets/general/display/banner_widget.cpp index 5cb62db0f..baf46bbba 100644 --- a/cockatrice/src/interface/widgets/general/display/banner_widget.cpp +++ b/cockatrice/src/interface/widgets/general/display/banner_widget.cpp @@ -1,11 +1,9 @@ #include "banner_widget.h" #include "../../../pixel_map_generator.h" -#include "../../../theme_manager.h" #include #include -#include #include #include #include @@ -30,9 +28,7 @@ BannerWidget::BannerWidget(QWidget *parent, const QString &text, Qt::Orientation if (transparency > 50) { textColor = " color: white;"; } - bannerLabel->setStyleSheet(textColor); - applyInterfaceDefaultFont(); - connect(themeManager, &ThemeManager::fontsChanged, this, &BannerWidget::applyInterfaceDefaultFont); + bannerLabel->setStyleSheet("font-size: 24px; font-weight: bold;" + textColor); layout->addWidget(iconLabel); layout->addWidget(bannerLabel); @@ -60,16 +56,6 @@ void BannerWidget::setText(const QString &text) const bannerLabel->setText(text); } -void BannerWidget::applyInterfaceDefaultFont() -{ - // Family comes from the InterfaceDefault theme role; the 24px size and - // bold weight previously carried by the stylesheet stay caller-side. - QFont bannerFont = themeManager->appFont(AppFont::InterfaceDefault); - bannerFont.setPixelSize(24); - bannerFont.setWeight(QFont::Bold); - bannerLabel->setFont(bannerFont); -} - void BannerWidget::setClickable(bool _clickable) { clickable = _clickable; diff --git a/cockatrice/src/interface/widgets/general/display/banner_widget.h b/cockatrice/src/interface/widgets/general/display/banner_widget.h index d46250bdb..06556089b 100644 --- a/cockatrice/src/interface/widgets/general/display/banner_widget.h +++ b/cockatrice/src/interface/widgets/general/display/banner_widget.h @@ -48,7 +48,6 @@ signals: private slots: void toggleBuddyVisibility() const; void updateDropdownIconState() const; - void applyInterfaceDefaultFont(); }; #endif // BANNER_WIDGET_H diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.cpp b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.cpp index 6bb1dcd62..484ac861d 100644 --- a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.cpp +++ b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.cpp @@ -1,7 +1,5 @@ #include "bar_chart_widget.h" -#include "../../interface/theme_manager.h" - #include #include #include @@ -21,10 +19,6 @@ BarChartWidget::BarChartWidget(QWidget *parent) : QWidget(parent) { setMouseTracking(true); - - // Labels read the InterfaceDefault role at paint time, so a font change - // only needs a repaint. - connect(themeManager, &ThemeManager::fontsChanged, this, [this] { update(); }); } void BarChartWidget::setBars(const QVector &newBars) @@ -152,8 +146,7 @@ void BarChartWidget::paintEvent(QPaintEvent *) // draw label below bar QRect labelRect(left + i * (barWidth + spacing), bottom, barWidth, LABEL_H); - // Family comes from the InterfaceDefault theme role; bold stays caller-side. - QFont f = themeManager->appFont(AppFont::InterfaceDefault); + QFont f = p.font(); f.setBold(true); p.setFont(f); p.setPen(Qt::black); diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.cpp b/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.cpp index 359d56772..5a3130964 100644 --- a/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.cpp +++ b/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.cpp @@ -1,7 +1,5 @@ #include "segmented_bar_widget.h" -#include "../../interface/theme_manager.h" - #include #include #include @@ -24,10 +22,6 @@ SegmentedBarWidget::SegmentedBarWidget(QString label, QVector segments, setMinimumWidth(36); setMaximumWidth(50); setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding); - - // The label reads the InterfaceDefault role at paint time, so a font - // change only needs a repaint. - connect(themeManager, &ThemeManager::fontsChanged, this, [this] { update(); }); } QSize SegmentedBarWidget::sizeHint() const @@ -101,8 +95,7 @@ void SegmentedBarWidget::paintEvent(QPaintEvent *) // draw label QRect labelRect(0, h - LABEL_H, w, LABEL_H); - // Family comes from the InterfaceDefault theme role; bold stays caller-side. - QFont f = themeManager->appFont(AppFont::InterfaceDefault); + QFont f = p.font(); f.setBold(true); p.setFont(f); p.setPen(Qt::black); diff --git a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.cpp b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.cpp index 598c70fe2..0609eb16a 100644 --- a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.cpp +++ b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_label.cpp @@ -1,7 +1,5 @@ #include "dynamic_font_size_label.h" -#include "../../interface/theme_manager.h" - #include #include #include @@ -30,13 +28,9 @@ void DynamicFontSizeLabel::paintEvent(QPaintEvent *event) // QElapsedTimer timer; // timer.start(); - // Family follows the InterfaceDefault theme role; the fitted point size - // stays computed from the widget geometry as before. - QFont newFont = themeManager->appFont(AppFont::InterfaceDefault); + QFont newFont = font(); float fontSize = getWidgetMaximumFontSize(this, this->text()); newFont.setPointSizeF(fontSize); - // Preserve the caller's bold emphasis, which the role font does not carry. - newFont.setBold(font().bold()); setFont(newFont); // qDebug() << "Font size set to" << fontSize; @@ -46,10 +40,7 @@ void DynamicFontSizeLabel::paintEvent(QPaintEvent *event) float DynamicFontSizeLabel::getWidgetMaximumFontSize(QWidget *widget, const QString &text) { - // Measure with the InterfaceDefault family so the fit matches the painted font. - QFont font = themeManager->appFont(AppFont::InterfaceDefault); - font.setBold(widget->font().bold()); - font.setPointSizeF(widget->font().pointSizeF()); + QFont font = widget->font(); const QRect widgetRect = widget->contentsRect(); const float widgetWidth = widgetRect.width(); const float widgetHeight = widgetRect.height(); diff --git a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.cpp b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.cpp index 9b5f5bdda..25e8ca48f 100644 --- a/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.cpp +++ b/cockatrice/src/interface/widgets/general/display/dynamic_font_size_push_button.cpp @@ -1,6 +1,5 @@ #include "dynamic_font_size_push_button.h" -#include "../../interface/theme_manager.h" #include "dynamic_font_size_label.h" #include @@ -21,12 +20,10 @@ void DynamicFontSizePushButton::paintEvent(QPaintEvent *event) // Call the base class paintEvent to preserve any other painting behavior QPushButton::paintEvent(event); - // Adjust the font size dynamically based on the text. Family follows the - // InterfaceDefault theme role; the fitted size stays computed as before. - QFont newFont = themeManager->appFont(AppFont::InterfaceDefault); + // Adjust the font size dynamically based on the text + QFont newFont = font(); float fontSize = DynamicFontSizeLabel::getWidgetMaximumFontSize(this, this->text()); newFont.setPointSizeF(fontSize); - newFont.setBold(font().bold()); setFont(newFont); // Get painter for custom painting diff --git a/cockatrice/src/interface/widgets/general/home_styled_button.cpp b/cockatrice/src/interface/widgets/general/home_styled_button.cpp index a2ac7912d..7f23827bc 100644 --- a/cockatrice/src/interface/widgets/general/home_styled_button.cpp +++ b/cockatrice/src/interface/widgets/general/home_styled_button.cpp @@ -1,9 +1,6 @@ #include "home_styled_button.h" -#include "../../theme_manager.h" - #include -#include #include #include #include @@ -21,21 +18,9 @@ class QWidget; HomeStyledButton::HomeStyledButton(const QString &text, QPair _gradientColors, QWidget *parent) : QPushButton(text, parent), gradientColors(_gradientColors) { - // Keep the font/style-derived height even when the home page has ample space. - setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + setMinimumHeight(25); setStyleSheet(generateButtonStylesheet(gradientColors)); - applyInterfaceDefaultFont(); - connect(themeManager, &ThemeManager::fontsChanged, this, &HomeStyledButton::applyInterfaceDefaultFont); -} - -void HomeStyledButton::applyInterfaceDefaultFont() -{ - // Family comes from the InterfaceDefault theme role; the 34px size and - // bold weight previously carried by the stylesheet stay caller-side. - QFont buttonFont = themeManager->appFont(AppFont::InterfaceDefault); - buttonFont.setPixelSize(34); - buttonFont.setWeight(QFont::Bold); - setFont(buttonFont); } void HomeStyledButton::updateStylesheet(const QPair &colors) @@ -65,6 +50,9 @@ QString HomeStyledButton::generateButtonStylesheet(const QPair & return QString(R"( QPushButton { + font-size: 34px; + font-weight: bold; + font-family: sans-serif, "Segoe UI", "Helvetica Neue"; padding: 30px; color: white; border: 2px solid %1; diff --git a/cockatrice/src/interface/widgets/general/home_styled_button.h b/cockatrice/src/interface/widgets/general/home_styled_button.h index 5756db5a1..55ac5550f 100644 --- a/cockatrice/src/interface/widgets/general/home_styled_button.h +++ b/cockatrice/src/interface/widgets/general/home_styled_button.h @@ -24,9 +24,6 @@ public: public slots: void paintEvent(QPaintEvent *event) override; -private slots: - void applyInterfaceDefaultFont(); - private: QPair gradientColors; }; diff --git a/cockatrice/src/interface/widgets/general/home_widget.cpp b/cockatrice/src/interface/widgets/general/home_widget.cpp index db4501efc..7555d1f45 100644 --- a/cockatrice/src/interface/widgets/general/home_widget.cpp +++ b/cockatrice/src/interface/widgets/general/home_widget.cpp @@ -2,7 +2,9 @@ #include "../../../client/settings/cache_settings.h" #include "../../../interface/widgets/tabs/tab_supervisor.h" +#include "../../deck_loader/deck_file_format.h" #include "../../deck_loader/deck_loader.h" +#include "../../deck_loader/loaded_deck.h" #include "../../pixel_map_generator.h" #include "../../theme_config.h" #include "../../theme_manager.h" @@ -27,11 +29,10 @@ #include #include #include -#include +#include #include #include #include -#include #include #include #include @@ -45,9 +46,9 @@ #include #include #include -#include #include #include +#include #include #include #include @@ -56,12 +57,9 @@ #include #include #include -#include -#include #include #include #include -#include #include #include #include @@ -70,26 +68,20 @@ HomeWidget::HomeWidget(QWidget *parent, TabSupervisor *_tabSupervisor) : QWidget(parent), tabSupervisor(_tabSupervisor), background(themePixmap(QStringLiteral("backgrounds/home"))) { - setObjectName("homeWidget"); + layout = new QGridLayout(this); backgroundSourceCard = new CardInfoPictureArtCropWidget(this); gradientColors = determineButtonColor(); - // The launcher keeps its natural size on a large display and stays centred in the - // viewport. On a small window it scrolls, instead of its combined minimum height - // becoming the minimum height of the entire application. - auto *scrollArea = QtUtils::makeScrollArea(this, Qt::ScrollBarAsNeeded, Qt::ScrollBarAsNeeded); - scrollArea->setObjectName("homeActionsScrollArea"); - scrollArea->setFrameShape(QFrame::NoFrame); - scrollArea->setWidgetResizable(false); - scrollArea->setAlignment(Qt::AlignCenter); - // The home background is painted by this widget, so let it show through the viewport. - scrollArea->viewport()->setAutoFillBackground(false); - scrollArea->setWidget(createButtons()); + layout->addWidget(createButtons(), 1, 1, Qt::AlignVCenter | Qt::AlignHCenter); - auto *layout = new QVBoxLayout(this); - layout->addWidget(scrollArea); + layout->setRowStretch(0, 1); + layout->setRowStretch(2, 1); + layout->setColumnStretch(0, 1); + layout->setColumnStretch(2, 1); + + setLayout(layout); cardChangeTimer = new QTimer(this); connect(cardChangeTimer, &QTimer::timeout, this, &HomeWidget::updateRandomCard); @@ -295,25 +287,22 @@ void HomeWidget::updateButtonsToBackgroundColor() QGroupBox *HomeWidget::createButtons() { QGroupBox *box = new QGroupBox(this); - box->setObjectName("homeButtonsBox"); - // The box only stacks the logo and the actions: no frame, and no background of its - // own, so the home background art stays visible. It never shows a title. The rule is - // load-bearing: QScrollArea::setWidget() turns autoFillBackground on for its widget. - box->setStyleSheet("QGroupBox { background: transparent; border: none; }"); - // Family comes from the InterfaceDefault theme role; the 20px size stays caller-side. - auto applyBoxFont = [box]() { - QFont boxFont = themeManager->appFont(AppFont::InterfaceDefault); - boxFont.setPixelSize(20); - box->setFont(boxFont); - }; - applyBoxFont(); - connect(themeManager, &ThemeManager::fontsChanged, this, applyBoxFont); + box->setStyleSheet(R"( + QGroupBox { + font-size: 20px; + color: white; /* Title text color */ + background: transparent; + } + + QGroupBox::title { + color: white; + subcontrol-origin: margin; + subcontrol-position: top center; /* or top left / right */ + } +)"); + box->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); QVBoxLayout *boxLayout = new QVBoxLayout; boxLayout->setAlignment(Qt::AlignHCenter); - // The scroll area is not resizable, so the box has to size itself: SetFixedSize keeps - // it at its content size and re-fixes it whenever the labels or fonts change, which is - // what makes the scroll area's scroll bars follow the content. - boxLayout->setSizeConstraint(QLayout::SetFixedSize); logoLabel = new QLabel; logoLabel->setAlignment(Qt::AlignCenter); @@ -322,34 +311,27 @@ QGroupBox *HomeWidget::createButtons() boxLayout->addSpacing(25); connectButton = new HomeStyledButton(QString(), gradientColors); - connectButton->setObjectName("homeConnectButton"); boxLayout->addWidget(connectButton); visualDeckEditorButton = new HomeStyledButton(QString(), gradientColors); - visualDeckEditorButton->setObjectName("homeCreateNewDeckButton"); connect(visualDeckEditorButton, &QPushButton::clicked, tabSupervisor, [this] { tabSupervisor->openDeckInNewTab(LoadedDeck()); }); boxLayout->addWidget(visualDeckEditorButton); visualDeckStorageButton = new HomeStyledButton(QString(), gradientColors); - visualDeckStorageButton->setObjectName("homeBrowseDecksButton"); connect(visualDeckStorageButton, &QPushButton::clicked, tabSupervisor, [this] { tabSupervisor->actTabVisualDeckStorage(true); }); boxLayout->addWidget(visualDeckStorageButton); visualDatabaseDisplayButton = new HomeStyledButton(QString(), gradientColors); - visualDatabaseDisplayButton->setObjectName("homeBrowseCardDatabaseButton"); connect(visualDatabaseDisplayButton, &QPushButton::clicked, tabSupervisor, &TabSupervisor::addVisualDatabaseDisplayTab); boxLayout->addWidget(visualDatabaseDisplayButton); edhrecButton = new HomeStyledButton(QString(), gradientColors); - edhrecButton->setObjectName("homeBrowseEdhrecButton"); connect(edhrecButton, &QPushButton::clicked, tabSupervisor, &TabSupervisor::addEdhrecMainTab); boxLayout->addWidget(edhrecButton); archidektButton = new HomeStyledButton(QString(), gradientColors); - archidektButton->setObjectName("homeBrowseArchidektButton"); connect(archidektButton, &QPushButton::clicked, tabSupervisor, &TabSupervisor::addArchidektTab); boxLayout->addWidget(archidektButton); replayButton = new HomeStyledButton(QString(), gradientColors); - replayButton->setObjectName("homeViewReplaysButton"); connect(replayButton, &QPushButton::clicked, tabSupervisor, [this] { tabSupervisor->actTabReplays(true); }); boxLayout->addWidget(replayButton); if (qobject_cast(tabSupervisor->parentWidget())) { @@ -481,9 +463,7 @@ void HomeWidget::paintEvent(QPaintEvent *event) constexpr int margin = 15; constexpr qreal attributionMargin = 4.0; - // Family comes from the InterfaceDefault theme role; the 14px sizes and - // bold weights stay caller-side as before. - QFont attributionFont = themeManager->appFont(AppFont::InterfaceDefault); + QFont attributionFont = painter.font(); attributionFont.setPointSize(14); attributionFont.setBold(true); painter.setFont(attributionFont); @@ -496,7 +476,7 @@ void HomeWidget::paintEvent(QPaintEvent *event) // Card name bubble above the attribution (when enabled). if (!cardName.isEmpty() && SettingsCache::instance().appearance().getHomeTabDisplayCardName()) { - QFont font = themeManager->appFont(AppFont::InterfaceDefault); + QFont font = painter.font(); font.setPointSize(14); font.setBold(true); painter.setFont(font); diff --git a/cockatrice/src/interface/widgets/general/home_widget.h b/cockatrice/src/interface/widgets/general/home_widget.h index fec1db950..aa4745c82 100644 --- a/cockatrice/src/interface/widgets/general/home_widget.h +++ b/cockatrice/src/interface/widgets/general/home_widget.h @@ -16,6 +16,7 @@ #include #include +class QGridLayout; class QLabel; class CardInfoPictureArtCropWidget; class ExactCard; @@ -45,6 +46,7 @@ public slots: void updateConnectButton(const ClientStatus status); private: + QGridLayout *layout; QTimer *cardChangeTimer; TabSupervisor *tabSupervisor; QPixmap background; diff --git a/cockatrice/src/interface/widgets/onboarding/first_run_wizard.cpp b/cockatrice/src/interface/widgets/onboarding/first_run_wizard.cpp index e69687c54..c4298d6b6 100644 --- a/cockatrice/src/interface/widgets/onboarding/first_run_wizard.cpp +++ b/cockatrice/src/interface/widgets/onboarding/first_run_wizard.cpp @@ -1,6 +1,5 @@ #include "first_run_wizard.h" -#include "../interface/theme_manager.h" #include "first_run_wizard_page.h" #include "pages/account_setup_page.h" #include "pages/card_database_setup_page.h" @@ -33,8 +32,9 @@ FirstRunWizard::FirstRunWizard(QWidget *parent) : QDialog(parent) bannerHost = new BannerHost(this); titleLabel = new QLabel(this); - applyInterfaceDefaultFont(); - connect(themeManager, &ThemeManager::fontsChanged, this, &FirstRunWizard::applyInterfaceDefaultFont); + QFont titleFont = QtUtils::boldFont(titleLabel->font()); + titleFont.setPointSizeF(titleFont.pointSizeF() * 1.4); + titleLabel->setFont(titleFont); subtitleLabel = new QLabel(this); subtitleLabel->setWordWrap(true); @@ -154,16 +154,6 @@ void FirstRunWizard::updateChrome() } } -void FirstRunWizard::applyInterfaceDefaultFont() -{ - // Family comes from the InterfaceDefault theme role; the *1.4 size - // multiplier and bold weight stay caller-side as before. - QFont titleFont = themeManager->appFont(AppFont::InterfaceDefault); - titleFont.setPointSizeF(titleFont.pointSizeF() * 1.4); - titleFont.setBold(true); - titleLabel->setFont(titleFont); -} - void FirstRunWizard::goNext() { FirstRunWizardPage *page = pages[currentIndex]; diff --git a/cockatrice/src/interface/widgets/onboarding/first_run_wizard.h b/cockatrice/src/interface/widgets/onboarding/first_run_wizard.h index a5fa3b4bd..812985a9f 100644 --- a/cockatrice/src/interface/widgets/onboarding/first_run_wizard.h +++ b/cockatrice/src/interface/widgets/onboarding/first_run_wizard.h @@ -55,7 +55,6 @@ private slots: void goBack(); void skip(); void updateChrome(); - void applyInterfaceDefaultFont(); private: void addPage(FirstRunWizardPage *page); diff --git a/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp index 13a43bd47..bad88ddbb 100644 --- a/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp +++ b/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp @@ -1,6 +1,5 @@ #include "all_zones_card_amount_widget.h" -#include "../../theme_manager.h" #include "../general/display/shadow_background_label.h" #include "card_amount_widget.h" #include "libcockatrice/card/card_info.h" @@ -68,7 +67,6 @@ AllZonesCardAmountWidget::AllZonesCardAmountWidget(QWidget *parent, buttonBoxSideboard->setVisible(!isToken); connect(cardSizeSlider, &QSlider::valueChanged, this, &AllZonesCardAmountWidget::adjustFontSize); - connect(themeManager, &ThemeManager::fontsChanged, this, &AllZonesCardAmountWidget::applyCardTextFont); QTimer::singleShot(10, this, [this]() { adjustFontSize(this->cardSizeSlider->value()); }); @@ -92,9 +90,8 @@ void AllZonesCardAmountWidget::adjustFontSize(int scalePercentage) int newFontSize = minFontSize + (scalePercentage - basePercentage) * (maxFontSize - minFontSize) / 225; newFontSize = std::clamp(newFontSize, minFontSize, maxFontSize); - // Update the font labels. The family comes from the CardText theme - // role; the slider-driven point size stays as before. - QFont zoneLabelFont = themeManager->appFont(AppFont::CardText); + // Update the font labels + QFont zoneLabelFont = zoneLabelMainboard->font(); zoneLabelFont.setPointSize(newFontSize); zoneLabelMainboard->setFont(zoneLabelFont); zoneLabelSideboard->setFont(zoneLabelFont); @@ -104,11 +101,6 @@ void AllZonesCardAmountWidget::adjustFontSize(int scalePercentage) repaint(); } -void AllZonesCardAmountWidget::applyCardTextFont() -{ - adjustFontSize(cardSizeSlider->value()); -} - void AllZonesCardAmountWidget::setAmounts(int mainboardAmount, int sideboardAmount, int tokensboardAmount) { buttonBoxMainboard->setAmount(mainboardAmount); diff --git a/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h b/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h index 3213cf16b..cefabe293 100644 --- a/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h +++ b/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h @@ -36,9 +36,6 @@ public slots: void adjustFontSize(int scalePercentage); void setAmounts(int mainboardAmount, int sideboardAmount, int tokensboardAmount); -private slots: - void applyCardTextFont(); - private: QVBoxLayout *layout; QSlider *cardSizeSlider; diff --git a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp index 7f25ea1f4..eae49d7ef 100644 --- a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp +++ b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp @@ -1,6 +1,5 @@ #include "card_amount_widget.h" -#include "../../theme_manager.h" #include "../deck_editor/deck_state_manager.h" #include "../general/display/dynamic_font_size_push_button.h" #include "deck_list_model.h" @@ -78,7 +77,6 @@ CardAmountWidget::CardAmountWidget(QWidget *parent, // Connect slider for dynamic font size adjustment connect(cardSizeSlider, &QSlider::valueChanged, this, &CardAmountWidget::adjustFontSize); - connect(themeManager, &ThemeManager::fontsChanged, this, &CardAmountWidget::applyCardTextFont); } int CardAmountWidget::getAmount() @@ -140,9 +138,8 @@ void CardAmountWidget::adjustFontSize(int scalePercentage) int newFontSize = minFontSize + (scalePercentage - basePercentage) * (maxFontSize - minFontSize) / 225; newFontSize = std::clamp(newFontSize, minFontSize, maxFontSize); - // Update the font for card count label. The family comes from the - // CardText theme role; the slider-driven point size stays as before. - QFont cardCountFont = themeManager->appFont(AppFont::CardText); + // Update the font for card count label + QFont cardCountFont = cardCountInZone->font(); cardCountFont.setPointSize(newFontSize); cardCountInZone->setFont(cardCountFont); @@ -153,11 +150,6 @@ void CardAmountWidget::adjustFontSize(int scalePercentage) repaint(); } -void CardAmountWidget::applyCardTextFont() -{ - adjustFontSize(cardSizeSlider->value()); -} - /** * @brief Updates the card count display in the widget. */ diff --git a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h index cef872157..6f5889fc7 100644 --- a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h +++ b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h @@ -67,7 +67,6 @@ private slots: void removePrintingSideboard(); void removePrintingTokensboard(); void adjustFontSize(int scalePercentage); - void applyCardTextFont(); }; #endif // CARD_AMOUNT_WIDGET_H diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp index a5177a6bc..94acdbdce 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp @@ -2,8 +2,6 @@ #include "../../../client/settings/cache_settings.h" #include "../../card_picture_loader/card_picture_loader.h" -#include "../../theme_icon.h" -#include "../../theme_manager.h" #include "../cards/card_info_picture_widget.h" #include "../tabs/abstract_tab_deck_editor.h" #include "all_zones_card_amount_widget.h" @@ -14,19 +12,16 @@ #include #include -#include #include #include #include #include +#include #include #include #include #include #include -#include -#include -#include #include #include #include @@ -41,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -124,12 +120,6 @@ PrintingSelectorCardOverlayWidget::PrintingSelectorCardOverlayWidget(QWidget *pa mainLayout->addWidget(cardInfoPicture); initializePinBadge(); - auto refreshPinBadge = [this] { - initializePinBadge(); - updatePinBadgeVisibility(); - }; - connect(themeManager, &ThemeManager::paletteChanged, this, refreshPinBadge); - connect(themeManager, &ThemeManager::themeChanged, this, refreshPinBadge); // Parent the preview to this overlay so it is destroyed with it (Qt::ToolTip keeps // it a frameless, non-activating top-level window despite the parent). @@ -411,55 +401,10 @@ void PrintingSelectorCardOverlayWidget::customMenu(QPoint point) } /** - * @brief Composes the pin badge: the glyph over a rounded palette backdrop. + * @brief Initializes the pin badge overlay and loads its icon with DPI-aware rasterization. * - * The badge floats on card art rather than on a palette surface, so a bare glyph - * colored WindowText is not enough: a thin dark stroke disappears on dark art in a - * light palette, and a thin light stroke disappears on light art in a dark palette. - * A Window-filled rounded rect with a WindowText outline gives the glyph a solid - * backing, and the outline guarantees the badge edge contrasts with the art even when - * the fill matches it. Both roles follow the palette, like the glyph. - * - * @param logicalSize The badge's size in logical pixels. - * @param devicePixelRatio The label's device pixel ratio, applied to the pixmap so it - * stays crisp on HiDPI displays. - * @param palette The palette the glyph's WindowText resolves against. - */ -static QPixmap composePinBadgePixmap(const QSize &logicalSize, qreal devicePixelRatio, const QPalette &palette) -{ - // Inset the glyph so the backdrop reads as a badge around it, not as a border. - const int inset = qRound(logicalSize.width() * 0.16); - const QSize glyphSize = logicalSize - QSize(inset * 2, inset * 2); - const QPixmap glyph = loadThemedIcon(QStringLiteral("icons/pin")).pixmap(glyphSize, devicePixelRatio); - if (glyph.isNull()) { - // Let the caller fall back to the textual badge instead of drawing an empty panel. - return QPixmap(); - } - - QPixmap badge(logicalSize * devicePixelRatio); - badge.setDevicePixelRatio(devicePixelRatio); - badge.fill(Qt::transparent); - - QPainter painter(&badge); - painter.setRenderHint(QPainter::Antialiasing); - - // Half-pixel inset keeps the 1.5px outline inside the pixmap instead of clipping it. - const QRectF box(QPointF(0.5, 0.5), QSizeF(logicalSize) - QSizeF(1, 1)); - painter.setPen(QPen(palette.color(QPalette::WindowText), 1.5)); - painter.setBrush(palette.color(QPalette::Window)); - painter.drawRoundedRect(box, 8, 8); - painter.drawPixmap(QPointF(inset, inset), glyph); - - return badge; -} - -/** - * @brief Initializes the pin badge overlay and loads a DPI-aware icon pixmap. - * - * The glyph is drawn onto a rounded palette backdrop so the badge stays readable on - * card art, and it is rasterized at the label's device pixel ratio so it stays crisp on - * HiDPI displays. It is re-rendered when the palette or theme changes so the badge - * follows the surrounding UI instead of freezing at its first colors. + * The icon is rasterized once using the label's device pixel ratio so it stays crisp on HiDPI + * displays. The resulting pixmap is cached on the QLabel and simply shown/hidden when needed. * If the SVG cannot be read, a textual fallback badge is created instead. */ void PrintingSelectorCardOverlayWidget::initializePinBadge() @@ -475,13 +420,24 @@ void PrintingSelectorCardOverlayWidget::initializePinBadge() } bool pinLoaded = false; - const QSize targetSize(64, 64); - const QPixmap pinPix = composePinBadgePixmap(targetSize, pinBadge->devicePixelRatioF(), pinBadge->palette()); - if (!pinPix.isNull()) { - pinBadge->setPixmap(pinPix); - pinBadge->setFixedSize(targetSize); - pinBadge->setStyleSheet(QStringLiteral("background: transparent;")); - pinLoaded = true; + QImageReader pinReader(QStringLiteral("theme:icons/pin")); + + if (pinReader.canRead()) { + // Rasterize a 64×64 logical icon so it has a consistent size regardless of card scaling. + const QSize targetSize(64, 64); + const qreal dpr = pinBadge->devicePixelRatioF(); + const QSize rasterSize(qMax(1, qCeil(targetSize.width() * dpr)), qMax(1, qCeil(targetSize.height() * dpr))); + pinReader.setScaledSize(rasterSize); + const QImage pinImage = pinReader.read(); + if (!pinImage.isNull()) { + // Tag the pixmap with the same DPR so Qt renders it at the correct physical size. + QPixmap pinPix = QPixmap::fromImage(pinImage); + pinPix.setDevicePixelRatio(dpr); + pinBadge->setPixmap(pinPix); + pinBadge->setFixedSize(targetSize); + pinBadge->setStyleSheet(QStringLiteral("background: transparent;")); + pinLoaded = true; + } } if (!pinLoaded) { diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp index 225c3e21d..7f9ad66c8 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp @@ -1,8 +1,5 @@ #include "printing_selector_placeholder_widget.h" -#include "../interface/theme_manager.h" - -#include #include #include #include @@ -33,12 +30,10 @@ PrintingSelectorPlaceholderWidget::PrintingSelectorPlaceholderWidget(QWidget *pa textLabel->setStyleSheet(R"( QLabel { color: palette(mid); + font-size: 14px; padding: 10px; } )"); - applyInterfaceDefaultFont(); - connect(themeManager, &ThemeManager::fontsChanged, this, - &PrintingSelectorPlaceholderWidget::applyInterfaceDefaultFont); mainLayout->addWidget(imageLabel); mainLayout->addWidget(textLabel); @@ -49,12 +44,4 @@ PrintingSelectorPlaceholderWidget::PrintingSelectorPlaceholderWidget(QWidget *pa void PrintingSelectorPlaceholderWidget::retranslateUi() { textLabel->setText(tr("Select a card to view its available printings")); -} - -void PrintingSelectorPlaceholderWidget::applyInterfaceDefaultFont() -{ - // Family comes from the InterfaceDefault theme role; the 14px size stays caller-side. - QFont placeholderFont = themeManager->appFont(AppFont::InterfaceDefault); - placeholderFont.setPixelSize(14); - textLabel->setFont(placeholderFont); } \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.h index 9e6e47bcb..6702d325a 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.h +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.h @@ -14,9 +14,6 @@ class PrintingSelectorPlaceholderWidget : public QWidget public: explicit PrintingSelectorPlaceholderWidget(QWidget *parent = nullptr); -private slots: - void applyInterfaceDefaultFont(); - private: QVBoxLayout *mainLayout; QLabel *imageLabel; diff --git a/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp b/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp index c6a6d989f..ea0d2db5a 100644 --- a/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp +++ b/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp @@ -1,12 +1,12 @@ #include "settings_button_widget.h" -#include "../../theme_icon.h" +#include "../../pixel_map_generator.h" #include "settings_popup_widget.h" #include #include -#include #include +#include #include #include #include @@ -21,7 +21,7 @@ SettingsButtonWidget::SettingsButtonWidget(QWidget *parent) : QWidget(parent), button(new QToolButton(this)), popup(new SettingsPopupWidget(nullptr)) { - button->setIcon(loadThemedIcon(QStringLiteral("icons/settings"))); + button->setIcon(themePixmap(QStringLiteral("icons/cogwheel"))); button->setCheckable(true); button->setFixedSize(32, 32); connect(button, &QToolButton::clicked, this, &SettingsButtonWidget::togglePopup); @@ -49,9 +49,9 @@ void SettingsButtonWidget::removeSettingsWidget(QWidget *toRemove) const popup->removeSettingsWidget(toRemove); } -void SettingsButtonWidget::setButtonIcon(const QIcon &icon) +void SettingsButtonWidget::setButtonIcon(QPixmap iconMap) { - button->setIcon(icon); + button->setIcon(iconMap); } void SettingsButtonWidget::setButtonText(const QString &text) diff --git a/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.h b/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.h index 56d542d37..015300bf8 100644 --- a/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.h +++ b/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.h @@ -13,7 +13,7 @@ #include class QHBoxLayout; -class QIcon; +class QPixmap; class QToolButton; class SettingsPopupWidget; @@ -28,7 +28,7 @@ public: void addSettingsWidget(QWidget *toAdd) const; void removeSettingsWidget(QWidget *toRemove) const; - void setButtonIcon(const QIcon &icon); + void setButtonIcon(QPixmap iconMap); void setButtonText(const QString &buttonText); void setCompact(bool compact); bool isCompact() const diff --git a/cockatrice/src/interface/widgets/replay/replay_event_index.cpp b/cockatrice/src/interface/widgets/replay/replay_event_index.cpp deleted file mode 100644 index d21671b5a..000000000 --- a/cockatrice/src/interface/widgets/replay/replay_event_index.cpp +++ /dev/null @@ -1,876 +0,0 @@ -#include "replay_event_index.h" - -#include "libcockatrice/protocol/get_pb_extension.h" -#include "libcockatrice/protocol/pb/card_attributes.pb.h" -#include "libcockatrice/protocol/pb/context_concede.pb.h" -#include "libcockatrice/protocol/pb/context_connection_state_changed.pb.h" -#include "libcockatrice/protocol/pb/context_deck_select.pb.h" -#include "libcockatrice/protocol/pb/context_mulligan.pb.h" -#include "libcockatrice/protocol/pb/context_ready_start.pb.h" -#include "libcockatrice/protocol/pb/context_set_sideboard_lock.pb.h" -#include "libcockatrice/protocol/pb/context_undo_draw.pb.h" -#include "libcockatrice/protocol/pb/event_attach_card.pb.h" -#include "libcockatrice/protocol/pb/event_change_zone_properties.pb.h" -#include "libcockatrice/protocol/pb/event_create_counter.pb.h" -#include "libcockatrice/protocol/pb/event_create_token.pb.h" -#include "libcockatrice/protocol/pb/event_del_counter.pb.h" -#include "libcockatrice/protocol/pb/event_destroy_card.pb.h" -#include "libcockatrice/protocol/pb/event_draw_cards.pb.h" -#include "libcockatrice/protocol/pb/event_dump_zone.pb.h" -#include "libcockatrice/protocol/pb/event_flip_card.pb.h" -#include "libcockatrice/protocol/pb/event_game_closed.pb.h" -#include "libcockatrice/protocol/pb/event_game_host_changed.pb.h" -#include "libcockatrice/protocol/pb/event_game_log_notice.pb.h" -#include "libcockatrice/protocol/pb/event_game_say.pb.h" -#include "libcockatrice/protocol/pb/event_game_state_changed.pb.h" -#include "libcockatrice/protocol/pb/event_join.pb.h" -#include "libcockatrice/protocol/pb/event_kicked.pb.h" -#include "libcockatrice/protocol/pb/event_leave.pb.h" -#include "libcockatrice/protocol/pb/event_move_card.pb.h" -#include "libcockatrice/protocol/pb/event_player_properties_changed.pb.h" -#include "libcockatrice/protocol/pb/event_reveal_cards.pb.h" -#include "libcockatrice/protocol/pb/event_reverse_turn.pb.h" -#include "libcockatrice/protocol/pb/event_roll_die.pb.h" -#include "libcockatrice/protocol/pb/event_set_active_phase.pb.h" -#include "libcockatrice/protocol/pb/event_set_active_player.pb.h" -#include "libcockatrice/protocol/pb/event_set_card_attr.pb.h" -#include "libcockatrice/protocol/pb/event_set_card_counter.pb.h" -#include "libcockatrice/protocol/pb/event_set_counter.pb.h" -#include "libcockatrice/protocol/pb/event_shuffle.pb.h" -#include "libcockatrice/protocol/pb/game_event.pb.h" -#include "libcockatrice/protocol/pb/game_event_container.pb.h" -#include "libcockatrice/protocol/pb/game_event_context.pb.h" -#include "libcockatrice/protocol/pb/game_replay.pb.h" -#include "libcockatrice/protocol/pb/serverinfo_card.pb.h" -#include "libcockatrice/protocol/pb/serverinfo_counter.pb.h" -#include "libcockatrice/protocol/pb/serverinfo_player.pb.h" -#include "libcockatrice/protocol/pb/serverinfo_playerproperties.pb.h" -#include "libcockatrice/protocol/pb/serverinfo_zone.pb.h" -#include "libcockatrice/utility/zone_names.h" - -#include -#include -#include -#include -#include -#include - -namespace -{ -struct PendingDetail -{ - QString text; - QString badge; - ReplayEventKind kind = ReplayEventKind::Action; - QString actor; -}; - -QString formatTime(int timeMs) -{ - const int totalSeconds = qMax(0, timeMs) / 1000; - const int hours = totalSeconds / 3600; - const int minutes = (totalSeconds / 60) % 60; - const int seconds = totalSeconds % 60; - - if (hours > 0) { - return QStringLiteral("%1:%2:%3") - .arg(hours) - .arg(minutes, 2, 10, QLatin1Char('0')) - .arg(seconds, 2, 10, QLatin1Char('0')); - } - - return QStringLiteral("%1:%2").arg(minutes, 2, 10, QLatin1Char('0')).arg(seconds, 2, 10, QLatin1Char('0')); -} - -class ReplayEventIndexBuilder -{ - Q_DECLARE_TR_FUNCTIONS(ReplayEventIndex) - -public: - ReplayEventIndexBuilder(const GameReplay *replay, const QList &timeline) : replay(replay), timeline(timeline) - { - } - - QList build() - { - QList entries; - - for (int i = 0; i < replay->event_list_size(); ++i) { - const GameEventContainer &container = replay->event_list(i); - const QList details = describeContainer(container); - if (details.isEmpty()) { - continue; - } - - ReplayEventEntry entry; - entry.eventIndex = i; - entry.timeMs = timeline.value(i, static_cast(container.seconds_elapsed()) * 1000); - entry.timeLabel = formatTime(entry.timeMs); - entry.kind = details.first().kind; - entry.badge = details.first().badge; - if (details.size() > 1) { - entry.badge += QStringLiteral(" +%1").arg(details.size() - 1); - } - - const QString sharedActor = details.first().actor; - const bool mixedActors = std::any_of(details.cbegin(), details.cend(), [&sharedActor](const auto &detail) { - return detail.actor != sharedActor; - }); - - QStringList detailTexts; - for (const PendingDetail &detail : details) { - if (mixedActors && !detail.actor.isEmpty()) { - detailTexts.append(tr("%1: %2").arg(detail.actor, detail.text)); - } else { - detailTexts.append(detail.text); - } - } - entry.actor = mixedActors ? QString() : sharedActor; - entry.detail = detailTexts.join(QStringLiteral(" • ")); - - entries.append(entry); - } - - return entries; - } - -private: - const GameReplay *replay; - const QList &timeline; - - QHash playerNames; - QHash spectators; - QHash cardNames; - QHash counterNames; - - int activePlayerId = -1; - bool gameStarted = false; - bool sawGameState = false; - - static QString cardKey(int playerId, const QString &zone, int cardId) - { - return QStringLiteral("%1/%2/%3").arg(playerId).arg(zone).arg(cardId); - } - - static QString counterKey(int playerId, int counterId) - { - return QStringLiteral("%1/%2").arg(playerId).arg(counterId); - } - - QString playerName(int playerId) const - { - if (playerId < 0) { - return tr("Game"); - } - return playerNames.value(playerId, tr("Player %1").arg(playerId)); - } - - QString actorName(int playerId) const - { - if (playerId < 0) { - return QString(); - } - return playerNames.value(playerId, tr("Player %1").arg(playerId)); - } - - bool isSpectator(int playerId) const - { - return spectators.value(playerId, false); - } - - void rememberPlayer(const ServerInfo_PlayerProperties &properties) - { - const int playerId = properties.player_id(); - if (playerId < 0) { - return; - } - - const QString name = QString::fromStdString(properties.user_info().name()); - if (!name.isEmpty()) { - playerNames.insert(playerId, name); - } - spectators.insert(playerId, properties.spectator()); - } - - void rememberCard(int playerId, const QString &zone, int cardId, const QString &name) - { - if (cardId >= 0 && !name.isEmpty()) { - cardNames.insert(cardKey(playerId, zone, cardId), name); - } - } - - void forgetCard(int playerId, const QString &zone, int cardId) - { - if (cardId >= 0) { - cardNames.remove(cardKey(playerId, zone, cardId)); - } - } - - QString cardName(int playerId, const QString &zone, int cardId) const - { - if (cardId < 0) { - return QString(); - } - return cardNames.value(cardKey(playerId, zone, cardId)); - } - - void rememberCounter(int playerId, const ServerInfo_Counter &counter) - { - const QString name = QString::fromStdString(counter.name()); - if (!name.isEmpty()) { - counterNames.insert(counterKey(playerId, counter.id()), name); - } - } - - QString counterName(int playerId, int counterId) const - { - return counterNames.value(counterKey(playerId, counterId)); - } - - QString zoneName(const QString &zone) const - { - if (zone == ZoneNames::TABLE) { - return tr("battlefield"); - } - if (zone == ZoneNames::GRAVE) { - return tr("graveyard"); - } - if (zone == ZoneNames::EXILE) { - return tr("exile"); - } - if (zone == ZoneNames::HAND) { - return tr("hand"); - } - if (zone == ZoneNames::DECK) { - return tr("library"); - } - if (zone == ZoneNames::SIDEBOARD) { - return tr("sideboard"); - } - if (zone == ZoneNames::STACK) { - return tr("stack"); - } - return zone; - } - - QString zonePhrase(int playerId, const QString &zone, int actorId) const - { - if (zone == ZoneNames::TABLE) { - return tr("the battlefield"); - } - if (zone == ZoneNames::EXILE) { - return tr("exile"); - } - if (zone == ZoneNames::STACK) { - return tr("the stack"); - } - - const QString name = zoneName(zone); - if (playerId < 0 || playerId == actorId) { - return tr("their %1").arg(name); - } - return tr("%1's %2").arg(playerName(playerId), name); - } - - QString formatCardList(const QStringList &names, int total) const - { - // Keep repeats: each entry is a drawn/revealed card, so the list length must agree with the count. - QStringList listedNames; - for (const QString &name : names) { - if (!name.isEmpty()) { - listedNames.append(name); - } - } - - if (listedNames.isEmpty()) { - if (total <= 0) { - return tr("no cards"); - } - return total == 1 ? tr("1 card") : tr("%1 cards").arg(total); - } - - if (total < listedNames.size()) { - total = listedNames.size(); - } - - if (listedNames.size() > 3) { - return tr("%1 and %2 more").arg(listedNames.mid(0, 3).join(QStringLiteral(", "))).arg(total - 3); - } - if (total > listedNames.size()) { - return tr("%1 and %2 more").arg(listedNames.join(QStringLiteral(", "))).arg(total - listedNames.size()); - } - - return listedNames.join(QStringLiteral(", ")); - } - - void updateGameState(const Event_GameStateChanged &event) - { - for (int i = 0; i < event.player_list_size(); ++i) { - const ServerInfo_Player &player = event.player_list(i); - const int playerId = player.properties().player_id(); - rememberPlayer(player.properties()); - - for (int j = 0; j < player.zone_list_size(); ++j) { - const ServerInfo_Zone &zone = player.zone_list(j); - for (int k = 0; k < zone.card_list_size(); ++k) { - const ServerInfo_Card &card = zone.card_list(k); - rememberCard(playerId, QString::fromStdString(zone.name()), card.id(), - QString::fromStdString(card.name())); - } - } - - for (int j = 0; j < player.counter_list_size(); ++j) { - rememberCounter(playerId, player.counter_list(j)); - } - } - - if (event.has_active_player_id()) { - activePlayerId = event.active_player_id(); - } - if (event.has_game_started()) { - gameStarted = event.game_started(); - } - } - - QString describeMoveCard(const Event_MoveCard &event, int actorId, const GameEventContext &context) - { - const int startPlayerId = event.start_player_id() >= 0 ? event.start_player_id() : actorId; - const int targetPlayerId = event.target_player_id() >= 0 ? event.target_player_id() : startPlayerId; - const QString startZone = QString::fromStdString(event.start_zone()); - const QString targetZone = event.has_target_zone() ? QString::fromStdString(event.target_zone()) : startZone; - - QString name; - if (event.has_card_name()) { - name = QString::fromStdString(event.card_name()); - } - if (name.isEmpty()) { - name = cardName(startPlayerId, startZone, event.card_id()); - } - - const bool knownName = !name.isEmpty(); - if (name.isEmpty()) { - name = event.face_down() ? tr("a face-down card") : tr("a card"); - } - - const int newCardId = event.has_new_card_id() ? event.new_card_id() : event.card_id(); - forgetCard(startPlayerId, startZone, event.card_id()); - if (knownName) { - rememberCard(targetPlayerId, targetZone, newCardId, name); - } - - if (startZone == targetZone) { - return tr("moved %1 within %2.").arg(name, zonePhrase(targetPlayerId, targetZone, actorId)); - } - if (context.HasExtension(Context_UndoDraw::ext)) { - return tr("returned %1 to %2.").arg(name, zonePhrase(targetPlayerId, targetZone, actorId)); - } - - return tr("moved %1 from %2 to %3.") - .arg(name, zonePhrase(startPlayerId, startZone, actorId), zonePhrase(targetPlayerId, targetZone, actorId)); - } - - QString describeSetCardAttribute(const Event_SetCardAttr &event, int actorId) - { - const QString zone = QString::fromStdString(event.zone_name()); - QString name; - if (event.has_card_id()) { - name = cardName(actorId, zone, event.card_id()); - } - if (name.isEmpty()) { - name = event.has_card_id() ? tr("a card") : tr("all cards"); - } - - const QString value = QString::fromStdString(event.attr_value()); - switch (event.attribute()) { - case AttrTapped: - return value == QLatin1String("1") ? tr("tapped %1.").arg(name) : tr("untapped %1.").arg(name); - case AttrAttacking: - return value == QLatin1String("1") ? tr("%1 is now attacking.").arg(name) - : tr("%1 is no longer attacking.").arg(name); - case AttrFaceDown: - return value == QLatin1String("1") ? tr("turned %1 face down.").arg(name) - : tr("turned %1 face up.").arg(name); - case AttrColor: - return tr("changed %1's color to %2.").arg(name, value); - case AttrPT: - return tr("set %1's power/toughness to %2.").arg(name, value); - case AttrAnnotation: - return value.isEmpty() ? tr("cleared %1's annotation.").arg(name) - : tr("annotated %1: %2").arg(name, value); - case AttrDoesntUntap: - return value == QLatin1String("1") ? tr("%1 will no longer untap.").arg(name) - : tr("%1 will untap normally again.").arg(name); - } - - return tr("changed %1.").arg(name); - } - - QString badgeForCardAttribute(CardAttribute attribute) const - { - switch (attribute) { - case AttrTapped: - return tr("TAP"); - case AttrAttacking: - return tr("ATTACK"); - case AttrFaceDown: - return tr("FLIP"); - case AttrColor: - return tr("COLOR"); - case AttrPT: - return tr("PT"); - case AttrAnnotation: - return tr("NOTE"); - case AttrDoesntUntap: - return tr("TAP"); - } - return tr("CARD"); - } - - QString describeLeaveReason(Event_Leave::LeaveReason reason) const - { - switch (reason) { - case Event_Leave::USER_KICKED: - return tr("kicked by game host or moderator"); - case Event_Leave::USER_LEFT: - return tr("left the game"); - case Event_Leave::USER_DISCONNECTED: - return tr("disconnected"); - case Event_Leave::OTHER: - default: - return tr("reason unknown"); - } - } - - void addDetail(QList &details, - const QString &text, - const QString &badge, - ReplayEventKind kind, - int actorId, - bool forcedByJudge) const - { - if (text.isEmpty()) { - return; - } - - const QString finalText = forcedByJudge ? tr("%1 (judge)").arg(text) : text; - details.append(PendingDetail{.text = finalText, .badge = badge, .kind = kind, .actor = actorName(actorId)}); - } - - QList describeContainer(const GameEventContainer &container) - { - QList details; - const GameEventContext &context = container.context(); - const bool forcedByJudge = container.has_forced_by_judge(); - const auto contextType = static_cast(getPbExtension(context)); - - for (int i = 0; i < container.event_list_size(); ++i) { - const GameEvent &event = container.event_list(i); - const int eventPlayerId = event.player_id(); - const auto eventType = static_cast(getPbExtension(event)); - - switch (eventType) { - case GameEvent::GAME_STATE_CHANGED: { - const Event_GameStateChanged &state = event.GetExtension(Event_GameStateChanged::ext); - const bool wasStarted = gameStarted; - updateGameState(state); - if (state.game_started() && !wasStarted) { - addDetail(details, tr("Game started."), tr("GAME"), ReplayEventKind::System, -1, forcedByJudge); - } else if (!sawGameState) { - addDetail(details, tr("Game state loaded."), tr("GAME"), ReplayEventKind::System, -1, - forcedByJudge); - } - sawGameState = true; - break; - } - case GameEvent::PLAYER_PROPERTIES_CHANGED: { - const Event_PlayerPropertiesChanged &propertiesEvent = - event.GetExtension(Event_PlayerPropertiesChanged::ext); - const bool hasProperties = propertiesEvent.has_player_properties(); - const ServerInfo_PlayerProperties &properties = propertiesEvent.player_properties(); - // The server only fills in the field that changed, so player_id is absent from these events - // unless they are about a specific player; fall back to the event's own player id. - const bool describesPlayer = hasProperties && properties.has_player_id(); - const int playerId = describesPlayer ? properties.player_id() : eventPlayerId; - if (describesPlayer) { - rememberPlayer(properties); - } - - switch (contextType) { - case GameEventContext::READY_START: - addDetail(details, - properties.ready_start() ? tr("is ready to start.") : tr("is no longer ready."), - tr("READY"), ReplayEventKind::System, playerId, forcedByJudge); - break; - case GameEventContext::CONCEDE: - addDetail(details, tr("conceded the game."), tr("CONCEDE"), ReplayEventKind::System, - playerId, forcedByJudge); - break; - case GameEventContext::UNCONCEDE: - addDetail(details, tr("unconceded the game."), tr("CONCEDE"), ReplayEventKind::System, - playerId, forcedByJudge); - break; - case GameEventContext::DECK_SELECT: { - const Context_DeckSelect &deckSelect = context.GetExtension(Context_DeckSelect::ext); - const int sideboardSize = deckSelect.sideboard_size(); - addDetail(details, - sideboardSize >= 0 - ? tr("selected a deck with %1 sideboard cards.").arg(sideboardSize) - : tr("selected a deck."), - tr("DECK"), ReplayEventKind::System, playerId, forcedByJudge); - break; - } - case GameEventContext::MULLIGAN: { - const Context_Mulligan &mulligan = context.GetExtension(Context_Mulligan::ext); - addDetail(details, - mulligan.number() > 0 ? tr("took a mulligan (%1).").arg(mulligan.number()) - : tr("took a mulligan."), - tr("MULLIGAN"), ReplayEventKind::System, playerId, forcedByJudge); - break; - } - case GameEventContext::SET_SIDEBOARD_LOCK: - addDetail(details, - properties.sideboard_locked() ? tr("locked their sideboard.") - : tr("unlocked their sideboard."), - tr("SIDEBOARD"), ReplayEventKind::System, playerId, forcedByJudge); - break; - case GameEventContext::CONNECTION_STATE_CHANGED: - addDetail(details, - properties.ping_seconds() != -1 ? tr("reconnected to the game.") - : tr("lost connection to the game."), - tr("CONNECTION"), ReplayEventKind::System, playerId, forcedByJudge); - break; - default: - break; - } - break; - } - case GameEvent::JOIN: { - const Event_Join &join = event.GetExtension(Event_Join::ext); - if (join.has_player_properties()) { - rememberPlayer(join.player_properties()); - } - const int playerId = join.player_properties().player_id() >= 0 - ? join.player_properties().player_id() - : eventPlayerId; - addDetail(details, isSpectator(playerId) ? tr("joined as a spectator.") : tr("joined the game."), - tr("JOIN"), ReplayEventKind::System, playerId, forcedByJudge); - break; - } - case GameEvent::LEAVE: { - const Event_Leave &leave = event.GetExtension(Event_Leave::ext); - const QString reason = describeLeaveReason(leave.reason()); - if (eventPlayerId < 0) { - addDetail(details, tr("A player left the game (%1).").arg(reason), tr("LEAVE"), - ReplayEventKind::System, -1, forcedByJudge); - } else { - addDetail(details, - isSpectator(eventPlayerId) ? tr("stopped spectating (%1).").arg(reason) - : tr("left the game (%1).").arg(reason), - tr("LEAVE"), ReplayEventKind::System, eventPlayerId, forcedByJudge); - } - break; - } - case GameEvent::KICKED: - addDetail(details, - eventPlayerId >= 0 ? tr("was kicked from the game.") - : tr("A player was kicked from the game."), - tr("KICK"), ReplayEventKind::System, eventPlayerId, forcedByJudge); - break; - case GameEvent::GAME_CLOSED: - addDetail(details, tr("Game closed."), tr("GAME"), ReplayEventKind::System, -1, forcedByJudge); - break; - case GameEvent::GAME_HOST_CHANGED: - addDetail(details, eventPlayerId >= 0 ? tr("is now the game host.") : tr("The game host changed."), - tr("HOST"), ReplayEventKind::System, eventPlayerId, forcedByJudge); - break; - case GameEvent::GAME_SAY: { - const Event_GameSay &say = event.GetExtension(Event_GameSay::ext); - addDetail(details, QString::fromStdString(say.message()), tr("CHAT"), ReplayEventKind::Chat, - eventPlayerId, forcedByJudge); - break; - } - case GameEvent::SET_ACTIVE_PLAYER: { - const Event_SetActivePlayer &setActivePlayer = event.GetExtension(Event_SetActivePlayer::ext); - activePlayerId = setActivePlayer.active_player_id(); - if (activePlayerId >= 0) { - addDetail(details, tr("begins their turn."), tr("TURN"), ReplayEventKind::Turn, activePlayerId, - forcedByJudge); - } - break; - } - case GameEvent::SET_ACTIVE_PHASE: { - const Event_SetActivePhase &setActivePhase = event.GetExtension(Event_SetActivePhase::ext); - if (setActivePhase.phase() >= 0) { - const QString phaseName = Phases::getPhase(setActivePhase.phase()).getName(); - addDetail(details, tr("entered the %1 phase.").arg(phaseName), tr("PHASE"), - ReplayEventKind::Phase, activePlayerId >= 0 ? activePlayerId : eventPlayerId, - forcedByJudge); - } - break; - } - case GameEvent::REVERSE_TURN: { - const Event_ReverseTurn &reverseTurn = event.GetExtension(Event_ReverseTurn::ext); - addDetail(details, - reverseTurn.reversed() ? tr("reversed the turn order.") : tr("restored the turn order."), - tr("TURN"), ReplayEventKind::Turn, eventPlayerId, forcedByJudge); - break; - } - case GameEvent::MOVE_CARD: { - const Event_MoveCard &moveCard = event.GetExtension(Event_MoveCard::ext); - const QString text = describeMoveCard(moveCard, eventPlayerId, context); - const QString startZone = QString::fromStdString(moveCard.start_zone()); - const QString targetZone = QString::fromStdString(moveCard.target_zone()); - QString badge = tr("MOVE"); - if (context.HasExtension(Context_UndoDraw::ext)) { - badge = tr("UNDO"); - } else if (startZone == ZoneNames::STACK) { - badge = tr("RESOLVE"); - } else if (startZone == ZoneNames::HAND && targetZone == ZoneNames::TABLE) { - badge = tr("PLAY"); - } - addDetail(details, text, badge, ReplayEventKind::Action, eventPlayerId, forcedByJudge); - break; - } - case GameEvent::DRAW_CARDS: { - const Event_DrawCards &drawCards = event.GetExtension(Event_DrawCards::ext); - QStringList names; - for (int j = 0; j < drawCards.cards_size(); ++j) { - const ServerInfo_Card &card = drawCards.cards(j); - const QString name = QString::fromStdString(card.name()); - names.append(name); - rememberCard(eventPlayerId, ZoneNames::HAND, card.id(), name); - } - if (drawCards.number() > 0) { - addDetail(details, tr("drew %1.").arg(formatCardList(names, drawCards.number())), tr("DRAW"), - ReplayEventKind::Action, eventPlayerId, forcedByJudge); - } - break; - } - case GameEvent::REVEAL_CARDS: { - const Event_RevealCards &revealCards = event.GetExtension(Event_RevealCards::ext); - const QString zone = QString::fromStdString(revealCards.zone_name()); - QStringList names; - for (int j = 0; j < revealCards.cards_size(); ++j) { - const ServerInfo_Card &card = revealCards.cards(j); - const QString name = QString::fromStdString(card.name()); - names.append(name); - rememberCard(eventPlayerId, zone, card.id(), name); - } - const int total = - revealCards.number_of_cards() > 0 ? revealCards.number_of_cards() : revealCards.cards_size(); - QString text = - tr("revealed %1 from %2.") - .arg(formatCardList(names, total), zonePhrase(eventPlayerId, zone, eventPlayerId)); - if (revealCards.other_player_id() >= 0 && revealCards.other_player_id() != eventPlayerId) { - text = tr("revealed %1 from %2 to %3.") - .arg(formatCardList(names, total), zonePhrase(eventPlayerId, zone, eventPlayerId), - playerName(revealCards.other_player_id())); - } - addDetail(details, text, tr("REVEAL"), ReplayEventKind::Action, eventPlayerId, forcedByJudge); - break; - } - case GameEvent::SHUFFLE: { - const Event_Shuffle &shuffle = event.GetExtension(Event_Shuffle::ext); - addDetail( - details, - tr("shuffled %1.") - .arg(zonePhrase(eventPlayerId, QString::fromStdString(shuffle.zone_name()), eventPlayerId)), - tr("SHUFFLE"), ReplayEventKind::Action, eventPlayerId, forcedByJudge); - break; - } - case GameEvent::ROLL_DIE: { - const Event_RollDie &rollDie = event.GetExtension(Event_RollDie::ext); - QStringList rolls; - for (int j = 0; j < rollDie.values_size(); ++j) { - rolls.append(QString::number(rollDie.values(j))); - } - if (rolls.isEmpty() && rollDie.value() > 0) { - rolls.append(QString::number(rollDie.value())); - } - const QString sides = rollDie.sides() > 0 ? QString::number(rollDie.sides()) : QStringLiteral("?"); - addDetail(details, tr("rolled a d%1: %2.").arg(sides, rolls.join(QStringLiteral(", "))), tr("DICE"), - ReplayEventKind::Action, eventPlayerId, forcedByJudge); - break; - } - case GameEvent::FLIP_CARD: { - const Event_FlipCard &flipCard = event.GetExtension(Event_FlipCard::ext); - const QString zone = QString::fromStdString(flipCard.zone_name()); - if (flipCard.has_card_name()) { - rememberCard(eventPlayerId, zone, flipCard.card_id(), - QString::fromStdString(flipCard.card_name())); - } - QString name = flipCard.has_card_name() ? QString::fromStdString(flipCard.card_name()) - : cardName(eventPlayerId, zone, flipCard.card_id()); - if (name.isEmpty()) { - name = tr("a card"); - } - addDetail(details, - flipCard.face_down() ? tr("flipped %1 face down.").arg(name) - : tr("flipped %1 face up.").arg(name), - tr("FLIP"), ReplayEventKind::Action, eventPlayerId, forcedByJudge); - break; - } - case GameEvent::DESTROY_CARD: { - const Event_DestroyCard &destroyCard = event.GetExtension(Event_DestroyCard::ext); - const QString zone = QString::fromStdString(destroyCard.zone_name()); - const QString name = cardName(eventPlayerId, zone, destroyCard.card_id()); - forgetCard(eventPlayerId, zone, destroyCard.card_id()); - addDetail(details, tr("destroyed %1.").arg(name.isEmpty() ? tr("a card") : name), tr("DESTROY"), - ReplayEventKind::Action, eventPlayerId, forcedByJudge); - break; - } - case GameEvent::ATTACH_CARD: { - const Event_AttachCard &attachCard = event.GetExtension(Event_AttachCard::ext); - const QString startZone = QString::fromStdString(attachCard.start_zone()); - const QString source = cardName(eventPlayerId, startZone, attachCard.card_id()); - const QString sourceText = source.isEmpty() ? tr("a card") : source; - // An unattach event carries no target at all, so the target fields default to player 0 / no zone - // / card 0; only a present target_player_id means the card was attached to something. - if (!attachCard.has_target_player_id()) { - addDetail(details, tr("unattached %1.").arg(sourceText), tr("ATTACH"), ReplayEventKind::Action, - eventPlayerId, forcedByJudge); - break; - } - const QString targetZone = QString::fromStdString(attachCard.target_zone()); - const int targetPlayerId = - attachCard.target_player_id() >= 0 ? attachCard.target_player_id() : eventPlayerId; - const QString target = cardName(targetPlayerId, targetZone, attachCard.target_card_id()); - addDetail(details, - tr("attached %1 to %2.").arg(sourceText, target.isEmpty() ? tr("a card") : target), - tr("ATTACH"), ReplayEventKind::Action, eventPlayerId, forcedByJudge); - break; - } - case GameEvent::CREATE_TOKEN: { - const Event_CreateToken &createToken = event.GetExtension(Event_CreateToken::ext); - const QString name = QString::fromStdString(createToken.card_name()); - rememberCard(eventPlayerId, QString::fromStdString(createToken.zone_name()), createToken.card_id(), - name); - const QString pt = QString::fromStdString(createToken.pt()); - addDetail( - details, - tr("created a token: %1%2.") - .arg(name.isEmpty() ? tr("token") : name, pt.isEmpty() ? QString() : tr(" (%1)").arg(pt)), - tr("TOKEN"), ReplayEventKind::Action, eventPlayerId, forcedByJudge); - break; - } - case GameEvent::SET_CARD_ATTR: { - const Event_SetCardAttr &setCardAttr = event.GetExtension(Event_SetCardAttr::ext); - addDetail(details, describeSetCardAttribute(setCardAttr, eventPlayerId), - badgeForCardAttribute(setCardAttr.attribute()), ReplayEventKind::Action, eventPlayerId, - forcedByJudge); - break; - } - case GameEvent::SET_CARD_COUNTER: { - const Event_SetCardCounter &setCardCounter = event.GetExtension(Event_SetCardCounter::ext); - const QString name = cardName(eventPlayerId, QString::fromStdString(setCardCounter.zone_name()), - setCardCounter.card_id()); - addDetail( - details, - tr("set a counter on %1 to %2.") - .arg(name.isEmpty() ? tr("a card") : name, QString::number(setCardCounter.counter_value())), - tr("COUNTER"), ReplayEventKind::Action, eventPlayerId, forcedByJudge); - break; - } - case GameEvent::CREATE_COUNTER: { - const Event_CreateCounter &createCounter = event.GetExtension(Event_CreateCounter::ext); - const ServerInfo_Counter &counter = createCounter.counter_info(); - rememberCounter(eventPlayerId, counter); - const QString name = QString::fromStdString(counter.name()); - addDetail(details, - tr("created the %1 counter (%2).") - .arg(name.isEmpty() ? tr("new") : name, QString::number(counter.count())), - tr("COUNTER"), ReplayEventKind::Action, eventPlayerId, forcedByJudge); - break; - } - case GameEvent::SET_COUNTER: { - const Event_SetCounter &setCounter = event.GetExtension(Event_SetCounter::ext); - const QString name = counterName(eventPlayerId, setCounter.counter_id()); - addDetail(details, - tr("set %1 to %2.") - .arg(name.isEmpty() ? tr("a counter") : tr("the %1 counter").arg(name), - QString::number(setCounter.value())), - tr("COUNTER"), ReplayEventKind::Action, eventPlayerId, forcedByJudge); - break; - } - case GameEvent::DEL_COUNTER: { - const Event_DelCounter &delCounter = event.GetExtension(Event_DelCounter::ext); - const QString name = counterName(eventPlayerId, delCounter.counter_id()); - counterNames.remove(counterKey(eventPlayerId, delCounter.counter_id())); - addDetail(details, - tr("removed %1.").arg(name.isEmpty() ? tr("a counter") : tr("the %1 counter").arg(name)), - tr("COUNTER"), ReplayEventKind::Action, eventPlayerId, forcedByJudge); - break; - } - case GameEvent::DUMP_ZONE: { - const Event_DumpZone &dumpZone = event.GetExtension(Event_DumpZone::ext); - const QString zoneOwnerPhrase = zonePhrase( - dumpZone.zone_owner_id(), QString::fromStdString(dumpZone.zone_name()), eventPlayerId); - if (dumpZone.number_cards() < 0) { - addDetail(details, tr("looked at %1.").arg(zoneOwnerPhrase), tr("LOOK"), - ReplayEventKind::Action, eventPlayerId, forcedByJudge); - } else { - addDetail(details, - tr("looked at %1 from %2.") - .arg(formatCardList(QStringList(), dumpZone.number_cards()), zoneOwnerPhrase), - tr("LOOK"), ReplayEventKind::Action, eventPlayerId, forcedByJudge); - } - break; - } - case GameEvent::CHANGE_ZONE_PROPERTIES: { - const Event_ChangeZoneProperties &changeZone = event.GetExtension(Event_ChangeZoneProperties::ext); - const QString zone = QString::fromStdString(changeZone.zone_name()); - QStringList changes; - if (changeZone.always_reveal_top_card()) { - changes.append(tr("top card revealed to all")); - } - if (changeZone.always_look_at_top_card()) { - changes.append(tr("top card visible to its owner")); - } - addDetail( - details, - changes.isEmpty() - ? tr("changed the properties of %1.").arg(zonePhrase(eventPlayerId, zone, eventPlayerId)) - : tr("changed %1: %2.") - .arg(zonePhrase(eventPlayerId, zone, eventPlayerId), - changes.join(QStringLiteral(", "))), - tr("ZONE"), ReplayEventKind::Action, eventPlayerId, forcedByJudge); - break; - } - case GameEvent::GAME_LOG_NOTICE: { - const Event_GameLogNotice ¬ice = event.GetExtension(Event_GameLogNotice::ext); - switch (notice.notice_type()) { - case Event_GameLogNotice::UNDO_DRAW_FAILED: - addDetail(details, tr("failed to undo a draw."), tr("NOTICE"), ReplayEventKind::System, - eventPlayerId, forcedByJudge); - break; - default: - addDetail(details, tr("A game notice was logged."), tr("NOTICE"), ReplayEventKind::System, - -1, forcedByJudge); - break; - } - break; - } - case GameEvent::CREATE_ARROW: - case GameEvent::DELETE_ARROW: - // Arrows are transient visual annotations and would make the history very noisy. - break; - default: - addDetail(details, tr("Unrecognized game event."), tr("EVENT"), ReplayEventKind::Action, - eventPlayerId, forcedByJudge); - break; - } - } - - return details; - } -}; -} // namespace - -QList buildReplayEventEntries(const GameReplay *replay, const QList &timeline) -{ - if (!replay) { - return {}; - } - - return ReplayEventIndexBuilder(replay, timeline).build(); -} diff --git a/cockatrice/src/interface/widgets/replay/replay_event_index.h b/cockatrice/src/interface/widgets/replay/replay_event_index.h deleted file mode 100644 index 40f72a965..000000000 --- a/cockatrice/src/interface/widgets/replay/replay_event_index.h +++ /dev/null @@ -1,43 +0,0 @@ -#ifndef COCKATRICE_REPLAY_EVENT_INDEX_H -#define COCKATRICE_REPLAY_EVENT_INDEX_H - -#include -#include - -class GameReplay; - -enum class ReplayEventKind -{ - Action, - Turn, - Phase, - Chat, - System -}; - -/** - * @brief One user-visible entry in the replay history sidebar. - * - * The event index refers to the corresponding GameEventContainer in the replay. It is used to seek the replay to that - * container. - */ -struct ReplayEventEntry -{ - int eventIndex = -1; - int timeMs = 0; - QString timeLabel; - QString actor; - QString badge; - QString detail; - ReplayEventKind kind = ReplayEventKind::Action; -}; - -/** - * @brief Builds a compact, human-readable index of the events in a replay. - * - * The returned entries copy all the data they need, so the caller does not need to keep the replay object alive after - * this function returns. - */ -QList buildReplayEventEntries(const GameReplay *replay, const QList &timeline); - -#endif // COCKATRICE_REPLAY_EVENT_INDEX_H diff --git a/cockatrice/src/interface/widgets/replay/replay_event_sidebar.cpp b/cockatrice/src/interface/widgets/replay/replay_event_sidebar.cpp deleted file mode 100644 index b5fab2794..000000000 --- a/cockatrice/src/interface/widgets/replay/replay_event_sidebar.cpp +++ /dev/null @@ -1,284 +0,0 @@ -#include "replay_event_sidebar.h" - -#include "replay_event_index.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace -{ -enum ItemDataRole -{ - EventIndexRole = Qt::UserRole + 1, - TimeLabelRole, - KindRole, - ActorRole, - BadgeRole, - DetailRole -}; - -QColor accentForKind(ReplayEventKind kind, const QPalette &palette) -{ - switch (kind) { - case ReplayEventKind::Turn: - return QColor(0x4c, 0xaf, 0x50); - case ReplayEventKind::Phase: - return QColor(0x42, 0xa5, 0xf5); - case ReplayEventKind::Chat: - return QColor(0xff, 0xb3, 0x00); - case ReplayEventKind::System: - return palette.mid().color(); - case ReplayEventKind::Action: - default: - return palette.highlight().color(); - } -} - -class ReplayEventDelegate : public QStyledItemDelegate -{ -public: - explicit ReplayEventDelegate(QObject *parent) : QStyledItemDelegate(parent) - { - } - - void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override - { - painter->save(); - painter->setRenderHint(QPainter::Antialiasing, true); - - const QPalette &palette = option.palette; - const bool selected = option.state.testFlag(QStyle::State_Selected); - const bool hovered = option.state.testFlag(QStyle::State_MouseOver); - const auto kind = static_cast(index.data(KindRole).toInt()); - const QColor accent = accentForKind(kind, palette); - - const QRect card = option.rect.adjusted(4, 2, -4, -2); - QColor cardBackground = selected ? palette.highlight().color() : palette.base().color(); - if (!selected && hovered) { - cardBackground = palette.alternateBase().color(); - } - - painter->setPen(Qt::NoPen); - painter->setBrush(cardBackground); - painter->drawRoundedRect(card, 6, 6); - - QColor borderColor = selected ? palette.highlightedText().color() : palette.mid().color(); - borderColor.setAlpha(selected ? 100 : 130); - painter->setBrush(Qt::NoBrush); - painter->setPen(QPen(borderColor, 1)); - painter->drawRoundedRect(card.adjusted(0, 0, -1, -1), 6, 6); - - QColor accentColor = accent; - if (selected) { - accentColor = palette.highlightedText().color(); - accentColor.setAlpha(210); - } - painter->setPen(Qt::NoPen); - painter->setBrush(accentColor); - painter->drawRoundedRect(QRect(card.left() + 7, card.top() + 7, 3, card.height() - 14), 1.5, 1.5); - - const QColor textColor = selected ? palette.highlightedText().color() : palette.text().color(); - QColor mutedColor = textColor; - mutedColor.setAlpha(170); - - QFont timeFont = option.font; - timeFont.setBold(true); - timeFont.setPointSizeF(qMax(7.0, timeFont.pointSizeF() * 0.9)); - - QFont actorFont = option.font; - actorFont.setBold(true); - - QFont badgeFont = option.font; - badgeFont.setBold(true); - badgeFont.setPointSizeF(qMax(6.5, badgeFont.pointSizeF() * 0.72)); - - QFont detailFont = option.font; - detailFont.setPointSizeF(qMax(7.0, detailFont.pointSizeF() * 0.95)); - - const QFontMetrics timeMetrics(timeFont); - const QFontMetrics actorMetrics(actorFont); - const QFontMetrics badgeMetrics(badgeFont); - const QFontMetrics detailMetrics(detailFont); - - const int contentLeft = card.left() + 15; - const int contentRight = card.right() - 10; - const int topRowTop = card.top() + 6; - const int topRowHeight = qMax(timeMetrics.height(), badgeMetrics.height()) + 2; - - const QString timeText = index.data(TimeLabelRole).toString(); - const QString actorText = index.data(ActorRole).toString(); - const QString badgeText = index.data(BadgeRole).toString(); - const QString detailText = index.data(DetailRole).toString(); - - const int timeWidth = timeMetrics.horizontalAdvance(timeText); - painter->setFont(timeFont); - painter->setPen(mutedColor); - painter->drawText(QRect(contentLeft, topRowTop, timeWidth + 2, topRowHeight), Qt::AlignLeft | Qt::AlignVCenter, - timeText); - - int actorRight = contentRight; - if (!badgeText.isEmpty()) { - const int badgeWidth = badgeMetrics.horizontalAdvance(badgeText) + 10; - const int badgeHeight = badgeMetrics.height() + 2; - const QRect badgeRect(contentRight - badgeWidth, topRowTop + (topRowHeight - badgeHeight) / 2, badgeWidth, - badgeHeight); - - QColor badgeBackground = accentColor; - badgeBackground.setAlpha(selected ? 45 : 32); - painter->setPen(Qt::NoPen); - painter->setBrush(badgeBackground); - painter->drawRoundedRect(badgeRect, 3, 3); - - painter->setFont(badgeFont); - painter->setPen(accentColor); - painter->drawText(badgeRect, Qt::AlignCenter, badgeText); - - actorRight = badgeRect.left() - 8; - } - - const int actorLeft = contentLeft + timeWidth + 10; - if (actorRight > actorLeft) { - const QString elidedActor = - actorMetrics.elidedText(actorText, Qt::ElideRight, qMax(0, actorRight - actorLeft)); - painter->setFont(actorFont); - painter->setPen(textColor); - painter->drawText(QRect(actorLeft, topRowTop, actorRight - actorLeft, topRowHeight), - Qt::AlignLeft | Qt::AlignVCenter, elidedActor); - } - - const int detailTop = topRowTop + topRowHeight + 2; - const int detailHeight = qMax(detailMetrics.height(), card.bottom() - detailTop); - const QString elidedDetail = - detailMetrics.elidedText(detailText, Qt::ElideRight, qMax(0, contentRight - contentLeft)); - painter->setFont(detailFont); - painter->setPen(textColor); - painter->drawText(QRect(contentLeft, detailTop, contentRight - contentLeft, detailHeight), - Qt::AlignLeft | Qt::AlignVCenter, elidedDetail); - - painter->restore(); - } - - QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex & /*index*/) const override - { - const QFontMetrics metrics(option.font); - return {0, qMax(58, metrics.height() * 3 + 10)}; - } -}; -} // namespace - -ReplayEventSidebar::ReplayEventSidebar(QWidget *parent, const GameReplay *replay, const QList &timeline) - : QWidget(parent), eventList(new QListWidget(this)), emptyLabel(new QLabel(this)) -{ - setObjectName("replayEventSidebar"); - - eventList->setObjectName("replayEventList"); - eventList->setItemDelegate(new ReplayEventDelegate(eventList)); - eventList->setFrameShape(QFrame::NoFrame); - eventList->setFocusPolicy(Qt::NoFocus); - eventList->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - eventList->setSelectionMode(QAbstractItemView::SingleSelection); - eventList->setMouseTracking(true); - eventList->setUniformItemSizes(true); - eventList->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel); - - emptyLabel->setAlignment(Qt::AlignCenter); - emptyLabel->setWordWrap(true); - emptyLabel->setMargin(16); - emptyLabel->setForegroundRole(QPalette::PlaceholderText); - - auto *layout = QtUtils::makeLayout(this); - layout->addWidget(eventList); - layout->addWidget(emptyLabel); - - const QList entries = buildReplayEventEntries(replay, timeline); - eventIndices.reserve(entries.size()); - - for (const ReplayEventEntry &entry : entries) { - auto *item = new QListWidgetItem(eventList); - item->setData(EventIndexRole, entry.eventIndex); - item->setData(TimeLabelRole, entry.timeLabel); - item->setData(KindRole, static_cast(entry.kind)); - item->setData(ActorRole, entry.actor); - item->setData(BadgeRole, entry.badge); - item->setData(DetailRole, entry.detail); - const QString tooltip = entry.actor.isEmpty() - ? tr("%1\n%2").arg(entry.timeLabel, entry.detail) - : tr("%1 · %2\n%3").arg(entry.timeLabel, entry.actor, entry.detail); - item->setToolTip(tooltip); - item->setData(Qt::AccessibleTextRole, entry.actor.isEmpty() - ? tr("%1: %2").arg(entry.timeLabel, entry.detail) - : tr("%1, %2: %3").arg(entry.timeLabel, entry.actor, entry.detail)); - eventIndices.append(entry.eventIndex); - } - - const bool hasEvents = !entries.isEmpty(); - eventList->setVisible(hasEvents); - emptyLabel->setVisible(!hasEvents); - emptyLabel->setText(tr("No game events in this replay.")); - - connect(eventList, &QListWidget::itemClicked, this, [this](QListWidgetItem *item) { - if (!item) { - return; - } - - setCurrentRow(eventList->row(item)); - emit eventSelected(item->data(EventIndexRole).toInt()); - }); - - if (hasEvents) { - setCurrentRow(-1); - } -} - -void ReplayEventSidebar::setCurrentEvent(int eventIndex) -{ - if (eventIndices.isEmpty()) { - setCurrentRow(-1); - return; - } - - // The rows hold a subset of the replay's events, in playback order, so the last row at or before eventIndex is the - // one the game state has reached. An eventIndex of -1 (nothing replayed yet) selects no row. - const auto it = std::upper_bound(eventIndices.cbegin(), eventIndices.cend(), eventIndex); - const int row = static_cast(it - eventIndices.cbegin()) - 1; - setCurrentRow(row); -} - -void ReplayEventSidebar::setCurrentRow(int row) -{ - if (row < 0 || row >= eventList->count()) { - row = -1; - } - - if (row >= 0) { - // The view's current index also moves on mouse press and can be deselected by a ctrl-click, - // so the cached row alone cannot tell whether the view is already in the desired state. - const QListWidgetItem *item = eventList->item(row); - if (row == eventList->currentRow() && item && item->isSelected()) { - return; - } - } else if (row == currentRow) { - return; - } - - currentRow = row; - eventList->setCurrentRow(currentRow); - - if (currentRow >= 0) { - QListWidgetItem *item = eventList->item(currentRow); - if (!eventList->viewport()->rect().contains(eventList->visualItemRect(item))) { - eventList->scrollToItem(item, QAbstractItemView::PositionAtCenter); - } - } -} diff --git a/cockatrice/src/interface/widgets/replay/replay_event_sidebar.h b/cockatrice/src/interface/widgets/replay/replay_event_sidebar.h deleted file mode 100644 index ee163356e..000000000 --- a/cockatrice/src/interface/widgets/replay/replay_event_sidebar.h +++ /dev/null @@ -1,50 +0,0 @@ -#ifndef COCKATRICE_REPLAY_EVENT_SIDEBAR_H -#define COCKATRICE_REPLAY_EVENT_SIDEBAR_H - -#include -#include -#include - -class GameReplay; -class QLabel; -class QListWidget; - -/** - * @brief A scrollable list of replay events that can be used to seek the replay. - * - * The sidebar copies the event data it needs at construction time. It does not keep a reference to the replay or to - * the replay manager. - */ -class ReplayEventSidebar : public QWidget -{ - Q_OBJECT - -public: - /** - * @param parent The parent widget - * @param replay The replay to build the event list from - * @param timeline Event index to time in milliseconds, as used by ReplayManager - */ - ReplayEventSidebar(QWidget *parent, const GameReplay *replay, const QList &timeline); - -public slots: - /** - * @brief Highlights the row of the event the game state has reached. - * - * @param eventIndex Index into the replay's event list, or -1 when nothing has been replayed yet - */ - void setCurrentEvent(int eventIndex); - -signals: - void eventSelected(int eventIndex); - -private: - void setCurrentRow(int row); - - QListWidget *eventList; - QLabel *emptyLabel; - QList eventIndices; ///< Replay event index of each row, ascending - int currentRow = -1; -}; - -#endif // COCKATRICE_REPLAY_EVENT_SIDEBAR_H diff --git a/cockatrice/src/interface/widgets/replay/replay_manager.cpp b/cockatrice/src/interface/widgets/replay/replay_manager.cpp index b01d7f9d6..f3f1da2c4 100644 --- a/cockatrice/src/interface/widgets/replay/replay_manager.cpp +++ b/cockatrice/src/interface/widgets/replay/replay_manager.cpp @@ -1,13 +1,13 @@ #include "replay_manager.h" #include "../../../client/settings/cache_settings.h" +#include "../../../game/player/event_processing_options.h" #include "libcockatrice/protocol/pb/game_event.pb.h" #include "libcockatrice/protocol/pb/game_event_container.pb.h" #include "libcockatrice/protocol/pb/game_replay.pb.h" #include #include -#include #include #include #include @@ -57,7 +57,7 @@ ReplayManager::ReplayManager(QObject *parent, GameReplay *replay) rewindBufferingTimer = new QTimer(this); rewindBufferingTimer->setSingleShot(true); - connect(rewindBufferingTimer, &QTimer::timeout, this, [this] { processRewind(); }); + connect(rewindBufferingTimer, &QTimer::timeout, this, &ReplayManager::processRewind); } ReplayManager::~ReplayManager() @@ -65,7 +65,7 @@ ReplayManager::~ReplayManager() delete replay; } -void ReplayManager::skipToTime(int newTime, bool doRewindBuffering, bool includeEventsAtTime) +void ReplayManager::skipToTime(int newTime, bool doRewindBuffering) { // check boundary conditions if (newTime < 0) { @@ -75,17 +75,15 @@ void ReplayManager::skipToTime(int newTime, bool doRewindBuffering, bool include newTime = maxTime; } - if (!includeEventsAtTime) { - newTime -= newTime % TIMER_INTERVAL_MS; // Time should always be a multiple of the interval - } + 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, includeEventsAtTime); + handleBackwardsSkip(doRewindBuffering); } else { - processNewEvents(FORWARD_SKIP, includeEventsAtTime); + processNewEvents(FORWARD_SKIP); } timeChanged(currentVisualTime); @@ -97,7 +95,7 @@ void ReplayManager::skipToTime(int newTime, bool doRewindBuffering, bool include * @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 ReplayManager::handleBackwardsSkip(bool doRewindBuffering, bool includeEventsAtTime) +void ReplayManager::handleBackwardsSkip(bool doRewindBuffering) { if (doRewindBuffering) { // We use a one-shot timer to implement the rewind buffering. @@ -107,11 +105,11 @@ void ReplayManager::handleBackwardsSkip(bool doRewindBuffering, bool includeEven rewindBufferingTimer->start(SettingsCache::instance().userInterface().getRewindBufferingMs()); } else { // otherwise, process the rewind immediately - processRewind(includeEventsAtTime); + processRewind(); } } -void ReplayManager::processRewind(bool includeEventsAtTime) +void ReplayManager::processRewind() { // stop any queued-up rewinds rewindBufferingTimer->stop(); @@ -119,7 +117,7 @@ void ReplayManager::processRewind(bool includeEventsAtTime) // process the rewind currentEvent = 0; emit rewound(); - processNewEvents(BACKWARD_SKIP, includeEventsAtTime); + processNewEvents(BACKWARD_SKIP); } void ReplayManager::replayTimerTimeout() @@ -136,13 +134,11 @@ void ReplayManager::replayTimerTimeout() } /** @brief Processes all unprocessed events up to the current time. */ -void ReplayManager::processNewEvents(PlaybackMode playbackMode, bool includeEventsAtTime) +void ReplayManager::processNewEvents(PlaybackMode playbackMode) { currentProcessedTime = currentVisualTime; - while (currentEvent < replayTimeline.size() && - (replayTimeline[currentEvent] < currentProcessedTime || - (includeEventsAtTime && replayTimeline[currentEvent] == currentProcessedTime))) { + while (currentEvent < replayTimeline.size() && replayTimeline[currentEvent] < currentProcessedTime) { EventProcessingOptions options; // backwards skip => always skip reveal windows @@ -240,24 +236,6 @@ void ReplayManager::setTime(int time) skipToTime(time, false); } -void ReplayManager::setTimeToEvent(int eventIndex) -{ - if (eventIndex < 0 || eventIndex >= replayTimeline.size()) { - return; - } - - // Flush a pending buffered rewind before seeking, otherwise its timer fires after this seek and rebuilds the - // replay state from an outdated currentVisualTime, dropping the event we seek to. Stopping the timer instead - // of processing it is not enough: playback ticks advance currentProcessedTime without rewinding currentEvent, - // so the board could still be ahead of the target. - if (rewindBufferingTimer->isActive()) { - processRewind(); - } - - // Unlike a timeline seek, jumping to an event should apply that event immediately. - skipToTime(replayTimeline.at(eventIndex), false, true); -} - void ReplayManager::skipByAmount(int amount) { skipToTime(currentVisualTime + amount, amount < 0); diff --git a/cockatrice/src/interface/widgets/replay/replay_manager.h b/cockatrice/src/interface/widgets/replay/replay_manager.h index e3745778e..3b33deada 100644 --- a/cockatrice/src/interface/widgets/replay/replay_manager.h +++ b/cockatrice/src/interface/widgets/replay/replay_manager.h @@ -1,10 +1,11 @@ #ifndef COCKATRICE_REPLAY_MANAGER_H #define COCKATRICE_REPLAY_MANAGER_H +#include "../../../game/player/event_processing_options.h" + #include #include #include -#include #include class GameReplay; @@ -40,10 +41,10 @@ class ReplayManager : public QObject ///< to rewind buffering int currentEvent = 0; ///< current event's index - void skipToTime(int newTime, bool doRewindBuffering, bool includeEventsAtTime = false); - void handleBackwardsSkip(bool doRewindBuffering, bool includeEventsAtTime = false); - void processRewind(bool includeEventsAtTime = false); - void processNewEvents(PlaybackMode playbackMode, bool includeEventsAtTime = false); + void skipToTime(int newTime, bool doRewindBuffering); + void handleBackwardsSkip(bool doRewindBuffering); + void processRewind(); + void processNewEvents(PlaybackMode playbackMode); void handleSkipEmptySection(); private slots: @@ -66,16 +67,6 @@ public: return replayTimeline; } - /** - * @brief Index of the last event the game state has processed. - * - * @return The event index, or -1 while no event has been replayed yet - */ - [[nodiscard]] int getLastProcessedEventIndex() const - { - return currentEvent - 1; - } - void setTimeScaleFactor(qreal _timeScaleFactor); void setSkipEmptySections(bool value); @@ -83,7 +74,6 @@ public slots: void startReplay(); void stopReplay(); void setTime(int time); - void setTimeToEvent(int eventIndex); void skipByAmount(int amount); // use a negative amount to skip backwards signals: diff --git a/cockatrice/src/interface/widgets/replay/replay_widget.cpp b/cockatrice/src/interface/widgets/replay/replay_widget.cpp index e911bc0f9..07b4e72ce 100644 --- a/cockatrice/src/interface/widgets/replay/replay_widget.cpp +++ b/cockatrice/src/interface/widgets/replay/replay_widget.cpp @@ -19,11 +19,6 @@ class GameReplay; -int ReplayWidget::getLastProcessedEventIndex() const -{ - return replayManager->getLastProcessedEventIndex(); -} - ReplayWidget::ReplayWidget(QWidget *parent, GameReplay *replay) : QWidget(parent), replayPlayButton(nullptr), replayFastForwardButton(nullptr), aReplaySkipForward(nullptr), aReplaySkipBackward(nullptr), aReplaySkipForwardBig(nullptr), aReplaySkipBackwardBig(nullptr) @@ -33,7 +28,6 @@ ReplayWidget::ReplayWidget(QWidget *parent, GameReplay *replay) connect(replayManager, &ReplayManager::eventReplayed, this, &ReplayWidget::eventReplayed); connect(replayManager, &ReplayManager::replayFinished, this, &ReplayWidget::replayFinished); connect(replayManager, &ReplayManager::rewound, this, &ReplayWidget::rewound); - connect(replayManager, &ReplayManager::timeChanged, this, &ReplayWidget::timeChanged); // timeline widget timelineWidget = new ReplayTimelineWidget; @@ -102,16 +96,6 @@ ReplayWidget::ReplayWidget(QWidget *parent, GameReplay *replay) refreshShortcuts(); } -const QList &ReplayWidget::getReplayTimeline() const -{ - return replayManager->getReplayTimeline(); -} - -void ReplayWidget::seekToEvent(int eventIndex) -{ - replayManager->setTimeToEvent(eventIndex); -} - void ReplayWidget::replayFinished() { replayPlayButton->setChecked(false); diff --git a/cockatrice/src/interface/widgets/replay/replay_widget.h b/cockatrice/src/interface/widgets/replay/replay_widget.h index cbb676288..74aace570 100644 --- a/cockatrice/src/interface/widgets/replay/replay_widget.h +++ b/cockatrice/src/interface/widgets/replay/replay_widget.h @@ -8,9 +8,9 @@ #ifndef REPLAY_WIDGET_H #define REPLAY_WIDGET_H -#include +#include "../../../game/player/event_processing_options.h" + #include -#include #include class ReplayManager; @@ -36,19 +36,8 @@ public: */ ReplayWidget(QWidget *parent, GameReplay *replay); - [[nodiscard]] const QList &getReplayTimeline() const; - - /** - * @brief Index of the last replay event the game state has processed, or -1 before the first event. - */ - [[nodiscard]] int getLastProcessedEventIndex() const; - -public slots: - void seekToEvent(int eventIndex); - signals: void rewound(); - void timeChanged(int time); void eventReplayed(const GameEventContainer &cont, EventProcessingOptions options); private: diff --git a/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp b/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp index c57f65352..037a4a1e5 100644 --- a/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp +++ b/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp @@ -4,7 +4,6 @@ #include "../../client/sound_engine.h" #include "../../interface/card_localization.h" #include "../../interface/pixel_map_generator.h" -#include "../../interface/theme_manager.h" #include "../../tabs/tab_supervisor.h" #include "../user/user_context_menu.h" #include "../user/user_list_manager.h" @@ -64,9 +63,6 @@ ChatView::ChatView(TabSupervisor *_tabSupervisor, AbstractGame *_game, bool _sho connect(&SettingsCache::instance(), &SettingsCache::themeChanged, this, &ChatView::adjustColorsToPalette); - applyChatFont(); - connect(themeManager, &ThemeManager::fontsChanged, this, &ChatView::applyChatFont); - userContextMenu = new UserContextMenu(tabSupervisor, this, game); connect(userContextMenu, SIGNAL(openMessageDialog(QString, bool)), this, SIGNAL(openMessageDialog(QString, bool))); @@ -112,16 +108,6 @@ void ChatView::adjustColorsToPalette() QTimer::singleShot(0, this, &ChatView::refreshBlockColors); } -void ChatView::applyChatFont() -{ - // Family comes from the ChatLog theme role; the message char formats carry - // no family of their own, so they (and new content) follow the widget and - // document default fonts. Weights/italics stay caller-side as before. - const QFont chatFont = themeManager->appFont(AppFont::ChatLog); - setFont(chatFont); - document()->setDefaultFont(chatFont); -} - void ChatView::refreshBlockColors() { QTextDocument *doc = document(); diff --git a/cockatrice/src/interface/widgets/server/chat_view/chat_view.h b/cockatrice/src/interface/widgets/server/chat_view/chat_view.h index a2e2f33dd..3fa7224e5 100644 --- a/cockatrice/src/interface/widgets/server/chat_view/chat_view.h +++ b/cockatrice/src/interface/widgets/server/chat_view/chat_view.h @@ -111,7 +111,6 @@ private slots: void openLink(const QUrl &link); void actMessageClicked(); void adjustColorsToPalette(); - void applyChatFont(); void refreshBlockColors(); void onScrollBarRangeChanged(); void onScrollBarValueChanged(int value); diff --git a/cockatrice/src/interface/widgets/server/game_selector.cpp b/cockatrice/src/interface/widgets/server/game_selector.cpp index 468095adb..2702a527d 100644 --- a/cockatrice/src/interface/widgets/server/game_selector.cpp +++ b/cockatrice/src/interface/widgets/server/game_selector.cpp @@ -1,7 +1,7 @@ #include "game_selector.h" #include "../../../client/settings/cache_settings.h" -#include "../../theme_icon.h" +#include "../../pixel_map_generator.h" #include "../interface/widgets/dialogs/dlg_create_game.h" #include "../interface/widgets/dialogs/dlg_filter_games.h" #include "../interface/widgets/tabs/tab_room.h" @@ -130,10 +130,10 @@ GameSelector::GameSelector(AbstractClient *_client, } filterButton = new QPushButton; - filterButton->setIcon(loadThemedIcon(QStringLiteral("icons/search"))); + filterButton->setIcon(themePixmap(QStringLiteral("icons/search"))); connect(filterButton, &QPushButton::clicked, this, &GameSelector::actSetFilter); clearFilterButton = new QPushButton; - clearFilterButton->setIcon(loadThemedIcon(QStringLiteral("icons/clearsearch"))); + clearFilterButton->setIcon(themePixmap(QStringLiteral("icons/clearsearch"))); bool filtersSetToDefault = showFilters && gameListProxyModel->areFilterParametersSetToDefaults(); clearFilterButton->setEnabled(!filtersSetToDefault); connect(clearFilterButton, &QPushButton::clicked, this, &GameSelector::actClearFilter); @@ -266,13 +266,9 @@ void GameSelector::actCreate() return; } - // Heap-allocate the dialog: if this selector (or its room tab) is destroyed while the - // dialog is open, e.g. on server disconnect, Qt deletes its children. A stack-allocated - // child would then be deleted by Qt and crash. - auto *dlg = new DlgCreateGame(room, room->getGameTypes(), this); - dlg->setAttribute(Qt::WA_DeleteOnClose); - connect(dlg, &QDialog::finished, this, &GameSelector::updateTitle); - dlg->open(); + DlgCreateGame dlg(room, room->getGameTypes(), this); + dlg.exec(); + updateTitle(); } void GameSelector::checkResponse(const Response &response) @@ -366,9 +362,8 @@ void GameSelector::customContextMenu(const QPoint &point) const ServerInfo_Game &gameInfo = gameListModel->getGame(index.data(Qt::UserRole).toInt()); const QMap &gameTypes = gameListModel->getGameTypes().value(gameInfo.room_id()); - auto *dlg = new DlgCreateGame(gameInfo, gameTypes, this); - dlg->setAttribute(Qt::WA_DeleteOnClose); - dlg->open(); + DlgCreateGame dlg(gameInfo, gameTypes, this); + dlg.exec(); }); QAction copyLink(tr("Cop&y game link")); diff --git a/cockatrice/src/interface/widgets/server/games_model.cpp b/cockatrice/src/interface/widgets/server/games_model.cpp index d33526bd1..315d51d9e 100644 --- a/cockatrice/src/interface/widgets/server/games_model.cpp +++ b/cockatrice/src/interface/widgets/server/games_model.cpp @@ -1,7 +1,6 @@ #include "games_model.h" #include "../../../client/settings/cache_settings.h" -#include "../../theme_icon.h" #include "../interface/pixel_map_generator.h" #include "libcockatrice/protocol/pb/serverinfo_user.pb.h" #include "user/user_list_proxy.h" @@ -86,8 +85,7 @@ const QString GamesModel::getGameCreatedString(const int secs) } GamesModel::GamesModel(const QMap &_rooms, const QMap &_gameTypes, QObject *parent) - : QAbstractTableModel(parent), rooms(_rooms), gameTypes(_gameTypes), - lockIcon(loadThemedIcon(QStringLiteral("icons/lock"))) + : QAbstractTableModel(parent), rooms(_rooms), gameTypes(_gameTypes) { } @@ -187,15 +185,10 @@ QVariant GamesModel::data(const QModelIndex &index, int role) const if (gameentry.share_decklists_on_load()) { result.append(tr("open decklists")); } - if (gameentry.shuffle_players()) { - result.append(tr("random turn order")); - } return result.join(", "); } case Qt::DecorationRole: { - // One engine per model: it is palette- and theme-aware and - // invalidates itself, so a repaint must not build a new one. - return gameentry.with_password() ? lockIcon : QVariant(); + return gameentry.with_password() ? QIcon(LockPixmapGenerator::generatePixmap(13)) : QVariant(); case Qt::TextAlignmentRole: return Qt::AlignLeft; default: diff --git a/cockatrice/src/interface/widgets/server/games_model.h b/cockatrice/src/interface/widgets/server/games_model.h index 62862417d..9bf54b83a 100644 --- a/cockatrice/src/interface/widgets/server/games_model.h +++ b/cockatrice/src/interface/widgets/server/games_model.h @@ -5,7 +5,6 @@ #include "game_type_map.h" #include -#include #include #include #include @@ -33,7 +32,6 @@ private: QList gameList; /**< List of games currently displayed. */ QMap rooms; /**< Map of room IDs to room names. */ QMap gameTypes; /**< Map of room IDs to available game types. */ - QIcon lockIcon; /**< Themed lock for password-protected games. */ static const int NUM_COLS = 8; /**< Number of columns in the table. */ diff --git a/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp b/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp index c1db6138d..c131c3cbf 100644 --- a/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp +++ b/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp @@ -1,6 +1,6 @@ #include "remote_replay_list_tree_widget.h" -#include "../../../theme_icon.h" +#include "../../../pixel_map_generator.h" #include "libcockatrice/protocol/pb/response.pb.h" #include "libcockatrice/protocol/pb/serverinfo_replay_match.pb.h" @@ -50,7 +50,7 @@ RemoteReplayList_TreeModel::RemoteReplayList_TreeModel(AbstractClient *_client, QFileIconProvider fip; dirIcon = fip.icon(QFileIconProvider::Folder); fileIcon = fip.icon(QFileIconProvider::File); - lockIcon = loadThemedIcon(QStringLiteral("icons/lock")); + lockIcon = themePixmap(QStringLiteral("icons/lock")); } RemoteReplayList_TreeModel::~RemoteReplayList_TreeModel() diff --git a/cockatrice/src/interface/widgets/server/user/user_card_art_provider.cpp b/cockatrice/src/interface/widgets/server/user/user_card_art_provider.cpp index 6e8fd771a..d84bd5804 100644 --- a/cockatrice/src/interface/widgets/server/user/user_card_art_provider.cpp +++ b/cockatrice/src/interface/widgets/server/user/user_card_art_provider.cpp @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -65,6 +66,27 @@ void UserCardArtProvider::requestCardArt(const QString &userName, const QString processQueue(); } +QPixmap UserCardArtProvider::cropCardArt(const QPixmap &fullRes, const ExactCard &card) +{ + QPixmap source = fullRes; + + // Sideways-layout cards (plane, siege/battle, split) store their landscape + // artwork rotated 90° inside a portrait frame. Rotate it upright first so + // the crop below lands on the horizontal art, mirroring the way + // CardInfoPictureWidget displays these cards. + const bool landscape = card.getInfo().getUiAttributes().landscapeOrientation; + source = CardArtUtils::rotateSidewaysLayoutArt(source, card); + + const QSize sz = source.size(); + const int marginX = sz.width() * 0.07; + const int topMargin = landscape ? sz.height() * 0.05 : sz.height() * 0.11; + const int bottomMargin = landscape ? sz.height() * 0.42 : sz.height() * 0.45; + + const QRect artRect(marginX, topMargin, sz.width() - 2 * marginX, sz.height() - topMargin - bottomMargin); + + return source.copy(artRect.intersected(source.rect())); +} + void UserCardArtProvider::insertIntoCache(const QString &key, const QPixmap &pixmap) { if (pixmap.isNull()) { @@ -112,7 +134,7 @@ void UserCardArtProvider::processQueue() // Synchronous hit (already loaded/on disk) if (!fullRes.isNull()) { - insertIntoCache(key, CardArtUtils::cropCardArt(fullRes, card)); + insertIntoCache(key, cropCardArt(fullRes, card)); pending.remove(key); emit cardArtUpdated(userName); @@ -136,7 +158,7 @@ void UserCardArtProvider::processQueue() CardPictureLoader::getPixmap(fullRes, card, QSize(745, 1040)); if (!fullRes.isNull()) { - self->insertIntoCache(key, CardArtUtils::cropCardArt(fullRes, card)); + self->insertIntoCache(key, self->cropCardArt(fullRes, card)); } self->pending.remove(key); @@ -150,4 +172,4 @@ void UserCardArtProvider::processQueue() // Stop here. We'll continue when the async load finishes. return; } -} +} \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/server/user/user_card_art_provider.h b/cockatrice/src/interface/widgets/server/user/user_card_art_provider.h index a7844ca88..ce9225b00 100644 --- a/cockatrice/src/interface/widgets/server/user/user_card_art_provider.h +++ b/cockatrice/src/interface/widgets/server/user/user_card_art_provider.h @@ -10,6 +10,8 @@ #include #include +class ExactCard; + class UserCardArtProvider : public QObject { Q_OBJECT @@ -19,6 +21,7 @@ public: void requestCardArt(const QString &userName, const QString &cardName, const QString &providerId); const QMap &cache() const; + static QPixmap cropCardArt(const QPixmap &fullRes, const ExactCard &card); signals: void cardArtUpdated(const QString &userName); diff --git a/cockatrice/src/interface/widgets/server/user/user_card_settings_dialog.cpp b/cockatrice/src/interface/widgets/server/user/user_card_settings_dialog.cpp index 67fb57e78..f8b57cfc2 100644 --- a/cockatrice/src/interface/widgets/server/user/user_card_settings_dialog.cpp +++ b/cockatrice/src/interface/widgets/server/user/user_card_settings_dialog.cpp @@ -2,7 +2,6 @@ #include "../../../card_picture_loader/card_picture_loader.h" #include "../../cards/art_crop_attribution.h" -#include "../../cards/card_art_utils.h" #include "../../utility/completer_utils.h" #include "card_database_display_model.h" #include "card_database_model.h" @@ -11,6 +10,7 @@ #include "libcockatrice/card/printing/exact_card.h" #include "libcockatrice/card/printing/printing_info.h" #include "libcockatrice/card/set/card_set.h" +#include "user_card_art_provider.h" #include "user_list_painter.h" #include @@ -580,7 +580,7 @@ void UserCardArtSettingsDialog::reloadPreview() return; } - currentPixmap = CardArtUtils::cropCardArt(fullRes, card); + currentPixmap = UserCardArtProvider::cropCardArt(fullRes, card); preview->setPixmap(currentPixmap); preview->setParams(currentParams); diff --git a/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp b/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp index 447e63673..0b5523f67 100644 --- a/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp +++ b/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp @@ -1,5 +1,8 @@ #include "user_context_menu.h" +#include "../../../../game/abstract_game.h" +#include "../../../../game/game_event_handler.h" +#include "../../../../game/game_meta_info.h" #include "../../dialogs/dlg_report_user.h" #include "../../interface/widgets/tabs/tab_supervisor.h" #include "../chat_view/chat_view.h" @@ -34,9 +37,6 @@ #include #include #include -#include -#include -#include #include #include #include diff --git a/cockatrice/src/interface/widgets/server/user/user_games_model.cpp b/cockatrice/src/interface/widgets/server/user/user_games_model.cpp deleted file mode 100644 index b7c728c45..000000000 --- a/cockatrice/src/interface/widgets/server/user/user_games_model.cpp +++ /dev/null @@ -1,149 +0,0 @@ -#include "user_games_model.h" - -#include -#include -#include -#include -#include -#include -#include - -UserGamesModel::UserGamesModel(AbstractClient *_client, int requestTimeoutMs, QObject *parent) - : QAbstractListModel(parent), client(_client) -{ - timeout.setSingleShot(true); - timeout.setInterval(requestTimeoutMs); - connect(&timeout, &QTimer::timeout, this, [this] { - invalidateRequest(); - setState(State::Error); - }); - connected = client->getStatus() == StatusLoggedIn; - connect(client, &AbstractClient::statusChanged, this, [this](ClientStatus status) { - // AbstractClient::setStatus emits this signal while holding the (non-recursive) - // status mutex, which getStatus() would try to lock again. Track the emitted - // value here, and read this cache from canRefresh() for the same reason. - connected = status == StatusLoggedIn; - if (!connected) { - invalidateRequest(); - replaceGames({}); - setState(online ? State::Disconnected : State::Offline); - } else if (online) { - refresh(); - } - }); - connect(client, &QObject::destroyed, this, [this] { - client = nullptr; - connected = false; - invalidateRequest(); - replaceGames({}); - setState(online ? State::Disconnected : State::Offline); - }); -} - -int UserGamesModel::rowCount(const QModelIndex &parent) const -{ - return parent.isValid() ? 0 : games.size(); -} - -QVariant UserGamesModel::data(const QModelIndex &index, int role) const -{ - if (!index.isValid() || index.model() != this || index.column() != 0 || index.row() < 0 || - index.row() >= games.size() || role != GameRole) { - return {}; - } - return QVariant::fromValue(games.at(index.row())); -} - -void UserGamesModel::setUser(const QString &name, bool isOnline) -{ - userName = name; - online = isOnline; - refresh(); -} - -UserGamesModel::State UserGamesModel::getState() const -{ - return state; -} - -bool UserGamesModel::canRefresh() const -{ - return online && !userName.isEmpty() && client && connected && state != State::Loading; -} - -void UserGamesModel::invalidateRequest() -{ - ++requestGeneration; - // The client owns pending commands. Detach our interest without deleting - // an object that may already have moved to the client's thread. - disconnect(responseConnection); - responseConnection = {}; - timeout.stop(); -} - -void UserGamesModel::replaceGames(QList replacement) -{ - beginResetModel(); - games = std::move(replacement); - endResetModel(); -} - -void UserGamesModel::setState(State newState) -{ - state = newState; - emit stateChanged(); -} - -void UserGamesModel::refresh() -{ - invalidateRequest(); - const quint64 request = requestGeneration; - replaceGames({}); - if (!online || userName.isEmpty()) { - setState(State::Offline); - return; - } - if (!client || !connected) { - setState(State::Disconnected); - return; - } - - setState(State::Loading); - // State listeners may select another user or disconnect the client. - if (request != requestGeneration) { - return; - } - - Command_GetGamesOfUser command; - command.set_user_name(userName.toStdString()); - PendingCommand *pending = client->prepareSessionCommand(command); - responseConnection = connect(pending, &PendingCommand::finished, this, - [this, request](const Response &response) { finishRequest(response, request); }); - timeout.start(); - client->sendCommand(pending); -} - -void UserGamesModel::finishRequest(const Response &response, quint64 request) -{ - if (request != requestGeneration) { - return; - } - invalidateRequest(); - const quint64 completion = requestGeneration; - if (response.response_code() != Response::RespOk || !response.HasExtension(Response_GetGamesOfUser::ext)) { - setState(State::Error); - return; - } - - const auto &result = response.GetExtension(Response_GetGamesOfUser::ext); - QList replacement; - replacement.reserve(result.game_list_size()); - for (const auto &game : result.game_list()) { - replacement.append(game); - } - replaceGames(std::move(replacement)); - if (completion != requestGeneration) { - return; - } - setState(games.isEmpty() ? State::Empty : State::Ready); -} diff --git a/cockatrice/src/interface/widgets/server/user/user_games_model.h b/cockatrice/src/interface/widgets/server/user/user_games_model.h deleted file mode 100644 index b8ad71a67..000000000 --- a/cockatrice/src/interface/widgets/server/user/user_games_model.h +++ /dev/null @@ -1,63 +0,0 @@ -#ifndef COCKATRICE_USER_GAMES_MODEL_H -#define COCKATRICE_USER_GAMES_MODEL_H - -#include -#include -#include -#include -#include -#include - -class AbstractClient; -class Response; - -/** Current user's games and the lifetime of the request that supplies them. */ -class UserGamesModel : public QAbstractListModel -{ - Q_OBJECT - -public: - enum class State - { - Offline, - Disconnected, - Loading, - Ready, - Empty, - Error - }; - static constexpr int DefaultRequestTimeoutMs = 15000; - static constexpr int GameRole = Qt::UserRole + 10; - - explicit UserGamesModel(AbstractClient *client, - int requestTimeoutMs = DefaultRequestTimeoutMs, - QObject *parent = nullptr); - int rowCount(const QModelIndex &parent = {}) const override; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; - - void setUser(const QString &name, bool isOnline); - void refresh(); - State getState() const; - bool canRefresh() const; - -signals: - void stateChanged(); - -private: - void invalidateRequest(); - void replaceGames(QList replacement); - void finishRequest(const Response &response, quint64 request); - void setState(State newState); - - QPointer client; - QString userName; - bool online = false; - bool connected = false; - State state = State::Offline; - QList games; - quint64 requestGeneration = 0; - QMetaObject::Connection responseConnection; - QTimer timeout; -}; - -#endif // COCKATRICE_USER_GAMES_MODEL_H diff --git a/cockatrice/src/interface/widgets/server/user/user_info_box.cpp b/cockatrice/src/interface/widgets/server/user/user_info_box.cpp index 997001c50..4feb73538 100644 --- a/cockatrice/src/interface/widgets/server/user/user_info_box.cpp +++ b/cockatrice/src/interface/widgets/server/user/user_info_box.cpp @@ -1,7 +1,6 @@ #include "user_info_box.h" #include "../../interface/pixel_map_generator.h" -#include "../../interface/theme_manager.h" #include "../../interface/widgets/dialogs/dlg_edit_avatar.h" #include "../../interface/widgets/dialogs/dlg_edit_password.h" #include "../../interface/widgets/dialogs/dlg_edit_user.h" @@ -33,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -40,8 +40,10 @@ UserInfoBox::UserInfoBox(AbstractClient *_client, bool _editable, QWidget *parent, Qt::WindowFlags flags) : QWidget(parent, flags), client(_client), editable(_editable) { - applyInterfaceDefaultFont(); - connect(themeManager, &ThemeManager::fontsChanged, this, &UserInfoBox::applyInterfaceDefaultFont); + QFont nameFont = nameLabel.font(); + nameFont.setBold(true); + nameFont.setPointSizeF(nameFont.pointSizeF() * 1.5); + nameLabel.setFont(nameFont); auto *userIconAndNameLayout = new QHBoxLayout; userIconAndNameLayout->addWidget(&userLevelIcon, 0, Qt::AlignCenter); @@ -90,16 +92,6 @@ UserInfoBox::UserInfoBox(AbstractClient *_client, bool _editable, QWidget *paren retranslateUi(); } -void UserInfoBox::applyInterfaceDefaultFont() -{ - // Family comes from the InterfaceDefault theme role; the *1.5 size - // multiplier and bold weight stay caller-side as before. - QFont nameFont = themeManager->appFont(AppFont::InterfaceDefault); - nameFont.setBold(true); - nameFont.setPointSizeF(nameFont.pointSizeF() * 1.5); - nameLabel.setFont(nameFont); -} - void UserInfoBox::retranslateUi() { realNameLabel1.setText(tr("Real Name:")); @@ -307,7 +299,17 @@ void UserInfoBox::actPassword() void UserInfoBox::changePassword(const QString &oldPassword, const QString &newPassword) { - const Command_AccountPassword cmd = client->makeAccountPasswordCommand(oldPassword, newPassword); + Command_AccountPassword cmd; + cmd.set_old_password(oldPassword.toStdString()); + if (client->getServerSupportsChallengeResponse()) { + cmd.set_hashed_new_password(PasswordHasher::generatePasswordVerifier(newPassword).toStdString()); + } else if (client->getServerSupportsPasswordHash()) { + auto passwordSalt = PasswordHasher::generateRandomSalt(); + QString hashedPassword = PasswordHasher::computeHash(newPassword, passwordSalt); + cmd.set_hashed_new_password(hashedPassword.toStdString()); + } else { + cmd.set_new_password(newPassword.toStdString()); + } PendingCommand *pend = client->prepareSessionCommand(cmd); connect(pend, &PendingCommand::finished, this, &UserInfoBox::processPasswordResponse); diff --git a/cockatrice/src/interface/widgets/server/user/user_info_box.h b/cockatrice/src/interface/widgets/server/user/user_info_box.h index 98919b027..6bc571a37 100644 --- a/cockatrice/src/interface/widgets/server/user/user_info_box.h +++ b/cockatrice/src/interface/widgets/server/user/user_info_box.h @@ -48,7 +48,6 @@ private slots: void processEditResponse(const Response &r); void processPasswordResponse(const Response &r); void processAvatarResponse(const Response &r); - void applyInterfaceDefaultFont(); void actEdit(); void actEditInternal(const Response &r); diff --git a/cockatrice/src/interface/widgets/server/user/user_info_connection.cpp b/cockatrice/src/interface/widgets/server/user/user_info_connection.cpp index 2e864824c..d23ac63ba 100644 --- a/cockatrice/src/interface/widgets/server/user/user_info_connection.cpp +++ b/cockatrice/src/interface/widgets/server/user/user_info_connection.cpp @@ -29,10 +29,19 @@ QMap> UserConnection_Inf ServersSettings &servers = SettingsCache::instance().servers(); - for (const auto &entry : servers.getServers()) { - UserConnection_Information userInfo(entry.saveName, entry.host, entry.port, entry.username, entry.password, - entry.savePassword, entry.site); - serverList.insert(entry.saveName, std::make_pair(entry.host, userInfo)); + int size = servers.getValue("totalServers", "server", "server_details").toInt() + 1; + + for (int i = 0; i < size; i++) { + QString _saveName = servers.getValue(QString("saveName%1").arg(i), "server", "server_details").toString(); + QString serverName = servers.getValue(QString("server%1").arg(i), "server", "server_details").toString(); + QString portNum = servers.getValue(QString("port%1").arg(i), "server", "server_details").toString(); + QString userName = servers.getValue(QString("username%1").arg(i), "server", "server_details").toString(); + QString pass = servers.getValue(QString("password%1").arg(i), "server", "server_details").toString(); + bool savePass = servers.getValue(QString("savePassword%1").arg(i), "server", "server_details").toBool(); + QString _site = servers.getValue(QString("site%1").arg(i), "server", "server_details").toString(); + + UserConnection_Information userInfo(_saveName, serverName, portNum, userName, pass, savePass, _site); + serverList.insert(_saveName, std::make_pair(serverName, userInfo)); } return serverList; @@ -44,18 +53,28 @@ QStringList UserConnection_Information::getServerInfo(const QString &find) ServersSettings &servers = SettingsCache::instance().servers(); - for (const auto &entry : servers.getServers()) { - if (find != entry.saveName) { + int size = servers.getValue("totalServers", "server", "server_details").toInt() + 1; + for (int i = 0; i < size; i++) { + QString _saveName = servers.getValue(QString("saveName%1").arg(i), "server", "server_details").toString(); + + if (find != _saveName) { continue; } - _server.append(entry.saveName); - _server.append(entry.host); - _server.append(entry.port); - _server.append(entry.username); - _server.append(entry.password); - _server.append(entry.savePassword ? "1" : "0"); - _server.append(entry.site); + QString serverName = servers.getValue(QString("server%1").arg(i), "server", "server_details").toString(); + QString portNum = servers.getValue(QString("port%1").arg(i), "server", "server_details").toString(); + QString userName = servers.getValue(QString("username%1").arg(i), "server", "server_details").toString(); + QString pass = servers.getValue(QString("password%1").arg(i), "server", "server_details").toString(); + bool savePass = servers.getValue(QString("savePassword%1").arg(i), "server", "server_details").toBool(); + QString _site = servers.getValue(QString("site%1").arg(i), "server", "server_details").toString(); + + _server.append(_saveName); + _server.append(serverName); + _server.append(portNum); + _server.append(userName); + _server.append(pass); + _server.append(savePass ? "1" : "0"); + _server.append(_site); break; } diff --git a/cockatrice/src/interface/widgets/server/user/user_info_popup.cpp b/cockatrice/src/interface/widgets/server/user/user_info_popup.cpp index 4b4887bc4..efb3b2e31 100644 --- a/cockatrice/src/interface/widgets/server/user/user_info_popup.cpp +++ b/cockatrice/src/interface/widgets/server/user/user_info_popup.cpp @@ -6,9 +6,10 @@ #include "../../interface/widgets/tabs/tab_supervisor.h" #include "libcockatrice/card/database/card_database_querier.h" #include "libcockatrice/card/printing/exact_card.h" +#include "libcockatrice/protocol/pb/response.pb.h" #include "libcockatrice/protocol/pb/serverinfo_game.pb.h" #include "libcockatrice/protocol/pb/serverinfo_user.pb.h" -#include "user_games_model.h" +#include "libcockatrice/protocol/pb/session_commands.pb.h" #include "user_level.h" #include "user_list_painter.h" @@ -33,7 +34,6 @@ #include #include #include -#include #include #include #include @@ -41,6 +41,8 @@ #include #include #include +#include +#include #include #include #include @@ -50,6 +52,8 @@ #include #include #include +#include +#include #include #include #include @@ -138,8 +142,7 @@ public: p->drawEllipse(QRectF(rect.left() + 9, rect.top() + (rect.height() - 8) / 2.0, 8, 8)); // Game title (bold, elided) - // Family comes from the InterfaceDefault theme role; bold stays caller-side. - QFont tf = themeManager->appFont(AppFont::InterfaceDefault); + QFont tf = option.font; tf.setBold(true); p->setFont(tf); p->setPen(pal.color(QPalette::Text)); @@ -151,7 +154,7 @@ public: // Player count const bool full = game.player_count() >= game.max_players(); - p->setFont(themeManager->appFont(AppFont::InterfaceDefault)); + p->setFont(option.font); p->setPen(full ? QColor(249, 115, 22) : pal.color(QPalette::Disabled, QPalette::Text)); p->drawText(QRect(rect.right() - countW - 4, rect.top(), countW, rect.height()), Qt::AlignVCenter | Qt::AlignRight, @@ -320,8 +323,7 @@ void UserInfoHeaderWidget::paintEvent(QPaintEvent *) const int tx = ax + AvatarSize + AvatarToTextGap; const int tw = rect.width() - tx - 8; - // Family comes from the InterfaceDefault theme role; the *1.12 size and bold stay caller-side. - QFont nf = themeManager->appFont(AppFont::InterfaceDefault); + QFont nf = font(); nf.setBold(true); nf.setPointSizeF(nf.pointSizeF() * 1.12); p.setFont(nf); @@ -350,7 +352,7 @@ void UserInfoHeaderWidget::paintEvent(QPaintEvent *) } if (!badge.text.isEmpty()) { - QFont bf = themeManager->appFont(AppFont::InterfaceDefault); + QFont bf = font(); bf.setPointSizeF(bf.pointSizeF() * 0.70); bf.setBold(true); p.setFont(bf); @@ -367,8 +369,7 @@ void UserInfoHeaderWidget::paintEvent(QPaintEvent *) // The painter font at this point depends on whether a badge was drawn // (badge font vs username font), so pin an explicit font for the pill. - // Family follows the InterfaceDefault theme role like the rest of the popup chrome. - p.setFont(themeManager->appFont(AppFont::InterfaceDefault)); + p.setFont(font()); // Only show the attribution when there is actually art on screen: on a // cache miss cardArt is null and the pill would float over the plain @@ -397,7 +398,6 @@ UserInfoPopup::UserInfoPopup(TabSupervisor *_ts, // Restyle the popup chrome when the theme or its color scheme changes. if (themeManager) { connect(themeManager, &ThemeManager::themeChanged, this, &UserInfoPopup::applyTheme); - connect(themeManager, &ThemeManager::fontsChanged, this, &UserInfoPopup::applyTheme); } } @@ -427,7 +427,6 @@ void UserInfoPopup::buildUi() refreshBtn = new QPushButton(QStringLiteral("↻"), this); refreshBtn->setFixedSize(20, 20); refreshBtn->setFlat(true); - refreshBtn->setToolTip(tr("Refresh games")); connect(refreshBtn, &QPushButton::clicked, this, &UserInfoPopup::refreshGames); gh->addWidget(refreshBtn); root->addLayout(gh); @@ -438,8 +437,7 @@ void UserInfoPopup::buildUi() root->addWidget(gamesStatus); // Games list - gamesModel = new UserGamesModel(client, UserGamesModel::DefaultRequestTimeoutMs, this); - connect(gamesModel, &UserGamesModel::stateChanged, this, &UserInfoPopup::updateGamesDisplay); + gamesModel = new QStandardItemModel(this); gamesView = new QListView(this); gamesView->setModel(gamesModel); gamesView->setItemDelegate(new PopupGameDelegate(gamesView)); @@ -477,24 +475,15 @@ void UserInfoPopup::applyTheme() separator->setStyleSheet(QStringLiteral("color:%1; margin: 0 8px;").arg(colorStr(theme.border))); - gamesLabel->setStyleSheet(QStringLiteral("color:%1; background:transparent;").arg(colorStr(theme.subText))); - QFont gamesLabelFont = themeManager->appFont(AppFont::InterfaceDefault); - gamesLabelFont.setPixelSize(11); - gamesLabelFont.setWeight(QFont::Bold); - gamesLabel->setFont(gamesLabelFont); + gamesLabel->setStyleSheet(QStringLiteral("color:%1; font-size:11px; font-weight:bold; background:transparent;") + .arg(colorStr(theme.subText))); - refreshBtn->setStyleSheet(QStringLiteral("QPushButton{color:%1;border:none;background:transparent;}" + refreshBtn->setStyleSheet(QStringLiteral("QPushButton{color:%1;border:none;font-size:14px;background:transparent;}" "QPushButton:hover{color:%2;}") .arg(colorStr(theme.subText), colorStr(theme.text))); - QFont refreshFont = themeManager->appFont(AppFont::InterfaceDefault); - refreshFont.setPixelSize(14); - refreshBtn->setFont(refreshFont); - gamesStatus->setStyleSheet( - QStringLiteral("color:%1; padding:10px; background:transparent;").arg(colorStr(theme.statusText))); - QFont statusFont = themeManager->appFont(AppFont::InterfaceDefault); - statusFont.setPixelSize(11); - gamesStatus->setFont(statusFont); + gamesStatus->setStyleSheet(QStringLiteral("color:%1; font-size:11px; padding:10px; background:transparent;") + .arg(colorStr(theme.statusText))); gamesView->setStyleSheet(QStringLiteral("QListView{background:%1;border:none;}" "QListView::item:selected{background:%2;}") @@ -502,12 +491,9 @@ void UserInfoPopup::applyTheme() closeBtn->setStyleSheet( QStringLiteral("QPushButton{background:%1;color:%2;" - "border:none;border-radius:11px;}" + "border:none;border-radius:11px;font-size:10px;}" "QPushButton:hover{color:%3;background:%4;}") .arg(colorStr(theme.closeBg), colorStr(theme.subText), colorStr(theme.text), colorStr(theme.closeHover))); - QFont closeFont = themeManager->appFont(AppFont::InterfaceDefault); - closeFont.setPixelSize(10); - closeBtn->setFont(closeFont); header->update(); } @@ -522,17 +508,13 @@ static QPushButton *makeBtn(const QString &label, const QString &tip, QWidget *p b->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); b->setStyleSheet(QStringLiteral("QPushButton{" " background:%1;color:%2;border:1px solid %3;" - " border-radius:4px;padding:0 4px;" + " border-radius:4px;font-size:11px;padding:0 4px;" "}" "QPushButton:hover{background:%4;color:%5;}" "QPushButton:pressed{background:%6;}" "QPushButton:disabled{color:%7;border-color:%3;}") .arg(colorStr(t.buttonBg), colorStr(t.text), colorStr(t.buttonBorder), colorStr(t.buttonHover), colorStr(t.text), colorStr(t.buttonPressed), colorStr(t.buttonDisabled))); - // Family comes from the InterfaceDefault theme role; the 11px size stays caller-side. - QFont btnFont = themeManager->appFont(AppFont::InterfaceDefault); - btnFont.setPixelSize(11); - b->setFont(btnFont); return b; } @@ -663,21 +645,13 @@ void UserInfoPopup::rebuildActionButtons(const ServerInfo_User &userInfo, bool o void UserInfoPopup::updateActionButtons(const ServerInfo_User &userInfo, bool online, bool isBuddy, bool isIgnored) { - currentUserInfo = userInfo; - currentBuddy = isBuddy; - currentIgnored = isIgnored; - if (currentOnline != online) { - setOnline(online); - } else { - refreshHeader(); - rebuildActionButtons(userInfo, online, isBuddy, isIgnored); - adjustSize(); - } + rebuildActionButtons(userInfo, online, isBuddy, isIgnored); + adjustSize(); } void UserInfoPopup::onGamesContextMenu(const QPoint &pos) { - const QPersistentModelIndex idx = gamesView->indexAt(pos); + const QModelIndex idx = gamesView->indexAt(pos); if (!idx.isValid()) { return; } @@ -705,7 +679,7 @@ void UserInfoPopup::onGamesContextMenu(const QPoint &pos) } const QAction *chosen = menu.exec(gamesView->viewport()->mapToGlobal(pos)); - if (!chosen || !idx.isValid()) { + if (!chosen) { return; } @@ -742,8 +716,6 @@ void UserInfoPopup::showForUser(const QString &userName, currentUser = userName; currentUserInfo = userInfo; currentOnline = online; - currentBuddy = isBuddy; - currentIgnored = isIgnored; // Header refreshHeader(); @@ -751,71 +723,88 @@ void UserInfoPopup::showForUser(const QString &userName, // Actions rebuildActionButtons(userInfo, online, isBuddy, isIgnored); + // Games list reset + gamesModel->clear(); + gamesView->hide(); + gamesStatus->setText(tr("Loading games…")); + gamesStatus->show(); + // Close button, top right corner, above everything closeBtn->move(PopupWidth - closeBtn->width() - 6, 6); closeBtn->raise(); - gamesModel->setUser(currentUser, currentOnline); adjustSize(); + fetchGames(); } // ── Games fetch ─────────────────────────────────────────────────────────────── void UserInfoPopup::fetchGames() { - gamesModel->refresh(); -} - -void UserInfoPopup::setOnline(bool online) -{ - if (currentOnline == online) { + if (!client || currentUser.isEmpty()) { return; } - currentOnline = online; - refreshHeader(); - rebuildActionButtons(currentUserInfo, online, currentBuddy, currentIgnored); - gamesModel->setUser(currentUser, online); + + Command_GetGamesOfUser cmd; + cmd.set_user_name(currentUser.toStdString()); + + const QString snapshot = currentUser; + PendingCommand *pend = client->prepareSessionCommand(cmd); + connect(pend, &PendingCommand::finished, this, + [this, snapshot](const Response &r) { onGamesReceived(r, snapshot); }); + client->sendCommand(pend); } -void UserInfoPopup::updateGamesDisplay() +void UserInfoPopup::onGamesReceived(const Response &r, const QString &forUser) { - refreshBtn->setEnabled(gamesModel->canRefresh()); - const auto state = gamesModel->getState(); - const bool ready = state == UserGamesModel::State::Ready; - gamesView->setVisible(ready); - gamesStatus->setVisible(!ready); - - switch (state) { - case UserGamesModel::State::Offline: - gamesStatus->setText(tr("User is offline.")); - break; - case UserGamesModel::State::Disconnected: - gamesStatus->setText(tr("Not connected to the server.")); - break; - case UserGamesModel::State::Loading: - gamesStatus->setText(tr("Loading games…")); - break; - case UserGamesModel::State::Empty: - gamesStatus->setText(tr("No active games.")); - break; - case UserGamesModel::State::Error: - gamesStatus->setText(tr("Could not load games.")); - break; - case UserGamesModel::State::Ready: { - // Fit exactly to the number of visible rows, scroll when more than 5. - constexpr int rowH = 38; // must match PopupGameDelegate::sizeHint - constexpr int maxRows = 5; - const int count = gamesModel->rowCount(); - gamesView->setFixedHeight(qMin(count, maxRows) * rowH + 2); - gamesView->setVerticalScrollBarPolicy(count > maxRows ? Qt::ScrollBarAlwaysOn : Qt::ScrollBarAlwaysOff); - break; - } + if (forUser != currentUser) { + return; // stale response, different user showing now } + + gamesModel->clear(); + + if (r.response_code() != Response::RespOk) { + gamesStatus->setText(tr("Could not load games.")); + gamesStatus->show(); + gamesView->hide(); + return; + } + + const auto &resp = r.GetExtension(Response_GetGamesOfUser::ext); + if (resp.game_list_size() == 0) { + gamesStatus->setText(tr("No active games.")); + gamesStatus->show(); + gamesView->hide(); + return; + } + + for (int i = 0; i < resp.game_list_size(); ++i) { + auto *item = new QStandardItem; + item->setData(QVariant::fromValue(resp.game_list(i)), PopupRoles::GameData); + item->setEditable(false); + gamesModel->appendRow(item); + } + + gamesStatus->hide(); + gamesView->show(); + + // Fit exactly to the number of visible rows, scroll when more than 5 + constexpr int rowH = 38; // must match PopupGameDelegate::sizeHint + constexpr int maxRows = 5; + const int count = gamesModel->rowCount(); + const int visible = qMin(count, maxRows); + gamesView->setFixedHeight(visible * rowH + 2); + gamesView->setVerticalScrollBarPolicy(count > maxRows ? Qt::ScrollBarAlwaysOn : Qt::ScrollBarAlwaysOff); + adjustSize(); } void UserInfoPopup::refreshGames() { + gamesModel->clear(); + gamesView->hide(); + gamesStatus->setText(tr("Loading games…")); + gamesStatus->show(); fetchGames(); } diff --git a/cockatrice/src/interface/widgets/server/user/user_info_popup.h b/cockatrice/src/interface/widgets/server/user/user_info_popup.h index 1af4ad0e1..f2a91d025 100644 --- a/cockatrice/src/interface/widgets/server/user/user_info_popup.h +++ b/cockatrice/src/interface/widgets/server/user/user_info_popup.h @@ -1,7 +1,6 @@ #ifndef COCKATRICE_USER_INFO_POPUP_H #define COCKATRICE_USER_INFO_POPUP_H -#include "user_games_model.h" #include "user_list_painter.h" #include @@ -22,13 +21,15 @@ class QPushButton; class TabSupervisor; class QListView; class QPoint; +class QStandardItemModel; +class Response; template class QMap; // ── Roles ───────────────────────────────────────────────────────────────────── namespace PopupRoles { -constexpr int GameData = UserGamesModel::GameRole; +constexpr int GameData = Qt::UserRole + 10; } // Popup theme @@ -142,7 +143,6 @@ public: void showForUser(const QString &userName, const ServerInfo_User &userInfo, bool online, bool isBuddy, bool isIgnored); void fetchGames(); - void setOnline(bool online); [[nodiscard]] QString getCurrentUser() const { @@ -199,7 +199,7 @@ protected: private slots: void refreshGames(); - void updateGamesDisplay(); + void onGamesReceived(const Response &r, const QString &forUser); void onGamesContextMenu(const QPoint &pos); private: @@ -218,8 +218,6 @@ private: QString currentUser; ServerInfo_User currentUserInfo; bool currentOnline = false; - bool currentBuddy = false; - bool currentIgnored = false; std::function gameInviteAvailable; UserInfoHeaderWidget *header; @@ -227,7 +225,7 @@ private: QLabel *gamesLabel; QFrame *separator; QListView *gamesView; - UserGamesModel *gamesModel; + QStandardItemModel *gamesModel; QLabel *gamesStatus; QPushButton *closeBtn; QPushButton *refreshBtn; diff --git a/cockatrice/src/interface/widgets/server/user/user_list_painter.cpp b/cockatrice/src/interface/widgets/server/user/user_list_painter.cpp index acb91351b..08eaaaff7 100644 --- a/cockatrice/src/interface/widgets/server/user/user_list_painter.cpp +++ b/cockatrice/src/interface/widgets/server/user/user_list_painter.cpp @@ -1,7 +1,6 @@ #include "user_list_painter.h" #include "../../interface/pixel_map_generator.h" -#include "../../interface/theme_manager.h" #include "libcockatrice/protocol/pb/serverinfo_user.pb.h" #include @@ -293,9 +292,7 @@ void UserListPainter::drawUserName(QPainter *painter, bool online, const Style &style) { - Q_UNUSED(option); - // Family comes from the InterfaceDefault theme role; bold stays caller-side. - QFont nameFont = themeManager->appFont(AppFont::InterfaceDefault); + QFont nameFont = option.font; nameFont.setBold(true); painter->setFont(nameFont); @@ -354,9 +351,7 @@ void UserListPainter::drawBadges(QPainter *painter, return; } - Q_UNUSED(option); - // Family comes from the InterfaceDefault theme role; the *0.68 size and bold stay caller-side. - QFont badgeFont = themeManager->appFont(AppFont::InterfaceDefault); + QFont badgeFont = option.font; badgeFont.setPointSizeF(badgeFont.pointSizeF() * 0.68); badgeFont.setBold(true); painter->setFont(badgeFont); diff --git a/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp b/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp index 943b4d5de..a20b39b82 100644 --- a/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp +++ b/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp @@ -519,19 +519,6 @@ UserListWidget::UserListWidget(TabSupervisor *_tabSupervisor, userTree->viewport()->update(); userTree->update(); }); - // Divider headers store their font on the item, so re-apply the role - // family here; the painter reads the role live and needs only the - // repaint below. - connect(themeManager, &ThemeManager::fontsChanged, this, [this] { - QFont dividerFont = themeManager->appFont(AppFont::InterfaceDefault); - dividerFont.setBold(true); - for (auto it = sectionItems.constBegin(); it != sectionItems.constEnd(); ++it) { - it.value()->setFont(0, dividerFont); - it.value()->setSizeHint(0, QSize(0, QFontMetrics(dividerFont).height() + 16)); - } - userTree->viewport()->update(); - userTree->update(); - }); } QVBoxLayout *vbox = new QVBoxLayout; @@ -630,14 +617,7 @@ void UserListWidget::bind(UserListManager *mgr) connect(manager, &UserListManager::addedToIgnoreList, this, refreshCurrentPopup); connect(manager, &UserListManager::removedFromIgnoreList, this, refreshIfPopupOpen); connect(manager, &UserListManager::userJoinedOnline, this, refreshCurrentPopup); - connect(manager, &UserListManager::userLeftOnline, this, [this, refreshIfPopupOpen](const QString &name) { - // The online row may already have been removed; the pinned popup must - // still invalidate its games request and display the offline state. - if (userInfoPopup && userInfoPopup->getCurrentUser() == name) { - userInfoPopup->setOnline(false); - } - refreshIfPopupOpen(name); - }); + connect(manager, &UserListManager::userLeftOnline, this, refreshIfPopupOpen); rebuild(); } @@ -1512,7 +1492,7 @@ QTreeWidgetItem *UserListWidget::createSectionItem(Section section) // They act as collapsible section headers once they have focus. divider->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable); - QFont font = themeManager->appFont(AppFont::InterfaceDefault); + QFont font = userTree->font(); font.setBold(true); divider->setFont(0, font); // A little taller than a plain text row so the header reads as a section diff --git a/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.cpp index e90603858..31178ba4c 100644 --- a/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.cpp +++ b/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.cpp @@ -1,14 +1,13 @@ #include "deck_editor_settings_page.h" #include "../../../client/settings/cache_settings.h" -#include "../../theme_icon.h" +#include "../../pixel_map_generator.h" #include "../dialogs/path_safety_warning.h" #include "update/card_spoiler/spoiler_background_updater.h" #include #include #include -#include #include #include #include @@ -62,7 +61,7 @@ DeckEditorSettingsPage::DeckEditorSettingsPage() connect(mpSpoilerPathButton, &QPushButton::clicked, this, &DeckEditorSettingsPage::spoilerPathButtonClicked); updateNowButton = new QPushButton; - updateNowButton->setMinimumWidth(150); + updateNowButton->setFixedWidth(150); connect(updateNowButton, &QPushButton::clicked, this, &DeckEditorSettingsPage::updateSpoilers); // Update the GUI depending on if the box is ticked or not @@ -80,19 +79,19 @@ DeckEditorSettingsPage::DeckEditorSettingsPage() } aAdd = new QAction(this); - aAdd->setIcon(loadThemedIcon(QStringLiteral("icons/increment"))); + aAdd->setIcon(themePixmap(QStringLiteral("icons/increment"))); connect(aAdd, &QAction::triggered, this, &DeckEditorSettingsPage::actAddURL); aEdit = new QAction(this); - aEdit->setIcon(loadThemedIcon(QStringLiteral("icons/pencil"))); + aEdit->setIcon(themePixmap(QStringLiteral("icons/pencil"))); connect(aEdit, &QAction::triggered, this, &DeckEditorSettingsPage::actEditURL); aRemove = new QAction(this); - aRemove->setIcon(loadThemedIcon(QStringLiteral("icons/decrement"))); + aRemove->setIcon(themePixmap(QStringLiteral("icons/decrement"))); connect(aRemove, &QAction::triggered, this, &DeckEditorSettingsPage::actRemoveURL); aRateLimit = new QAction(this); - aRateLimit->setIcon(loadThemedIcon(QStringLiteral("icons/settings"))); + aRateLimit->setIcon(themePixmap(QStringLiteral("icons/cogwheel"))); connect(aRateLimit, &QAction::triggered, this, &DeckEditorSettingsPage::actAdjustRateLimit); auto *urlToolBar = new QToolBar; @@ -121,19 +120,12 @@ DeckEditorSettingsPage::DeckEditorSettingsPage() lpSpoilerGrid->addWidget(&lastUpdatedLabel, 2, 0); lpSpoilerGrid->addWidget(updateNowButton, 2, 1); lpSpoilerGrid->addWidget(&infoOnSpoilersLabel, 3, 0, 1, 3, Qt::AlignTop); - infoOnSpoilersLabel.setWordWrap(true); // On a change to the checkbox, hide/un-hide the other fields connect(&mcDownloadSpoilersCheckBox, &QCheckBox::toggled, &SettingsCache::instance().downloads(), &DownloadSettings::setDownloadSpoilerStatus); connect(&mcDownloadSpoilersCheckBox, &QCheckBox::toggled, this, &DeckEditorSettingsPage::setSpoilersEnabled); - // The updater is application-owned and outlives this page, so a Settings page - // reopened mid-update must observe the operation that is still running. - if (auto *runningUpdater = SpoilerBackgroundUpdater::current()) { - observeSpoilerUpdater(runningUpdater); - } - mpGeneralGroupBox = new QGroupBox; mpGeneralGroupBox->setLayout(lpGeneralGrid); @@ -336,60 +328,20 @@ void DeckEditorSettingsPage::urlListChanged(const QModelIndex &, int, int, const void DeckEditorSettingsPage::updateSpoilers() { - if (spoilerUpdater) { - return; - } - // Application ownership lets either operation finish after settings closes. - // When disabled, the same button retries file removal and the local reload. - SpoilerBackgroundUpdater *sbu; - if (SettingsCache::instance().downloads().getDownloadSpoilersStatus()) { - sbu = new SpoilerBackgroundUpdater(QCoreApplication::instance(), true); - // Only an updater this page creates is retired by deleteLater: observation - // may attach to the stack-allocated launch updater, which must not be deleted. - connect(sbu, &SpoilerBackgroundUpdater::spoilerCheckerDone, sbu, &QObject::deleteLater); - } else { - // deleteSpoilerFile() wires its own deleteLater. - sbu = SpoilerBackgroundUpdater::deleteSpoilerFile(); - } - observeSpoilerUpdater(sbu); -} + // Disable the button so the user can only press it once at a time + updateNowButton->setDisabled(true); + updateNowButton->setText(tr("Updating...")); -void DeckEditorSettingsPage::observeSpoilerUpdater(SpoilerBackgroundUpdater *sbu) -{ - spoilerUpdater = sbu; - unlockSettings(); - connect(sbu, &SpoilerBackgroundUpdater::spoilerCheckerDone, this, [this, sbu] { - if (spoilerUpdater == sbu) { - spoilerUpdater.clear(); - unlockSettings(); - } - }); - connect(sbu, &SpoilerBackgroundUpdater::spoilerUpdateFailed, this, [this, sbu](const QString &message) { - if (spoilerUpdater != sbu) { - return; - } - auto *notice = new QMessageBox(QMessageBox::Warning, tr("Spoiler update"), message, QMessageBox::Ok, this); - notice->setTextFormat(Qt::PlainText); - notice->setAttribute(Qt::WA_DeleteOnClose); - notice->open(); - }); + // Create a new SBU that will act as if the client was just reloaded + auto *sbu = new SpoilerBackgroundUpdater(); + connect(sbu, &SpoilerBackgroundUpdater::spoilerCheckerDone, this, &DeckEditorSettingsPage::unlockSettings); + connect(sbu, &SpoilerBackgroundUpdater::spoilersUpdatedSuccessfully, this, &DeckEditorSettingsPage::unlockSettings); } void DeckEditorSettingsPage::unlockSettings() { - updateNowButton->setEnabled(!spoilerUpdater); - updateNowButton->setText(spoilerUpdater ? tr("Updating...") - : SettingsCache::instance().downloads().getDownloadSpoilersStatus() - ? tr("Update Spoilers") - : tr("Reload Card Database")); - lastUpdatedLabel.setText(tr("Last Change") + ": " + getLastUpdateTime()); - infoOnSpoilersLabel.setText( - SettingsCache::instance().downloads().getDownloadSpoilersStatus() - ? tr("Spoilers download automatically on launch") + "\n" + - tr("Press the button to manually update without relaunching") + "\n\n" + - tr("Updates continue if you close settings") - : tr("Spoilers are off. Reload Card Database removes any downloaded spoiler file and reloads your " - "card data.")); + updateNowButton->setDisabled(false); + updateNowButton->setText(tr("Update Spoilers")); } QString DeckEditorSettingsPage::getLastUpdateTime() @@ -427,17 +379,12 @@ void DeckEditorSettingsPage::setSpoilersEnabled(bool anInput) mpSpoilerSavePathLineEdit->setEnabled(anInput); mpSpoilerPathButton->setEnabled(anInput); lastUpdatedLabel.setEnabled(anInput); - // The hint explains the button in both states, especially the disabled-state - // Reload Card Database action, so keep it readable while spoilers are off. - infoOnSpoilersLabel.setEnabled(true); + updateNowButton->setEnabled(anInput); + infoOnSpoilersLabel.setEnabled(anInput); - // Only react to the user disabling the setting. The constructor calls this to - // initialize the controls, and a leftover spoiler file is recovered through the - // Reload Card Database button rather than an unrequested reload on page open. - if (!anInput && sender() == &mcDownloadSpoilersCheckBox) { - observeSpoilerUpdater(SpoilerBackgroundUpdater::deleteSpoilerFile()); + if (!anInput) { + SpoilerBackgroundUpdater::deleteSpoilerFile(); } - unlockSettings(); } void DeckEditorSettingsPage::retranslateUi() @@ -447,10 +394,13 @@ void DeckEditorSettingsPage::retranslateUi() mcDownloadSpoilersCheckBox.setText(tr("Download Spoilers Automatically")); mcSpoilerSaveLabel.setText(tr("Spoiler Location:")); lastUpdatedLabel.setText(tr("Last Change") + ": " + getLastUpdateTime()); + infoOnSpoilersLabel.setText(tr("Spoilers download automatically on launch") + "\n" + + tr("Press the button to manually update without relaunching") + "\n\n" + + tr("Do not close settings until manual update is complete")); picDownloadCheckBox.setText(tr("Download card pictures on the fly")); urlLinkLabel.setText(QString("%2").arg(WIKI_CUSTOM_PIC_URL).arg(tr("How to add a custom URL"))); resetDownloadURLs.setText(tr("Reset Download URLs")); - unlockSettings(); + updateNowButton->setText(tr("Update Spoilers")); aAdd->setText(tr("Add New URL")); aEdit->setText(tr("Edit URL")); aRemove->setText(tr("Remove URL")); diff --git a/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.h b/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.h index 8e33e697d..47f840191 100644 --- a/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.h +++ b/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.h @@ -5,7 +5,6 @@ #include #include -#include #include #include #include @@ -16,7 +15,6 @@ class QLineEdit; class QListWidget; class QListWidgetItem; class QModelIndex; -class SpoilerBackgroundUpdater; class DeckEditorSettingsPage : public AbstractSettingsPage { @@ -56,7 +54,6 @@ private: QLabel infoOnSpoilersLabel; QPushButton *mpSpoilerPathButton; QPushButton *updateNowButton; - QPointer spoilerUpdater; /** @brief Adds a list item for the given URL, storing the raw URL alongside its displayed label. */ QListWidgetItem *addUrlItem(const QString &url); @@ -69,8 +66,6 @@ private: /** @brief Refreshes the displayed label of every URL item after limits or settings change. */ void refreshUrlItems(); - - void observeSpoilerUpdater(SpoilerBackgroundUpdater *updater); }; #endif // COCKATRICE_DECK_EDITOR_SETTINGS_PAGE_H diff --git a/cockatrice/src/interface/widgets/settings_page/messages_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/messages_settings_page.cpp index 09dd9e9b0..6128a7830 100644 --- a/cockatrice/src/interface/widgets/settings_page/messages_settings_page.cpp +++ b/cockatrice/src/interface/widgets/settings_page/messages_settings_page.cpp @@ -1,7 +1,7 @@ #include "messages_settings_page.h" #include "../../../client/settings/cache_settings.h" -#include "../../theme_icon.h" +#include "../../pixel_map_generator.h" #include "../interface/widgets/utility/get_text_with_max.h" #include "libcockatrice/utility/macros.h" @@ -146,15 +146,15 @@ MessagesSettingsPage::MessagesSettingsPage() } aAdd = new QAction(this); - aAdd->setIcon(loadThemedIcon(QStringLiteral("icons/increment"))); + aAdd->setIcon(themePixmap(QStringLiteral("icons/increment"))); connect(aAdd, &QAction::triggered, this, &MessagesSettingsPage::actAdd); aEdit = new QAction(this); - aEdit->setIcon(loadThemedIcon(QStringLiteral("icons/pencil"))); + aEdit->setIcon(themePixmap(QStringLiteral("icons/pencil"))); connect(aEdit, &QAction::triggered, this, &MessagesSettingsPage::actEdit); aRemove = new QAction(this); - aRemove->setIcon(loadThemedIcon(QStringLiteral("icons/decrement"))); + aRemove->setIcon(themePixmap(QStringLiteral("icons/decrement"))); connect(aRemove, &QAction::triggered, this, &MessagesSettingsPage::actRemove); auto *messageToolBar = new QToolBar; diff --git a/cockatrice/src/interface/widgets/settings_page/settings_search_delegate.cpp b/cockatrice/src/interface/widgets/settings_page/settings_search_delegate.cpp index 67354c9d7..bf35b7557 100644 --- a/cockatrice/src/interface/widgets/settings_page/settings_search_delegate.cpp +++ b/cockatrice/src/interface/widgets/settings_page/settings_search_delegate.cpp @@ -5,7 +5,6 @@ */ #include "settings_search_delegate.h" -#include "../interface/theme_manager.h" #include "settings_search_model.h" #include @@ -89,8 +88,7 @@ void SettingsSearchDelegate::paint(QPainter *painter, QRect textRect = contentRect.adjusted(iconOffset, 0, 0, 0); // Breadcrumb: "Page > Group" - // Family comes from the InterfaceDefault theme role; the -1 size and bold stay caller-side. - QFont breadcrumbFont = themeManager->appFont(AppFont::InterfaceDefault); + QFont breadcrumbFont = option.font; breadcrumbFont.setPointSize(breadcrumbFont.pointSize() - 1); breadcrumbFont.setBold(true); @@ -115,7 +113,7 @@ void SettingsSearchDelegate::paint(QPainter *painter, yPos += 20; // Setting label - QFont labelFont = themeManager->appFont(AppFont::InterfaceDefault); + QFont labelFont = option.font; labelFont.setPointSize(labelFont.pointSize() + 1); labelFont.setBold(isSelected); diff --git a/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.cpp index 83c2ec585..a77c0c2c3 100644 --- a/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.cpp +++ b/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.cpp @@ -3,7 +3,7 @@ #include "../../../client/settings/cache_settings.h" #include "../../../client/settings/shortcut_treeview.h" #include "../../../client/settings/shortcuts_settings.h" -#include "../../theme_icon.h" +#include "../../pixel_map_generator.h" #include "../interface/widgets/utility/custom_line_edit.h" #include "../interface/widgets/utility/sequence_edit.h" @@ -58,8 +58,8 @@ ShortcutSettingsPage::ShortcutSettingsPage() btnResetAll = new QPushButton(this); btnClearAll = new QPushButton(this); - btnResetAll->setIcon(loadThemedIcon(QStringLiteral("icons/reload"))); - btnClearAll->setIcon(loadThemedIcon(QStringLiteral("icons/clearsearch"))); + btnResetAll->setIcon(themePixmap(QStringLiteral("icons/update"))); + btnClearAll->setIcon(themePixmap(QStringLiteral("icons/clearsearch"))); // layout auto *_editLayout = new QGridLayout; diff --git a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp index 1e80b2715..4044f03db 100644 --- a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp +++ b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp @@ -11,7 +11,9 @@ #include "../../../client/settings/cache_settings.h" #include "../../../client/settings/shortcuts_settings.h" +#include "../../deck_loader/deck_file_format.h" #include "../../deck_loader/deck_loader.h" +#include "../../deck_loader/loaded_deck.h" #include "../cards/additional_info/deck_color_identity.h" #include "../cards/card_info_frame_widget.h" #include "../client/network/interfaces/deck_stats_interface.h" @@ -53,8 +55,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp index 46d2466c6..3abf3f9aa 100644 --- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp +++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp @@ -2,6 +2,7 @@ #include "../../../../../../client/settings/cache_settings.h" #include "../../../../../deck_loader/card_node_function.h" +#include "../../../../../deck_loader/loaded_deck.h" #include "../../../../cards/deck_card_zone_display_widget.h" #include "../../../../visual_deck_editor/visual_deck_display_options_widget.h" #include "../../../../visual_deck_editor/visual_deck_editor_widget.h" @@ -29,7 +30,6 @@ #include #include #include -#include #include #include #include diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.cpp index 3720aeb55..97383534f 100644 --- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.cpp +++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.cpp @@ -1,6 +1,5 @@ #include "archidekt_deck_preview_image_display_widget.h" -#include "../../../../../theme_manager.h" #include "../../../../general/display/shadow_background_label.h" #include @@ -18,27 +17,19 @@ ArchidektDeckPreviewImageDisplayWidget::ArchidektDeckPreviewImageDisplayWidget(Q bottomLeftLabel = new ShadowBackgroundLabel(this, ""); bottomRightLabel = new ShadowBackgroundLabel(this, ""); - applyCardTextFont(); - connect(themeManager, &ThemeManager::fontsChanged, this, - &ArchidektDeckPreviewImageDisplayWidget::applyCardTextFont); - - // Raise so labels appear above image - topLeftLabel->raise(); - topRightLabel->raise(); - bottomLeftLabel->raise(); - bottomRightLabel->raise(); -} - -void ArchidektDeckPreviewImageDisplayWidget::applyCardTextFont() -{ - // Family comes from the CardText theme role; size and weight stay caller-side as before. - QFont f = themeManager->appFont(AppFont::CardText); + QFont f; f.setBold(true); f.setPointSize(16); topLeftLabel->setFont(f); topRightLabel->setFont(f); bottomLeftLabel->setFont(f); bottomRightLabel->setFont(f); + + // Raise so labels appear above image + topLeftLabel->raise(); + topRightLabel->raise(); + bottomLeftLabel->raise(); + bottomRightLabel->raise(); } void ArchidektDeckPreviewImageDisplayWidget::setAspectRatio(float ratio) diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.h index 41585e851..991f27b6a 100644 --- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.h +++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.h @@ -60,9 +60,6 @@ protected: */ void resizeEvent(QResizeEvent *event) override; -private slots: - void applyCardTextFont(); - private: float aspectRatio = 1.0f; ///< Aspect ratio to maintain for the preview image }; diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp index ae3a9baef..7f7a2d3fd 100644 --- a/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp +++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp @@ -1,7 +1,7 @@ #include "tab_archidekt.h" #include "../../../../../client/settings/cache_settings.h" -#include "../../../../theme_icon.h" +#include "../../../../pixel_map_generator.h" #include "../../../cards/additional_info/mana_symbol_widget.h" #include "../../../cards/card_size_widget.h" #include "../../../quick_settings/settings_button_widget.h" @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include @@ -61,6 +60,8 @@ TabArchidekt::TabArchidekt(TabSupervisor *_tabSupervisor) { // Initialize network networkManager = NetworkManagerFactory::create(this); + networkManager->setRedirectPolicy(QNetworkRequest::ManualRedirectPolicy); + connect(networkManager, &QNetworkAccessManager::finished, this, &TabArchidekt::processApiJson); // Initialize debounce timer searchDebounceTimer = new QTimer(this); @@ -76,48 +77,6 @@ TabArchidekt::TabArchidekt(TabSupervisor *_tabSupervisor) getTopDecks(); } -TabArchidekt::~TabArchidekt() -{ - cancelRequest(); -} - -void TabArchidekt::cancelRequest() -{ - const QPointer previousReply = activeReply; - activeReply = nullptr; - isLoadingMore = false; - if (previousReply) { - disconnect(previousReply, nullptr, this, nullptr); - previousReply->abort(); - previousReply->deleteLater(); - } -} - -void TabArchidekt::startRequest(QUrl url, RequestKind kind, int page) -{ - cancelRequest(); - requestUrl = url; - requestKind = kind; - requestedPage = page; - isLoadingMore = true; - retryButton->hide(); - requestStatusLabel->setText(kind == RequestKind::Deck ? tr("Loading deck…") : tr("Loading decks…")); - requestStatusLabel->show(); - - QNetworkRequest request(url); - request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING)); - auto *reply = networkManager->get(request); - activeReply = reply; - connect(reply, &QNetworkReply::finished, this, [this, reply]() { processApiJson(reply); }); -} - -void TabArchidekt::showRequestError(const QString &error) -{ - requestStatusLabel->setText(tr("Unable to load decks: %1").arg(error)); - requestStatusLabel->show(); - retryButton->show(); -} - void TabArchidekt::initializeUi() { // Main container @@ -235,18 +194,6 @@ void TabArchidekt::initializeUi() mainLayout->addWidget(primaryToolbar); mainLayout->addWidget(secondaryToolbar); - - auto *requestStatusRow = new QHBoxLayout; - requestStatusLabel = new QLabel(container); - requestStatusLabel->setTextFormat(Qt::PlainText); - requestStatusLabel->setWordWrap(true); - retryButton = new QPushButton(tr("Retry"), container); - retryButton->hide(); - connect(retryButton, &QPushButton::clicked, this, - [this]() { startRequest(requestUrl, requestKind, requestedPage); }); - requestStatusRow->addWidget(requestStatusLabel, 1); - requestStatusRow->addWidget(retryButton); - mainLayout->addLayout(requestStatusRow); mainLayout->addWidget(scrollArea); setCentralWidget(container); @@ -282,7 +229,7 @@ void TabArchidekt::setupFilterWidgets() // Format filter (collapsible) formatButton = new SettingsButtonWidget(secondaryToolbar); formatButton->setButtonText(tr("Formats")); - formatButton->setButtonIcon(loadThemedIcon(QStringLiteral("icons/scales"))); + formatButton->setButtonIcon(themePixmap(QStringLiteral("icons/scale_balanced"))); QWidget *formatContainer = new QWidget(secondaryToolbar); QGridLayout *formatLayout = new QGridLayout(formatContainer); @@ -457,7 +404,6 @@ void TabArchidekt::retranslateUi() minDeckSizeLogicCombo->setItemText(0, tr("Exact")); searchButton->setText(tr("Search")); - retryButton->setText(tr("Retry")); settingsButton->setToolTip(tr("Display Settings")); } @@ -571,95 +517,82 @@ QString TabArchidekt::buildSearchUrl() void TabArchidekt::doSearch() { + // Reset to first page on new search + currentPage = 1; + // We're searching, so we'll be in list mode + isListMode = true; // Don't debounce - only called by explicit user actions now doSearchImmediate(); } void TabArchidekt::doSearchImmediate() { - searchDebounceTimer->stop(); - currentPage = 1; - startRequest(QUrl(buildSearchUrl()), RequestKind::Search); + QString url = buildSearchUrl(); + QNetworkRequest req{QUrl(url)}; + req.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING)); + networkManager->get(req); } void TabArchidekt::loadNextPage() { - if (activeReply || !isListMode || !listingsWidget || nextPageUrl.isEmpty()) { + if (isLoadingMore) { return; } - // Continue the accepted search, even if the user has edited filters without submitting them. - // Advance currentPage only after this response has been accepted, so failures can retry it. - startRequest(nextPageUrl, RequestKind::NextPage, currentPage + 1); + isLoadingMore = true; + currentPage++; + + QString url = buildSearchUrl(); + QNetworkRequest req{QUrl(url)}; + req.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING)); + networkManager->get(req); } void TabArchidekt::actNavigatePage(QString url) { - searchDebounceTimer->stop(); - startRequest(QUrl(url), RequestKind::Deck); + QNetworkRequest request{QUrl(url)}; + request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING)); + networkManager->get(request); } void TabArchidekt::getTopDecks() { - doSearchImmediate(); + currentPage = 1; + QNetworkRequest request{QUrl(buildSearchUrl())}; + request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING)); + networkManager->get(request); } void TabArchidekt::processApiJson(QNetworkReply *reply) { - if (reply != activeReply) { - reply->deleteLater(); - return; - } - activeReply = nullptr; - isLoadingMore = false; - reply->deleteLater(); - if (reply->error() != QNetworkReply::NoError) { - showRequestError(reply->errorString()); + isLoadingMore = false; + reply->deleteLater(); return; } QByteArray responseData = reply->readAll(); - QJsonParseError parseError; - QJsonDocument jsonDoc = QJsonDocument::fromJson(responseData, &parseError); + QJsonDocument jsonDoc = QJsonDocument::fromJson(responseData); - if (parseError.error != QJsonParseError::NoError || !jsonDoc.isObject()) { - showRequestError(tr("Invalid response from Archidekt.")); + if (!jsonDoc.isObject()) { + isLoadingMore = false; + reply->deleteLater(); return; } QJsonObject jsonObj = jsonDoc.object(); - if (requestKind != RequestKind::Deck) { - if (!jsonObj.value("results").isArray() || - (!jsonObj.value("next").isNull() && !jsonObj.value("next").isString())) { - showRequestError(tr("Invalid deck listing from Archidekt.")); - return; - } - for (const auto &value : jsonObj.value("results").toArray()) { - if (!value.isObject() || value.toObject().value("id").toInt() <= 0) { - showRequestError(tr("Invalid deck listing from Archidekt.")); - return; - } - } - currentPage = requestedPage; - const QString next = jsonObj.value("next").toString(); - nextPageUrl = next.isEmpty() ? QUrl() : reply->url().resolved(QUrl(next)); - // An empty or self-repeating page cannot make forward progress. - if (jsonObj.value("results").toArray().isEmpty() || nextPageUrl == reply->url()) { - nextPageUrl.clear(); - } - requestStatusLabel->setText( - currentPage == 1 && jsonObj.value("results").toArray().isEmpty() ? tr("No decks found.") : QString()); - requestStatusLabel->setVisible(!requestStatusLabel->text().isEmpty()); + QString responseUrl = reply->url().toString(); + + if (responseUrl.startsWith("https://archidekt.com/api/decks/v3/")) { processTopDecksResponse(jsonObj); - } else { - if (jsonObj.value("id").toInt() <= 0 || !jsonObj.value("cards").isArray()) { - showRequestError(tr("Invalid deck from Archidekt.")); - return; - } - requestStatusLabel->hide(); + } else if (responseUrl.startsWith("https://archidekt.com/api/decks/")) { processDeckResponse(jsonObj); + } else { + prettyPrintJson(jsonObj, 4); } + + isLoadingMore = false; + reply->deleteLater(); } void TabArchidekt::processTopDecksResponse(QJsonObject reply) @@ -667,12 +600,8 @@ void TabArchidekt::processTopDecksResponse(QJsonObject reply) ArchidektDeckListingApiResponse deckData; deckData.fromJson(reply); - // An accepted listing restores list mode; a failed deck navigation leaves the listing usable. - isListMode = true; - // New search → clear everything - if (requestKind == RequestKind::Search) { - listingsWidget = nullptr; + if (currentPage == 1) { QtUtils::clearLayoutRec(resultsLayout, QtUtils::DeletePolicy::Immediate); listingsWidget = new ArchidektApiResponseDeckListingsDisplayWidget(resultsContainer, deckData, cardSizeSlider); @@ -697,10 +626,8 @@ void TabArchidekt::processDeckResponse(QJsonObject reply) // We're in single deck mode - disable infinite scroll isListMode = false; - nextPageUrl.clear(); // Clear existing results for single deck view - listingsWidget = nullptr; QtUtils::clearLayoutRec(resultsLayout, QtUtils::DeletePolicy::Immediate); auto display = new ArchidektApiResponseDeckDisplayWidget(resultsContainer, deckData, cardSizeSlider); diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.h index 81c9502df..c74380b63 100644 --- a/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.h +++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.h @@ -8,10 +8,8 @@ #include #include #include -#include #include #include -#include #include #include @@ -57,7 +55,6 @@ public: * connects signals and slots, and triggers an initial fetch of top decks. */ explicit TabArchidekt(TabSupervisor *_tabSupervisor); - ~TabArchidekt() override; /** * @brief Update all UI text to reflect the current language or translation @@ -193,17 +190,6 @@ protected: bool eventFilter(QObject *obj, QEvent *event) override; private: - enum class RequestKind - { - Search, - NextPage, - Deck - }; - - void startRequest(QUrl url, RequestKind kind, int page = 1); - void cancelRequest(); - void showRequestError(const QString &error); - /** * @brief Initialize the main UI layout and toolbars * @@ -250,14 +236,7 @@ private: int currentPage; ///< Current page number for infinite scroll bool isLoadingMore; ///< Flag to prevent multiple simultaneous page loads bool isListMode; - QPointer activeReply; - RequestKind requestKind = RequestKind::Search; - QUrl requestUrl; - QUrl nextPageUrl; - int requestedPage = 1; - QPointer listingsWidget; - QLabel *requestStatusLabel; - QPushButton *retryButton; + ArchidektApiResponseDeckListingsDisplayWidget *listingsWidget = nullptr; // --------------------------------------------------------------------- // Layout Containers diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.cpp b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.cpp index 7b60ed23c..8e0448faa 100644 --- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.cpp +++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.cpp @@ -26,11 +26,6 @@ quint64 CommanderBracketService::estimateBracket(const DeckList &deck, QObject * return CommanderSpellbookApiAccessor::instance().estimateBracket(deck, requester); } -void CommanderBracketService::cancelEstimate(quint64 requestId) -{ - CommanderSpellbookApiAccessor::instance().cancelEstimate(requestId); -} - void CommanderBracketService::onEstimateBracketFinished(CommanderSpellbookApiAccessor::RequestId id, QObject *requester, const EstimateBracketResult &result) diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.h b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.h index 00debce86..22962cc95 100644 --- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.h +++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.h @@ -30,7 +30,6 @@ public: static CommanderBracketService &instance(); quint64 estimateBracket(const DeckList &deck, QObject *requester); - void cancelEstimate(quint64 requestId); signals: void estimateFinished(quint64 requestId, QObject *requester, const CommanderBracketEstimate &estimate); diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp index a0e3f2491..5279165af 100644 --- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp +++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp @@ -1,7 +1,7 @@ #include "commander_bracket_widget.h" #include "../../../../../client/settings/cache_settings.h" -#include "../../../../theme_icon.h" +#include "../../../../pixel_map_generator.h" #include "commander_bracket_service.h" #include "libcockatrice/deck_list/deck_list.h" @@ -28,18 +28,9 @@ template class QSharedPointer; CommanderBracketWidget::CommanderBracketWidget(QWidget *parent) : QWidget(parent) { - autoEstimateTimer = new QTimer(this); - autoEstimateTimer->setSingleShot(true); - connect(autoEstimateTimer, &QTimer::timeout, this, [this]() { - if (SettingsCache::instance().deckEditor().getCommanderSpellbookIntegrationEnabled() == - commanderSpellbookIntegrationEnabledIndexAutomatic) { - requestBracketEstimate(); - } - }); bracketLabel = new QLabel(tr("Bracket:"), this); bracketValueLabel = new QLabel(this); - bracketValueLabel->setTextFormat(Qt::PlainText); bracketValueLabel->setText("-"); bracketValueLabel->setObjectName("bracketValueLabel"); @@ -49,7 +40,7 @@ CommanderBracketWidget::CommanderBracketWidget(QWidget *parent) : QWidget(parent bracketInfoButton->setEnabled(false); bracketRefreshButton = new QToolButton(this); - bracketRefreshButton->setIcon(loadThemedIcon(QStringLiteral("icons/reload"))); + bracketRefreshButton->setIcon(themePixmap(QStringLiteral("icons/reload"))); bracketRefreshButton->setAutoRaise(true); connect(bracketRefreshButton, &QToolButton::clicked, this, &CommanderBracketWidget::requestBracketEstimate); @@ -74,38 +65,18 @@ CommanderBracketWidget::CommanderBracketWidget(QWidget *parent) : QWidget(parent this, &CommanderBracketWidget::maybeAutoEstimateBracket); connect(&SettingsCache::instance().deckEditor(), &DeckEditorSettings::commanderSpellbookIntegrationUseOfficialBracketNamesChanged, this, - &CommanderBracketWidget::displayEstimate); + &CommanderBracketWidget::maybeAutoEstimateBracket); setVisible(false); } -CommanderBracketWidget::~CommanderBracketWidget() -{ - cancelEstimate(); -} - -void CommanderBracketWidget::cancelEstimate() -{ - autoEstimateTimer->stop(); - const quint64 canceledRequest = requestId; - requestId = 0; - CommanderBracketService::instance().cancelEstimate(canceledRequest); - bracketRefreshButton->setEnabled(true); - if (canceledRequest) { - bracketValueLabel->setText("-"); - bracketValueLabel->setToolTip({}); - } -} - void CommanderBracketWidget::setDeck(const QSharedPointer &_deck) { - cancelEstimate(); deck = _deck; - hasEstimate = false; + requestId = 0; // invalidate any in-flight estimate for the previous deck // Reset the displayed bracket bracketValueLabel->setText("-"); - bracketValueLabel->setToolTip({}); bracketInfoButton->setToolTip({}); bracketInfoButton->setEnabled(false); bracketRefreshButton->setEnabled(true); @@ -173,7 +144,7 @@ bool CommanderBracketWidget::promptCommanderSpellbookIntegration() dialog.exec(); // Persist naming choice (if not disabled) - if (clickedButton == enableBtn || clickedButton == automaticBtn) { + if (clickedButton != disableBtn) { bool useOfficial = namingCombo->currentIndex() == 1; SettingsCache::instance().deckEditor().setCommanderSpellbookIntegrationUseOfficialBracketNames(useOfficial); } @@ -205,20 +176,9 @@ void CommanderBracketWidget::updateBracketVisibility(bool visible) void CommanderBracketWidget::requestBracketEstimate() { - const int mode = SettingsCache::instance().deckEditor().getCommanderSpellbookIntegrationEnabled(); - if (!deck || deck->getGameFormat().compare("commander", Qt::CaseInsensitive) != 0 || requestId || - (mode != commanderSpellbookIntegrationEnabledIndexEnabled && - mode != commanderSpellbookIntegrationEnabledIndexAutomatic)) { - return; - } - - autoEstimateTimer->stop(); - hasEstimate = false; bracketRefreshButton->setEnabled(false); bracketInfoButton->setEnabled(false); - bracketInfoButton->setToolTip({}); bracketValueLabel->setText(tr("Calculating…")); - bracketValueLabel->setToolTip({}); requestId = CommanderBracketService::instance().estimateBracket(*deck, this); } @@ -231,35 +191,22 @@ void CommanderBracketWidget::onEstimateBracketFinished(quint64 id, return; } - requestId = 0; - hasEstimate = true; - lastEstimate = result; - displayEstimate(); - bracketRefreshButton->setEnabled(true); -} - -void CommanderBracketWidget::displayEstimate() -{ - if (!hasEstimate) { - bracketInfoButton->setToolTip(tr("Why this bracket?")); - return; - } - BracketExplainer explainer; - lastBracketExplanation = explainer.explain(lastEstimate.rawResult); + lastBracketExplanation = explainer.explain(result.rawResult); // Display bracket bracketValueLabel->setText( SettingsCache::instance().deckEditor().getCommanderSpellbookIntegrationUseOfficialBracketNames() - ? lastEstimate.officialName - : lastEstimate.displayName); + ? result.officialName + : result.displayName); + bracketRefreshButton->setEnabled(true); // Build tooltip QString tooltip; for (const auto §ion : lastBracketExplanation.sections) { - tooltip += "" + section.title.toHtmlEscaped() + "
    "; + tooltip += "" + section.title + "
    "; for (const auto &line : section.bulletPoints) { - tooltip += "• " + line.toHtmlEscaped() + "
    "; + tooltip += "• " + line + "
    "; } tooltip += "
    "; } @@ -268,17 +215,13 @@ void CommanderBracketWidget::displayEstimate() bracketInfoButton->setEnabled(!tooltip.isEmpty()); } -void CommanderBracketWidget::onEstimateBracketError(quint64 id, QObject *requester, const QString &error) +void CommanderBracketWidget::onEstimateBracketError(quint64 id, QObject *requester, const QString & /*error*/) { if (requester != this || id != requestId) { return; } - requestId = 0; - hasEstimate = false; bracketValueLabel->setText("-"); - bracketValueLabel->setToolTip( - QStringLiteral("%1").arg(tr("Unable to estimate bracket: %1").arg(error).toHtmlEscaped())); bracketRefreshButton->setEnabled(true); bracketInfoButton->setToolTip({}); bracketInfoButton->setEnabled(false); @@ -286,15 +229,6 @@ void CommanderBracketWidget::onEstimateBracketError(quint64 id, QObject *request void CommanderBracketWidget::maybeAutoEstimateBracket() { - if (prompting) { - return; - } - autoEstimateTimer->stop(); - if (!deck) { - cancelEstimate(); - updateBracketVisibility(false); - return; - } const QString formatKey = deck->getGameFormat(); const bool isCommander = (formatKey.compare("commander", Qt::CaseInsensitive) == 0); @@ -302,20 +236,17 @@ void CommanderBracketWidget::maybeAutoEstimateBracket() int mode = SettingsCache::instance().deckEditor().getCommanderSpellbookIntegrationEnabled(); if (!isCommander || mode == commanderSpellbookIntegrationEnabledIndexDisabled) { - cancelEstimate(); updateBracketVisibility(false); return; } if (mode == commanderSpellbookIntegrationEnabledIndexUnprompted) { - const auto promptedDeck = deck; + if (prompting) { + return; + } prompting = true; const bool accepted = promptCommanderSpellbookIntegration(); prompting = false; - if (deck != promptedDeck || !deck || deck->getGameFormat().compare("commander", Qt::CaseInsensitive) != 0) { - maybeAutoEstimateBracket(); - return; - } if (!accepted) { updateBracketVisibility(false); return; @@ -330,17 +261,17 @@ void CommanderBracketWidget::maybeAutoEstimateBracket() } // Avoid firing if we already have a result or a request in flight - if (requestId || hasEstimate) { + if (!bracketRefreshButton->isEnabled()) { return; } // Defer to avoid races during init / model rebuild - autoEstimateTimer->start(0); + QTimer::singleShot(0, this, &CommanderBracketWidget::requestBracketEstimate); } void CommanderBracketWidget::retranslateUi() { bracketLabel->setText(tr("Bracket:")); - displayEstimate(); + bracketInfoButton->setToolTip(tr("Why this bracket?")); bracketRefreshButton->setToolTip(tr("Recalculate bracket")); } diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.h b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.h index 0ef1eedee..f5b2b7958 100644 --- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.h +++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.h @@ -1,7 +1,6 @@ #ifndef COCKATRICE_COMMANDER_BRACKET_WIDGET_H #define COCKATRICE_COMMANDER_BRACKET_WIDGET_H -#include "commander_bracket_service.h" #include "commander_spellbook_bracket_explainer.h" #include @@ -12,7 +11,6 @@ class QLabel; class QToolButton; -class QTimer; struct CommanderBracketEstimate; class DeckList; class QObject; @@ -24,7 +22,6 @@ class CommanderBracketWidget : public QWidget public: explicit CommanderBracketWidget(QWidget *parent = nullptr); - ~CommanderBracketWidget() override; void setDeck(const QSharedPointer &_deck); void retranslateUi(); @@ -38,15 +35,10 @@ private slots: private: bool promptCommanderSpellbookIntegration(); void updateBracketVisibility(bool visible); - void cancelEstimate(); - void displayEstimate(); QSharedPointer deck; bool prompting = false; quint64 requestId = 0; - QTimer *autoEstimateTimer; - bool hasEstimate = false; - CommanderBracketEstimate lastEstimate; QLabel *bracketLabel; QLabel *bracketValueLabel; diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.cpp b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.cpp index 8456e2e21..bd8d9379d 100644 --- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.cpp +++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.cpp @@ -9,10 +9,9 @@ #include #include #include -#include #include #include -#include +#include #include class DeckList; @@ -25,18 +24,13 @@ CommanderSpellbookApiAccessor &CommanderSpellbookApiAccessor::instance() return instance; } -CommanderSpellbookApiAccessor::CommanderSpellbookApiAccessor(QObject *parent) - : QObject(parent), network(NetworkManagerFactory::create(this)) +CommanderSpellbookApiAccessor::CommanderSpellbookApiAccessor(QObject *parent) : QObject(parent) { } CommanderSpellbookApiAccessor::RequestId CommanderSpellbookApiAccessor::estimateBracket(const DeckList &deck, QObject *requester) { - if (!requester) { - return 0; - } - CommanderSpellbookDeckRequest deckRequest = CommanderSpellbookDeckRequest::fromDeckList(deck); QJsonDocument doc(deckRequest.toJson()); @@ -46,39 +40,30 @@ CommanderSpellbookApiAccessor::RequestId CommanderSpellbookApiAccessor::estimate req.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); req.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING)); - QNetworkReply *reply = network->post(req, body); + QNetworkReply *reply = network.post(req, body); const RequestId id = nextRequestId++; - pendingRequests.insert(id, reply); - const QPointer guardedRequester(requester); - connect(requester, &QObject::destroyed, reply, [this, id]() { cancelEstimate(id); }); - connect(reply, &QNetworkReply::finished, this, [this, reply, id, guardedRequester]() { - if (pendingRequests.take(id) != reply) { - return; - } - reply->deleteLater(); - if (guardedRequester) { - onEstimateReplyFinished(reply, id, guardedRequester); - } - }); + reply->setProperty("requestId", QVariant::fromValue(id)); + reply->setProperty("requester", QVariant::fromValue(requester)); + + connect(reply, &QNetworkReply::finished, this, [this, reply]() { onEstimateReplyFinished(reply); }); return id; } -void CommanderSpellbookApiAccessor::cancelEstimate(RequestId id) +void CommanderSpellbookApiAccessor::onEstimateReplyFinished(QNetworkReply *reply) { - const QPointer reply = pendingRequests.take(id); - if (!reply) { + reply->deleteLater(); + + const RequestId id = reply->property("requestId").toULongLong(); + QObject *requester = reply->property("requester").value(); + + if (!requester) { + // Requester died — silently drop return; } - disconnect(reply, nullptr, this, nullptr); - reply->abort(); - reply->deleteLater(); -} -void CommanderSpellbookApiAccessor::onEstimateReplyFinished(QNetworkReply *reply, RequestId id, QObject *requester) -{ if (reply->error() != QNetworkReply::NoError) { emit estimateBracketError(id, requester, reply->errorString()); return; @@ -93,10 +78,6 @@ void CommanderSpellbookApiAccessor::onEstimateReplyFinished(QNetworkReply *reply } EstimateBracketResult result = EstimateBracketResult::fromJson(doc.object()); - if (result.bracketTag.trimmed().isEmpty()) { - emit estimateBracketError(id, requester, QStringLiteral("Missing bracket in response")); - return; - } emit estimateBracketFinished(id, requester, result); } diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.h b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.h index a1b2936bb..98e7e3710 100644 --- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.h +++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.h @@ -1,16 +1,14 @@ #ifndef COCKATRICE_COMMANDER_SPELLBOOK_API_ACCESSOR_H #define COCKATRICE_COMMANDER_SPELLBOOK_API_ACCESSOR_H -#include +#include #include -#include #include #include #include class DeckList; class QNetworkReply; -class QNetworkAccessManager; struct EstimateBracketResult; class CommanderSpellbookApiAccessor final : public QObject @@ -23,7 +21,6 @@ public: using RequestId = quint64; RequestId estimateBracket(const DeckList &deck, QObject *requester); - void cancelEstimate(RequestId id); signals: void estimateBracketFinished(RequestId id, QObject *requester, const EstimateBracketResult &result); @@ -34,10 +31,9 @@ private: explicit CommanderSpellbookApiAccessor(QObject *parent = nullptr); Q_DISABLE_COPY_MOVE(CommanderSpellbookApiAccessor) - void onEstimateReplyFinished(QNetworkReply *reply, RequestId id, QObject *requester); + void onEstimateReplyFinished(QNetworkReply *reply); - QNetworkAccessManager *network; - QHash> pendingRequests; + QNetworkAccessManager network; RequestId nextRequestId = 1; }; diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.cpp b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.cpp index be490ce37..407f53e99 100644 --- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.cpp +++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.cpp @@ -3,14 +3,11 @@ #include "../../../../../client/settings/cache_settings.h" #include -#include #include -#include #include #include #include #include -#include #include #include #include @@ -25,14 +22,6 @@ HandleCommanderBrackets::HandleCommanderBrackets(QObject *parent) { } -HandleCommanderBrackets::~HandleCommanderBrackets() -{ - if (reply) { - disconnect(reply, nullptr, this, nullptr); - reply->abort(); - } -} - void HandleCommanderBrackets::downloadBracketDefinitions() { if (reply) { @@ -46,49 +35,31 @@ void HandleCommanderBrackets::downloadBracketDefinitions() void HandleCommanderBrackets::actFinishParsingDownloadedData() { - auto *finishedReply = qobject_cast(sender()); - if (!finishedReply || finishedReply != reply) { - return; - } + reply = qobject_cast(sender()); - // Clear the active request before notifying listeners, which may immediately retry. - reply = nullptr; - finishedReply->deleteLater(); + if (reply->error() != QNetworkReply::NoError) { + emit sigBracketDefinitionsDownloadFailed(reply->error()); - if (finishedReply->error() != QNetworkReply::NoError) { - emit sigBracketDefinitionsDownloadFailed(finishedReply->error()); + reply->deleteLater(); return; } QJsonParseError parseError; - auto document = QJsonDocument::fromJson(finishedReply->readAll(), &parseError); + auto document = QJsonDocument::fromJson(reply->readAll(), &parseError); - if (parseError.error != QJsonParseError::NoError || !document.isObject() || - !document.object().value("brackets").isArray() || document.object().value("brackets").toArray().isEmpty()) { + if (parseError.error != QJsonParseError::NoError) { emit sigBracketDefinitionsDownloadFailed(QNetworkReply::UnknownContentError); - return; - } - // Validate the complete replacement before touching the last usable definitions. - // Tags are QSettings group names, so path separators must not create nested groups. - QSet tags; - for (const auto &value : document.object().value("brackets").toArray()) { - const auto definition = value.toObject(); - const auto tag = definition.value("tag").toString(); - if (!value.isObject() || tag.trimmed().isEmpty() || tag.contains('/') || tag.contains('\\') || - tags.contains(tag) || definition.value("officialName").toString().trimmed().isEmpty() || - definition.value("displayName").toString().trimmed().isEmpty() || - !definition.value("explanation").isString()) { - emit sigBracketDefinitionsDownloadFailed(QNetworkReply::UnknownContentError); - return; - } - tags.insert(tag); + reply->deleteLater(); + return; } updateBracketDefinitions(document.toVariant().toMap()); emit sigBracketDefinitionsDownloaded(); + + reply->deleteLater(); } void HandleCommanderBrackets::updateBracketDefinitions(const QVariantMap &jsonMap) diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.h b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.h index 99b15832c..39bddba05 100644 --- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.h +++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.h @@ -3,7 +3,6 @@ #include #include -#include #include #include @@ -15,7 +14,6 @@ class HandleCommanderBrackets : public QObject public: explicit HandleCommanderBrackets(QObject *parent = nullptr); - ~HandleCommanderBrackets() override; void downloadBracketDefinitions(); @@ -30,7 +28,7 @@ private: void updateBracketDefinitions(const QVariantMap &jsonMap); QNetworkAccessManager *nam; - QPointer reply; + QNetworkReply *reply; }; #endif // COCKATRICE_HANDLE_COMMANDER_BRACKETS_H diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp index 2b76de973..b2ddace01 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp @@ -1,6 +1,5 @@ #include "edhrec_api_response_card_details_display_widget.h" -#include "../../../../../../theme_manager.h" #include "../../../../../cards/card_info_picture_widget.h" #include "../../../../../cards/card_size_widget.h" #include "../../../../../general/display/background_plate_widget.h" @@ -10,7 +9,6 @@ #include "edhrec_api_response_card_synergy_display_widget.h" #include "libcockatrice/card/database/card_database_querier.h" -#include #include #include #include @@ -34,9 +32,7 @@ EdhrecApiResponseCardDetailsDisplayWidget::EdhrecApiResponseCardDetailsDisplayWi nameLabel = new QLabel(this); nameLabel->setText(toDisplay.name); nameLabel->setAlignment(Qt::AlignHCenter); - applyCardTextFont(); - connect(themeManager, &ThemeManager::fontsChanged, this, - &EdhrecApiResponseCardDetailsDisplayWidget::applyCardTextFont); + nameLabel->setStyleSheet("font-size: 20px; font-weight: bold"); inclusionDisplayWidget = new EdhrecApiResponseCardInclusionDisplayWidget(this, toDisplay); @@ -90,14 +86,3 @@ void EdhrecApiResponseCardDetailsDisplayWidget::actRequestPageNavigation() { emit requestUrl(toDisplay.url); } - -void EdhrecApiResponseCardDetailsDisplayWidget::applyCardTextFont() -{ - // Family comes from the CardText theme role; the 20px size and bold - // weight previously carried by the stylesheet stay caller-side. Pixel - // size, not point size: the stylesheet said 20px, and 20pt is ~27px. - QFont cardFont = themeManager->appFont(AppFont::CardText); - cardFont.setPixelSize(20); - cardFont.setWeight(QFont::Bold); - nameLabel->setFont(cardFont); -} diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h index 8a3c8fba4..d738f4685 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h @@ -30,9 +30,6 @@ public slots: signals: void requestUrl(QString url); -private slots: - void applyCardTextFont(); - private: EdhrecApiResponseCardDetails toDisplay; QVBoxLayout *layout; diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp index df0319f88..2ff22f2b3 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp @@ -1,6 +1,5 @@ #include "edhrec_api_response_commander_details_display_widget.h" -#include "../../../../../../theme_manager.h" #include "../../../../../cards/card_info_picture_widget.h" #include "../../../../../cards/card_size_widget.h" #include "../../api_response/cards/edhrec_commander_api_response_commander_details.h" @@ -9,7 +8,6 @@ #include "edhrec_commander_api_response_navigation_widget.h" #include "libcockatrice/card/database/card_database_querier.h" -#include #include #include #include @@ -50,16 +48,15 @@ EdhrecCommanderResponseCommanderDetailsDisplayWidget::EdhrecCommanderResponseCom commanderName = new QLabel(this); commanderName->setText(commanderDetails.getName()); commanderName->setAlignment(Qt::AlignCenter); + commanderName->setStyleSheet("font-size: 28px; font-weight: bold"); label = new QLabel(this); label->setAlignment(Qt::AlignCenter); + label->setStyleSheet("font-size: 16px"); salt = new QLabel(this); salt->setAlignment(Qt::AlignCenter); - - applyCardTextFont(); - connect(themeManager, &ThemeManager::fontsChanged, this, - &EdhrecCommanderResponseCommanderDetailsDisplayWidget::applyCardTextFont); + salt->setStyleSheet("font-size: 16px"); cardPricesDisplayWidget = new EdhrecApiResponseCardPricesDisplayWidget(this, commanderDetails.getPrices()); @@ -86,19 +83,3 @@ void EdhrecCommanderResponseCommanderDetailsDisplayWidget::retranslateUi() label->setText(commanderDetails.getLabel()); salt->setText(tr("Salt: ") + QString::number(commanderDetails.getSalt())); } - -void EdhrecCommanderResponseCommanderDetailsDisplayWidget::applyCardTextFont() -{ - // Family comes from the CardText theme role; the sizes and the bold - // weight previously carried by the stylesheets stay caller-side. Pixel - // sizes, not point sizes: the stylesheets said 28px and 16px. - QFont nameFont = themeManager->appFont(AppFont::CardText); - nameFont.setPixelSize(28); - nameFont.setWeight(QFont::Bold); - commanderName->setFont(nameFont); - - QFont detailsFont = themeManager->appFont(AppFont::CardText); - detailsFont.setPixelSize(16); - label->setFont(detailsFont); - salt->setFont(detailsFont); -} diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h index 99e6b3d43..197263512 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.h @@ -30,9 +30,6 @@ public: QString baseUrl); void retranslateUi(); -private slots: - void applyCardTextFont(); - private: EdhrecCommanderApiResponseCommanderDetails commanderDetails; QHBoxLayout *layout; diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp index 749476619..b26a7e574 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp @@ -1,9 +1,6 @@ #include "edhrec_commander_api_response_bracket_navigation_widget.h" -#include "../../interface/theme_manager.h" - #include -#include #include #include #include @@ -28,7 +25,7 @@ EdhrecCommanderApiResponseBracketNavigationWidget::EdhrecCommanderApiResponseBra QString label = option.isEmpty() ? "All" : option.at(0).toUpper() + option.mid(1); QPushButton *optionButton = new QPushButton(label, this); optionButton->setMinimumHeight(84); - optionButton->setStyleSheet(QString()); + optionButton->setStyleSheet("font-size: 24px"); gameChangerButtons[option] = optionButton; layout->addWidget(optionButton, 2, i); connect(optionButton, &QPushButton::clicked, this, [=, this]() { @@ -38,10 +35,6 @@ EdhrecCommanderApiResponseBracketNavigationWidget::EdhrecCommanderApiResponseBra }); } - applyInterfaceDefaultFont(); - connect(themeManager, &ThemeManager::fontsChanged, this, - &EdhrecCommanderApiResponseBracketNavigationWidget::applyInterfaceDefaultFont); - updateOptionButtonSelection(gameChangerButtons, ""); retranslateUi(); @@ -101,18 +94,8 @@ void EdhrecCommanderApiResponseBracketNavigationWidget::updateOptionButtonSelect const QString &selectedKey) { for (auto it = buttons.begin(); it != buttons.end(); ++it) { - const bool selected = (it.key() == selectedKey); - it.value()->setStyleSheet(selected ? QStringLiteral("background-color: lightblue;") : QString()); - QFont buttonFont = themeManager->appFont(AppFont::InterfaceDefault); - buttonFont.setPixelSize(24); - buttonFont.setWeight(selected ? QFont::Bold : QFont::Normal); - it.value()->setFont(buttonFont); + it.value()->setStyleSheet(it.key() == selectedKey + ? "background-color: lightblue; font-weight: bold; font-size: 24px;" + : "font-size: 24px"); } -} - -void EdhrecCommanderApiResponseBracketNavigationWidget::applyInterfaceDefaultFont() -{ - // Family comes from the InterfaceDefault theme role; the 24px size stays - // caller-side and the selected button keeps its bold emphasis. - updateOptionButtonSelection(gameChangerButtons, selectedGameChanger); } \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.h index aa4e61ff1..a741b6696 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.h @@ -37,9 +37,6 @@ private: QMap gameChangerButtons; void updateOptionButtonSelection(QMap &buttons, const QString &selectedKey); - -private slots: - void applyInterfaceDefaultFont(); }; #endif // COCKATRICE_EDHREC_COMMANDER_API_RESPONSE_BRACKET_NAVIGATION_WIDGET_H diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp index 27cd1c51f..48704d010 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp @@ -1,9 +1,6 @@ #include "edhrec_commander_api_response_budget_navigation_widget.h" -#include "../../interface/theme_manager.h" - #include -#include #include #include #include @@ -28,7 +25,7 @@ EdhrecCommanderApiResponseBudgetNavigationWidget::EdhrecCommanderApiResponseBudg QString label = option.isEmpty() ? "Any" : option.at(0).toUpper() + option.mid(1); QPushButton *btn = new QPushButton(label, this); btn->setMinimumHeight(84); - btn->setStyleSheet(QString()); + btn->setStyleSheet("font-size: 24px"); budgetButtons[option] = btn; layout->addWidget(btn, 4, i); connect(btn, &QPushButton::clicked, this, [=, this]() { @@ -38,10 +35,6 @@ EdhrecCommanderApiResponseBudgetNavigationWidget::EdhrecCommanderApiResponseBudg }); } - applyInterfaceDefaultFont(); - connect(themeManager, &ThemeManager::fontsChanged, this, - &EdhrecCommanderApiResponseBudgetNavigationWidget::applyInterfaceDefaultFont); - updateOptionButtonSelection(budgetButtons, ""); retranslateUi(); @@ -103,18 +96,8 @@ void EdhrecCommanderApiResponseBudgetNavigationWidget::updateOptionButtonSelecti const QString &selectedKey) { for (auto it = buttons.begin(); it != buttons.end(); ++it) { - const bool selected = (it.key() == selectedKey); - it.value()->setStyleSheet(selected ? QStringLiteral("background-color: lightblue;") : QString()); - QFont buttonFont = themeManager->appFont(AppFont::InterfaceDefault); - buttonFont.setPixelSize(24); - buttonFont.setWeight(selected ? QFont::Bold : QFont::Normal); - it.value()->setFont(buttonFont); + it.value()->setStyleSheet(it.key() == selectedKey + ? "background-color: lightblue; font-weight: bold; font-size: 24px;" + : "font-size: 24px"); } -} - -void EdhrecCommanderApiResponseBudgetNavigationWidget::applyInterfaceDefaultFont() -{ - // Family comes from the InterfaceDefault theme role; the 24px size stays - // caller-side and the selected button keeps its bold emphasis. - updateOptionButtonSelection(budgetButtons, selectedBudget); } \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.h index d727225a5..8013d1d6b 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.h @@ -37,9 +37,6 @@ private: QMap budgetButtons; void updateOptionButtonSelection(QMap &buttons, const QString &selectedKey); - -private slots: - void applyInterfaceDefaultFont(); }; #endif // COCKATRICE_EDHREC_COMMANDER_API_RESPONSE_BUDGET_NAVIGATION_WIDGET_H diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp index 57070a5e1..220dcfbda 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp @@ -1,11 +1,9 @@ #include "edhrec_commander_api_response_navigation_widget.h" -#include "../../interface/theme_manager.h" #include "../../tab_edhrec_main.h" #include "edhrec_commander_api_response_bracket_navigation_widget.h" #include "edhrec_commander_api_response_budget_navigation_widget.h" -#include #include #include #include @@ -32,14 +30,10 @@ EdhrecCommanderApiResponseNavigationWidget::EdhrecCommanderApiResponseNavigation comboPushButton = new QPushButton(this); comboPushButton->setMinimumHeight(84); - comboPushButton->setStyleSheet(QString()); + comboPushButton->setStyleSheet("font-size: 24px"); averageDeckPushButton = new QPushButton(this); averageDeckPushButton->setMinimumHeight(84); - averageDeckPushButton->setStyleSheet(QString()); - - applyInterfaceDefaultFont(); - connect(themeManager, &ThemeManager::fontsChanged, this, - &EdhrecCommanderApiResponseNavigationWidget::applyInterfaceDefaultFont); + averageDeckPushButton->setStyleSheet("font-size: 24px"); layout->addWidget(comboPushButton, 0, 0, 1, 1); layout->addWidget(averageDeckPushButton, 0, 1, 1, 1); @@ -67,15 +61,6 @@ void EdhrecCommanderApiResponseNavigationWidget::retranslateUi() averageDeckPushButton->setText(tr("Average Deck")); } -void EdhrecCommanderApiResponseNavigationWidget::applyInterfaceDefaultFont() -{ - // Family comes from the InterfaceDefault theme role; the 24px size stays caller-side. - QFont navFont = themeManager->appFont(AppFont::InterfaceDefault); - navFont.setPixelSize(24); - comboPushButton->setFont(navFont); - averageDeckPushButton->setFont(navFont); -} - QString EdhrecCommanderApiResponseNavigationWidget::addNavigationOptionsToUrl(QString baseUrl) { if (!bracketNavigationWidget->getSelectedGameChanger().isEmpty()) { diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h index 456228554..737558625 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.h @@ -35,9 +35,6 @@ public slots: signals: void requestUrl(QString url); -private slots: - void applyInterfaceDefaultFont(); - private: QGridLayout *layout; diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp index c8822930e..741a1e85f 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp @@ -1,6 +1,7 @@ #include "tab_edhrec_main.h" #include "../../../../../client/settings/cache_settings.h" +#include "../../../../deck_loader/loaded_deck.h" #include "../../../cards/card_size_widget.h" #include "../../../quick_settings/settings_button_widget.h" #include "../../../utility/completer_utils.h" @@ -27,7 +28,6 @@ #include #include #include -#include #include #include #include diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp index e88b2aad6..7ca179cea 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp @@ -131,16 +131,10 @@ void TabDeckEditor::loadLayout() LayoutsSettings &layouts = SettingsCache::instance().layouts(); auto layoutState = layouts.getDeckEditorLayoutState(); - // Start with every current dock placed. Saved layouts from older versions - // cannot describe docks introduced later; restoreState leaves those docks - // in their existing positions while restoring the saved docks, including - // their visibility and floating state. - restartLayout(); - if (!layoutState.isEmpty()) { - if (!restoreState(layoutState)) { - // A corrupt or incompatible state must not leave a partial layout. - restartLayout(); - } + if (layoutState.isNull()) { + restartLayout(); + } else { + restoreState(layoutState); restoreGeometry(layouts.getDeckEditorGeometry()); } } diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp index 8af9d5e6e..9db1952f1 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp @@ -1,8 +1,10 @@ #include "tab_deck_storage.h" #include "../../../client/settings/cache_settings.h" +#include "../../deck_loader/deck_file_format.h" #include "../../deck_loader/deck_loader.h" -#include "../../theme_icon.h" +#include "../../deck_loader/loaded_deck.h" +#include "../../pixel_map_generator.h" #include "../cards/additional_info/deck_color_identity.h" #include "../deck_share/deck_share_utils.h" #include "../deck_share/share_bar_widget.h" @@ -47,9 +49,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -187,19 +187,19 @@ TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor, // Left side actions aOpenLocalDeck = new QAction(this); - aOpenLocalDeck->setIcon(loadThemedIcon(QStringLiteral("icons/pencil"))); + aOpenLocalDeck->setIcon(themePixmap(QStringLiteral("icons/pencil"))); connect(aOpenLocalDeck, &QAction::triggered, this, &TabDeckStorage::actOpenLocalDeck); aRenameLocal = new QAction(this); - aRenameLocal->setIcon(loadThemedIcon(QStringLiteral("icons/rename"))); + aRenameLocal->setIcon(themePixmap(QStringLiteral("icons/rename"))); connect(aRenameLocal, &QAction::triggered, this, &TabDeckStorage::actRenameLocal); aUpload = new QAction(this); - aUpload->setIcon(loadThemedIcon(QStringLiteral("icons/arrow_right"))); + aUpload->setIcon(themePixmap(QStringLiteral("icons/arrow_right_green"))); connect(aUpload, &QAction::triggered, this, &TabDeckStorage::actUpload); aNewLocalFolder = new QAction(this); aNewLocalFolder->setIcon(qApp->style()->standardIcon(QStyle::SP_FileDialogNewFolder)); connect(aNewLocalFolder, &QAction::triggered, this, &TabDeckStorage::actNewLocalFolder); aDeleteLocalDeck = new QAction(this); - aDeleteLocalDeck->setIcon(loadThemedIcon(QStringLiteral("icons/remove_row"))); + aDeleteLocalDeck->setIcon(themePixmap(QStringLiteral("icons/remove_row"))); connect(aDeleteLocalDeck, &QAction::triggered, this, &TabDeckStorage::actDeleteLocalDeck); aOpenDecksFolder = new QAction(this); @@ -208,24 +208,24 @@ TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor, // Right side actions aOpenRemoteDeck = new QAction(this); - aOpenRemoteDeck->setIcon(loadThemedIcon(QStringLiteral("icons/pencil"))); + aOpenRemoteDeck->setIcon(themePixmap(QStringLiteral("icons/pencil"))); connect(aOpenRemoteDeck, &QAction::triggered, this, &TabDeckStorage::actOpenRemoteDeck); aDownload = new QAction(this); - aDownload->setIcon(loadThemedIcon(QStringLiteral("icons/arrow_left"))); + aDownload->setIcon(themePixmap(QStringLiteral("icons/arrow_left_green"))); connect(aDownload, &QAction::triggered, this, &TabDeckStorage::actDownload); aNewFolder = new QAction(this); aNewFolder->setIcon(qApp->style()->standardIcon(QStyle::SP_FileDialogNewFolder)); connect(aNewFolder, &QAction::triggered, this, &TabDeckStorage::actNewFolder); aDeleteRemoteDeck = new QAction(this); - aDeleteRemoteDeck->setIcon(loadThemedIcon(QStringLiteral("icons/remove_row"))); + aDeleteRemoteDeck->setIcon(themePixmap(QStringLiteral("icons/remove_row"))); connect(aDeleteRemoteDeck, &QAction::triggered, this, &TabDeckStorage::actDeleteRemoteDeck); aShareDecks = new QAction(this); - aShareDecks->setIcon(loadThemedIcon(QStringLiteral("icons/share"))); + aShareDecks->setIcon(themePixmap(QStringLiteral("icons/share"))); connect(aShareDecks, &QAction::triggered, this, &TabDeckStorage::actShareDecks); aPublishDeck = new QAction(this); - aPublishDeck->setIcon(loadThemedIcon(QStringLiteral("icons/lock"))); + aPublishDeck->setIcon(QPixmap("theme:icons/lock")); connect(aPublishDeck, &QAction::triggered, this, &TabDeckStorage::actPublishDeck); // Add actions to toolbars diff --git a/cockatrice/src/interface/widgets/tabs/tab_developer.cpp b/cockatrice/src/interface/widgets/tabs/tab_developer.cpp index 024cd46f0..d641a1ea5 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_developer.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_developer.cpp @@ -6,7 +6,6 @@ #include "tab_developer.h" -#include "../interface/theme_manager.h" #include "libcockatrice/protocol/pb/response.pb.h" #include @@ -101,20 +100,6 @@ TabDeveloper::TabDeveloper(TabSupervisor *_tabSupervisor, AbstractClient *_clien central->setLayout(mainLayout); setCentralWidget(central); - // Separator rows store their font on the item; re-apply the role family on - // font changes (value cells keep the default font and need only a repaint). - connect(themeManager, &ThemeManager::fontsChanged, this, [this] { - QFont separatorFont = themeManager->appFont(AppFont::InterfaceDefault); - separatorFont.setBold(true); - for (int row = 0; row < statsTable->rowCount(); ++row) { - auto *labelItem = statsTable->item(row, 0); - if (labelItem && !(labelItem->flags() & Qt::ItemIsSelectable)) { - labelItem->setFont(separatorFont); - } - } - statsTable->viewport()->update(); - }); - retranslateUi(); } @@ -170,8 +155,7 @@ void TabDeveloper::appendSeparatorRow(const QString §ionTitle) const int row = statsTable->rowCount(); statsTable->insertRow(row); auto *labelItem = new QTableWidgetItem(sectionTitle); - // Family comes from the InterfaceDefault theme role; bold stays caller-side. - QFont font = themeManager->appFont(AppFont::InterfaceDefault); + auto font = labelItem->font(); font.setBold(true); labelItem->setFont(font); labelItem->setFlags(labelItem->flags() & ~Qt::ItemIsSelectable); diff --git a/cockatrice/src/interface/widgets/tabs/tab_game.cpp b/cockatrice/src/interface/widgets/tabs/tab_game.cpp index 01d021907..11813cdf4 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_game.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_game.cpp @@ -2,10 +2,16 @@ #include "../../../client/settings/cache_settings.h" #include "../../../client/settings/shortcuts_settings.h" -#include "../../../database/interface/settings_card_preference_provider.h" +#include "../../../game/abstract_game.h" +#include "../../../game/game_event_handler.h" +#include "../../../game/game_meta_info.h" +#include "../../../game/game_state.h" +#include "../../../game/player/player_info.h" +#include "../../../game/player/player_manager.h" #include "../../../game_graphics/board/abstract_card_item.h" -#include "../game_graphics/board/arrow_item.h" -#include "../game_graphics/board/card_item.h" +#include "../game/game.h" +#include "../game/player/player_logic.h" +#include "../game/replay.h" #include "../game_graphics/deckview/deck_view_container.h" #include "../game_graphics/deckview/tabbed_deck_view_container.h" #include "../game_graphics/game_scene.h" @@ -20,14 +26,12 @@ #include "../interface/widgets/cards/card_info_frame_widget.h" #include "../interface/widgets/dialogs/dlg_create_game.h" #include "../interface/widgets/dialogs/dlg_invite_to_game.h" -#include "../interface/widgets/dialogs/dlg_turn_order.h" #include "../interface/widgets/server/game_link.h" #include "../interface/widgets/server/user/user_list_manager.h" #include "../interface/widgets/utility/completer_utils.h" #include "../interface/widgets/utility/line_edit_completer.h" #include "../main.h" #include "../menus/tearoff_menu.h" -#include "../replay/replay_event_sidebar.h" #include "../replay/replay_widget.h" #include "../utility/visibility_change_listener.h" #include "card/card_completer_proxy_model.h" @@ -67,15 +71,6 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include @@ -99,12 +94,10 @@ class Message; } // namespace google TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay) - : Tab(_tabSupervisor), sayLabel(nullptr), sayEdit(nullptr), replayDock(nullptr), historyDock(nullptr) + : Tab(_tabSupervisor), sayLabel(nullptr), sayEdit(nullptr) { - setObjectName("TabGame"); // THIS CTOR IS USED ON REPLAY - game = new Replay(this, _replay, tabSupervisor->getIsLocalGame(), &SettingsCache::instance().userInterface(), - new SettingsCardPreferenceProvider(this)); + game = new Replay(this, _replay, tabSupervisor->getIsLocalGame()); createCardInfoDock(true); createPlayerListDock(true); @@ -116,11 +109,9 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay) addDockWidget(Qt::RightDockWidgetArea, cardInfoDock); addDockWidget(Qt::RightDockWidgetArea, playerListDock); addDockWidget(Qt::RightDockWidgetArea, messageLayoutDock); - addDockWidget(Qt::LeftDockWidgetArea, historyDock); addDockWidget(Qt::BottomDockWidgetArea, replayDock); mainWidget = new QStackedWidget(this); - mainWidget->setObjectName("mainWidget"); mainWidget->addWidget(deckViewContainerWidget); mainWidget->addWidget(gamePlayAreaWidget); setCentralWidget(mainWidget); @@ -149,10 +140,8 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, const QMap &_roomGameTypes) : Tab(_tabSupervisor), userListProxy(_tabSupervisor->getUserListManager()) { - setObjectName("TabGame"); // THIS CTOR IS USED ON GAMES - game = new Game(this, tabSupervisor->getIsLocalGame(), _clients, event, _roomGameTypes, - &SettingsCache::instance().userInterface(), new SettingsCardPreferenceProvider(this)); + game = new Game(this, tabSupervisor->getIsLocalGame(), _clients, event, _roomGameTypes); createCardInfoDock(); createPlayerListDock(); @@ -160,14 +149,12 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, createPlayAreaWidget(); createDeckViewContainerWidget(); replayDock = nullptr; - historyDock = nullptr; addDockWidget(Qt::RightDockWidgetArea, cardInfoDock); addDockWidget(Qt::RightDockWidgetArea, playerListDock); addDockWidget(Qt::RightDockWidgetArea, messageLayoutDock); mainWidget = new QStackedWidget(this); - mainWidget->setObjectName("mainWidget"); mainWidget->addWidget(deckViewContainerWidget); mainWidget->addWidget(gamePlayAreaWidget); mainWidget->setContentsMargins(0, 0, 0, 0); @@ -199,7 +186,6 @@ void TabGame::connectToGameState() { connect(game->getGameState(), &GameState::gameStarted, this, &TabGame::startGame); connect(game->getGameState(), &GameState::gameStopped, this, &TabGame::stopGame); - connect(game->getGameState(), &GameState::hostChanged, this, &TabGame::updateTurnOrderAction); connect(game->getGameState(), &GameState::activePhaseChanged, this, &TabGame::setActivePhase); connect(game->getGameState(), &GameState::activePlayerChanged, this, &TabGame::setActivePlayer); } @@ -268,8 +254,6 @@ void TabGame::connectMessageLogToGameEventHandler() connect(game->getGameEventHandler(), &GameEventHandler::logTurnReversed, messageLog, &MessageLogWidget::logReverseTurn); - connect(game->getGameEventHandler(), &GameEventHandler::logTurnOrderChanged, messageLog, - &MessageLogWidget::logTurnOrderChanged); connect(game->getGameEventHandler(), &GameEventHandler::logConcede, messageLog, &MessageLogWidget::logConcede); connect(game->getGameEventHandler(), &GameEventHandler::logUnconcede, messageLog, &MessageLogWidget::logUnconcede); @@ -356,9 +340,6 @@ void TabGame::retranslateUi() } cardInfoDock->setWindowTitle(tr("Card Info") + (cardInfoDock->isWindow() ? tabText : QString())); messageLayoutDock->setWindowTitle(tr("Messages") + (messageLayoutDock->isWindow() ? tabText : QString())); - if (historyDock) { - historyDock->setWindowTitle(tr("Game History") + (historyDock->isWindow() ? tabText : QString())); - } if (replayDock) { replayDock->setWindowTitle(tr("Replay Timeline") + (replayDock->isWindow() ? tabText : QString())); } @@ -383,9 +364,6 @@ void TabGame::retranslateUi() if (aReverseTurn) { aReverseTurn->setText(tr("Reverse turn order")); } - if (aTurnOrder) { - aTurnOrder->setText(tr("&Set turn order...")); - } if (aRemoveLocalArrows) { aRemoveLocalArrows->setText(tr("&Remove all local arrows")); } @@ -435,9 +413,6 @@ void TabGame::retranslateUi() dockToActions[messageLayoutDock].menu->setTitle(tr("Messages")); dockToActions[playerListDock].menu->setTitle(tr("Player List")); - if (historyDock) { - dockToActions[historyDock].menu->setTitle(tr("Game History")); - } if (replayDock) { dockToActions[replayDock].menu->setTitle(tr("Replay Timeline")); } @@ -570,10 +545,8 @@ void TabGame::adminLockChanged(bool lock) void TabGame::actGameInfo() { - // Heap-allocated so that destroying this tab while the dialog is open cannot delete a stack object. - auto *dlg = new DlgCreateGame(game->getGameMetaInfo()->proto(), game->getGameMetaInfo()->getRoomGameTypes(), this); - dlg->setAttribute(Qt::WA_DeleteOnClose); - dlg->open(); + DlgCreateGame dlg(game->getGameMetaInfo()->proto(), game->getGameMetaInfo()->getRoomGameTypes(), this); + dlg.exec(); } void TabGame::actCopyGameLink() @@ -647,73 +620,6 @@ void TabGame::actConcede() } } -void TabGame::actTurnOrder() -{ - if (!canSetTurnOrder()) { - return; - } - - QStringList playerNames; - const QList seatOrder = game->getGameState()->getSeatOrder(); - const auto &players = game->getPlayerManager()->getPlayers(); - if (!seatOrder.isEmpty()) { - for (int playerId : seatOrder) { - if (PlayerLogic *player = players.value(playerId, nullptr)) { - playerNames.append(player->getPlayerInfo()->getName()); - } - } - // Include any players missing from the tracked order rather than dropping them. - for (auto it = players.constBegin(); it != players.constEnd(); ++it) { - const QString name = it.value()->getPlayerInfo()->getName(); - if (!playerNames.contains(name)) { - playerNames.append(name); - } - } - } else { - for (PlayerLogic *player : players) { - playerNames.append(player->getPlayerInfo()->getName()); - } - } - - DlgTurnOrder dlg(playerNames, this); - if (dlg.exec() != QDialog::Accepted) { - return; - } - - game->getGameEventHandler()->handleSetPlayerOrder(dlg.order(), dlg.isRandomizeRequested()); -} - -/** - * Whether the local user may change the seating order: only while the game has - * not started, and only as the host or a moderator - the server allows both - * (Server_AbstractParticipant::cmdSetPlayerOrder). - */ -bool TabGame::canSetTurnOrder() const -{ - if (game->getGameMetaInfo()->started()) { - return false; - } - if (game->isHost()) { - return true; - } - const ServerInfo_User *userInfo = tabSupervisor->getUserInfo(); - return userInfo != nullptr && (userInfo->user_level() & ServerInfo_User::IsModerator); -} - -/** - * Shows the turn order action only when it can actually change anything: the - * player must be allowed to set the order and the game must not have started. - * Called whenever either condition may have changed (game start/stop, host - * change). - */ -void TabGame::updateTurnOrderAction() -{ - if (aTurnOrder == nullptr) { - return; - } - aTurnOrder->setVisible(canSetTurnOrder()); -} - /** * Confirms the leave game and sends the leave game command, if applicable. * @@ -925,15 +831,6 @@ void TabGame::processPlayerLeave(PlayerLogic *leavingPlayer) } } - // A shuffled local player has their seat changed, so the deck view container - // keyed by their previous id must be cleaned up alongside the leaving player. - int leavingPlayerId = leavingPlayer->getPlayerInfo()->getId(); - if (deckViewContainers.contains(leavingPlayerId)) { - TabbedDeckViewContainer *deckView = deckViewContainers.take(leavingPlayerId); - deckViewContainerLayout->removeWidget(deckView); - deckView->deleteLater(); - } - scene->removePlayer(leavingPlayer); } @@ -1042,7 +939,6 @@ void TabGame::startGame(bool _resuming) aConcede->setText(tr("&Concede")); aConcede->setEnabled(true); } - updateTurnOrderAction(); } void TabGame::stopGame() @@ -1065,7 +961,6 @@ void TabGame::stopGame() aConcede->setText(tr("&Concede")); aConcede->setEnabled(false); } - updateTurnOrderAction(); } void TabGame::closeGame() @@ -1190,9 +1085,6 @@ void TabGame::createMenuItems() connect(aNextTurn, &QAction::triggered, game->getGameEventHandler(), &GameEventHandler::handleNextTurn); aReverseTurn = new QAction(this); connect(aReverseTurn, &QAction::triggered, game->getGameEventHandler(), &GameEventHandler::handleReverseTurn); - aTurnOrder = new QAction(this); - connect(aTurnOrder, &QAction::triggered, this, &TabGame::actTurnOrder); - updateTurnOrderAction(); aRemoveLocalArrows = new QAction(this); connect(aRemoveLocalArrows, &QAction::triggered, this, &TabGame::actRemoveLocalArrows); aRotateViewCW = new QAction(this); @@ -1221,7 +1113,6 @@ void TabGame::createMenuItems() connect(aFocusChat, &QAction::triggered, sayEdit, qOverload<>(&LineEditCompleter::setFocus)); phasesMenu = new TearOffMenu(this); - phasesMenu->setObjectName("phasesMenu"); for (int i = 0; i < phasesToolbar->phaseCount(); ++i) { auto *temp = new QAction(QString(), this); @@ -1232,18 +1123,13 @@ void TabGame::createMenuItems() phasesMenu->addSeparator(); phasesMenu->addAction(aNextPhase); - aNextPhase->setObjectName("aNextPhase"); phasesMenu->addAction(aNextPhaseAction); - aNextPhaseAction->setObjectName("aNextPhaseAction"); gameMenu = new QMenu(this); - gameMenu->setObjectName("gameMenu"); playersSeparator = gameMenu->addSeparator(); gameMenu->addMenu(phasesMenu); gameMenu->addAction(aNextTurn); - aNextTurn->setObjectName("aNextTurn"); gameMenu->addAction(aReverseTurn); - gameMenu->addAction(aTurnOrder); gameMenu->addSeparator(); gameMenu->addAction(aRemoveLocalArrows); gameMenu->addAction(aRotateViewCW); @@ -1272,7 +1158,6 @@ void TabGame::createReplayMenuItems() aNextPhaseAction = nullptr; aNextTurn = nullptr; aReverseTurn = nullptr; - aTurnOrder = nullptr; aRemoveLocalArrows = nullptr; aRotateViewCW = nullptr; aRotateViewCCW = nullptr; @@ -1302,10 +1187,6 @@ void TabGame::createViewMenuItems() registerDockWidget(viewMenu, messageLayoutDock, {250, 200}); registerDockWidget(viewMenu, playerListDock, {250, 50}); - if (historyDock) { - registerDockWidget(viewMenu, historyDock, {280, 400}); - } - if (replayDock) { registerDockWidget(viewMenu, replayDock, {900, 100}); } @@ -1375,12 +1256,6 @@ void TabGame::actResetLayout() addDockWidget(Qt::RightDockWidgetArea, playerListDock); addDockWidget(Qt::RightDockWidgetArea, messageLayoutDock); - if (historyDock) { - historyDock->setVisible(true); - historyDock->setFloating(false); - addDockWidget(Qt::LeftDockWidgetArea, historyDock); - } - if (replayDock) { replayDock->setVisible(true); replayDock->setFloating(false); @@ -1389,9 +1264,6 @@ void TabGame::actResetLayout() cardInfoDock->resize(250, 360); messageLayoutDock->resize(250, 200); playerListDock->resize(250, 50); - if (historyDock) { - historyDock->resize(280, 400); - } replayDock->resize(900, 100); } else { cardInfoDock->resize(250, 360); @@ -1404,19 +1276,12 @@ void TabGame::createPlayAreaWidget(bool bReplay) { phasesToolbar = new PhasesToolbar; if (!bReplay) { - connect(phasesToolbar, &PhasesToolbar::setActivePhaseRequested, game->getGameEventHandler(), - &GameEventHandler::handleActivePhaseChanged); - connect(phasesToolbar, &PhasesToolbar::nextTurnRequested, game->getGameEventHandler(), - &GameEventHandler::handleNextTurn); - connect(phasesToolbar, &PhasesToolbar::untapAllRequested, game->getGameEventHandler(), - &GameEventHandler::handleUntapAll); - connect(phasesToolbar, &PhasesToolbar::drawCardRequested, game->getGameEventHandler(), - &GameEventHandler::handleDrawCard); + connect(phasesToolbar, &PhasesToolbar::sendGameCommand, game->getGameEventHandler(), + qOverload(&GameEventHandler::sendGameCommand)); } scene = new GameScene(phasesToolbar, this); connect(game->getPlayerManager(), &PlayerManager::playerConceded, scene, &GameScene::rearrange); connect(game->getPlayerManager(), &PlayerManager::playerCountChanged, scene, &GameScene::rearrange); - connect(game->getGameState(), &GameState::seatOrderChanged, scene, &GameScene::rearrange); connect(scene, &GameScene::arrowDeletionRequested, game->getGameEventHandler(), &GameEventHandler::handleArrowDeletion); connect(game->getGameEventHandler(), &GameEventHandler::arrowDeleted, scene, &GameScene::deleteArrow); @@ -1446,22 +1311,6 @@ void TabGame::createReplayDock(GameReplay *replay) [this](const auto &event, auto options) { game->getGameEventHandler()->processGameEventContainer(event, nullptr, options); }); - - auto *historySidebar = new ReplayEventSidebar(nullptr, replay, replayWidget->getReplayTimeline()); - historyDock = new QDockWidget(this); - historyDock->setObjectName("historyDock"); - historyDock->setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetFloatable | - QDockWidget::DockWidgetMovable); - historyDock->setWidget(historySidebar); - historyDock->setFloating(false); - - connect(historySidebar, &ReplayEventSidebar::eventSelected, replayWidget, &ReplayWidget::seekToEvent); - // The sidebar highlights events rather than times, so ask the manager which event the game state has reached. - connect(replayWidget, &ReplayWidget::timeChanged, historySidebar, - [this, historySidebar] { historySidebar->setCurrentEvent(replayWidget->getLastProcessedEventIndex()); }); - - // No event has been replayed yet when the sidebar is connected, so apply the initial state explicitly. - historySidebar->setCurrentEvent(replayWidget->getLastProcessedEventIndex()); } void TabGame::createDeckViewContainerWidget(bool bReplay) diff --git a/cockatrice/src/interface/widgets/tabs/tab_game.h b/cockatrice/src/interface/widgets/tabs/tab_game.h index 142c02999..7bc52202f 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_game.h +++ b/cockatrice/src/interface/widgets/tabs/tab_game.h @@ -50,7 +50,6 @@ class AbstractClient; class GameView; class GameScene; class ReplayWidget; -class ReplayEventSidebar; class CardInfoFrameWidget; class QLabel; class QPushButton; @@ -90,13 +89,12 @@ private: QMap deckViewContainers; QVBoxLayout *deckViewContainerLayout; QWidget *gamePlayAreaWidget, *deckViewContainerWidget; - QDockWidget *cardInfoDock, *messageLayoutDock, *playerListDock, *replayDock, *historyDock; + QDockWidget *cardInfoDock, *messageLayoutDock, *playerListDock, *replayDock; QAction *playersSeparator; QMenu *gameMenu, *viewMenu; TearOffMenu *phasesMenu; QAction *aGameInfo, *aConcede, *aCopyGameLink, *aLeaveGame, *aNextPhase, *aNextPhaseAction, *aNextTurn, - *aReverseTurn, *aTurnOrder, *aRemoveLocalArrows, *aRotateViewCW, *aRotateViewCCW, *aResetLayout, - *aResetReplayLayout; + *aReverseTurn, *aRemoveLocalArrows, *aRotateViewCW, *aRotateViewCCW, *aResetLayout, *aResetReplayLayout; QAction *aFocusChat; QAction *aInviteToGame = nullptr; QList phaseActions; @@ -131,7 +129,6 @@ private: PlayerLogic *setActivePlayer(int id); void setActivePhase(int phase); - bool canSetTurnOrder() const; void createMenuItems(); void createReplayMenuItems(); void createViewMenuItems(); @@ -165,8 +162,6 @@ private slots: void actInviteToGame(); void actConcede(); void actCopyGameLink(); - void actTurnOrder(); - void updateTurnOrderAction(); void actRemoveLocalArrows(); void actRotateViewCW(); void actRotateViewCCW(); diff --git a/cockatrice/src/interface/widgets/tabs/tab_home.cpp b/cockatrice/src/interface/widgets/tabs/tab_home.cpp index 3ad16aa91..af9994fdd 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_home.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_home.cpp @@ -6,7 +6,6 @@ class TabSupervisor; TabHome::TabHome(TabSupervisor *_tabSupervisor, AbstractClient *_client) : Tab(_tabSupervisor), client(_client) { - setObjectName("TabHome"); homeWidget = new HomeWidget(this, tabSupervisor); setCentralWidget(homeWidget); } diff --git a/cockatrice/src/interface/widgets/tabs/tab_logs.cpp b/cockatrice/src/interface/widgets/tabs/tab_logs.cpp index 9509f48ec..67e076983 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_logs.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_logs.cpp @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include @@ -22,7 +21,6 @@ #include #include #include -#include #include #include #include @@ -33,17 +31,6 @@ class TabSupervisor; -namespace -{ -/** @brief Identifies the newest row of a page well enough to recognise a repeated page. */ -QString pageStartKey(const Response_ViewLogHistory &response) -{ - const ServerInfo_ChatMessage &first = response.log_message(0); - return QString::fromStdString(first.time()) + QChar(0x1f) + QString::fromStdString(first.sender_name()) + - QChar(0x1f) + QString::fromStdString(first.message()); -} -} // namespace - TabLog::TabLog(TabSupervisor *_tabSupervisor, AbstractClient *_client, bool _canUseDeveloperCommands) : Tab(_tabSupervisor), client(_client), canUseDeveloperCommands(_canUseDeveloperCommands) { @@ -65,20 +52,12 @@ TabLog::TabLog(TabSupervisor *_tabSupervisor, AbstractClient *_client, bool _can chatTable->setHorizontalHeaderLabels( QString(tr("Time;SenderName;SenderIP;Message;TargetID;TargetName")).split(";")); - tabManager = new QTabWidget(); + QTabWidget *tabManager = new QTabWidget(); tabManager->addTab(roomTable, tr("Room Logs")); tabManager->addTab(gameTable, tr("Game Logs")); tabManager->addTab(chatTable, tr("Chat Logs")); setCentralWidget(tabManager); - connect(roomTable->verticalScrollBar(), &QScrollBar::valueChanged, this, &TabLog::checkFetchMore); - connect(gameTable->verticalScrollBar(), &QScrollBar::valueChanged, this, &TabLog::checkFetchMore); - connect(chatTable->verticalScrollBar(), &QScrollBar::valueChanged, this, &TabLog::checkFetchMore); - // A tab that gains only a few rows has nothing to scroll, so its scrollbar never fires: - // switching to it would leave its next page unfetched until the moderator scrolled - // another tab. Re-check on every tab switch so the visible table can continue the browse. - connect(tabManager, &QTabWidget::currentChanged, this, &TabLog::checkFetchMore); - createDock(); restartLayout(); clearClicked(); @@ -95,9 +74,12 @@ void TabLog::retranslateUi() void TabLog::getClicked() { - // Empty filters are a valid browse: room/game history going back from - // today, paginated. Only require a date range + location, both of which - // get sensible defaults below so a bare "Get" just works. + if (findUsername->text().isEmpty() && findIPAddress->text().isEmpty() && findGameName->text().isEmpty() && + findGameID->text().isEmpty() && findMessage->text().isEmpty()) { + QMessageBox::critical(this, tr("Error"), tr("You must select at least one filter.")); + return; + } + if (!lastHour->isChecked() && !today->isChecked() && !pastDays->isChecked()) { pastDays->setChecked(true); pastXDays->setValue(20); @@ -117,71 +99,39 @@ void TabLog::getClicked() } if (maximumResults->value() == 0) { - maximumResults->setValue(200); + maximumResults->setValue(1000); } - pageSize = qBound(1, maximumResults->value(), 1000); - // Build the command once, here, and let every page copy it: rebuilding it from the - // widgets per page would run page 2+ against filters edited after Get was clicked, - // appending rows selected by a different query under the first page's results. - currentQuery.Clear(); - currentQuery.set_user_name(findUsername->text().toStdString()); - currentQuery.set_ip_address(findIPAddress->text().toStdString()); - currentQuery.set_game_name(findGameName->text().toStdString()); - currentQuery.set_game_id(findGameID->text().toStdString()); - currentQuery.set_message(findMessage->text().toStdString()); - if (mainRoom->isChecked()) { - currentQuery.add_log_location("room"); - } - if (gameRoom->isChecked()) { - currentQuery.add_log_location("game"); - } - if (privateChat->isChecked()) { - currentQuery.add_log_location("chat"); - } - currentQuery.set_date_range(dateRangeForSelection()); - currentQuery.set_maximum_results(pageSize); - hasCurrentQuery = true; - snapshotBefore.clear(); - lastPageStartKey.clear(); - - // Fresh search: reset pagination state and clear previous pages. - currentOffset = 0; - roomCounter = 0; - gameCounter = 0; - chatCounter = 0; - roomTable->setRowCount(0); - gameTable->setRowCount(0); - chatTable->setRowCount(0); - - fetchPage(0); -} - -int TabLog::dateRangeForSelection() const -{ + int dateRange = 0; if (lastHour->isChecked()) { - return 1; + dateRange = 1; } + if (today->isChecked()) { - return 24; + dateRange = 24; } + if (pastDays->isChecked()) { - return pastXDays->value() * 24; - } - return 0; -} - -void TabLog::fetchPage(int offset) -{ - if (isFetching || !hasCurrentQuery) { - return; + dateRange = pastXDays->value() * 24; } - Command_ViewLogHistory cmd = currentQuery; - cmd.set_offset(offset); - if (!snapshotBefore.isEmpty()) { - cmd.set_before_time(snapshotBefore.toStdString()); - } + Command_ViewLogHistory cmd; + cmd.set_user_name(findUsername->text().toStdString()); + cmd.set_ip_address(findIPAddress->text().toStdString()); + cmd.set_game_name(findGameName->text().toStdString()); + cmd.set_game_id(findGameID->text().toStdString()); + cmd.set_message(findMessage->text().toStdString()); + if (mainRoom->isChecked()) { + cmd.add_log_location("room"); + }; + if (gameRoom->isChecked()) { + cmd.add_log_location("game"); + }; + if (privateChat->isChecked()) { + cmd.add_log_location("chat"); + }; + cmd.set_date_range(dateRange); + cmd.set_maximum_results(maximumResults->value()); PendingCommand *pend; if (canUseDeveloperCommands) { @@ -191,42 +141,10 @@ void TabLog::fetchPage(int offset) pend = client->prepareModeratorCommand(cmd); } - isFetching = true; - getButton->setEnabled(false); - connect(pend, &PendingCommand::finished, this, &TabLog::viewLogHistory_processResponse); client->sendCommand(pend); } -void TabLog::checkFetchMore() -{ - if (isFetching || !hasMoreResults) { - return; - } - - // Only the table the moderator is looking at may pull the next page. Checking all - // three would make an empty or hidden table nearBottom by definition (maximum() and - // value() are both zero), so a room-only browse chained page after page without any - // scrolling - pulling the whole range with a growing OFFSET scan per page, and - // looping forever against a server that ignores `offset`. - auto *table = qobject_cast(tabManager->currentWidget()); - if (table == nullptr || table->rowCount() == 0) { - return; - } - - // ScrollPerItem (the default) counts rows, not pixels: `value` is the top visible row - // and `maximum` the last one that can be scrolled to. Prefetch half a page ahead so - // scrolling never visibly stalls, without the fixed 300-row threshold firing the next - // page the moment a page loads. - const QScrollBar *bar = table->verticalScrollBar(); - const int prefetchRows = qMax(1, pageSize / 2); - if (bar->maximum() - bar->value() > prefetchRows) { - return; - } - - fetchPage(currentOffset); -} - void TabLog::clearClicked() { findUsername->clear(); @@ -248,10 +166,6 @@ void TabLog::clearClicked() pastDays->setAutoExclusive(true); today->setAutoExclusive(true); lastHour->setAutoExclusive(true); - currentOffset = 0; - hasMoreResults = false; - hasCurrentQuery = false; - snapshotBefore.clear(); } void TabLog::createDock() @@ -295,15 +209,14 @@ void TabLog::createDock() pastXDays = new QSpinBox; pastXDays->setMaximum(20); - labelMaximum = new QLabel(tr("Results per page: ")); + labelMaximum = new QLabel(tr("Maximum Results: ")); maximumResults = new QSpinBox; maximumResults->setMaximum(1000); - maximumResults->setToolTip(tr("Page size for smooth scrolling: more rows load automatically as you scroll.")); - labelDescription = new QLabel(tr("Leave filters empty to browse recent room and game messages.\n" - "More rows load automatically as you scroll.")); + labelDescription = new QLabel(tr( + "At least one filter is required.\nThe more information you put in, the more specific your results will be.")); - getButton = new QPushButton(tr("Get Logs")); + getButton = new QPushButton(tr("Get User Logs")); getButton->setAutoDefault(true); connect(getButton, &QPushButton::clicked, this, &TabLog::getClicked); @@ -349,7 +262,7 @@ void TabLog::createDock() maxResultsGrid->addWidget(labelMaximum, 0, 0); maxResultsGrid->addWidget(maximumResults, 0, 1); - maxResultsGroupBox = new QGroupBox(tr("Results per page")); + maxResultsGroupBox = new QGroupBox(tr("Maximum Results")); maxResultsGroupBox->setLayout(maxResultsGrid); descriptionGrid = new QGridLayout; @@ -382,134 +295,84 @@ void TabLog::createDock() searchDock->setWidget(searchDockContents); } -void TabLog::appendChatMessage(QTableWidget *table, - int &counter, - const QString &time, - const QString &senderName, - const QString &senderIp, - const QString &messageText, - const QString &targetId, - const QString &targetName, - const QString &channel) -{ - table->insertRow(counter); - table->setItem(counter, 0, new QTableWidgetItem(time)); - table->setItem(counter, 1, new QTableWidgetItem(senderName)); - table->setItem(counter, 2, new QTableWidgetItem(senderIp)); - table->setItem(counter, 3, new QTableWidgetItem(messageText)); - table->setItem(counter, 4, new QTableWidgetItem(targetId)); - table->setItem(counter, 5, new QTableWidgetItem(targetName)); - if (table->columnCount() > 6) { - table->setItem(counter, 6, new QTableWidgetItem(channel)); - } - ++counter; -} - void TabLog::viewLogHistory_processResponse(const Response &resp) { const Response_ViewLogHistory &response = resp.GetExtension(Response_ViewLogHistory::ext); - const bool isFirstPage = (currentOffset == 0); - isFetching = false; - getButton->setEnabled(true); - if (resp.response_code() != Response::RespOk) { QMessageBox::critical(static_cast(parent()), tr("Message History"), tr("Failed to collect message history information.")); return; } - if (isFirstPage && response.log_message_size() == 0) { + if (response.log_message_size() == 0) { QMessageBox::information(static_cast(parent()), tr("Message History"), tr("There are no messages for the selected filters.")); - hasMoreResults = false; return; } - const QString thisPageStart = response.log_message_size() > 0 ? pageStartKey(response) : QString(); - - if (isFirstPage) { - // Rows come newest first, so the first one fixes the snapshot every later page is - // bounded by. Without it, each message logged between two page fetches pushes the - // window down by one and repeats a row the moderator already has. - snapshotBefore = QString::fromStdString(response.log_message(0).time()); - } else if (!response.has_has_more() && !thisPageStart.isEmpty() && thisPageStart == lastPageStartKey) { - // A server that predates `offset` ignores it and returns the same page again. It - // also predates `has_more`, so the full-page heuristic below can never prove - // exhaustion and every scroll would append the same rows forever. The identical - // first row is the proof; stop instead of looping. - hasMoreResults = false; - return; - } - lastPageStartKey = thisPageStart; + int roomCounter = 0, gameCounter = 0, chatCounter = 0; + roomTable->setRowCount(roomCounter); + gameTable->setRowCount(gameCounter); + chatTable->setRowCount(chatCounter); for (int i = 0; i < response.log_message_size(); ++i) { ServerInfo_ChatMessage message = response.log_message(i); const QString targetType = QString::fromStdString(message.target_type()); if (targetType == "room" || targetType == "room_channel") { - appendChatMessage(roomTable, roomCounter, QString::fromStdString(message.time()), - QString::fromStdString(message.sender_name()), - QString::fromStdString(message.sender_ip()), QString::fromStdString(message.message()), - QString::fromStdString(message.target_id()), - QString::fromStdString(message.target_name()), QString::fromStdString(message.channel())); + roomTable->insertRow(roomCounter); + roomTable->setItem(roomCounter, 0, new QTableWidgetItem(QString::fromStdString(message.time()))); + roomTable->setItem(roomCounter, 1, new QTableWidgetItem(QString::fromStdString(message.sender_name()))); + roomTable->setItem(roomCounter, 2, new QTableWidgetItem(QString::fromStdString(message.sender_ip()))); + roomTable->setItem(roomCounter, 3, new QTableWidgetItem(QString::fromStdString(message.message()))); + roomTable->setItem(roomCounter, 4, new QTableWidgetItem(QString::fromStdString(message.target_id()))); + roomTable->setItem(roomCounter, 5, new QTableWidgetItem(QString::fromStdString(message.target_name()))); + roomTable->setItem(roomCounter, 6, new QTableWidgetItem(QString::fromStdString(message.channel()))); + ++roomCounter; } if (targetType == "game") { - appendChatMessage(gameTable, gameCounter, QString::fromStdString(message.time()), - QString::fromStdString(message.sender_name()), - QString::fromStdString(message.sender_ip()), QString::fromStdString(message.message()), - QString::fromStdString(message.target_id()), - QString::fromStdString(message.target_name())); + gameTable->insertRow(gameCounter); + gameTable->setItem(gameCounter, 0, new QTableWidgetItem(QString::fromStdString(message.time()))); + gameTable->setItem(gameCounter, 1, new QTableWidgetItem(QString::fromStdString(message.sender_name()))); + gameTable->setItem(gameCounter, 2, new QTableWidgetItem(QString::fromStdString(message.sender_ip()))); + gameTable->setItem(gameCounter, 3, new QTableWidgetItem(QString::fromStdString(message.message()))); + gameTable->setItem(gameCounter, 4, new QTableWidgetItem(QString::fromStdString(message.target_id()))); + gameTable->setItem(gameCounter, 5, new QTableWidgetItem(QString::fromStdString(message.target_name()))); + ++gameCounter; } if (targetType == "chat") { - appendChatMessage(chatTable, chatCounter, QString::fromStdString(message.time()), - QString::fromStdString(message.sender_name()), - QString::fromStdString(message.sender_ip()), QString::fromStdString(message.message()), - QString::fromStdString(message.target_id()), - QString::fromStdString(message.target_name())); + chatTable->insertRow(chatCounter); + chatTable->setItem(chatCounter, 0, new QTableWidgetItem(QString::fromStdString(message.time()))); + chatTable->setItem(chatCounter, 1, new QTableWidgetItem(QString::fromStdString(message.sender_name()))); + chatTable->setItem(chatCounter, 2, new QTableWidgetItem(QString::fromStdString(message.sender_ip()))); + chatTable->setItem(chatCounter, 3, new QTableWidgetItem(QString::fromStdString(message.message()))); + chatTable->setItem(chatCounter, 4, new QTableWidgetItem(QString::fromStdString(message.target_id()))); + chatTable->setItem(chatCounter, 5, new QTableWidgetItem(QString::fromStdString(message.target_name()))); + ++chatCounter; } } - currentOffset += response.log_message_size(); - if (response.has_has_more()) { - hasMoreResults = response.has_more(); - } else { - // Legacy server without has_more: a full page implies more may exist. - hasMoreResults = (response.log_message_size() >= pageSize); - } - if (roomCounter) { roomTable->show(); - if (isFirstPage) { - roomTable->resizeColumnsToContents(); - } + roomTable->resizeColumnsToContents(); } else { roomTable->hide(); } if (gameCounter) { - if (isFirstPage) { - gameTable->resizeColumnsToContents(); - } + gameTable->resizeColumnsToContents(); gameTable->show(); } else { gameTable->hide(); } if (chatCounter) { - if (isFirstPage) { - chatTable->resizeColumnsToContents(); - } + chatTable->resizeColumnsToContents(); chatTable->show(); } else { chatTable->hide(); } - - // The new rows may already fill less than a viewport (or the user is - // still parked at the bottom), so chain the next page without waiting - // for another scroll event. The prefetch stays invisible: rows simply - // keep appearing as you scroll. - checkFetchMore(); } void TabLog::restartLayout() diff --git a/cockatrice/src/interface/widgets/tabs/tab_logs.h b/cockatrice/src/interface/widgets/tabs/tab_logs.h index f2f5842c5..fc8ef1ea0 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_logs.h +++ b/cockatrice/src/interface/widgets/tabs/tab_logs.h @@ -10,7 +10,6 @@ #include "tab.h" #include -#include #include class AbstractClient; @@ -26,7 +25,6 @@ class QWidget; class QGridLayout; class QVBoxLayout; class QTableWidget; -class QTabWidget; class Response; class TabSupervisor; @@ -50,37 +48,8 @@ private: *buttonGroupBox; QVBoxLayout *mainLayout; QTableWidget *roomTable, *gameTable, *chatTable; - QTabWidget *tabManager = nullptr; - - //! The filters of the search in flight, captured when Get was clicked so that - //! later pages cannot pick up edits the moderator made after starting it. - Command_ViewLogHistory currentQuery; - bool hasCurrentQuery = false; - //! Newest `log_time` of the first page, sent back as the upper bound of every - //! later page so messages logged in the meantime do not shift the window. - QString snapshotBefore; - //! Identity of the previous page's first row, used to spot a server that ignores - //! `offset` and hands back the same page forever. - QString lastPageStartKey; - int currentOffset = 0; - int pageSize = 200; - int roomCounter = 0, gameCounter = 0, chatCounter = 0; - bool isFetching = false; - bool hasMoreResults = false; void createDock(); - [[nodiscard]] int dateRangeForSelection() const; - void fetchPage(int offset); - void appendChatMessage(QTableWidget *table, - int &counter, - const QString &time, - const QString &senderName, - const QString &senderIp, - const QString &messageText, - const QString &targetId, - const QString &targetName, - const QString &channel = QString()); - void checkFetchMore(); signals: private slots: diff --git a/cockatrice/src/interface/widgets/tabs/tab_public_decks.cpp b/cockatrice/src/interface/widgets/tabs/tab_public_decks.cpp index dfde08f8e..9c28abd0b 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_public_decks.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_public_decks.cpp @@ -2,10 +2,9 @@ #include "../../../client/settings/cache_settings.h" #include "../../deck_loader/deck_loader.h" -#include "../../theme_icon.h" +#include "../../deck_loader/loaded_deck.h" #include "../cards/card_size_widget.h" #include "../general/layout_containers/flow_widget.h" -#include "../interface/theme_manager.h" #include "../visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.h" #include "../visual_deck_storage/deck_preview/public_deck_preview_widget.h" #include "../visual_deck_storage/remote_public_decks_model.h" @@ -29,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -47,25 +45,15 @@ TabPublicDecks::TabPublicDecks(TabSupervisor *_tabSupervisor, AbstractClient *_c cardSize = SettingsCache::instance().cardsDisplay().getVisualDeckStorageCardSize(); titleLabel = new QLabel(tr("Public decks of %1").arg(userName.toHtmlEscaped()), this); - // Family comes from the InterfaceDefault theme role; bold stays caller-side. - auto applyTitleFont = [this]() { - titleLabel->setFont(QtUtils::boldFont(themeManager->appFont(AppFont::InterfaceDefault))); - }; - applyTitleFont(); - connect(themeManager, &ThemeManager::fontsChanged, this, [this, applyTitleFont] { - applyTitleFont(); - // Preview cells paint with the live role font; repaint the grid so the - // new family shows without waiting for a scroll or hover. - flowWidget->update(); - }); + titleLabel->setFont(QtUtils::boldFont(titleLabel->font())); auto *headerLayout = new QHBoxLayout; headerLayout->addWidget(titleLabel); headerLayout->addStretch(1); // Filter/toolbar row, matching the Visual Deck Storage: color identity filter - // first, the search bar stretching in the middle, and the quick-settings button - // at the end. The card size slider lives inside its popup. + // first, the search bar stretching in the middle, and the quick settings + // cogwheel at the end. The card size slider lives inside the cogwheel popup. emptyLabel = new QLabel(tr("This user has not published any decks."), this); emptyLabel->setAlignment(Qt::AlignCenter); emptyLabel->setVisible(false); @@ -80,7 +68,7 @@ TabPublicDecks::TabPublicDecks(TabSupervisor *_tabSupervisor, AbstractClient *_c colorIdentityFilter = new DeckPreviewColorIdentityFilterWidget(this); searchWidget = new VisualDeckStorageSearchWidget(this); refreshButton = new QToolButton(this); - refreshButton->setIcon(loadThemedIcon(QStringLiteral("icons/reload"))); + refreshButton->setIcon(QPixmap("theme:icons/reload")); refreshButton->setFixedSize(32, 32); quickSettingsWidget = new VisualDeckStorageQuickSettingsWidget(this); quickSettingsWidget->setPublicDecksMode(true); diff --git a/cockatrice/src/interface/widgets/tabs/tab_replays.cpp b/cockatrice/src/interface/widgets/tabs/tab_replays.cpp index bd2a69017..d37bff3d8 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_replays.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_replays.cpp @@ -1,7 +1,7 @@ #include "tab_replays.h" #include "../../../client/settings/cache_settings.h" -#include "../../theme_icon.h" +#include "../../pixel_map_generator.h" #include "../interface/widgets/server/remote/remote_replay_list_tree_widget.h" #include "libcockatrice/protocol/pb/commands.pb.h" #include "libcockatrice/protocol/pb/serverinfo_replay.pb.h" @@ -145,17 +145,17 @@ QGroupBox *TabReplays::createLeftLayout() // Left side actions aOpenLocalReplay = new QAction(this); - aOpenLocalReplay->setIcon(loadThemedIcon(QStringLiteral("icons/view"))); + aOpenLocalReplay->setIcon(themePixmap(QStringLiteral("icons/view"))); connect(aOpenLocalReplay, &QAction::triggered, this, &TabReplays::actOpenLocalReplay); connect(localDirView, &QTreeView::doubleClicked, this, &TabReplays::actOpenLocalReplay); aRenameLocal = new QAction(this); - aRenameLocal->setIcon(loadThemedIcon(QStringLiteral("icons/rename"))); + aRenameLocal->setIcon(themePixmap(QStringLiteral("icons/rename"))); connect(aRenameLocal, &QAction::triggered, this, &TabReplays::actRenameLocal); aNewLocalFolder = new QAction(this); aNewLocalFolder->setIcon(qApp->style()->standardIcon(QStyle::SP_FileDialogNewFolder)); connect(aNewLocalFolder, &QAction::triggered, this, &TabReplays::actNewLocalFolder); aDeleteLocalReplay = new QAction(this); - aDeleteLocalReplay->setIcon(loadThemedIcon(QStringLiteral("icons/remove_row"))); + aDeleteLocalReplay->setIcon(themePixmap(QStringLiteral("icons/remove_row"))); connect(aDeleteLocalReplay, &QAction::triggered, this, &TabReplays::actDeleteLocalReplay); aOpenReplaysFolder = new QAction(this); @@ -207,24 +207,24 @@ QGroupBox *TabReplays::createRightLayout() // Right side actions aOpenRemoteReplay = new QAction(this); - aOpenRemoteReplay->setIcon(loadThemedIcon(QStringLiteral("icons/view"))); + aOpenRemoteReplay->setIcon(themePixmap(QStringLiteral("icons/view"))); connect(aOpenRemoteReplay, &QAction::triggered, this, &TabReplays::actOpenRemoteReplay); connect(serverDirView, &QTreeView::doubleClicked, this, &TabReplays::actOpenRemoteReplay); aDownload = new QAction(this); - aDownload->setIcon(loadThemedIcon(QStringLiteral("icons/arrow_left"))); + aDownload->setIcon(themePixmap(QStringLiteral("icons/arrow_left_green"))); connect(aDownload, &QAction::triggered, this, &TabReplays::actDownload); aKeep = new QAction(this); - aKeep->setIcon(loadThemedIcon(QStringLiteral("icons/lock"))); + aKeep->setIcon(themePixmap(QStringLiteral("icons/lock"))); connect(aKeep, &QAction::triggered, this, &TabReplays::actKeepRemoteReplay); aDeleteRemoteReplay = new QAction(this); - aDeleteRemoteReplay->setIcon(loadThemedIcon(QStringLiteral("icons/remove_row"))); + aDeleteRemoteReplay->setIcon(themePixmap(QStringLiteral("icons/remove_row"))); connect(aDeleteRemoteReplay, &QAction::triggered, this, &TabReplays::actDeleteRemoteReplay); aGetReplayCode = new QAction(this); - aGetReplayCode->setIcon(loadThemedIcon(QStringLiteral("icons/share"))); + aGetReplayCode->setIcon(themePixmap(QStringLiteral("icons/share"))); connect(aGetReplayCode, &QAction::triggered, this, &TabReplays::actGetReplayCode); aSubmitReplayCode = new QAction(this); - aSubmitReplayCode->setIcon(loadThemedIcon(QStringLiteral("icons/search"))); + aSubmitReplayCode->setIcon(themePixmap(QStringLiteral("icons/search"))); connect(aSubmitReplayCode, &QAction::triggered, this, &TabReplays::actSubmitReplayCode); // Add actions to toolbars diff --git a/cockatrice/src/interface/widgets/tabs/tab_report.cpp b/cockatrice/src/interface/widgets/tabs/tab_report.cpp index 7986286b3..988c3e7d9 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_report.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_report.cpp @@ -1,6 +1,5 @@ #include "tab_report.h" -#include "../interface/theme_manager.h" #include "../server/user/user_context_menu.h" #include "../utility/report_utils.h" #include "abstract_client.h" @@ -13,7 +12,6 @@ #include #include #include -#include #include #include #include @@ -139,8 +137,7 @@ TabReport::TabReport(TabSupervisor *_tabSupervisor, AbstractClient *_client) : T chatGroup = new QGroupBox; chatLogEdit = new QTextEdit; chatLogEdit->setReadOnly(true); - applyChatLogFont(); - connect(themeManager, &ThemeManager::fontsChanged, this, &TabReport::applyChatLogFont); + chatLogEdit->setFont(QtUtils::monospaceFont()); auto *chatLayout = new QVBoxLayout(chatGroup); chatLayout->setContentsMargins(4, 4, 4, 4); chatLayout->addWidget(chatLogEdit); @@ -272,11 +269,6 @@ TabReport::TabReport(TabSupervisor *_tabSupervisor, AbstractClient *_client) : T refreshList(); } -void TabReport::applyChatLogFont() -{ - chatLogEdit->setFont(report_utils::reportLogFont()); -} - void TabReport::retranslateUi() { userContextMenu->retranslateUi(); diff --git a/cockatrice/src/interface/widgets/tabs/tab_report.h b/cockatrice/src/interface/widgets/tabs/tab_report.h index 43e778f4b..32ebe1a3f 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_report.h +++ b/cockatrice/src/interface/widgets/tabs/tab_report.h @@ -62,7 +62,6 @@ private slots: void statsResponse(const Response &response); void reopenReport(); void reopenResponse(const Response &response); - void applyChatLogFont(); private: int selectedReportId() const; diff --git a/cockatrice/src/interface/widgets/tabs/tab_room.cpp b/cockatrice/src/interface/widgets/tabs/tab_room.cpp index 329732c64..f63b77445 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_room.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_room.cpp @@ -2,7 +2,7 @@ #include "../../../client/settings/cache_settings.h" #include "../../../client/settings/shortcuts_settings.h" -#include "../../theme_icon.h" +#include "../../pixel_map_generator.h" #include "../interface/widgets/dialogs/dlg_settings.h" #include "../interface/widgets/server/chat_view/chat_view.h" #include "../interface/widgets/server/game_link.h" @@ -198,7 +198,7 @@ TabRoom::TabRoom(TabSupervisor *_tabSupervisor, connect(aOpenChatSettings, &QAction::triggered, this, &TabRoom::actOpenChatSettings); auto *chatSettingsButton = new QToolButton; - chatSettingsButton->setIcon(loadThemedIcon(QStringLiteral("icons/settings"))); + chatSettingsButton->setIcon(themePixmap(QStringLiteral("icons/settings"))); chatSettingsButton->setMenu(chatSettingsMenu); chatSettingsButton->setPopupMode(QToolButton::InstantPopup); diff --git a/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp b/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp index 45c320852..c614fe7f6 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp @@ -2,12 +2,15 @@ #include "../../../client/settings/cache_settings.h" #include "../../../client/settings/shortcuts_settings.h" +#include "../../../game/abstract_game.h" +#include "../../../game/game_event_handler.h" +#include "../../../game/game_meta_info.h" +#include "../../deck_loader/loaded_deck.h" #include "../../intents/contexts/context_connect_to_server.h" #include "../../intents/contexts/context_join_game.h" #include "../../intents/contexts/context_join_room.h" #include "../../intents/intent.h" #include "../../intents/intent_join_server_game.h" -#include "../../theme_icon.h" #include "../interface/pixel_map_generator.h" #include "../interface/widgets/server/game_link.h" #include "../interface/widgets/server/user/user_list_manager.h" @@ -55,16 +58,11 @@ #include #include #include -#include #include #include #include #include #include -#include -#include -#include -#include #include #include #include @@ -159,15 +157,6 @@ TabSupervisor::TabSupervisor(AbstractClient *_client, QMenu *tabsMenu, QWidget * tabReplays(nullptr), tabAdmin(nullptr), tabCardArtRules(nullptr), tabLog(nullptr), tabReport(nullptr), tabModeration(nullptr), tabDeveloper(nullptr), isLocalGame(false) { - setObjectName("tabSupervisor"); - - // QTabWidget keeps tab pages in an internal stacked widget. Give it a stable - // name so the GUI tests can address the pages by a readable path - // (tabSupervisor/stackedWidget/). - if (auto *stackedWidget = findChild()) { - stackedWidget->setObjectName("stackedWidget"); - } - setElideMode(Qt::ElideRight); setMovable(true); setIconSize(QSize(15, 15)); @@ -473,9 +462,6 @@ void TabSupervisor::addCloseButtonToTab(Tab *tab, int tabIndex, QAction *manager auto closeSide = static_cast( tabBar()->style()->styleHint(QStyle::SH_TabBar_CloseButtonPosition, nullptr, tabBar())); auto *closeButton = new CloseButton(tab); - // No object name: the tab bar index shifts when tabs move or close, so an - // index-derived name would go stale (or collide). Callers find the button - // through the tab widget instead. if (manager) { // If managed, all close requests should go through the menu action connect(closeButton, &CloseButton::clicked, this, [manager] { checkAndTrigger(manager, false); }); @@ -1361,7 +1347,7 @@ void TabSupervisor::tabUserEvent(bool globalEvent) auto *tab = static_cast(sender()); if (tab != currentWidget()) { tab->setContentsChanged(true); - setTabIcon(indexOf(tab), loadThemedIcon(QStringLiteral("icons/tab_changed"))); + setTabIcon(indexOf(tab), themePixmap(QStringLiteral("icons/tab_changed"))); } if (globalEvent && SettingsCache::instance().userInterface().getNotificationsEnabled()) { QApplication::alert(this); diff --git a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp index 84bf026f7..964babcae 100644 --- a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp +++ b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp @@ -2,6 +2,7 @@ #include "../../../../client/settings/cache_settings.h" #include "../../../../client/settings/shortcuts_settings.h" +#include "../../../deck_loader/loaded_deck.h" #include "../../deck_editor/deck_editor_card_database_dock_widget.h" #include "../../deck_editor/deck_editor_card_info_dock_widget.h" #include "../../deck_editor/deck_editor_deck_dock_widget.h" @@ -20,6 +21,7 @@ #include "tab_deck_editor_visual_tab_widget.h" #include +#include #include #include #include @@ -42,7 +44,6 @@ #include #include #include -#include #include #include #include @@ -260,25 +261,17 @@ void TabDeckEditorVisual::processMainboardCardClick(const QMouseEvent *event, } } -/** @brief Get a zone name corresponding to keyboard modifiers. */ -static QString zoneForClickModifiers(const Qt::KeyboardModifiers &modifiers) -{ - if (modifiers.testFlag(Qt::ControlModifier)) { - return DECK_ZONE_SIDE; - } else if (modifiers.testFlag(Qt::ShiftModifier)) { - return DECK_ZONE_MAYBEBOARD; - } else { - return DECK_ZONE_MAIN; - } -} - /** @brief Handles clicks on cards in the database display. */ void TabDeckEditorVisual::processDatabaseCardClick(const QMouseEvent *event, const ExactCard &card) { if (event->button() == Qt::LeftButton) { - addCard(card, zoneForClickModifiers(event->modifiers())); + if (QApplication::keyboardModifiers() & Qt::ControlModifier) { + addCard(card, DECK_ZONE_SIDE); + } else { + addCard(card, DECK_ZONE_MAIN); + } } else if (event->button() == Qt::RightButton) { - decrementCard(card, zoneForClickModifiers(event->modifiers())); + decrementCard(card, DECK_ZONE_MAIN); } else if (event->button() == Qt::MiddleButton) { deckDockWidget->actRemoveCard(); } diff --git a/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp b/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp index ece9881b4..74c149b2d 100644 --- a/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp +++ b/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp @@ -1,7 +1,9 @@ #include "tab_deck_storage_visual.h" #include "../../../../client/settings/cache_settings.h" +#include "../../../deck_loader/deck_file_format.h" #include "../../../deck_loader/deck_loader.h" +#include "../../../deck_loader/loaded_deck.h" #include "../../cards/additional_info/deck_color_identity.h" #include "../../deck_share/deck_share_utils.h" #include "../../deck_share/share_bar_widget.h" @@ -15,9 +17,7 @@ #include #include #include -#include #include -#include #include #include #include diff --git a/cockatrice/src/interface/widgets/utility/card_completer_delegate.cpp b/cockatrice/src/interface/widgets/utility/card_completer_delegate.cpp index 0090e9d65..a629df43c 100644 --- a/cockatrice/src/interface/widgets/utility/card_completer_delegate.cpp +++ b/cockatrice/src/interface/widgets/utility/card_completer_delegate.cpp @@ -1,6 +1,5 @@ #include "card_completer_delegate.h" -#include "../../interface/theme_manager.h" #include "../../pixel_map_generator.h" #include "../cards/additional_info/mana_cost_widget.h" #include "libcockatrice/card/database/card_database_querier.h" @@ -183,7 +182,7 @@ void CardCompleterDelegate::drawManaSymbol(QPainter *p, QPoint centre, const QSt p->setBrush(Qt::NoBrush); p->drawEllipse(pip.adjusted(1, 1, -1, -1)); - QFont f = QtUtils::boldFont(themeManager->appFont(AppFont::CardText)); + QFont f = QtUtils::boldFont(p->font()); f.setPixelSize(qMax(radius - 1, 7)); p->setFont(f); @@ -430,7 +429,7 @@ void CardCompleterDelegate::paint(QPainter *painter, const QStyleOptionViewItem const QRect nameRect = showInfoBand ? QRect(textLeft, rect.top() + 2, textWidth, 20) : QRect(textLeft, rect.top() + 2, textWidth, rect.height() - 4); - QFont f = themeManager->appFont(AppFont::CardText); + QFont f = option.font; f.setPixelSize(13); f.setBold(true); @@ -452,7 +451,7 @@ void CardCompleterDelegate::paint(QPainter *painter, const QStyleOptionViewItem if (showInfoBand) { const QRect infoRect(textLeft, rect.top() + 22, textWidth, rect.height() - 24); - QFont f = themeManager->appFont(AppFont::CardText); + QFont f = option.font; f.setPixelSize(10); painter->setFont(f); diff --git a/cockatrice/src/interface/widgets/utility/card_completer_styler.cpp b/cockatrice/src/interface/widgets/utility/card_completer_styler.cpp index 1a17bb8be..8f1941412 100644 --- a/cockatrice/src/interface/widgets/utility/card_completer_styler.cpp +++ b/cockatrice/src/interface/widgets/utility/card_completer_styler.cpp @@ -1,6 +1,5 @@ #include "card_completer_styler.h" -#include "../../interface/theme_manager.h" #include "../cards/card_info_picture_enlarged_widget.h" #include "card_completer_delegate.h" #include "libcockatrice/card/database/card_database_querier.h" @@ -74,10 +73,6 @@ CardCompleterStyler::CardCompleterStyler(QCompleter *completer, QObject *parent) popup->viewport()->setMouseTracking(true); - // The delegate reads the CardText role at paint time, so a font change - // only needs a repaint of the popup. - connect(themeManager, &ThemeManager::fontsChanged, popup, [popup] { popup->viewport()->update(); }); - popup->installEventFilter(this); popup->viewport()->installEventFilter(this); diff --git a/cockatrice/src/interface/widgets/utility/report_utils.cpp b/cockatrice/src/interface/widgets/utility/report_utils.cpp index df2400b14..d7fc083c6 100644 --- a/cockatrice/src/interface/widgets/utility/report_utils.cpp +++ b/cockatrice/src/interface/widgets/utility/report_utils.cpp @@ -1,6 +1,5 @@ #include "report_utils.h" -#include "../../theme_manager.h" #include "libcockatrice/protocol/pb/serverinfo_report.pb.h" #include @@ -8,7 +7,6 @@ #include #include #include -#include #include #include #include @@ -21,20 +19,6 @@ namespace report_utils { -QFont reportLogFont() -{ - if (themeManager->hasAppFont(AppFont::ChatLog)) { - return themeManager->appFont(AppFont::ChatLog); - } - QFont monoFont(QStringLiteral("monospace")); - monoFont.setStyleHint(QFont::Monospace); - const int systemPointSize = QFontDatabase::systemFont(QFontDatabase::GeneralFont).pointSize(); - if (systemPointSize > 0) { - monoFont.setPointSize(systemPointSize); - } - return monoFont; -} - namespace { QColor reportStatusColor(const QString &status) diff --git a/cockatrice/src/interface/widgets/utility/report_utils.h b/cockatrice/src/interface/widgets/utility/report_utils.h index 32cc19eac..679989486 100644 --- a/cockatrice/src/interface/widgets/utility/report_utils.h +++ b/cockatrice/src/interface/widgets/utility/report_utils.h @@ -1,7 +1,6 @@ #ifndef REPORT_UTILS_H #define REPORT_UTILS_H -#include #include #include @@ -12,12 +11,6 @@ class ServerInfo_Report; namespace report_utils { -/** @brief Font for the report chat-log views: the theme's ChatLog role when it - * sets one, otherwise the monospace font these views used before the - * role existed. Shared by the three report surfaces so they cannot - * drift apart. */ -QFont reportLogFont(); - QString formatReportCategory(const QString &category); QString formatReportTime(qint64 secondsSinceEpoch); diff --git a/cockatrice/src/interface/widgets/utility/sequence_edit.cpp b/cockatrice/src/interface/widgets/utility/sequence_edit.cpp index b09e6da1e..44e6581e9 100644 --- a/cockatrice/src/interface/widgets/utility/sequence_edit.cpp +++ b/cockatrice/src/interface/widgets/utility/sequence_edit.cpp @@ -2,7 +2,7 @@ #include "../../../client/settings/cache_settings.h" #include "../../../client/settings/shortcuts_settings.h" -#include "../../theme_icon.h" +#include "../../pixel_map_generator.h" #include #include @@ -24,8 +24,8 @@ SequenceEdit::SequenceEdit(const QString &_shortcutName, QWidget *parent) : QWid defaultButton = new QPushButton("", this); lineEdit->setMinimumWidth(70); - clearButton->setIcon(loadThemedIcon(QStringLiteral("icons/clearsearch"))); - defaultButton->setIcon(loadThemedIcon(QStringLiteral("icons/reload"))); + clearButton->setIcon(themePixmap(QStringLiteral("icons/clearsearch"))); + defaultButton->setIcon(themePixmap(QStringLiteral("icons/update"))); auto *layout = QtUtils::makeLayout(this, 1); layout->addWidget(lineEdit); diff --git a/cockatrice/src/interface/widgets/visual_database_display/card_database_visual_view.cpp b/cockatrice/src/interface/widgets/visual_database_display/card_database_visual_view.cpp deleted file mode 100644 index a8262c75a..000000000 --- a/cockatrice/src/interface/widgets/visual_database_display/card_database_visual_view.cpp +++ /dev/null @@ -1,206 +0,0 @@ -#include "card_database_visual_view.h" - -#include "../../card_picture_loader/card_picture_loader.h" -#include "../cards/card_info_picture_widget.h" -#include "../cards/card_picture_delegate.h" -#include "../cards/card_size_widget.h" -#include "card_database_visual_display_model.h" -#include "libcockatrice/card/printing/exact_card.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -CardDatabaseVisualView::CardDatabaseVisualView(CardDatabaseVisualDisplayModel *_model, QWidget *parent) - : QListView(parent), model(_model) -{ - auto *cardDelegate = new CardPictureDelegate(model, this); - setItemDelegate(cardDelegate); - setModel(model); - - setViewMode(QListView::IconMode); - setFlow(QListView::LeftToRight); - setWrapping(true); - setResizeMode(QListView::Adjust); - setMovement(QListView::Static); - setUniformItemSizes(true); - setLayoutMode(QListView::SinglePass); - setVerticalScrollMode(QAbstractItemView::ScrollPerPixel); - setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - setFrameShape(QFrame::NoFrame); - setWordWrap(false); - - // QListView hands the delegate's item height to the scroll bar as its single - // step under ScrollPerPixel, so one wheel notch would jump wheelScrollLines() - // whole card rows. Give the bar a text line instead; the wheel handler below - // scales that line to the grid. A positive step also stops Qt from taking the - // item height back on the next layout. - verticalScrollBar()->setSingleStep(qMax(1, fontMetrics().height())); - - // The grid is a read-only surface: clicks are actions on a card, not a - // selection, and they must not steal focus from the search field. - setSelectionMode(QAbstractItemView::NoSelection); - setEditTriggers(QAbstractItemView::NoEditTriggers); - setFocusPolicy(Qt::NoFocus); - - // Hover drives the card preview. - setMouseTracking(true); - viewport()->setMouseTracking(true); - - connect(&CardPictureLoader::getInstance(), &CardPictureLoader::pixmapLoaded, this, - [this] { viewport()->update(); }); - - // A new search result starts at the top, like the widget-per-card grid did. - connect(model, &QAbstractItemModel::modelReset, this, [this] { - verticalScrollBar()->setValue(0); - // The rows under a stationary cursor changed with the reset: re-resolve the - // hover so the preview follows the grid, as enterEvent did per card widget. - hoveredRow = -1; - updateHoveredRow(viewport()->mapFromGlobal(QCursor::pos())); - }); - - setCardSizeFactor(cardSizeFactor); -} - -void CardDatabaseVisualView::setCardSizeFactor(int factor) -{ - cardSizeFactor = qBound(CardSizeWidget::MIN_CARD_SIZE, factor, CardSizeWidget::MAX_CARD_SIZE); - - const QSize cardSize = CardInfoPictureWidget::sizeForScaleFactor(cardSizeFactor); - if (auto *cardDelegate = qobject_cast(itemDelegate())) { - cardDelegate->setCardSize(cardSize); - } - // The delegate's sizeHint does not emit sizeHintChanged, so the grid size is what - // makes a resize take effect. Keep the two in step. - setGridSize(cardSize + QSize(CardPictureDelegate::SPACING, CardPictureDelegate::SPACING)); -} - -void CardDatabaseVisualView::mousePressEvent(QMouseEvent *event) -{ - const QModelIndex index = indexAt(event->pos()); - if (index.isValid() && model != nullptr) { - const ExactCard card = model->cardAt(index.row()); - if (card) { - emit cardClicked(event, card); - event->accept(); - return; - } - } - - QListView::mousePressEvent(event); -} - -void CardDatabaseVisualView::mouseMoveEvent(QMouseEvent *event) -{ - QListView::mouseMoveEvent(event); - updateHoveredRow(event->pos()); -} - -bool CardDatabaseVisualView::viewportEvent(QEvent *event) -{ - // A per-card widget reported its hover from enterEvent, which also fires when the - // grid changes under a stationary cursor. A QListView only reports moves, so - // re-resolve the hover on enter and clear it on leave. - if (event->type() == QEvent::Enter) { - updateHoveredRow(viewport()->mapFromGlobal(QCursor::pos())); - } else if (event->type() == QEvent::Leave) { - hoveredRow = -1; - } - - return QListView::viewportEvent(event); -} - -void CardDatabaseVisualView::wheelEvent(QWheelEvent *event) -{ - // Ctrl+wheel is the card-size gesture and is filtered out before it reaches - // the view; any other modifier keeps QAbstractSlider's own page scrolling. - if (event->modifiers() != Qt::NoModifier) { - QListView::wheelEvent(event); - return; - } - - // macOS uses transient (overlay) scroll bars that hide themselves - // once they fade out, so we need to use the range to determine if we ignore the wheel when there is nothing to - // scroll. This lets an enclosing scroll area take over. - QScrollBar *bar = verticalScrollBar(); - if (bar->maximum() <= bar->minimum()) { - event->ignore(); - return; - } - - // Touchpads and high-resolution wheels already report pixels: follow them. - if (!event->pixelDelta().isNull()) { - bar->setValue(bar->value() - event->pixelDelta().y()); - event->accept(); - return; - } - - if (event->angleDelta().y() == 0) { - QListView::wheelEvent(event); - return; - } - - // Accumulate wheel deltas smaller than a notch, like QAbstractSlider does, so - // a fine-grained wheel still moves. - wheelRemainder += static_cast(event->angleDelta().y()) / 120.0; - const int notches = static_cast(wheelRemainder); - if (notches == 0) { - event->accept(); - return; - } - wheelRemainder -= notches; - - const int pixels = -notches * wheelStep(); - bar->setValue(qBound(bar->minimum(), bar->value() + pixels, bar->maximum())); - event->accept(); -} - -int CardDatabaseVisualView::wheelStep() const -{ - // A card row is far too coarse for one wheel line, and a text line is too - // fine, so a line is an eighth of the grid cell. A notch then moves about a - // third of a card row at any card size, and the OS line count still applies. - const int lineHeight = qMax(1, gridSize().height() / 8); - return qMax(1, QApplication::wheelScrollLines()) * lineHeight; -} - -void CardDatabaseVisualView::updateHoveredRow(const QPoint &position) -{ - // indexAt() also answers for points outside the viewport, so a cursor parked - // below the grid (on the size slider, say) would resolve to the row just under - // the visible area. Only a point inside the viewport can hover a card. - if (model == nullptr || !viewport()->rect().contains(position)) { - return; - } - - const QModelIndex index = indexAt(position); - const int row = index.isValid() ? index.row() : -1; - if (row == hoveredRow) { - return; - } - - hoveredRow = row; - if (row >= 0) { - const ExactCard card = model->cardAt(row); - if (card) { - emit cardHovered(card); - } - } -} - -void CardDatabaseVisualView::leaveEvent(QEvent *event) -{ - hoveredRow = -1; - QListView::leaveEvent(event); -} diff --git a/cockatrice/src/interface/widgets/visual_database_display/card_database_visual_view.h b/cockatrice/src/interface/widgets/visual_database_display/card_database_visual_view.h deleted file mode 100644 index 5f004484d..000000000 --- a/cockatrice/src/interface/widgets/visual_database_display/card_database_visual_view.h +++ /dev/null @@ -1,67 +0,0 @@ -/** - * @file card_database_visual_view.h - * @ingroup VisualCardDatabaseWidgets - * @brief Icon-mode view of the card database, one card picture per item. - */ - -#ifndef CARD_DATABASE_VISUAL_VIEW_H -#define CARD_DATABASE_VISUAL_VIEW_H - -#include -#include -#include - -class CardDatabaseVisualDisplayModel; -class ExactCard; -class QEvent; -class QMouseEvent; -class QPoint; -class QWheelEvent; - -/** - * @brief A wrapping grid of card pictures. - * - * The view virtualizes painting: it only asks the delegate for the items that are - * on screen, so the whole card database can sit in the model without a widget (or - * pixmap) per card. Clicks and hover are reported with the exact card under the - * cursor, which is what the deck editor needs to add, decrement or preview a card. - */ -class CardDatabaseVisualView : public QListView -{ - Q_OBJECT - -public: - explicit CardDatabaseVisualView(CardDatabaseVisualDisplayModel *_model, QWidget *parent = nullptr); - - /** - * @brief Sets the card size as a percentage of the base card width. - * @param factor Percentage in the range of the card size slider. - */ - void setCardSizeFactor(int factor); - -signals: - /** @brief A card was pressed. The event is valid for the duration of the emission. */ - void cardClicked(QMouseEvent *event, const ExactCard &card); - /** @brief The cursor moved onto a different card. */ - void cardHovered(const ExactCard &card); - -protected: - void mousePressEvent(QMouseEvent *event) override; - void mouseMoveEvent(QMouseEvent *event) override; - void leaveEvent(QEvent *event) override; - bool viewportEvent(QEvent *event) override; - void wheelEvent(QWheelEvent *event) override; - -private: - void updateHoveredRow(const QPoint &position); - /// Pixels one wheel notch moves, scaled to the grid and the OS line count. - [[nodiscard]] int wheelStep() const; - - CardDatabaseVisualDisplayModel *model; - /// Fraction of a line left over from a wheel event smaller than one notch. - qreal wheelRemainder = 0.0; - int cardSizeFactor = 100; - int hoveredRow = -1; -}; - -#endif // CARD_DATABASE_VISUAL_VIEW_H diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp index 46330ac46..464d62e4a 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp @@ -15,23 +15,9 @@ #include #include -namespace -{ - -/** @brief Remove the filters that apply to the given color and attribute from the given model. */ -static void removeFilters(FilterTreeModel *filterModel, QChar color, CardFilter::Attr attr) -{ - for (const CardFilter *filter : filterModel->getFiltersOfType(attr)) { - if (filter->term() == color) { - filterModel->removeFilter(filter); - } - } -} -} // namespace - /** - * This widget provides a graphical control element for the CardFilter::Attr::AttrColor and - * CardFilter::Attr::AttrColorIdentity filters applied to the filter model. + * This widget provides a graphical control element for the CardFilter::Attr::AttrColor filters applied to the filter + * model. * @param parent The Qt Widget that this widget will parent to * @param _filterModel The filter model that this widget will manipulate */ @@ -73,25 +59,11 @@ void VisualDatabaseDisplayColorFilterWidget::retranslateUi() modeComboBox->blockSignals(true); modeComboBox->clear(); - modeComboBox->addItem(tr("Includes"), QVariant::fromValue(FilterMode::Includes)); - modeComboBox->addItem(tr("Excludes"), QVariant::fromValue(FilterMode::Excludes)); - modeComboBox->addItem(tr("Include / Exclude"), QVariant::fromValue(FilterMode::IncludeExclude)); modeComboBox->addItem(tr("Exact match"), QVariant::fromValue(FilterMode::ExactMatch)); - modeComboBox->addItem(tr("Color identity"), QVariant::fromValue(FilterMode::ColorIdentity)); - - modeComboBox->setItemData(0, tr("Cards containing any of the selected colors"), Qt::ToolTipRole); - modeComboBox->setItemData(1, tr("Cards containing none of the selected colors"), Qt::ToolTipRole); - modeComboBox->setItemData(2, tr("Cards containing any of the selected colors and none of the unselected colors"), - Qt::ToolTipRole); - modeComboBox->setItemData(3, tr("Cards being exactly of the selected colors"), Qt::ToolTipRole); - modeComboBox->setItemData(4, tr("Cards whose color identity fits within the selected colors"), Qt::ToolTipRole); - - if (currentMode == FilterMode::Custom) { - addCustomFilterModeItem(); - } + modeComboBox->addItem(tr("Includes"), QVariant::fromValue(FilterMode::Includes)); + modeComboBox->addItem(tr("Include / Exclude"), QVariant::fromValue(FilterMode::IncludeExclude)); modeComboBox->setToolTip(tr("How selected and unselected colors are combined in the filter")); - modeComboBox->setAccessibleName(tr("Color filter mode")); // Restore current mode const int index = modeComboBox->findData(QVariant::fromValue(currentMode)); @@ -102,28 +74,6 @@ void VisualDatabaseDisplayColorFilterWidget::retranslateUi() modeComboBox->blockSignals(false); } -void VisualDatabaseDisplayColorFilterWidget::setFilterMode(FilterMode filterMode) -{ - int index = modeComboBox->findData(QVariant::fromValue(filterMode)); - - if (index < 0 && filterMode == FilterMode::Custom) { - index = modeComboBox->count(); - addCustomFilterModeItem(); - } - - if (index >= 0) { - modeComboBox->setCurrentIndex(index); - } -} - -void VisualDatabaseDisplayColorFilterWidget::addCustomFilterModeItem() -{ - int customIndex = modeComboBox->count(); - modeComboBox->addItem(tr("Custom"), QVariant::fromValue(FilterMode::Custom)); - modeComboBox->setItemData(customIndex, tr("Cards matching an unknown combination of color filters"), - Qt::ToolTipRole); -} - void VisualDatabaseDisplayColorFilterWidget::handleColorToggled(QChar color, bool active) { if (active) { @@ -135,24 +85,74 @@ void VisualDatabaseDisplayColorFilterWidget::handleColorToggled(QChar color, boo void VisualDatabaseDisplayColorFilterWidget::addFilter(QChar color) { - FilterModeInfo info = getFilterModeInfo(currentMode); + QString colorString = color; + QString typeStr; - removeFilters(filterModel, color, info.attr); + // Remove previous filters - if (info.includeType != CardFilter::Type::TypeEnd) { - filterModel->addFilter(new CardFilter(color, info.includeType, info.attr)); + QList allColorFilters = filterModel->getFiltersOfType(CardFilter::Attr::AttrColor); + QList matchingFilters; + + for (const CardFilter *filter : allColorFilters) { + if (filter->term() == color) { + matchingFilters.append(filter); + } + } + + for (const CardFilter *filter : matchingFilters) { + filterModel->removeFilter(filter); + } + + // Add actual filter + + switch (currentMode) { + case FilterMode::ExactMatch: + filterModel->addFilter(new CardFilter(colorString, CardFilter::Type::TypeAnd, CardFilter::Attr::AttrColor)); + break; + + case FilterMode::Includes: + filterModel->addFilter(new CardFilter(colorString, CardFilter::Type::TypeOr, CardFilter::Attr::AttrColor)); + break; + + case FilterMode::IncludeExclude: + filterModel->addFilter(new CardFilter(colorString, CardFilter::Type::TypeOr, CardFilter::Attr::AttrColor)); + break; } } void VisualDatabaseDisplayColorFilterWidget::removeFilter(QChar color) { - FilterModeInfo info = getFilterModeInfo(currentMode); + QString colorString = color; - removeFilters(filterModel, color, info.attr); + // Remove inclusion filters + QList allColorFilters = filterModel->getFiltersOfType(CardFilter::Attr::AttrColor); + QList matchingFilters; - // Add exclusion filters if the mode demands it. - if (info.excludeType != CardFilter::Type::TypeEnd) { - filterModel->addFilter(new CardFilter(color, info.excludeType, info.attr)); + for (const CardFilter *filter : allColorFilters) { + if (filter->term() == color) { + matchingFilters.append(filter); + } + } + + for (const CardFilter *filter : matchingFilters) { + filterModel->removeFilter(filter); + } + + // Add exclusion filters if the mode demands it + switch (currentMode) { + case FilterMode::ExactMatch: + filterModel->addFilter( + new CardFilter(colorString, CardFilter::Type::TypeAndNot, CardFilter::Attr::AttrColor)); + break; + + case FilterMode::IncludeExclude: + filterModel->addFilter( + new CardFilter(colorString, CardFilter::Type::TypeAndNot, CardFilter::Attr::AttrColor)); + break; + + case FilterMode::Includes: + // No exclusion in Includes mode + break; } } @@ -169,7 +169,6 @@ void VisualDatabaseDisplayColorFilterWidget::updateFilterMode() filterModel->filterTree()->blockSignals(true); filterModel->clearFiltersOfType(CardFilter::Attr::AttrColor); - filterModel->clearFiltersOfType(CardFilter::Attr::AttrColorIdentity); const QList manaSymbolWidgets = findChildren(); @@ -212,53 +211,52 @@ QList VisualDatabaseDisplayColorFilterWidget::getActiveColors() void VisualDatabaseDisplayColorFilterWidget::syncWithFilterModel() { - QList filters; - filters.append(filterModel->getFiltersOfType(CardFilter::Attr::AttrColor)); - filters.append(filterModel->getFiltersOfType(CardFilter::Attr::AttrColorIdentity)); + QList allColorFilters = filterModel->getFiltersOfType(CardFilter::Attr::AttrColor); - // Re-derive the mode from the filters in the model, so that a loaded filter set selects the mode that - // produced it (or Custom when none could have). - currentMode = deriveFilterMode(filters, currentMode); + QList manaSymbolWidgets = findChildren(); - // Update the combobox. Add a Custom item only if we have a custom filter mode. - int customIndex = modeComboBox->findData(QVariant::fromValue(FilterMode::Custom)); - modeComboBox->blockSignals(true); - if (currentMode == FilterMode::Custom) { - if (customIndex < 0) { - customIndex = modeComboBox->count(); - addCustomFilterModeItem(); - } - modeComboBox->setCurrentIndex(customIndex); - } else { - if (customIndex >= 0) { - modeComboBox->removeItem(customIndex); - } - int index = modeComboBox->findData(QVariant::fromValue(currentMode)); - if (index >= 0) { - modeComboBox->setCurrentIndex(index); - } - } - modeComboBox->blockSignals(false); - - // Update the mana symbol widgets by looking for the current mode's include or exclude filters. - const FilterModeInfo modeInfo = getFilterModeInfo(currentMode); - - const bool useExclude = - modeInfo.includeType == CardFilter::Type::TypeEnd && modeInfo.excludeType != CardFilter::Type::TypeEnd; - const CardFilter::Type filterType = useExclude ? modeInfo.excludeType : modeInfo.includeType; - - filters = filterModel->getFiltersOfType(modeInfo.attr); - - for (ManaSymbolWidget *manaSymbolWidget : findChildren()) { + for (ManaSymbolWidget *manaSymbolWidget : manaSymbolWidgets) { bool found = false; - for (const CardFilter *filter : filters) { - if (filter->type() == filterType && manaSymbolWidget->getSymbolChar() == filter->term()) { + for (const CardFilter *filter : allColorFilters) { + if (manaSymbolWidget->getSymbolChar() == filter->term()) { + switch (currentMode) { + case FilterMode::ExactMatch: + switch (filter->type()) { + case CardFilter::Type::TypeAnd: + setManaSymbolActive(filter->term().at(0), true); + break; + default: + setManaSymbolActive(filter->term().at(0), false); + break; + } + break; + case FilterMode::Includes: + switch (filter->type()) { + case CardFilter::Type::TypeOr: + setManaSymbolActive(filter->term().at(0), true); + break; + default: + setManaSymbolActive(filter->term().at(0), false); + break; + } + break; + case FilterMode::IncludeExclude: + switch (filter->type()) { + case CardFilter::Type::TypeOr: + setManaSymbolActive(filter->term().at(0), true); + break; + default: + setManaSymbolActive(filter->term().at(0), false); + break; + } + break; + } found = true; - break; } } - manaSymbolWidget->setColorActive(useExclude ? !found : found); - manaSymbolWidget->setDisabled(currentMode == FilterMode::Custom); + if (!found) { + setManaSymbolActive(manaSymbolWidget->getSymbolChar(), false); + } } } diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.h index 561c92d09..184f1f96c 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.h +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.h @@ -10,8 +10,8 @@ #include #include #include +#include #include -#include #include #include @@ -38,6 +38,15 @@ private: int circleDiameter; }; +enum class FilterMode +{ + ExactMatch, // Only selected colors are included, all others are excluded. + Includes, // Include selected colors (OR condition). + IncludeExclude // Include selected colors (OR) and exclude unselected colors (AND NOT). +}; + +Q_DECLARE_METATYPE(FilterMode) + class VisualDatabaseDisplayColorFilterWidget : public QWidget { Q_OBJECT @@ -45,13 +54,11 @@ class VisualDatabaseDisplayColorFilterWidget : public QWidget public: explicit VisualDatabaseDisplayColorFilterWidget(QWidget *parent, FilterTreeModel *filterModel); void retranslateUi(); - void setFilterMode(FilterMode filterMode); signals: void filterModeChanged(FilterMode filterMode); private slots: - void addCustomFilterModeItem(); void handleColorToggled(QChar color, bool active); void addFilter(QChar color); void removeFilter(QChar color); diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp index ecb949b67..5063cce14 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp @@ -1,6 +1,6 @@ #include "visual_database_display_filter_toolbar_widget.h" -#include "../../theme_icon.h" +#include "../../pixel_map_generator.h" #include "../deck_editor/card_database_view.h" #include "../quick_settings/settings_button_widget.h" #include "card_database_display_model.h" @@ -45,13 +45,13 @@ VisualDatabaseDisplayFilterToolbarWidget::VisualDatabaseDisplayFilterToolbarWidg sortGroupBox = new QGroupBox(this); filterGroupBox = new QGroupBox(this); - auto scalePixmap = [](const QString &prefix) { return loadThemedIcon(prefix).pixmap({20, 20}); }; + auto scalePixmap = [](const QString &fileName) { return QIcon(QPixmap(fileName)).pixmap({20, 20}); }; sortByLabel = new QLabel(this); - sortByLabel->setPixmap(scalePixmap("icons/sort_arrow_down")); + sortByLabel->setPixmap(scalePixmap("theme:icons/sort_arrow_down")); filterByLabel = new QLabel(this); - filterByLabel->setPixmap(scalePixmap("icons/filter")); + filterByLabel->setPixmap(scalePixmap("theme:icons/filter")); sortColumnCombo = new QComboBox(this); sortColumnCombo->setSizeAdjustPolicy(QComboBox::SizeAdjustPolicy::AdjustToContents); @@ -89,22 +89,22 @@ VisualDatabaseDisplayFilterToolbarWidget::VisualDatabaseDisplayFilterToolbarWidg }); quickFilterSaveLoadWidget = new SettingsButtonWidget(this); - quickFilterSaveLoadWidget->setButtonIcon(loadThemedIcon(QStringLiteral("icons/floppy_disk"))); + quickFilterSaveLoadWidget->setButtonIcon(themePixmap(QStringLiteral("icons/floppy_disk"))); quickFilterNameWidget = new SettingsButtonWidget(this); - quickFilterNameWidget->setButtonIcon(loadThemedIcon(QStringLiteral("icons/pen_to_square"))); + quickFilterNameWidget->setButtonIcon(themePixmap(QStringLiteral("icons/pen_to_square"))); quickFilterMainTypeWidget = new SettingsButtonWidget(this); - quickFilterMainTypeWidget->setButtonIcon(loadThemedIcon(QStringLiteral("icons/circle_half_stroke"))); + quickFilterMainTypeWidget->setButtonIcon(themePixmap(QStringLiteral("icons/circle_half_stroke"))); quickFilterSubTypeWidget = new SettingsButtonWidget(this); - quickFilterSubTypeWidget->setButtonIcon(loadThemedIcon(QStringLiteral("icons/dragon"))); + quickFilterSubTypeWidget->setButtonIcon(themePixmap(QStringLiteral("icons/dragon"))); quickFilterSetWidget = new SettingsButtonWidget(this); - quickFilterSetWidget->setButtonIcon(loadThemedIcon(QStringLiteral("icons/scroll"))); + quickFilterSetWidget->setButtonIcon(themePixmap(QStringLiteral("icons/scroll"))); quickFilterFormatLegalityWidget = new SettingsButtonWidget(this); - quickFilterFormatLegalityWidget->setButtonIcon(loadThemedIcon(QStringLiteral("icons/scales"))); + quickFilterFormatLegalityWidget->setButtonIcon(themePixmap(QStringLiteral("icons/scale_balanced"))); retranslateUi(); } diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp index 6d9b28619..5a1097b0d 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp @@ -4,7 +4,7 @@ #include "../../../filters/filter_tree_model.h" #include "../../../filters/syntax_help.h" #include "../../key_signals.h" -#include "../../theme_icon.h" +#include "../../pixel_map_generator.h" #include "../cards/card_info_picture_widget.h" #include "../cards/card_info_picture_with_text_overlay_widget.h" #include "../cards/card_size_widget.h" @@ -13,23 +13,32 @@ #include "../utility/custom_line_edit.h" #include "card_database_display_model.h" #include "card_database_model.h" -#include "card_database_visual_display_model.h" -#include "card_database_visual_view.h" #include "deck_list_model.h" #include "libcockatrice/card/card_localization.h" #include "libcockatrice/card/database/card_database_loader.h" #include "libcockatrice/card/database/card_database_querier.h" #include "libcockatrice/card/printing/exact_card.h" +#include "libcockatrice/card/printing/printing_info.h" #include "libcockatrice/filters/filter_card.h" #include "libcockatrice/filters/filter_tree.h" #include "visual_database_display_color_filter_widget.h" #include "visual_database_display_filter_toolbar_widget.h" +#include #include +#include #include #include #include +#include +#include +#include +#include +#include #include +#include +#include +#include #include #include #include @@ -39,11 +48,14 @@ #include #include #include +#include +#include #include #include #include #include #include +#include class QMouseEvent; @@ -52,6 +64,11 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent, DeckListModel *deckListModel) : QWidget(parent) { + debounceTimer = new QTimer(this); + debounceTimer->setSingleShot(true); // Ensure it only fires once after the timeout + + connect(debounceTimer, &QTimer::timeout, this, &VisualDatabaseDisplayWidget::onSearchModelChanged); + // Create display model databaseDisplayModel = new CardDatabaseDisplayModel(this); databaseDisplayModel->setObjectName("databaseDisplayModel"); @@ -69,20 +86,31 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent, connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardSearchLanguageChanged, this, applyCardSearchLanguage); + cards = new QList; + connect(databaseDisplayModel, &CardDatabaseDisplayModel::modelDirty, this, + &VisualDatabaseDisplayWidget::modelDirty); + // Set up main layout and widgets setMinimumSize(0, 0); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); mainLayout = QtUtils::makeLayout(this, 0, 1); setLayout(mainLayout); + flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarPolicy::ScrollBarAsNeeded); + cardSizeWidget = new CardSizeWidget(this, flowWidget, + SettingsCache::instance().cardsDisplay().getVisualDatabaseDisplayCardSize()); + connect(cardSizeWidget, &CardSizeWidget::cardSizeSettingUpdated, &SettingsCache::instance().cardsDisplay(), + &CardsDisplaySettings::setVisualDatabaseDisplayCardSize); + cardSizeWidget->enableCtrlScrollResize(flowWidget); + searchContainer = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAlwaysOff); searchEdit = new SearchLineEdit(); searchEdit->setObjectName("searchEdit"); searchEdit->setPlaceholderText(tr("Search by card name (or search expressions)")); searchEdit->setClearButtonEnabled(true); - searchEdit->addAction(loadThemedIcon(QStringLiteral("icons/search")), QLineEdit::LeadingPosition); - auto help = searchEdit->addAction(loadThemedIcon(QStringLiteral("icons/info")), QLineEdit::TrailingPosition); + searchEdit->addAction(loadColorAdjustedPixmap("theme:icons/search"), QLineEdit::LeadingPosition); + auto help = searchEdit->addAction(themePixmap(QStringLiteral("icons/info")), QLineEdit::TrailingPosition); connect(help, &QAction::triggered, this, [this] { createSearchSyntaxHelpWindow(searchEdit); }); setFocusProxy(searchEdit); @@ -131,36 +159,16 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent, connect(databaseView, &CardDatabaseView::relatedCardClicked, this, &VisualDatabaseDisplayWidget::onRelatedCardClicked); - // The visual grid is a real view on a flattened model: one row per displayed - // card picture, painted on demand. - visualDisplayModel = new CardDatabaseVisualDisplayModel(databaseDisplayModel, CardDatabaseManager::query(), this); - - cardView = new CardDatabaseVisualView(visualDisplayModel, this); - cardView->setObjectName("visualCardView"); - connect(cardView, &CardDatabaseVisualView::cardClicked, this, - &VisualDatabaseDisplayWidget::cardClickedDatabaseDisplay); - connect(cardView, &CardDatabaseVisualView::cardHovered, this, - &VisualDatabaseDisplayWidget::cardHoveredDatabaseDisplay); - - const int cardSize = SettingsCache::instance().cardsDisplay().getVisualDatabaseDisplayCardSize(); - cardSizeWidget = new CardSizeWidget(this, nullptr, cardSize); - connect(cardSizeWidget, &CardSizeWidget::cardSizeSettingUpdated, &SettingsCache::instance().cardsDisplay(), - &CardsDisplaySettings::setVisualDatabaseDisplayCardSize); - connect(cardSizeWidget->getSlider(), &QSlider::valueChanged, cardView, &CardDatabaseVisualView::setCardSizeFactor); - cardView->setCardSizeFactor(cardSize); - cardSizeWidget->enableCtrlScrollResize(cardView); - colorFilterWidget = new VisualDatabaseDisplayColorFilterWidget(this, filterModel); filterContainer = new VisualDatabaseDisplayFilterToolbarWidget(this, deckListModel); clearFilterWidget = new QToolButton(); clearFilterWidget->setFixedSize(32, 32); - clearFilterWidget->setIcon(loadThemedIcon(QStringLiteral("icons/delete"))); + clearFilterWidget->setIcon(themePixmap(QStringLiteral("icons/delete"))); connect(clearFilterWidget, &QToolButton::clicked, this, [this] { filterModel->blockSignals(true); filterModel->filterTree()->blockSignals(true); - colorFilterWidget->setFilterMode(FilterMode::Includes); filterModel->clear(); filterModel->blockSignals(false); filterModel->filterTree()->blockSignals(false); @@ -182,6 +190,8 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent, databaseLoadIndicator->setVisible(false); } + QScrollBar *scrollBar = flowWidget->scrollArea->verticalScrollBar(); + connect(scrollBar, &QScrollBar::valueChanged, [this](int /*value*/) { loadCurrentPage(); }); retranslateUi(); } @@ -200,7 +210,7 @@ void VisualDatabaseDisplayWidget::initialize() mainLayout->addWidget(databaseView); - mainLayout->addWidget(cardView); + mainLayout->addWidget(flowWidget); mainLayout->addWidget(cardSizeWidget); @@ -231,6 +241,8 @@ void VisualDatabaseDisplayWidget::initializeFilters() databaseDisplayModel->setFilterTree(filterModel->filterTree()); + QTimer::singleShot(5000, this, [this] { loadCurrentPage(); }); + retranslateUi(); }); } @@ -266,36 +278,71 @@ void VisualDatabaseDisplayWidget::updateDisplayModeButton() displayModeButton->setText(displayModeButton->isChecked() ? tr("Table") : tr("Visual")); } +void VisualDatabaseDisplayWidget::resizeEvent(QResizeEvent *event) +{ + QWidget::resizeEvent(event); + loadCurrentPage(); +} + void VisualDatabaseDisplayWidget::onDisplayModeChanged(bool checked) { updateDisplayModeButton(); if (checked) { // Table mode - cardView->setVisible(false); + flowWidget->setVisible(false); cardSizeWidget->setVisible(false); databaseView->setItemDelegate(new QStyledItemDelegate(databaseView)); databaseView->setVisible(true); } else { // Visual mode - cardView->setVisible(true); + flowWidget->setVisible(true); cardSizeWidget->setVisible(true); databaseView->setVisible(false); + populateCards(); } } +void VisualDatabaseDisplayWidget::onClick(QMouseEvent *event, const ExactCard &card) +{ + emit cardClickedDatabaseDisplay(event, card); +} + +void VisualDatabaseDisplayWidget::onHover(const ExactCard &hoveredCard) +{ + emit cardHoveredDatabaseDisplay(hoveredCard); +} + +void VisualDatabaseDisplayWidget::addCardToDisplay(const ExactCard &cardToAdd) +{ + cards->append(cardToAdd); + auto *display = new CardInfoPictureWithTextOverlayWidget(flowWidget, false); + display->setScaleFactor(cardSizeWidget->getSlider()->value()); + display->setCard(cardToAdd); + flowWidget->addWidget(display); + connect(display, &CardInfoPictureWithTextOverlayWidget::cardClicked, this, &VisualDatabaseDisplayWidget::onClick); + connect(display, &CardInfoPictureWithTextOverlayWidget::hoveredOnCard, this, &VisualDatabaseDisplayWidget::onHover); + connect(cardSizeWidget->getSlider(), &QSlider::valueChanged, display, &CardInfoPictureWidget::setScaleFactor); +} + bool VisualDatabaseDisplayWidget::isVisualDisplayMode() const { return !displayModeButton->isChecked(); } -QStringList VisualDatabaseDisplayWidget::collectSetFilterTerms() const -{ - return filterModel->getFilterTermsOfType(CardFilter::AttrSet); -} - void VisualDatabaseDisplayWidget::onSearchModelChanged() { - visualDisplayModel->setSetFilterTerms(collectSetFilterTerms()); + if (flowWidget->isVisible()) { + // Clear the current page and prepare for new data + flowWidget->clearLayout(); // Clear existing cards + cards->clear(); // Clear the card list + // Reset scrollbar position to the top after loading new cards + QScrollBar *scrollBar = flowWidget->scrollArea->verticalScrollBar(); + scrollBar->setValue(0); // Reset scrollbar to top + + currentPage = 0; + loadCurrentPage(); + qCDebug(VisualDatabaseDisplayLog) << "Search model changed"; + } } void VisualDatabaseDisplayWidget::onSelectedCardChanged(const QString &cardName) @@ -321,3 +368,113 @@ void VisualDatabaseDisplayWidget::onRelatedCardClicked(const QString &relatedCar ExactCard exactCard = CardDatabaseManager::query()->guessCard({relatedCard}); emit cardInfoRequested(exactCard); } + +bool VisualDatabaseDisplayWidget::nearEndOfPage() const +{ + if (!flowWidget->isVisible()) { + return false; + } + + QScrollBar *scrollBar = flowWidget->scrollArea->verticalScrollBar(); + if (scrollBar->value() + scrollBar->pageStep() * 2 < scrollBar->maximum()) { + return false; // there is at least two pages of space to scroll remaining + } + + return true; +} + +void VisualDatabaseDisplayWidget::loadCurrentPage() +{ + // Ensure only the initial page is loaded + if (currentPage == 0) { + if (!initialLoadScheduled) { + initialLoadScheduled = true; + qCDebug(VisualDatabaseDisplayLog) << "Loading the first page"; + // Defer the first page so the tab switch stays responsive. The card + // grid builds one event loop turn later. This also applies to + // search-driven reloads, which reset currentPage back to 0. + QTimer::singleShot(0, this, [this] { + initialLoadScheduled = false; + populateCards(); + }); + } + } else if (nearEndOfPage()) { + // If not the first page, just load the next page and append to the flow widget + loadNextPage(); + } +} + +void VisualDatabaseDisplayWidget::populateCards() +{ + cards->clear(); + loadNextPage(); +} + +void VisualDatabaseDisplayWidget::loadNextPage() +{ + // Calculate the start and end indices for the next page + int rowCount = databaseDisplayModel->rowCount(); + int start = currentPage * cardsPerPage; + int end = qMin(start + cardsPerPage, rowCount); + + // Load more cards if we are at the end of the current list and can fetch more + if (end >= rowCount && databaseDisplayModel->canFetchMore(QModelIndex())) { + databaseDisplayModel->fetchMore(QModelIndex()); + } + + // Load the next page of cards and add them to the flow widget + flowWidget->setUpdatesEnabled(false); + loadPage(start, end); + flowWidget->setUpdatesEnabled(true); +} + +void VisualDatabaseDisplayWidget::loadPage(int start, int end) +{ + QList setFilters = filterModel->getFiltersOfType(CardFilter::AttrSet); + for (int row = start; row < end; ++row) { + qCDebug(VisualDatabaseDisplayLog) << "Adding " << row; + QModelIndex index = databaseDisplayModel->index(row, CardDatabaseModel::NameColumn); + QVariant name = databaseDisplayModel->data(index, Qt::DisplayRole); + qCDebug(VisualDatabaseDisplayLog) << name.toString(); + + if (CardInfoPtr info = CardDatabaseManager::query()->getCardInfo(name.toString())) { + if (!setFilters.empty()) { + const auto &setMap = info->getSets(); + for (const CardFilter *setFilter : setFilters) { + const auto it = setMap.constFind(setFilter->term()); + if (it != setMap.constEnd()) { + for (const PrintingInfo &printing : it.value()) { + addCardToDisplay(ExactCard(info, printing)); + } + } + } + } else { + addCardToDisplay(CardDatabaseManager::query()->getPreferredCard(info)); + } + } else { + qCDebug(VisualDatabaseDisplayLog) << "Card not found in database!"; + } + } + currentPage++; +} + +void VisualDatabaseDisplayWidget::modelDirty() const +{ + debounceTimer->start(debounceTime); +} + +void VisualDatabaseDisplayWidget::sortCardList(const QStringList &properties, + Qt::SortOrder order = Qt::AscendingOrder) const +{ + CardInfoComparator comparator(properties, order); + std::sort(cards->begin(), cards->end(), [comparator](const ExactCard &a, const ExactCard &b) { + return comparator(a.getCardPtr(), b.getCardPtr()); + }); +} + +void VisualDatabaseDisplayWidget::databaseDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) +{ + (void)topLeft; + (void)bottomRight; + qCDebug(VisualDatabaseDisplayLog) << "Database Data changed"; +} diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h index 6148670a3..15adca214 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h @@ -9,6 +9,8 @@ #include "libcockatrice/card/card_info.h" +#include +#include #include #include #include @@ -19,21 +21,26 @@ class CardDatabaseDisplayModel; class CardDatabaseModel; class CardDatabaseView; -class CardDatabaseVisualDisplayModel; -class CardDatabaseVisualView; class CardSizeWidget; +class DeckList; class DeckListModel; class ExactCard; class FilterTreeModel; class FlowWidget; +class OverlapControlWidget; class QLabel; -class QMouseEvent; +class QModelIndex; class QPushButton; +class QScrollArea; +class QTimer; class QToolButton; class QVBoxLayout; class SearchLineEdit; class VisualDatabaseDisplayColorFilterWidget; class VisualDatabaseDisplayFilterToolbarWidget; +template class QList; + +inline Q_LOGGING_CATEGORY(VisualDatabaseDisplayLog, "visual_database_display"); class VisualDatabaseDisplayWidget : public QWidget { @@ -45,6 +52,14 @@ public: DeckListModel *deckListModel = nullptr); void retranslateUi(); + void adjustCardsPerPage(); + void populateCards(); + void loadPage(int start, int end); + void loadNextPage(); + void loadCurrentPage(); + void sortCardList(const QStringList &properties, Qt::SortOrder order) const; + void setDeckList(const DeckList &new_deck_list_model); + /** * @brief Sets the callback used to create a custom zone from the add-to-zone menu. * The callback returns the name of the created zone, or an empty string if creation was cancelled. @@ -72,13 +87,6 @@ public: bool isVisualDisplayMode() const; public slots: - /** - * @brief Pushes the active set filters to the visual grid. - * - * The grid's rows follow the display model's filter and sort signals on their - * own; this only forwards the set filters, which decide which printings the - * grid shows. - */ void onSearchModelChanged(); signals: @@ -93,6 +101,11 @@ signals: protected slots: void initialize(); + void onClick(QMouseEvent *event, const ExactCard &card); + void onHover(const ExactCard &hoveredCard); + void addCardToDisplay(const ExactCard &cardToAdd); + void databaseDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight); + void modelDirty() const; void onDisplayModeChanged(bool checked); void onSelectedCardChanged(const QString &cardName); @@ -112,21 +125,31 @@ private: QToolButton *clearFilterWidget; VisualDatabaseDisplayFilterToolbarWidget *filterContainer; CardDatabaseDisplayModel *databaseDisplayModel; - CardDatabaseVisualDisplayModel *visualDisplayModel; CardDatabaseView *databaseView; - CardDatabaseVisualView *cardView; std::function newZoneCreator; + QList *cards; QVBoxLayout *mainLayout; + QScrollArea *scrollArea; + FlowWidget *flowWidget; + QWidget *overlapCategories; + QVBoxLayout *overlapCategoriesLayout; + OverlapControlWidget *overlapControlWidget; CardSizeWidget *cardSizeWidget; + QTimer *debounceTimer; + int debounceTime = 300; // in Ms + int currentPage = 0; // Current page index + int cardsPerPage = 100; // Number of cards per page bool filtersInitialized = false; + bool initialLoadScheduled = false; void initializeFilters(); void highlightAllSearchEdit(); void updateDisplayModeButton(); - [[nodiscard]] QStringList collectSetFilterTerms() const; + bool nearEndOfPage() const; protected: + void resizeEvent(QResizeEvent *event) override; void showEvent(QShowEvent *event) override; }; diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp index f0c054c3a..63ef07835 100644 --- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp @@ -1,6 +1,6 @@ #include "visual_deck_display_options_widget.h" -#include "../../theme_icon.h" +#include "../../pixel_map_generator.h" #include "../deck_editor/deck_editor_deck_dock_widget.h" #include "../quick_settings/settings_button_widget.h" #include "../tabs/visual_deck_editor/tab_deck_editor_visual.h" @@ -65,7 +65,7 @@ VisualDeckDisplayOptionsWidget::VisualDeckDisplayOptionsWidget(QWidget *parent) sortByLabel = new QLabel(this); sortCriteriaButton = new SettingsButtonWidget(this); - sortCriteriaButton->setButtonIcon(loadThemedIcon(QStringLiteral("icons/sort_arrow_down"))); + sortCriteriaButton->setButtonIcon(themePixmap(QStringLiteral("icons/sort_arrow_down"))); sortLabel = new QLabel(sortCriteriaButton); sortLabel->setWordWrap(true); @@ -119,11 +119,11 @@ void VisualDeckDisplayOptionsWidget::updateDisplayTypeButton() switch (currentDisplayType) { case DisplayType::Flat: displayTypeButton->setButtonText(tr("Toggle Layout: Flat")); - displayTypeButton->setButtonIcon(loadThemedIcon(QStringLiteral("icons/scroll"))); + displayTypeButton->setButtonIcon(themePixmap(QStringLiteral("icons/scroll"))); break; case DisplayType::Overlap: displayTypeButton->setButtonText(tr("Toggle Layout: Overlap")); - displayTypeButton->setButtonIcon(loadThemedIcon(QStringLiteral("icons/scales"))); + displayTypeButton->setButtonIcon(themePixmap(QStringLiteral("icons/scales"))); break; } } diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp index d3c087bc6..76c3d0908 100644 --- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp @@ -1,8 +1,5 @@ #include "visual_deck_editor_placeholder_widget.h" -#include "../interface/theme_manager.h" - -#include #include #include #include @@ -31,12 +28,10 @@ VisualDeckEditorPlaceholderWidget::VisualDeckEditorPlaceholderWidget(QWidget *pa textLabel->setStyleSheet(R"( QLabel { color: palette(mid); + font-size: 14px; padding: 10px; } )"); - applyInterfaceDefaultFont(); - connect(themeManager, &ThemeManager::fontsChanged, this, - &VisualDeckEditorPlaceholderWidget::applyInterfaceDefaultFont); mainLayout->addWidget(imageLabel); mainLayout->addWidget(textLabel); @@ -47,12 +42,4 @@ VisualDeckEditorPlaceholderWidget::VisualDeckEditorPlaceholderWidget(QWidget *pa void VisualDeckEditorPlaceholderWidget::retranslateUi() { textLabel->setText(tr("Add cards using the search bar or database tab to have them appear here")); -} - -void VisualDeckEditorPlaceholderWidget::applyInterfaceDefaultFont() -{ - // Family comes from the InterfaceDefault theme role; the 14px size stays caller-side. - QFont placeholderFont = themeManager->appFont(AppFont::InterfaceDefault); - placeholderFont.setPixelSize(14); - textLabel->setFont(placeholderFont); } \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.h b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.h index 794be671e..84a3142d8 100644 --- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.h @@ -15,9 +15,6 @@ public: explicit VisualDeckEditorPlaceholderWidget(QWidget *parent = nullptr); void retranslateUi(); -private slots: - void applyInterfaceDefaultFont(); - private: QVBoxLayout *mainLayout; QLabel *imageLabel; diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp index 0e0b5e4b4..506ffa2b4 100644 --- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp @@ -1,7 +1,7 @@ #include "visual_deck_editor_widget.h" #include "../../../client/settings/cache_settings.h" -#include "../../theme_icon.h" +#include "../../pixel_map_generator.h" #include "../cards/card_size_widget.h" #include "../cards/deck_card_zone_display_widget.h" #include "../general/layout_containers/flow_widget.h" @@ -144,7 +144,7 @@ void VisualDeckEditorWidget::initializeSearchBarAndCompleter() // Search button functionality searchPushButton = new CompactPushButton(searchContainer); - searchPushButton->setButtonIcon(loadThemedIcon(QStringLiteral("icons/search"))); + searchPushButton->setButtonIcon(themePixmap(QStringLiteral("icons/search"))); connect(searchPushButton, &QPushButton::clicked, this, [this] { addCardFromSearch(); }); searchLayout->addWidget(searchPushButton); diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp index cebe92495..11c8df54a 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp @@ -1,7 +1,9 @@ #include "deck_preview_deck_tags_display_widget.h" #include "../../../../client/settings/cache_settings.h" +#include "../../../deck_loader/deck_file_format.h" #include "../../../deck_loader/deck_loader.h" +#include "../../../deck_loader/loaded_deck.h" #include "../../general/layout_containers/flow_widget.h" #include "deck_preview_tag_addition_widget.h" #include "deck_preview_tag_dialog.h" @@ -14,8 +16,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp index 30e99f401..82ed6191c 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp @@ -1,7 +1,5 @@ #include "deck_preview_tag_addition_widget.h" -#include "../../interface/theme_manager.h" - #include #include #include @@ -28,10 +26,6 @@ DeckPreviewTagAdditionWidget::DeckPreviewTagAdditionWidget(QWidget *_parent, QSt // Adjust widget size setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); - - // The tag text reads the InterfaceDefault role at paint time, so a font - // change only needs a repaint. - connect(themeManager, &ThemeManager::fontsChanged, this, [this] { update(); }); } QSize DeckPreviewTagAdditionWidget::sizeHint() const @@ -71,9 +65,8 @@ void DeckPreviewTagAdditionWidget::paintEvent(QPaintEvent *event) painter.setPen(borderPen); painter.drawRect(rect().adjusted(0, 0, -1, -1)); // Adjust for pen width - // Calculate font size based on widget height. Family comes from the - // InterfaceDefault theme role; the height-derived size stays as before. - QFont font = themeManager->appFont(AppFont::InterfaceDefault); + // Calculate font size based on widget height + QFont font = painter.font(); int fontSize = std::max(10, height() / 2); // Ensure a minimum font size of 10 font.setPointSize(fontSize); painter.setFont(font); diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp index 34809da2e..e62570241 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp @@ -1,7 +1,5 @@ #include "deck_preview_tag_display_widget.h" -#include "../../interface/theme_manager.h" - #include #include #include @@ -43,10 +41,6 @@ DeckPreviewTagDisplayWidget::DeckPreviewTagDisplayWidget(QWidget *parent, const // Adjust widget size setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); - // The tag text reads the InterfaceDefault role at paint time, so a font - // change only needs a repaint. - connect(themeManager, &ThemeManager::fontsChanged, this, [this] { update(); }); - // Connect close button to the remove signal // connect(closeButton, &QPushButton::clicked, this, &DeckPreviewTagDisplayWidget::tagClosed); } @@ -123,9 +117,8 @@ void DeckPreviewTagDisplayWidget::paintEvent(QPaintEvent *event) painter.setPen(borderPen); painter.drawRect(rect().adjusted(0, 0, -1, -1)); - // Calculate font size based on widget height. Family comes from the - // InterfaceDefault theme role; the height-derived size stays as before. - QFont font = themeManager->appFont(AppFont::InterfaceDefault); + // Calculate font size based on widget height + QFont font = painter.font(); int fontSize = std::max(10, height() / 2); // Ensure a minimum font size of 10 font.setPointSize(fontSize); painter.setFont(font); diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp index f2002d4e4..220c55788 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp @@ -3,6 +3,7 @@ #include "../../../../client/settings/cache_settings.h" #include "../../../../interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h" #include "../../../deck_loader/deck_loader.h" +#include "../../../deck_loader/loaded_deck.h" #include "../../cards/additional_info/color_identity_widget.h" #include "../../cards/deck_preview_card_picture_widget.h" #include "../visual_deck_storage_model.h" @@ -44,7 +45,6 @@ #include #include #include -#include #include #include #include diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.cpp index 3611a8c1f..e84631e52 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.cpp @@ -1,6 +1,8 @@ #include "visual_deck_storage_model.h" +#include "../../deck_loader/deck_file_format.h" #include "../../deck_loader/deck_loader.h" +#include "../../deck_loader/loaded_deck.h" #include "../cards/additional_info/deck_color_identity.h" #include "libcockatrice/deck_list/deck_list.h" @@ -19,8 +21,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.h index f9af6f318..57eaebacf 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.h +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.h @@ -13,6 +13,7 @@ #ifndef VISUAL_DECK_STORAGE_MODEL_H #define VISUAL_DECK_STORAGE_MODEL_H +#include "../../deck_loader/loaded_deck.h" #include "libcockatrice/utility/card_ref.h" #include @@ -23,9 +24,6 @@ #include #include #include -#include -#include -#include #include #include diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp index 10a3bf33a..f2669f55d 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp @@ -1,7 +1,7 @@ #include "visual_deck_storage_search_widget.h" #include "../../../filters/syntax_help.h" -#include "../../theme_icon.h" +#include "../../pixel_map_generator.h" #include #include @@ -27,9 +27,9 @@ VisualDeckStorageSearchWidget::VisualDeckStorageSearchWidget(QWidget *parent) : searchBar = new QLineEdit(this); searchBar->setPlaceholderText(tr("Search by filename (or search expression)")); searchBar->setClearButtonEnabled(true); - searchBar->addAction(loadThemedIcon(QStringLiteral("icons/search")), QLineEdit::LeadingPosition); + searchBar->addAction(loadColorAdjustedPixmap("theme:icons/search"), QLineEdit::LeadingPosition); - auto help = searchBar->addAction(loadThemedIcon(QStringLiteral("icons/info")), QLineEdit::TrailingPosition); + auto help = searchBar->addAction(themePixmap(QStringLiteral("icons/info")), QLineEdit::TrailingPosition); connect(help, &QAction::triggered, this, [this] { createDeckSearchSyntaxHelpWindow(searchBar); }); layout->addWidget(searchBar); diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.cpp index c93e496ec..abe3327af 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.cpp @@ -1,6 +1,7 @@ #include "visual_deck_storage_sort_filter_proxy_model.h" #include "../../../client/settings/cache_settings.h" +#include "../../deck_loader/loaded_deck.h" #include "../../filters/deck_filter_string.h" #include "visual_deck_storage_model.h" @@ -15,7 +16,6 @@ #include #include #include -#include #include VisualDeckStorageSortFilterProxyModel::VisualDeckStorageSortFilterProxyModel(QObject *parent) diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp index bbf68adb9..4e1d6293f 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp @@ -1,7 +1,7 @@ #include "visual_deck_storage_widget.h" #include "../../../client/settings/cache_settings.h" -#include "../../theme_icon.h" +#include "../../pixel_map_generator.h" #include "deck_preview/deck_preview_color_identity_filter_widget.h" #include "deck_preview/deck_preview_widget.h" #include "libcockatrice/card/database/card_database.h" @@ -62,12 +62,12 @@ VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(pare searchWidget = new VisualDeckStorageSearchWidget(this); refreshButton = new QToolButton(this); - refreshButton->setIcon(loadThemedIcon(QStringLiteral("icons/reload"))); + refreshButton->setIcon(themePixmap(QStringLiteral("icons/reload"))); refreshButton->setFixedSize(32, 32); connect(refreshButton, &QPushButton::clicked, this, &VisualDeckStorageWidget::refreshIfPossible); shareButton = new QToolButton(this); - shareButton->setIcon(loadThemedIcon(QStringLiteral("icons/share"))); + shareButton->setIcon(themePixmap(QStringLiteral("icons/share"))); shareButton->setFixedSize(32, 32); shareButton->setVisible(false); connect(shareButton, &QPushButton::clicked, this, &VisualDeckStorageWidget::shareRequested); diff --git a/cockatrice/src/interface/window_main.cpp b/cockatrice/src/interface/window_main.cpp index 715505926..f8ab5d3f6 100644 --- a/cockatrice/src/interface/window_main.cpp +++ b/cockatrice/src/interface/window_main.cpp @@ -50,20 +50,11 @@ #include "latency_tracker.h" #include "logger.h" #include "pixel_map_generator.h" -#include "theme_icon.h" #include "version_string.h" #include "widgets/dialogs/dlg_connect.h" #include "widgets/server/handle_public_servers.h" #include "widgets/settings_page/abstract_settings_page.h" #include "widgets/tabs/api/commander_spellbook/handle_commander_brackets.h" -#ifdef WITH_GUI_TEST -#include "../game_graphics/pq_cockatrice_event_player.h" -#include "pqEventObserver.h" -#include "pqEventSource.h" -#include "pqEventTypes.h" -#include "pqTestUtility.h" -#include "recording.h" -#endif #include #include @@ -263,11 +254,7 @@ void MainWindow::actWatchReplay() void MainWindow::localGameEnded() { - // Defer deletion so the LocalClients (already scheduled with deleteLater() in TabSupervisor::stop) - // and any queued commands are processed before the server and its interfaces are destroyed. - if (localServer) { - localServer->deleteLater(); - } + delete localServer; localServer = nullptr; aConnect->setEnabled(true); @@ -319,7 +306,6 @@ void MainWindow::actAbout() mb.setIconPixmap( themePixmap(QStringLiteral("cockatrice")).scaled(64, 64, Qt::KeepAspectRatio, Qt::SmoothTransformation)); mb.setTextInteractionFlags(Qt::TextBrowserInteraction); - mb.setObjectName("aboutDialog"); mb.exec(); } @@ -358,24 +344,6 @@ void MainWindow::actOpenSettingsFolder() QtUtils::openPathInFileManager(dir); } -#ifdef WITH_GUI_TEST -void MainWindow::actRecord() -{ - QString filename = QFileDialog::getSaveFileName(this, tr("Test File Name"), QString(), tr("XML Files (*.xml)")); - if (!filename.isEmpty()) { - testUtility->recordTests(filename); - } -} - -void MainWindow::actPlayRecording() -{ - QString filename = QFileDialog::getOpenFileName(this, tr("Test File Name"), QString(), tr("XML Files (*.xml)")); - if (!filename.isEmpty()) { - testUtility->playTests(filename); - } -} -#endif - void MainWindow::retranslateUi() { connectionController->refreshWindowTitle(); @@ -388,10 +356,10 @@ void MainWindow::retranslateUi() aRegister->setText(tr("&Register to server...")); aForgotPassword->setText(tr("&Restore password...")); aSettings->setText(tr("&Settings...")); - aSettings->setIcon(loadThemedIcon(QStringLiteral("icons/settings"))); + aSettings->setIcon(themePixmap(QStringLiteral("icons/settings"))); settingsButton->setToolTip(tr("Settings")); settingsButton->setAccessibleName(tr("Settings")); - settingsButton->setIcon(loadThemedIcon(QStringLiteral("icons/settings"))); + settingsButton->setIcon(themePixmap(QStringLiteral("icons/cogwheel"))); aExit->setText(tr("&Exit")); #if defined(__APPLE__) /* For OSX */ @@ -420,10 +388,6 @@ void MainWindow::retranslateUi() aViewLog->setText(tr("View &Debug Log")); aOpenSettingsFolder->setText(tr("Open Settings Folder")); aFirstRunWizard->setText(tr("Re-run Onboarding Wizard...")); -#ifdef WITH_GUI_TEST - aRecord->setText(tr("&Record Test...")); - aPlayRecording->setText(tr("&Play Test...")); -#endif aShow->setText(tr("Show/Hide")); @@ -433,33 +397,24 @@ void MainWindow::retranslateUi() void MainWindow::createActions() { aConnect = new QAction(this); - aConnect->setObjectName("actionConnect"); connect(aConnect, &QAction::triggered, this, &MainWindow::actConnect); aDisconnect = new QAction(this); - aDisconnect->setObjectName("actionDisconnect"); aDisconnect->setEnabled(false); connect(aDisconnect, &QAction::triggered, this, &MainWindow::actDisconnect); aSinglePlayer = new QAction(this); - aSinglePlayer->setObjectName("actionSinglePlayer"); connect(aSinglePlayer, &QAction::triggered, this, &MainWindow::actSinglePlayer); aWatchReplay = new QAction(this); - aWatchReplay->setObjectName("actionWatchReplay"); connect(aWatchReplay, &QAction::triggered, this, &MainWindow::actWatchReplay); aFullScreen = new QAction(this); - aFullScreen->setObjectName("actionFullScreen"); aFullScreen->setCheckable(true); connect(aFullScreen, &QAction::toggled, this, &MainWindow::actFullScreen); aRegister = new QAction(this); - aRegister->setObjectName("actionRegister"); connect(aRegister, &QAction::triggered, connectionController, &ConnectionController::registerToServer); aForgotPassword = new QAction(this); - aForgotPassword->setObjectName("actionForgotPassword"); connect(aForgotPassword, &QAction::triggered, connectionController, &ConnectionController::forgotPasswordRequest); aSettings = new QAction(this); - aSettings->setObjectName("actionSettings"); connect(aSettings, &QAction::triggered, this, &MainWindow::actSettings); aExit = new QAction(this); - aExit->setObjectName("actionExit"); connect(aExit, &QAction::triggered, this, &MainWindow::actExit); aManageSets = new QAction(QString(), this); @@ -496,12 +451,6 @@ void MainWindow::createActions() connect(aOpenSettingsFolder, &QAction::triggered, this, &MainWindow::actOpenSettingsFolder); aFirstRunWizard = new QAction(this); connect(aFirstRunWizard, &QAction::triggered, this, [this] { runFirstRunWizard(); }); -#ifdef WITH_GUI_TEST - aRecord = new QAction(this); - connect(aRecord, &QAction::triggered, this, &MainWindow::actRecord); - aPlayRecording = new QAction(this); - connect(aPlayRecording, &QAction::triggered, this, &MainWindow::actPlayRecording); -#endif aShow = new QAction(this); connect(aShow, &QAction::triggered, this, &MainWindow::actShow); @@ -542,9 +491,7 @@ void MainWindow::createActions() void MainWindow::createMenus() { - menuBar()->setObjectName("menubar"); cockatriceMenu = menuBar()->addMenu(QString()); - cockatriceMenu->setObjectName("cockatriceMenu"); cockatriceMenu->addAction(aConnect); cockatriceMenu->addAction(aDisconnect); cockatriceMenu->addAction(aRegister); @@ -560,7 +507,6 @@ void MainWindow::createMenus() cockatriceMenu->addAction(aExit); dbMenu = menuBar()->addMenu(QString()); - dbMenu->setObjectName("dbMenu"); dbMenu->addAction(aManageSets); dbMenu->addAction(aEditTokens); dbMenu->addSeparator(); @@ -571,10 +517,8 @@ void MainWindow::createMenus() dbMenu->addAction(aReloadCardDatabase); tabsMenu = menuBar()->addMenu(QString()); - tabsMenu->setObjectName("tabsMenu"); helpMenu = menuBar()->addMenu(QString()); - helpMenu->setObjectName("helpMenu"); helpMenu->addAction(aAbout); helpMenu->addAction(aTips); helpMenu->addSeparator(); @@ -587,19 +531,12 @@ void MainWindow::createMenus() helpMenu->addAction(aOpenSettingsFolder); helpMenu->addSeparator(); helpMenu->addAction(aFirstRunWizard); -#ifdef WITH_GUI_TEST - helpMenu->addSeparator(); - helpMenu->addAction(aRecord); - helpMenu->addAction(aPlayRecording); -#endif } MainWindow::MainWindow(QWidget *parent) - : QMainWindow(parent), localServer(nullptr), bHasActivated(false), askedForDbUpdater(false), noConnect(false), + : QMainWindow(parent), localServer(nullptr), bHasActivated(false), askedForDbUpdater(false), cardUpdateProcess(nullptr), logviewDialog(nullptr) { - setObjectName("MainWindow"); - connect(&SettingsCache::instance().cacheStorage(), &CacheStorageSettings::pixmapCacheSizeChanged, this, &MainWindow::pixmapCacheSizeChanged); pixmapCacheSizeChanged(SettingsCache::instance().cacheStorage().getPixmapCacheSize()); @@ -685,14 +622,6 @@ MainWindow::MainWindow(QWidget *parent) // run startup check async QTimer::singleShot(0, this, &MainWindow::startupConfigCheck); QTimer::singleShot(0, this, &MainWindow::applyStartupDestination); - -#ifdef WITH_GUI_TEST - testUtility = new pqTestUtility(this); - testUtility->setRecordWithDialog(true); - testUtility->addEventObserver("xml", new XMLEventObserver(this)); - testUtility->addEventSource("xml", new XMLEventSource(this)); - testUtility->eventPlayer()->addWidgetEventPlayer(new pqCockatriceEventPlayer(this)); -#endif } void MainWindow::startupConfigCheck() @@ -847,11 +776,6 @@ void MainWindow::runFirstRunWizard(bool firstRun) */ void MainWindow::applyStartupDestination() { - if (noConnect) { - qCInfo(WindowMainStartupAutoconnectLog) << "Startup destination suppressed (--no-connect)"; - return; - } - // An explicit command-line connect takes precedence over the startup destination. if (!connectTo.isEmpty()) { return; @@ -1121,10 +1045,6 @@ void MainWindow::handleCockatriceLink(const QString &url) void MainWindow::attemptStartupAutoConnect() { - if (noConnect) { - qCInfo(WindowMainStartupAutoconnectLog) << "Auto-connect suppressed (--no-connect)"; - return; - } if (startupAutoConnectAttempted || skipStartupAutoConnect) { return; } diff --git a/cockatrice/src/interface/window_main.h b/cockatrice/src/interface/window_main.h index 48d093a38..9e342e4b0 100644 --- a/cockatrice/src/interface/window_main.h +++ b/cockatrice/src/interface/window_main.h @@ -48,7 +48,6 @@ class QAction; class QToolButton; class QWidget; -class pqTestUtility; struct LocalGameOptions; inline Q_LOGGING_CATEGORY(WindowMainLog, "window_main"); @@ -105,11 +104,6 @@ private slots: void actUpdate(); void actViewLog(); void actOpenSettingsFolder(); -#ifdef WITH_GUI_TEST - void actRecord(); - void actPlayRecording(); -#endif - void actShow(); void showWindowIfHidden(); void onUrlChainFinished(bool connected); @@ -191,9 +185,6 @@ private: *aReloadCardDatabase; QAction *aTips, *aUpdate, *aCheckCardUpdates, *aCheckCardUpdatesBackground, *aFirstRunWizard, *aStatusBar, *aViewLog, *aOpenSettingsFolder; -#ifdef WITH_GUI_TEST - QAction *aRecord, *aPlayRecording; -#endif TabSupervisor *tabSupervisor; IntentUrlParser *urlParser; @@ -217,7 +208,6 @@ private: bool skipStartupAutoConnect = false; bool startupAutoConnectAttempted = false; bool firstRunWizardActive = false; - bool noConnect = false; ///< --no-connect: skip every startup connection QProcess *cardUpdateProcess; QByteArray cardUpdateOutputBuffer; QByteArray cardUpdateErrorOutput; ///< diagnostic output collected from the updater's stderr @@ -229,9 +219,6 @@ private: GameReplay *replay; DlgTipOfTheDay *tip; QUrl connectTo; -#ifdef WITH_GUI_TEST - pqTestUtility *testUtility; -#endif public: explicit MainWindow(QWidget *parent = nullptr); @@ -239,16 +226,6 @@ public: { connectTo = QUrl(QString("cockatrice://%1").arg(url)); } - /** - * @brief Suppresses every startup connection: --connect, auto-connect and the - * configured startup destination. Used by the GUI test harness so a - * playback run never dials out. - */ - void setNoConnect(bool value) - { - noConnect = value; - } - // When set, the window's own startup connection (--connect or auto-connect // on first activation) is skipped. Used for activation launches: the intent // chain triggered by a cockatrice:// URL owns the connection, and letting @@ -289,13 +266,6 @@ public: */ void requestInstallerClose(); -#ifdef WITH_GUI_TEST - pqTestUtility *getTestUtility() const - { - return testUtility; - } -#endif - protected: void closeEvent(QCloseEvent *event) override; void changeEvent(QEvent *event) override; diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp index b4dc0610f..829a8ac42 100644 --- a/cockatrice/src/main.cpp +++ b/cockatrice/src/main.cpp @@ -39,10 +39,6 @@ #include "single_instance_manager.h" #include "version_string.h" -#ifdef WITH_GUI_TEST -#include "pqTestUtility.h" -#endif - #include #include #include @@ -66,12 +62,10 @@ #include #include #include -#include #include #include #include #include -#include #include #include #include @@ -349,16 +343,9 @@ int main(int argc, char *argv[]) parser.addOptions( {{{"c", "connect"}, QCoreApplication::translate("main", "Connect on startup"), "user:pass@host:port"}, {{"d", "debug-output"}, QCoreApplication::translate("main", "Debug to file")}, - {"simulate-crash", QCoreApplication::translate( - "main", "Show the crash-report dialog (saves a mock file when no DSN is configured)")}, - {"no-connect", QCoreApplication::translate("main", "Do not connect to any server on startup")} -#ifdef WITH_GUI_TEST - , - {{"t", "test"}, - QCoreApplication::translate("main", "Play back a QtTesting XML test file and exit"), - "test-file.xml"} -#endif - }); + {"simulate-crash", + QCoreApplication::translate("main", + "Show the crash-report dialog (saves a mock file when no DSN is configured)")}}); parser.process(app); @@ -496,9 +483,6 @@ int main(int argc, char *argv[]) if (parser.isSet("connect")) { ui.setConnectTo(parser.value("connect")); } - if (parser.isSet("no-connect")) { - ui.setNoConnect(true); - } qCInfo(MainLog) << "MainWindow constructor finished"; ui.setWindowIcon(themePixmap(QStringLiteral("cockatrice"))); @@ -539,27 +523,6 @@ int main(int argc, char *argv[]) handleActivation(file); } -#ifdef WITH_GUI_TEST - if (parser.isSet("test")) { - QString testFile = parser.value("test"); - qCInfo(MainLog) << "Playing test file:" << testFile; - QTimer::singleShot(0, &ui, [&ui, testFile]() { - bool success = ui.getTestUtility()->playTests(testFile); - qCInfo(MainLog) << "Test playback" << (success ? "succeeded" : "FAILED"); - qApp->exit(success ? 0 : 1); - - // An event that fails while a modal dialog is open aborts the dispatcher, - // but the dialog's nested event loop can then keep the application alive - // forever. Hard-exit after a grace period so a red test always terminates. - auto *watchdog = QThread::create([success] { - QThread::sleep(10); - ::_Exit(success ? 0 : 1); - }); - watchdog->start(); - }); - } -#endif - // Connect to future file/URL events from other instances QObject::connect(&instance, &SingleInstanceManager::filesReceived, [&handleActivation](const QStringList &files) { for (const QString &file : files) { diff --git a/doc/doxygen/pages/user_documentation/deck_management/editing_decks.md b/doc/doxygen/pages/user_documentation/deck_management/editing_decks.md index 04833282d..37b613461 100644 --- a/doc/doxygen/pages/user_documentation/deck_management/editing_decks.md +++ b/doc/doxygen/pages/user_documentation/deck_management/editing_decks.md @@ -1,7 +1,6 @@ @page editing_decks Editing Decks -- @subpage editing_decks_classic -- @subpage editing_decks_visual + - @subpage editing_decks_classic + - @subpage editing_decks_visual -- @subpage visual_database_display -- @subpage editing_decks_printings + - @subpage editing_decks_printings diff --git a/doc/doxygen/pages/user_documentation/deck_management/importing_decks.md b/doc/doxygen/pages/user_documentation/deck_management/importing_decks.md index fbfb8fe3c..4aab7ad2c 100644 --- a/doc/doxygen/pages/user_documentation/deck_management/importing_decks.md +++ b/doc/doxygen/pages/user_documentation/deck_management/importing_decks.md @@ -70,4 +70,4 @@ confirm. The action will automatically import the deck from the online service without any other required user action. -Currently supported services are Archidekt, Deckstats, ManaBox, Moxfield, and TappedOut. +Currently supported services are Archidekt, Deckstats, Moxfield, and TappedOut. \ No newline at end of file diff --git a/doc/doxygen/pages/user_documentation/deck_management/visual_database_display.md b/doc/doxygen/pages/user_documentation/deck_management/visual_database_display.md deleted file mode 100644 index 097848ab8..000000000 --- a/doc/doxygen/pages/user_documentation/deck_management/visual_database_display.md +++ /dev/null @@ -1,25 +0,0 @@ -@page visual_database_display Visual Database Display - -# Purpose - -The VisualDatabaseDisplay presents all the cards from the enabled sets in the CardDatabase, providing a visual way to find and add cards to your DeckList. - -# Using the Visual Database Display - -The VisualDatabaseDisplay can be opened by itself using the Tabs section in the menu bar at the top of the screen, or by selecting the "Visual Database Display" tab in the visual deck editor. When opened as a part of the visual deck editor, the VisualDatabaseDisplay can be used to add and remove cards from your deck. See @ref editing_decks_visual for more information about modifying your deck. - -By default the cards are displayed as a grid of pictures. However, a table view using card names can be toggled by pressing the Visual/Table button at the top right of the widget. - -# Filtering cards - -The top section of the VisualDatabaseDisplay can be used to filter cards based on various card properties, as well as specifying in which way they should be sorted. Filters can be saved and reused at a later time by using the Save/Load button at the right of this panel. - -# Modifying the Deck list - -When the VisualDatabaseDisplay is opened as part of the visual deck editor, clicking on cards adds or removes them to and from your deck. - -In the picture view, left-clicking on a card will add that card to the main board of your deck, while right-clicking will remove that printing of the card from the main board, if it exists. When clicking cards, modifier keys can be used to add (or remove) the card to zones other than the main board. Holding a Ctrl key on Windows and Linux or a Command key on MacOS adds/removes cards to the sideboard, while the Shift keys add/remove cards to the maybeboard. - -In the table view, double-clicking on a card adds that card to the main board of your deck, while right-click opens the card menu. Holding the Ctrl key on Windows and Linux or the Command key on MacOS when double-clicking adds the card to the sideboard instead. - -Tokens are always added to the token zone, regardless of which view is open or which modifier key is pressed. diff --git a/external/qttesting b/external/qttesting deleted file mode 160000 index c7bb5d372..000000000 --- a/external/qttesting +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c7bb5d372133e94c75cbdc70b04e039b864ea379 diff --git a/format.sh b/format.sh index fba76e93a..b4c78543b 100755 --- a/format.sh +++ b/format.sh @@ -33,7 +33,6 @@ cmakefile="CMakeLists.txt" cmakedir="cmake/.*\\.cmake" cmakeinclude=("cmake/gtest-CMakeLists.txt.in") scripts="*.sh" -scriptsrx="[^/]*\\.sh$" color="--" verbosity=0 sep="----------" @@ -255,7 +254,7 @@ if [[ $branch ]]; then if [[ $do_shell ]]; then shell_names=() for name in "${basenames[@]}"; do - filerx="(^|/)$scriptsrx" + filerx="(^|/)$scripts$" if [[ $name =~ $filerx ]]; then shell_names+=("$name") fi diff --git a/libcockatrice_card/CMakeLists.txt b/libcockatrice_card/CMakeLists.txt index d2e6ee83a..b3583522c 100644 --- a/libcockatrice_card/CMakeLists.txt +++ b/libcockatrice_card/CMakeLists.txt @@ -1,3 +1,7 @@ +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + set(HEADERS libcockatrice/card/card_info.h libcockatrice/card/card_info_comparator.h @@ -17,9 +21,11 @@ set(HEADERS libcockatrice/card/relation/card_relation.h ) +qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) + add_library( libcockatrice_card STATIC - ${HEADERS} + ${MOC_SOURCES} libcockatrice/card/card_info.cpp libcockatrice/card/card_info_comparator.cpp libcockatrice/card/card_localization.cpp diff --git a/libcockatrice_card/libcockatrice/card/card_info.cpp b/libcockatrice_card/libcockatrice/card/card_info.cpp index 36f0cdeb8..388c9ab57 100644 --- a/libcockatrice_card/libcockatrice/card/card_info.cpp +++ b/libcockatrice_card/libcockatrice/card/card_info.cpp @@ -6,7 +6,6 @@ #include "relation/card_relation.h" #include "set/card_set.h" -#include #include #include #include @@ -20,18 +19,6 @@ const QHash &CardInfo::getPropertiesHash() const return properties.getProperties(); } -void CardInfo::notifyChanged() -{ - const CardInfoPtr self = sharedFromThis(); - Q_ASSERT_X(self, "CardInfo::notifyChanged", "every CardInfo is owned by a QSharedPointer"); - if (!self) { - qCWarning(CardInfoLog) << "notifyChanged() on an unowned CardInfo" << name << "- observers stay stale"; - return; - } - - emit cardInfoChanged(self); -} - void CardInfo::setProperty(const QString &_name, const QString &_value) { bool changed = properties.insert(_name, _value); @@ -39,7 +26,7 @@ void CardInfo::setProperty(const QString &_name, const QString &_value) return; } - notifyChanged(); + emit cardInfoChanged(smartThis); } CardInfo::CardInfo(const QString &_name, @@ -110,6 +97,7 @@ CardInfoPtr CardInfo::newInstance(const QString &_name, { CardInfoPtr ptr(new CardInfo(_name, _text, _isToken, _properties, _relatedCards, _reverseRelatedCards, _sets, _uiAttributes, std::move(_localizedNames), std::move(_localizedTexts))); + ptr->setSmartPointer(ptr); for (const auto &printings : _sets) { for (const PrintingInfo &printing : printings) { @@ -138,6 +126,7 @@ CardInfoPtr CardInfo::newInstance(const QString &_name, CardInfoPtr ptr(new CardInfo(_name, _text, _isToken, std::move(_propertiesBlob), _relatedCards, _reverseRelatedCards, _sets, _uiAttributes, std::move(_simpleName), std::move(_altNames), std::move(_localizedNames), std::move(_localizedTexts))); + ptr->setSmartPointer(ptr); if (_appendToSets) { for (const auto &printings : _sets) { @@ -180,15 +169,8 @@ bool CardInfo::isLegalInFormat(const QString &format) const void CardInfo::addToSet(const CardSetPtr &_set, const PrintingInfo &_info) { - const CardInfoPtr self = sharedFromThis(); - Q_ASSERT_X(self, "CardInfo::addToSet", "every CardInfo is owned by a QSharedPointer"); - if (!self) { - qCWarning(CardInfoLog) << "addToSet() on an unowned CardInfo" << name << "- the set will not list it"; - return; - } - - if (!_set->contains(self)) { - _set->append(self); + if (!_set->contains(smartThis)) { + _set->append(smartThis); } if (!setsToPrintings[_set->getShortName()].contains(_info)) { setsToPrintings[_set->getShortName()].append(_info); @@ -206,7 +188,7 @@ void CardInfo::combineLegalities(const QHash &props) properties.insert(it.key(), it.value()); } } - notifyChanged(); + emit cardInfoChanged(smartThis); } void CardInfo::refreshCachedSets() @@ -316,10 +298,6 @@ void CardInfo::setColors(const QString &value) { setProperty(Mtg::Colors, value); } -QString CardInfo::getColorIdentity() const -{ - return getProperty(Mtg::ColorIdentity); -} QString CardInfo::getLoyalty() const { return getProperty(Mtg::Loyalty); diff --git a/libcockatrice_card/libcockatrice/card/card_info.h b/libcockatrice_card/libcockatrice/card/card_info.h index 075b5b264..eb1250a1c 100644 --- a/libcockatrice_card/libcockatrice/card/card_info.h +++ b/libcockatrice_card/libcockatrice/card/card_info.h @@ -7,7 +7,6 @@ #include #include -#include #include #include #include @@ -51,7 +50,7 @@ Q_DECLARE_METATYPE(CardInfoPtr) * Each CardInfo may belong to multiple sets through its printings, and can * be related to other cards through defined relationships. */ -class CardInfo : public QObject, public QEnableSharedFromThis +class CardInfo : public QObject { Q_OBJECT @@ -75,10 +74,11 @@ private: * @anchor PrivateCardProperties */ ///@{ - QString name; ///< Full name of the card. - QString simpleName; ///< Simplified name for fuzzy matching. - QString text; ///< Text description or rules text of the card. - bool isToken; ///< Whether this card is a token or not. + CardInfoPtr smartThis; ///< Smart pointer to self for safe cross-references. + QString name; ///< Full name of the card. + QString simpleName; ///< Simplified name for fuzzy matching. + QString text; ///< Text description or rules text of the card. + bool isToken; ///< Whether this card is a token or not. QMap localizedNames; ///< Localized card names, keyed by language code. QMap localizedTexts; ///< Localized rules text, keyed by language code. @@ -162,14 +162,13 @@ public: * @param other Another CardInfo to copy. */ CardInfo(const CardInfo &other) - : QObject(other.parent()), QEnableSharedFromThis(), name(other.name), simpleName(other.simpleName), - text(other.text), isToken(other.isToken), localizedNames(other.localizedNames), - localizedTexts(other.localizedTexts), properties(other.properties), relatedCards(other.relatedCards), + : QObject(other.parent()), name(other.name), simpleName(other.simpleName), text(other.text), + isToken(other.isToken), localizedNames(other.localizedNames), localizedTexts(other.localizedTexts), + properties(other.properties), relatedCards(other.relatedCards), reverseRelatedCards(other.reverseRelatedCards), reverseRelatedCardsToMe(other.reverseRelatedCardsToMe), setsToPrintings(other.setsToPrintings), uiAttributes(other.uiAttributes), setsNames(other.setsNames), altNames(other.altNames) { - // The copy deliberately starts unowned: the QSharedPointer that wraps it registers the self reference. } /** @@ -253,13 +252,27 @@ public: /** * @brief Clones the current CardInfo instance. * - * Uses the copy constructor; the copy is managed by its own shared pointer. + * Uses the copy constructor and ensures the smart pointer is properly set. * * @return Shared pointer to the cloned CardInfo. */ [[nodiscard]] CardInfoPtr clone() const { - return CardInfoPtr(new CardInfo(*this)); + auto newCardInfo = CardInfoPtr(new CardInfo(*this)); + newCardInfo->setSmartPointer(newCardInfo); // Set the smart pointer for the new instance + return newCardInfo; + } + + /** + * @brief Sets the internal smart pointer to self. + * + * Used internally to allow safe cross-references among CardInfo and CardSet. + * + * @param _ptr Shared pointer pointing to this instance. + */ + void setSmartPointer(CardInfoPtr _ptr) + { + smartThis = std::move(_ptr); } /** @name Basic Properties Accessors */ //@{ @@ -282,7 +295,7 @@ public: void setText(const QString &_text) { text = _text; - notifyChanged(); + emit cardInfoChanged(smartThis); } /** @@ -345,7 +358,7 @@ public: return; } localizedNames.insert(lang, _localizedName); - notifyChanged(); + emit cardInfoChanged(smartThis); } /** @@ -360,7 +373,7 @@ public: return; } localizedTexts.insert(lang, _localizedText); - notifyChanged(); + emit cardInfoChanged(smartThis); } /** @@ -469,7 +482,6 @@ public: [[nodiscard]] QString getCmc() const; [[nodiscard]] QString getColors() const; void setColors(const QString &value); - [[nodiscard]] QString getColorIdentity() const; [[nodiscard]] QString getLoyalty() const; [[nodiscard]] QString getMainCardType() const; [[nodiscard]] QString getManaCost() const; @@ -540,14 +552,6 @@ public: static QString simplifyName(const QString &name); private: - /** - * @brief Emits cardInfoChanged() with a strong reference to this card. - * - * A CardInfo is always owned by a QSharedPointer, so the self reference is always available; a released - * build that somehow finds it missing warns rather than emitting a null card. - */ - void notifyChanged(); - /** * @brief Refreshes the cached, human-readable list of set names. * diff --git a/libcockatrice_card/libcockatrice/card/database/card_database.cpp b/libcockatrice_card/libcockatrice/card/database/card_database.cpp index ed097ef3b..946412606 100644 --- a/libcockatrice_card/libcockatrice/card/database/card_database.cpp +++ b/libcockatrice_card/libcockatrice/card/database/card_database.cpp @@ -53,26 +53,13 @@ CardDatabase::~CardDatabase() clear(); } -void CardDatabase::detachSetMembership() -{ - for (const auto &set : sets) { - if (set) { - set->clear(); - } - } -} - void CardDatabase::clear() { QMutexLocker locker(clearDatabaseMutex); - // The sets hold strong card references, so empty them before dropping the cards: this breaks the - // CardInfo <-> CardSet cycle and spares the per-card detach over the whole database. - detachSetMembership(); - for (const auto &card : cards.values()) { if (card) { - unindexCard(card); + removeCard(card); } } @@ -169,23 +156,6 @@ void CardDatabase::removeCard(const CardInfoPtr &card) return; } - // The set holds a strong reference back to the card, so detach it: leaving it there keeps both - // objects alive after the database drops the card. newInstance() appends through the first - // printing of every set, so detaching through that same printing mirrors the append. - for (const auto &printings : card->getSets()) { - if (printings.isEmpty()) { - continue; - } - if (const CardSetPtr set = printings.first().getSet()) { - set->removeAll(card); - } - } - - unindexCard(card); -} - -void CardDatabase::unindexCard(const CardInfoPtr &card) -{ for (auto *cardRelation : card->getRelatedCards()) { cardRelation->deleteLater(); } @@ -310,10 +280,6 @@ void CardDatabase::swapInDatabaseData(CardDatabaseData data) card->clearDirectRelations(); } - // Break the CardSet <-> CardInfo cycle before replacing the containers, otherwise the previous - // snapshot survives the reload through the sets' strong card lists. - detachSetMembership(); - cards = std::move(data.cards); simpleNameCards = std::move(data.simpleNameCards); sets = std::move(data.sets); diff --git a/libcockatrice_card/libcockatrice/card/database/card_database.h b/libcockatrice_card/libcockatrice/card/database/card_database.h index 5c1cb43c1..9f0d67b67 100644 --- a/libcockatrice_card/libcockatrice/card/database/card_database.h +++ b/libcockatrice_card/libcockatrice/card/database/card_database.h @@ -74,23 +74,6 @@ private: */ void refreshCachedReverseRelatedCards(CardNameMap &cardMap); - /** - * @brief Empties every set, dropping the strong card references they hold. - * - * A card keeps a CardSetPtr through its printings while its set keeps a strong CardInfoPtr, so the - * two form a reference cycle. Dropping a whole snapshot has to break that cycle once, up front, - * instead of relying on the per-card detach in removeCard(). - */ - void detachSetMembership(); - - /** - * @brief Drops a card from the database indexes and notifies observers. - * - * Callers are responsible for detaching the card from its sets first. - * @param card Pointer to the card to unindex. - */ - void unindexCard(const CardInfoPtr &card); - /** @brief Mutexes for thread safety. */ QBasicMutex *clearDatabaseMutex = new QBasicMutex(), *addCardMutex = new QBasicMutex(), *removeCardMutex = new QBasicMutex(); diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp b/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp index 7ca5ba433..00b21f88e 100644 --- a/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp +++ b/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp @@ -83,7 +83,7 @@ LoadStatus CardDatabaseLoader::loadCardDatabase(const QString &path, CardDatabas auto startTime = QTime::currentTime(); LoadStatus tempLoadStatus = NotLoaded; if (!path.isEmpty()) { - QMutexLocker locker(&loadFromFileMutex); + QMutexLocker locker(loadFromFileMutex); tempLoadStatus = loadFromFile(path, data); } @@ -102,7 +102,7 @@ LoadStatus CardDatabaseLoader::loadCardDatabases(bool ignoreCache) LoadStatus CardDatabaseLoader::doLoadCardDatabases(bool ignoreCache) { - QMutexLocker locker(&reloadDatabaseMutex); + QMutexLocker locker(reloadDatabaseMutex); if (!database) { qCWarning(CardDatabaseLoadingLog) << "Loader has no database pointer"; diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_loader.h b/libcockatrice_card/libcockatrice/card/database/card_database_loader.h index 72aeeff3e..bfbaa0f51 100644 --- a/libcockatrice_card/libcockatrice/card/database/card_database_loader.h +++ b/libcockatrice_card/libcockatrice/card/database/card_database_loader.h @@ -177,8 +177,8 @@ private: ICardSetPriorityController *priorityController; /**< Controller for reconstructing set state. */ QList availableParsers; /**< List of available parsers for different formats. */ - QBasicMutex loadFromFileMutex; /**< Mutex for single-file loading. */ - QBasicMutex reloadDatabaseMutex; /**< Mutex for reloading entire database. */ + QBasicMutex *loadFromFileMutex = new QBasicMutex(); /**< Mutex for single-file loading. */ + QBasicMutex *reloadDatabaseMutex = new QBasicMutex(); /**< Mutex for reloading entire database. */ }; #endif // COCKATRICE_CARD_DATABASE_LOADER_H diff --git a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp index 8d5735db7..d40c1c063 100644 --- a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp +++ b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include @@ -500,7 +499,7 @@ bool CockatriceXml3Parser::saveToFile(FormatRulesNameMap _formats, { Q_UNUSED(_formats); - QSaveFile file(fileName); + QFile file(fileName); if (!file.open(QIODevice::WriteOnly)) { return false; } @@ -540,5 +539,5 @@ bool CockatriceXml3Parser::saveToFile(FormatRulesNameMap _formats, xml.writeEndElement(); // cockatrice_carddatabase xml.writeEndDocument(); - return !xml.hasError() && file.commit(); + return true; } diff --git a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp index 3965b80f0..3ee1e808e 100644 --- a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp +++ b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include @@ -683,7 +682,7 @@ bool CockatriceXml4Parser::saveToFile(FormatRulesNameMap _formats, const QString &sourceUrl, const QString &sourceVersion) { - QSaveFile file(fileName); + QFile file(fileName); if (!file.open(QIODevice::WriteOnly)) { return false; } @@ -731,5 +730,5 @@ bool CockatriceXml4Parser::saveToFile(FormatRulesNameMap _formats, xml.writeEndElement(); // cockatrice_carddatabase xml.writeEndDocument(); - return !xml.hasError() && file.commit(); + return true; } diff --git a/libcockatrice_card/libcockatrice/card/set/card_set.cpp b/libcockatrice_card/libcockatrice/card/set/card_set.cpp index a0f0f4578..e2b41a811 100644 --- a/libcockatrice_card/libcockatrice/card/set/card_set.cpp +++ b/libcockatrice_card/libcockatrice/card/set/card_set.cpp @@ -27,6 +27,7 @@ CardSetPtr CardSet::newInstance(ICardSetPriorityController *_priorityController, const Priority _priority) { CardSetPtr ptr(new CardSet(_priorityController, _shortName, _longName, _setType, _releaseDate, _priority)); + // ptr->setSmartPointer(ptr); return ptr; } diff --git a/libcockatrice_deck_list/CMakeLists.txt b/libcockatrice_deck_list/CMakeLists.txt index 3e7d522c2..e61a5702c 100644 --- a/libcockatrice_deck_list/CMakeLists.txt +++ b/libcockatrice_deck_list/CMakeLists.txt @@ -1,32 +1,34 @@ +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + set(HEADERS libcockatrice/deck_list/tree/abstract_deck_list_card_node.h libcockatrice/deck_list/tree/abstract_deck_list_node.h libcockatrice/deck_list/tree/deck_list_card_node.h libcockatrice/deck_list/tree/inner_deck_list_node.h - libcockatrice/deck_list/deck_file_format.h libcockatrice/deck_list/deck_list.h libcockatrice/deck_list/deck_list_history_manager.h libcockatrice/deck_list/deck_list_node_tree.h libcockatrice/deck_list/deck_list_memento.h libcockatrice/deck_list/deck_list_plain_text_parser.h - libcockatrice/deck_list/loaded_deck.h libcockatrice/deck_list/playmat_resolver.h libcockatrice/deck_list/sideboard_plan.h ) +qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) + add_library( libcockatrice_deck_list STATIC - ${HEADERS} + ${MOC_SOURCES} libcockatrice/deck_list/tree/abstract_deck_list_card_node.cpp libcockatrice/deck_list/tree/abstract_deck_list_node.cpp libcockatrice/deck_list/tree/deck_list_card_node.cpp libcockatrice/deck_list/tree/inner_deck_list_node.cpp - libcockatrice/deck_list/deck_file_format.cpp libcockatrice/deck_list/deck_list.cpp libcockatrice/deck_list/deck_list_history_manager.cpp libcockatrice/deck_list/deck_list_node_tree.cpp libcockatrice/deck_list/deck_list_plain_text_parser.cpp - libcockatrice/deck_list/loaded_deck.cpp libcockatrice/deck_list/playmat_resolver.cpp libcockatrice/deck_list/sideboard_plan.cpp ) diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp index b357b5801..821b53dff 100644 --- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp +++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp @@ -340,17 +340,7 @@ bool DeckList::saveToStream_Plain(QTextStream &stream, bool prefixSideboardCards } }; - // Export the main deck first without changing the saved tree's zone order. - forEachCard([&](const auto node, const auto card) { - if (node->getName() == DECK_ZONE_MAIN) { - writeToStream(node, card); - } - }); - forEachCard([&](const auto node, const auto card) { - if (node->getName() != DECK_ZONE_MAIN) { - writeToStream(node, card); - } - }); + forEachCard(writeToStream); return true; } @@ -433,23 +423,8 @@ DecklistCardNode *DeckList::addCard(const QString &cardName, const QString &cardProviderId, bool formatLegal) { - return addCards(cardName, 1, zoneName, position, cardSetName, cardSetCollectorNumber, cardProviderId, formatLegal); -} - -DecklistCardNode *DeckList::addCards(const QString &cardName, - int amount, - const QString &zoneName, - int position, - const QString &cardSetName, - const QString &cardSetCollectorNumber, - const QString &cardProviderId, - bool formatLegal) -{ - if (amount <= 0) { - return nullptr; - } - auto node = tree.addCard(cardName, amount, zoneName, position, cardSetName, cardSetCollectorNumber, cardProviderId, - formatLegal); + auto node = + tree.addCard(cardName, 1, zoneName, position, cardSetName, cardSetCollectorNumber, cardProviderId, formatLegal); refreshDeckHash(); return node; } diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h index 9d0f20586..6796e9c33 100644 --- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h +++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h @@ -284,14 +284,6 @@ public: const QString &cardSetCollectorNumber = QString(), const QString &cardProviderId = QString(), const bool formatLegal = true); - DecklistCardNode *addCards(const QString &cardName, - int amount, - const QString &zoneName, - int position = -1, - const QString &cardSetName = QString(), - const QString &cardSetCollectorNumber = QString(), - const QString &cardProviderId = QString(), - const bool formatLegal = true); ///@} /** @name Deck identity */ diff --git a/libcockatrice_filters/CMakeLists.txt b/libcockatrice_filters/CMakeLists.txt index 1b4303fc9..2d45b8e5b 100644 --- a/libcockatrice_filters/CMakeLists.txt +++ b/libcockatrice_filters/CMakeLists.txt @@ -1,9 +1,15 @@ -set(HEADERS libcockatrice/filters/filter_card.h libcockatrice/filters/filter_mode.h - libcockatrice/filters/filter_string.h libcockatrice/filters/filter_tree.h +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + +set(HEADERS libcockatrice/filters/filter_card.h libcockatrice/filters/filter_string.h + libcockatrice/filters/filter_tree.h ) +qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) + add_library( - libcockatrice_filters STATIC ${HEADERS} libcockatrice/filters/filter_card.cpp libcockatrice/filters/filter_mode.cpp + libcockatrice_filters STATIC ${MOC_SOURCES} libcockatrice/filters/filter_card.cpp libcockatrice/filters/filter_string.cpp libcockatrice/filters/filter_tree.cpp ) diff --git a/libcockatrice_filters/libcockatrice/filters/filter_card.cpp b/libcockatrice_filters/libcockatrice/filters/filter_card.cpp index 8af39c098..26cddd53c 100644 --- a/libcockatrice_filters/libcockatrice/filters/filter_card.cpp +++ b/libcockatrice_filters/libcockatrice/filters/filter_card.cpp @@ -69,8 +69,6 @@ const QString CardFilter::attrName(Attr a) return tr("Type"); case AttrColor: return tr("Color"); - case AttrColorIdentity: - return tr("Color Identity"); case AttrText: return tr("Text"); case AttrSet: diff --git a/libcockatrice_filters/libcockatrice/filters/filter_card.h b/libcockatrice_filters/libcockatrice/filters/filter_card.h index bc613fc9c..e6a37ee40 100644 --- a/libcockatrice_filters/libcockatrice/filters/filter_card.h +++ b/libcockatrice_filters/libcockatrice/filters/filter_card.h @@ -32,7 +32,6 @@ public: { AttrCmc = 0, AttrColor, - AttrColorIdentity, AttrLoyalty, AttrManaCost, AttrName, @@ -55,7 +54,7 @@ private: enum Attr a; public: - CardFilter(const QString &term, Type type, Attr attr) : trm(term), t(type), a(attr) + CardFilter(QString &term, Type type, Attr attr) : trm(term), t(type), a(attr) { } diff --git a/libcockatrice_filters/libcockatrice/filters/filter_mode.cpp b/libcockatrice_filters/libcockatrice/filters/filter_mode.cpp deleted file mode 100644 index 356ccf608..000000000 --- a/libcockatrice_filters/libcockatrice/filters/filter_mode.cpp +++ /dev/null @@ -1,77 +0,0 @@ -/** - * @file filter_mode.cpp - * @ingroup Filters - */ - -#include "libcockatrice/filters/filter_mode.h" - -#include - -FilterModeInfo getFilterModeInfo(FilterMode filterMode) -{ - switch (filterMode) { - case FilterMode::Includes: - return {CardFilter::Type::TypeOr, CardFilter::Type::TypeEnd, CardFilter::Attr::AttrColor}; - case FilterMode::Excludes: - return {CardFilter::Type::TypeAndNot, CardFilter::Type::TypeEnd, CardFilter::Attr::AttrColor}; - case FilterMode::IncludeExclude: - return {CardFilter::Type::TypeOr, CardFilter::Type::TypeAndNot, CardFilter::Attr::AttrColor}; - case FilterMode::ExactMatch: - return {CardFilter::Type::TypeAnd, CardFilter::Type::TypeAndNot, CardFilter::Attr::AttrColor}; - case FilterMode::ColorIdentity: - return {CardFilter::Type::TypeEnd, CardFilter::Type::TypeAndNot, CardFilter::Attr::AttrColorIdentity}; - case FilterMode::Custom: - case FilterMode::End: - break; - } - return {CardFilter::Type::TypeEnd, CardFilter::Type::TypeEnd, CardFilter::Attr::AttrEnd}; -} - -FilterMode deriveFilterMode(const QList &filters, FilterMode currentMode) -{ - constexpr int modeCount = static_cast(FilterMode::End); - bool modeImpossible[modeCount] = {}; - const QString colors = "WUBRG"; - - for (int i = 0; i < modeCount; ++i) { - const FilterModeInfo modeInfo = getFilterModeInfo(static_cast(i)); - - // Remove the modes that cannot create one of the filters. - for (const CardFilter *filter : filters) { - if (filter->attr() != modeInfo.attr || - (filter->type() != modeInfo.includeType && filter->type() != modeInfo.excludeType)) { - modeImpossible[i] = true; - break; - } - } - - // Modes that have both an include and an exclude filter should always have a filter for each color. - if (modeInfo.includeType != CardFilter::Type::TypeEnd && modeInfo.excludeType != CardFilter::Type::TypeEnd && - !modeImpossible[i]) { - for (const QChar &color : colors) { - int count = 0; - for (const CardFilter *filter : filters) { - count += filter->term() == color; - } - if (count != 1) { - modeImpossible[i] = true; - break; - } - } - } - } - - // Keep the current mode if it can produce the filters, so that a live mode is never swapped for another. - // Switching to and from the custom mode is always possible. - if (!modeImpossible[static_cast(currentMode)] && currentMode != FilterMode::Custom) { - return currentMode; - } - - for (int i = 0; i < modeCount; ++i) { - if (!modeImpossible[i] || i == static_cast(FilterMode::Custom)) { - return static_cast(i); - } - } - - return FilterMode::Custom; -} diff --git a/libcockatrice_filters/libcockatrice/filters/filter_mode.h b/libcockatrice_filters/libcockatrice/filters/filter_mode.h deleted file mode 100644 index f7662d662..000000000 --- a/libcockatrice_filters/libcockatrice/filters/filter_mode.h +++ /dev/null @@ -1,62 +0,0 @@ -/** - * @file filter_mode.h - * @ingroup Filters - */ - -#ifndef LIBCOCKATRICE_FILTERS_FILTER_MODE_H -#define LIBCOCKATRICE_FILTERS_FILTER_MODE_H - -#include "libcockatrice/filters/filter_card.h" - -#include -#include -#include - -/** - * @brief The way selected and unselected colors are combined into card filters. - */ -enum class FilterMode -{ - Includes = 0, // Include selected colors (OR condition). - Excludes, // Exclude selected colors (AND NOT). - IncludeExclude, // Include selected colors (OR) and exclude unselected colors (AND NOT). - ExactMatch, // Only selected colors are included, all others are excluded. - ColorIdentity, // Keep cards whose color identity is a subset of the selected colors (stored as AND NOT for each - // unselected color). - Custom, // The color filters do not match any of the above modes. Not included in the combo box. - End -}; - -Q_DECLARE_METATYPE(FilterMode) - -/** - * @brief The filters a single color contributes in a given mode. - */ -struct FilterModeInfo -{ - // When a color symbol is enabled, add filters of this type. Skipped if equal to CardFilter::Type::TypeEnd. - CardFilter::Type includeType; - - // When a color symbol is disabled, add filters of this type. Skipped if equal to CardFilter::Type::TypeEnd. - CardFilter::Type excludeType; - - // The attribute to filter for when adding the filters. - CardFilter::Attr attr; -}; - -/** @brief Return the filters the given mode contributes for one color. */ -FilterModeInfo getFilterModeInfo(FilterMode filterMode); - -/** - * @brief Determine the mode that produced the given color filters. - * - * Returns @p currentMode unchanged when that mode can still produce @p filters, so that a live mode is never - * replaced by an equally valid one. Otherwise returns the first mode that can produce them, falling back to - * FilterMode::Custom when none can. - * - * @param filters The filters on CardFilter::Attr::AttrColor and CardFilter::Attr::AttrColorIdentity. - * @param currentMode The mode currently selected in the UI. - */ -FilterMode deriveFilterMode(const QList &filters, FilterMode currentMode); - -#endif // LIBCOCKATRICE_FILTERS_FILTER_MODE_H diff --git a/libcockatrice_filters/libcockatrice/filters/filter_string.cpp b/libcockatrice_filters/libcockatrice/filters/filter_string.cpp index 1bcb1646b..081ada824 100644 --- a/libcockatrice_filters/libcockatrice/filters/filter_string.cpp +++ b/libcockatrice_filters/libcockatrice/filters/filter_string.cpp @@ -409,7 +409,7 @@ static void setupParserRules() const bool identity = sv.tokens[0].empty() || sv.tokens[0][0] != 'i'; if (sv.tokens[1][0] == ':') { return [=](const CardData &x) { - const QString match = identity ? x->getColors() : x->getColorIdentity(); + const QString match = identity ? x->getColors() : x->getProperty("coloridentity"); if (parts.contains("m") && match.length() < 2) { return false; } @@ -427,7 +427,7 @@ static void setupParserRules() } return [=](const CardData &x) { - const QString match = identity ? x->getColors() : x->getColorIdentity(); + const QString match = identity ? x->getColors() : x->getProperty("colorIdentity"); if (parts.contains("m") && match.length() < 2) { return false; } diff --git a/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp b/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp index 817c7298d..f12f87181 100644 --- a/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp +++ b/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp @@ -176,24 +176,23 @@ FilterItem::FilterItem(QString trm, FilterItemList *parent) : p(parent), term(st lowercaseTerm = term.toLower(); switch (attr()) { - case CardFilter::AttrColor: - case CardFilter::AttrColorIdentity: { - QString converted = term.trimmed().toLower(); + case CardFilter::AttrColor: { + QString converted = term.trimmed(); - converted.replace("green", "g"); - converted.replace("grn", "g"); - converted.replace("blue", "u"); - converted.replace("blu", "u"); - converted.replace("black", "b"); - converted.replace("blk", "b"); - converted.replace("red", "r"); - converted.replace("white", "w"); - converted.replace("wht", "w"); - converted.replace("colorless", "c"); - converted.replace("colourless", "c"); - converted.replace("none", "c"); + converted.replace("green", "g", Qt::CaseInsensitive); + converted.replace("grn", "g", Qt::CaseInsensitive); + converted.replace("blue", "u", Qt::CaseInsensitive); + converted.replace("blu", "u", Qt::CaseInsensitive); + converted.replace("black", "b", Qt::CaseInsensitive); + converted.replace("blk", "b", Qt::CaseInsensitive); + converted.replace("red", "r", Qt::CaseInsensitive); + converted.replace("white", "w", Qt::CaseInsensitive); + converted.replace("wht", "w", Qt::CaseInsensitive); + converted.replace("colorless", "c", Qt::CaseInsensitive); + converted.replace("colourless", "c", Qt::CaseInsensitive); + converted.replace("none", "c", Qt::CaseInsensitive); - converted.replace(QString(" "), QString("")); + converted.replace(QString(" "), QString(""), Qt::CaseInsensitive); convertedColorTerm = converted; break; @@ -359,17 +358,12 @@ bool FilterItem::acceptSubType(const CardInfoPtr &info) const return subType.contains(term, Qt::CaseInsensitive); } -/** - * @brief Return true when every letter of the given term appears in the given colors string. - * If the term is equal to "c", then only return true if the color string is empty. - * - * @param term The letters which should be included, or "c" - * @param colors The string to check for letters in - */ -static bool matchesColor(const QString &term, const QString &colors) +bool FilterItem::acceptColor(const CardInfoPtr &info) const { + const QString colors = info->getColors(); + // Colorless card filter - if (term == "c" && colors.length() < 1) { + if (convertedColorTerm.toLower() == "c" && colors.length() < 1) { return true; } @@ -378,23 +372,13 @@ static bool matchesColor(const QString &term, const QString &colors) * then we should match all of them to the card's colors */ int match_count = 0; - for (const QChar &color : term) { + for (const QChar &color : convertedColorTerm) { if (colors.contains(color, Qt::CaseInsensitive)) { match_count++; } } - return match_count == term.length(); -} - -bool FilterItem::acceptColor(const CardInfoPtr &info) const -{ - return matchesColor(convertedColorTerm, info->getColors()); -} - -bool FilterItem::acceptColorIdentity(const CardInfoPtr &info) const -{ - return matchesColor(convertedColorTerm, info->getColorIdentity()); + return match_count == convertedColorTerm.length(); } bool FilterItem::acceptText(const CardInfoPtr &info, const CardSearchLanguage &searchLanguage) const @@ -556,8 +540,6 @@ bool FilterItem::acceptCardAttr(const CardInfoPtr &info, return acceptType(info); case CardFilter::AttrColor: return acceptColor(info); - case CardFilter::AttrColorIdentity: - return acceptColorIdentity(info); case CardFilter::AttrText: return acceptText(info, searchLanguage); case CardFilter::AttrSet: diff --git a/libcockatrice_filters/libcockatrice/filters/filter_tree.h b/libcockatrice_filters/libcockatrice/filters/filter_tree.h index f1a5803e5..85a57304d 100644 --- a/libcockatrice_filters/libcockatrice/filters/filter_tree.h +++ b/libcockatrice_filters/libcockatrice/filters/filter_tree.h @@ -244,7 +244,6 @@ public: [[nodiscard]] bool acceptMainType(const CardInfoPtr &info) const; [[nodiscard]] bool acceptSubType(const CardInfoPtr &info) const; [[nodiscard]] bool acceptColor(const CardInfoPtr &info) const; - [[nodiscard]] bool acceptColorIdentity(const CardInfoPtr &info) const; [[nodiscard]] bool acceptText(const CardInfoPtr &info, const CardSearchLanguage &searchLanguage) const; [[nodiscard]] bool acceptSet(const CardInfoPtr &info) const; [[nodiscard]] bool acceptManaCost(const CardInfoPtr &info) const; diff --git a/libcockatrice_game/CMakeLists.txt b/libcockatrice_game/CMakeLists.txt deleted file mode 100644 index ce68c5ea6..000000000 --- a/libcockatrice_game/CMakeLists.txt +++ /dev/null @@ -1,77 +0,0 @@ -set(HEADERS - libcockatrice/game/abstract_game.h - libcockatrice/game/board/arrow_data.h - libcockatrice/game/board/card_list.h - libcockatrice/game/board/card_state.h - libcockatrice/game/board/counter_state.h - libcockatrice/game/game.h - libcockatrice/game/game_event_handler.h - libcockatrice/game/game_meta_info.h - libcockatrice/game/game_state.h - libcockatrice/game/phase.h - libcockatrice/game/player/card_menu_action_type.h - libcockatrice/game/player/card_move_request.h - libcockatrice/game/player/event_processing_options.h - libcockatrice/game/player/move_top_cards_until_options.h - libcockatrice/game/player/player_actions.h - libcockatrice/game/player/player_event_handler.h - libcockatrice/game/player/player_info.h - libcockatrice/game/player/player_logic.h - libcockatrice/game/player/player_manager.h - libcockatrice/game/player/token_info.h - libcockatrice/game/replay.h - libcockatrice/game/translation.h - libcockatrice/game/zones/card_zone_algorithms.h - libcockatrice/game/zones/card_zone_logic.h - libcockatrice/game/zones/hand_zone_logic.h - libcockatrice/game/zones/pile_zone_logic.h - libcockatrice/game/zones/stack_zone_logic.h - libcockatrice/game/zones/table_zone_logic.h - libcockatrice/game/zones/view_zone_logic.h -) - -qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) - -add_library( - libcockatrice_game STATIC - ${MOC_SOURCES} - libcockatrice/game/abstract_game.cpp - libcockatrice/game/board/arrow_data.cpp - libcockatrice/game/board/card_list.cpp - libcockatrice/game/board/card_state.cpp - libcockatrice/game/board/counter_state.cpp - libcockatrice/game/game.cpp - libcockatrice/game/game_event_handler.cpp - libcockatrice/game/game_meta_info.cpp - libcockatrice/game/game_state.cpp - libcockatrice/game/phase.cpp - libcockatrice/game/player/player_actions.cpp - libcockatrice/game/player/player_event_handler.cpp - libcockatrice/game/player/player_info.cpp - libcockatrice/game/player/player_logic.cpp - libcockatrice/game/player/player_manager.cpp - libcockatrice/game/replay.cpp - libcockatrice/game/zones/card_zone_logic.cpp - libcockatrice/game/zones/hand_zone_logic.cpp - libcockatrice/game/zones/pile_zone_logic.cpp - libcockatrice/game/zones/stack_zone_logic.cpp - libcockatrice/game/zones/table_zone_logic.cpp - libcockatrice/game/zones/view_zone_logic.cpp -) - -target_include_directories(libcockatrice_game PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) - -target_link_libraries( - libcockatrice_game - PUBLIC libcockatrice_card - libcockatrice_deck_list - libcockatrice_filters - libcockatrice_interfaces - libcockatrice_network - libcockatrice_protocol - libcockatrice_settings - libcockatrice_utility - ${QT_CORE_MODULE} - ${COCKATRICE_QT_VERSION_NAME}::Concurrent - ${COCKATRICE_QT_VERSION_NAME}::Gui -) diff --git a/libcockatrice_game/libcockatrice/game/board/card_state.cpp b/libcockatrice_game/libcockatrice/game/board/card_state.cpp deleted file mode 100644 index 7e8c079a4..000000000 --- a/libcockatrice_game/libcockatrice/game/board/card_state.cpp +++ /dev/null @@ -1,240 +0,0 @@ -#include "card_state.h" - -#include "../zones/card_zone_logic.h" - -#include -#include -#include -#include - -void CardState::resetState(bool keepAnnotations) -{ - attacking = false; - counters.clear(); - pt.clear(); - if (!keepAnnotations) { - annotation.clear(); - } - attachedTo = nullptr; - attachedCards.clear(); - setTapped(false, false); - setDoesntUntap(false); - emit stateReset(); -} - -void CardState::setColor(const QString &_color) -{ - color = _color; - emit colorChanged(); -} - -void CardState::deleteView() -{ - emit viewDeleteRequested(); -} - -void CardState::setCardRef(const CardRef &_cardRef) -{ - if (cardRef == _cardRef) { - return; - } - - const CardRef oldCardRef = cardRef; - if (exactCard) { - disconnect(exactCard.getCardPtr().data(), nullptr, this, nullptr); - } - cardRef = _cardRef; - - emit cardRefChanged(oldCardRef, cardRef); - refreshCardInfo(); -} - -void CardState::refreshCardInfo() -{ - exactCard = CardDatabaseManager::query()->getCard(cardRef); - - if (!exactCard && !cardRef.name.isEmpty()) { - CardInfo::UiAttributes attributes = {.tableRow = -1}; - auto info = CardInfo::newInstance(cardRef.name, "", true, {}, {}, {}, {}, attributes); - exactCard = ExactCard(info); - } - if (exactCard) { - connect(exactCard.getCardPtr().data(), &CardInfo::pixmapUpdated, this, &CardState::cardPixmapUpdated); - } - - emit cardInfoChanged(); -} - -void CardState::setTapped(bool _tapped, bool canAnimate) -{ - if (tapped == _tapped) { - return; - } - - tapped = _tapped; - emit tappedChanged(tapped, canAnimate); - emit stateChanged(); -} - -void CardState::setFaceDown(bool _facedown) -{ - facedown = _facedown; - emit facedownChanged(facedown); - emit stateChanged(); -} - -QVariantList CardState::parsePT(const QString &pt) -{ - QVariantList ptList = QVariantList(); - if (!pt.isEmpty()) { - int sep = pt.indexOf('/'); - if (sep == 0) { - ptList.append(QVariant(pt.mid(1))); // cut off starting '/' and take full string - } else { - int start = 0; - for (;;) { - QString item = pt.mid(start, sep - start); - if (item.isEmpty()) { - ptList.append(QVariant(QString())); - } else if (item[0] == '+') { - ptList.append(QVariant(item.mid(1).toInt())); // add as int - } else if (item[0] == '-') { - ptList.append(QVariant(item.toInt())); // add as int - } else { - ptList.append(QVariant(item)); // add as qstring - } - if (sep == -1) { - break; - } - start = sep + 1; - sep = pt.indexOf('/', start); - } - } - } - return ptList; -} - -void CardState::setZone(CardZoneLogic *_zone) -{ - if (zone == _zone) { - return; - } - - zone = _zone; - emit zoneChanged(this, zone); - emit stateChanged(); -} - -void CardState::setAttacking(bool _attacking) -{ - if (attacking == _attacking) { - return; - } - attacking = _attacking; - emit attackingChanged(_attacking); - emit stateChanged(); -} - -void CardState::insertCounter(int id, int value) -{ - counters.insert(id, value); - - emit countersChanged(counters); - emit stateChanged(); -} - -void CardState::setCounter(int id, int value) -{ - if (value) { - counters[id] = value; - } else { - counters.remove(id); - } - - emit countersChanged(counters); - emit stateChanged(); -} - -void CardState::clearCounters() -{ - counters.clear(); - emit countersChanged(counters); - emit stateChanged(); -} - -void CardState::setAnnotation(const QString &_annotation) -{ - if (annotation == _annotation) { - return; - } - annotation = _annotation; - emit annotationChanged(annotation); - emit stateChanged(); -} - -void CardState::setPT(const QString &_pt) -{ - if (pt == _pt) { - return; - } - pt = _pt; - emit ptChanged(pt); - emit stateChanged(); -} - -void CardState::setDoesntUntap(bool _doesntUntap) -{ - if (doesntUntap == _doesntUntap) { - return; - } - doesntUntap = _doesntUntap; - emit doesntUntapChanged(_doesntUntap); - emit stateChanged(); -} - -void CardState::setDestroyOnZoneChange(bool _destroyOnZoneChange) -{ - if (destroyOnZoneChange == _destroyOnZoneChange) { - return; - } - - destroyOnZoneChange = _destroyOnZoneChange; - emit destroyOnZoneChangeChanged(_destroyOnZoneChange); - emit stateChanged(); -} - -void CardState::setAttachedTo(CardState *_attachedTo) -{ - if (attachedTo == _attachedTo) { - return; - } - - if (attachedTo != nullptr) { - attachedTo->removeAttachedCard(this); - } - - setGridPoint(QPoint(-1, getGridPoint().y())); - attachedTo = _attachedTo; - emit attachedToChanged(_attachedTo); - emit stateChanged(); - - if (attachedTo != nullptr) { - // If the zone is being torn down, it might already be null by the time a card tries to un-attach all its - // attached cards. The graphics item that owns this state handles the teardown in that case. - CardZoneLogic *parentZone = attachedTo->getZone(); - if (parentZone == nullptr) { - return; - } - emit parentZone->cardAdded(this); - attachedTo->addAttachedCard(this); - if (getZone() != parentZone) { - parentZone->reorganizeCards(); - } - } else if (getZone() != nullptr) { - emit getZone() -> cardAdded(this); - } - - if (getZone() != nullptr) { - getZone()->reorganizeCards(); - } -} diff --git a/libcockatrice_game/libcockatrice/game/board/card_state.h b/libcockatrice_game/libcockatrice/game/board/card_state.h deleted file mode 100644 index fa1e81393..000000000 --- a/libcockatrice_game/libcockatrice/game/board/card_state.h +++ /dev/null @@ -1,243 +0,0 @@ -#ifndef COCKATRICE_CARD_STATE_H -#define COCKATRICE_CARD_STATE_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -class CardZoneLogic; -class CardState : public QObject -{ - Q_OBJECT - -private: - int id = -1; - CardRef cardRef; - ExactCard exactCard; - bool tapped = false; - bool facedown = false; - QPoint gridPoint; - - bool attacking = false; - QMap counters; - QString annotation; - QString pt; - bool doesntUntap = false; - bool destroyOnZoneChange = false; - QString color; - - CardState *attachedTo = nullptr; - QList attachedCards; - CardZoneLogic *zone = nullptr; - -signals: - void stateChanged(); - - void cardRefChanged(const CardRef &oldCardRef, const CardRef &newCardRef); - void cardInfoChanged(); - void cardPixmapUpdated(); - void tappedChanged(bool newTapped, bool canAnimate); - void facedownChanged(bool newFaceDown); - void stateReset(); - void colorChanged(); - - void attackingChanged(bool newValue); - void countersChanged(const QMap &newCounters); - void annotationChanged(const QString &newAnnotation); - void ptChanged(const QString &newPt); - void doesntUntapChanged(bool newValue); - void destroyOnZoneChangeChanged(bool newValue); - void attachedToChanged(CardState *newAttachedTo); - void zoneChanged(CardState *changedCard, CardZoneLogic *newZone); - - void viewDeleteRequested(); - -public: - explicit CardState(QObject *parent, CardZoneLogic *_zone = nullptr, const CardRef &_cardRef = {}, int _id = -1) - : QObject(parent), id(_id), cardRef(_cardRef), zone(_zone) - { - } - - void resetState(bool keepAnnotations); - - /** - * @brief Asks the card view owning this state to tear itself down. - * - * The state never holds a card item directly, so it cannot delete one. It asks instead and lets the view run - * its own teardown, which detaches attachments, drops it from the active card slot and unregisters its - * animations before the graphics object goes away. - */ - void deleteView(); - - int getId() const - { - return id; - } - - void setId(int _id) - { - id = _id; - } - - const CardRef &getCardRef() const - { - return cardRef; - } - - void setCardRef(const CardRef &_cardRef); - - QString getName() const - { - return cardRef.name; - } - - QString getProviderId() const - { - return cardRef.providerId; - } - - ExactCard getCard() const - { - return exactCard; - } - - const CardInfo &getCardInfo() const - { - return exactCard.getInfo(); - } - - void refreshCardInfo(); - - bool getTapped() const - { - return tapped; - } - - void setTapped(bool _tapped, bool canAnimate = false); - - bool getFaceDown() const - { - return facedown; - } - - void setFaceDown(bool _facedown); - - const QPoint &getGridPoint() const - { - return gridPoint; - } - - void setGridPoint(const QPoint &_gridPoint) - { - gridPoint = _gridPoint; - } - - CardZoneLogic *getZone() const - { - return zone; - } - - void setZone(CardZoneLogic *_zone); - - bool getAttacking() const - { - return attacking; - } - void setAttacking(bool _attacking); - - const QMap &getCounters() const - { - return counters; - } - - void insertCounter(int id, int value); - - void setCounter(int id, int value); - - void clearCounters(); - - QString getAnnotation() const - { - return annotation; - } - - void setAnnotation(const QString &_annotation); - - QString getPT() const - { - return pt; - } - - void setPT(const QString &_pt); - - /** - * @brief Parses a string representing a p/t in order to extract the values from it. - * - * If the string contains '/', the string will be split at the '/' and each side will be parsed separately, - * which means the result list will have two elements. - * - * If '/' is not found, then the entire string is parsed together, which means the result list will - * have a single element. - * - * If either side of the split is empty, there will also only be a single element in the result list. - * - * This function will attempt to parse each substring as an int first, handling plus and minus prefixes. - * If successful, it will put the parsed value into the QVariant as an int. - * If failed, it will just put the substring into the QVariant as a QString. - * - * @param pt The p/t string - * @return A QVariantList that can contain one or two elements, where each QVariant can be either int or QString - */ - static QVariantList parsePT(const QString &pt); - - [[nodiscard]] QString getColor() const - { - return color; - } - - void setColor(const QString &_color); - - bool getDoesntUntap() const - { - return doesntUntap; - } - - void setDoesntUntap(bool _doesntUntap); - - bool getDestroyOnZoneChange() const - { - return destroyOnZoneChange; - } - - void setDestroyOnZoneChange(bool _destroyOnZoneChange); - - CardState *getAttachedTo() const - { - return attachedTo; - } - - void setAttachedTo(CardState *_attachedTo); - - void addAttachedCard(CardState *card) - { - attachedCards.append(card); - } - - void removeAttachedCard(CardState *card) - { - attachedCards.removeOne(card); - } - - const QList &getAttachedCards() const - { - return attachedCards; - } -}; - -#endif // COCKATRICE_CARD_STATE_H diff --git a/libcockatrice_game/libcockatrice/game/player/card_move_request.h b/libcockatrice_game/libcockatrice/game/player/card_move_request.h deleted file mode 100644 index bed46ab60..000000000 --- a/libcockatrice_game/libcockatrice/game/player/card_move_request.h +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file card_move_request.h - * @ingroup GameLogicActions - */ -//! \todo Document this file. - -#ifndef COCKATRICE_CARD_MOVE_REQUEST_H -#define COCKATRICE_CARD_MOVE_REQUEST_H - -#include - -/** - * @brief Describes one card a view wants moved, in logic terms rather than wire terms. - */ -struct CardMoveRequest -{ - int cardId = -1; - bool faceDown = false; - QString pt = {}; -}; - -#endif // COCKATRICE_CARD_MOVE_REQUEST_H diff --git a/libcockatrice_game/libcockatrice/game/player/move_top_cards_until_options.h b/libcockatrice_game/libcockatrice/game/player/move_top_cards_until_options.h deleted file mode 100644 index da8028b0f..000000000 --- a/libcockatrice_game/libcockatrice/game/player/move_top_cards_until_options.h +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @file move_top_cards_until_options.h - * @ingroup GameLogicPlayers - */ -//! \todo Document this file. - -#ifndef COCKATRICE_MOVE_TOP_CARDS_UNTIL_OPTIONS_H -#define COCKATRICE_MOVE_TOP_CARDS_UNTIL_OPTIONS_H - -#include - -struct MoveTopCardsUntilOptions -{ - QStringList exprs = {}; - int numberOfHits = 1; - bool autoPlay = false; -}; - -#endif // COCKATRICE_MOVE_TOP_CARDS_UNTIL_OPTIONS_H diff --git a/libcockatrice_game/libcockatrice/game/player/token_info.h b/libcockatrice_game/libcockatrice/game/player/token_info.h deleted file mode 100644 index 99869f33e..000000000 --- a/libcockatrice_game/libcockatrice/game/player/token_info.h +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @file token_info.h - * @ingroup GameLogicPlayers - */ -//! \todo Document this file. - -#ifndef COCKATRICE_TOKEN_INFO_H -#define COCKATRICE_TOKEN_INFO_H - -#include - -struct TokenInfo -{ - QString name; - QString color; - QString pt; - QString annotation; - bool destroy = true; - bool faceDown = false; - QString providerId; -}; - -#endif // COCKATRICE_TOKEN_INFO_H diff --git a/libcockatrice_game/libcockatrice/game/replay.h b/libcockatrice_game/libcockatrice/game/replay.h deleted file mode 100644 index f8f82a70d..000000000 --- a/libcockatrice_game/libcockatrice/game/replay.h +++ /dev/null @@ -1,32 +0,0 @@ -/** - * @file replay.h - * @ingroup GameLogic - * @ingroup Replay - */ -//! \todo Document this file. - -#ifndef COCKATRICE_REPLAY_H -#define COCKATRICE_REPLAY_H - -#include "abstract_game.h" - -#include - -class GameReplay; -class QObject; -class ICardPreferenceProvider; -class IInterfaceSettingsProvider; - -class Replay : public AbstractGame -{ - Q_OBJECT - -public: - explicit Replay(QObject *_parent, - const GameReplay *_replay, - bool isLocalGame, - IInterfaceSettingsProvider *interfaceSettings = nullptr, - ICardPreferenceProvider *cardPreferences = nullptr); -}; - -#endif // COCKATRICE_REPLAY_H diff --git a/libcockatrice_interfaces/CMakeLists.txt b/libcockatrice_interfaces/CMakeLists.txt index 69ed13b0e..3b17569b1 100644 --- a/libcockatrice_interfaces/CMakeLists.txt +++ b/libcockatrice_interfaces/CMakeLists.txt @@ -1,3 +1,7 @@ +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + set(HEADERS libcockatrice/interfaces/interface_cache_storage_settings_provider.h libcockatrice/interfaces/interface_card_database_path_provider.h @@ -20,7 +24,9 @@ set(HEADERS libcockatrice/interfaces/noop_card_set_priority_controller.h ) -add_library(libcockatrice_interfaces STATIC ${HEADERS}) +qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) + +add_library(libcockatrice_interfaces STATIC ${MOC_SOURCES}) target_include_directories(libcockatrice_interfaces PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/interface_game_settings_provider.h b/libcockatrice_interfaces/libcockatrice/interfaces/interface_game_settings_provider.h index 00763d031..2b1ddf8ec 100644 --- a/libcockatrice_interfaces/libcockatrice/interfaces/interface_game_settings_provider.h +++ b/libcockatrice_interfaces/libcockatrice/interfaces/interface_game_settings_provider.h @@ -20,7 +20,6 @@ public: [[nodiscard]] virtual bool getCreateGameAsSpectator() const = 0; [[nodiscard]] virtual int getDefaultStartingLifeTotal() const = 0; [[nodiscard]] virtual bool getShareDecklistsOnLoad() const = 0; - [[nodiscard]] virtual bool getShufflePlayers() const = 0; [[nodiscard]] virtual bool getRememberGameSettings() const = 0; [[nodiscard]] virtual bool getLocalGameRememberSettings() const = 0; [[nodiscard]] virtual int getLocalGameMaxPlayers() const = 0; diff --git a/libcockatrice_models/CMakeLists.txt b/libcockatrice_models/CMakeLists.txt index 5186eff13..7af35b2d5 100644 --- a/libcockatrice_models/CMakeLists.txt +++ b/libcockatrice_models/CMakeLists.txt @@ -1,3 +1,7 @@ +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + add_subdirectory(libcockatrice/models/database) add_subdirectory(libcockatrice/models/deck_list) diff --git a/libcockatrice_models/libcockatrice/models/database/CMakeLists.txt b/libcockatrice_models/libcockatrice/models/database/CMakeLists.txt index 22a04cd32..a73e36dbb 100644 --- a/libcockatrice_models/libcockatrice/models/database/CMakeLists.txt +++ b/libcockatrice_models/libcockatrice/models/database/CMakeLists.txt @@ -1,7 +1,10 @@ +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + set(HEADERS card_database_model.h card_database_display_model.h - card_database_visual_display_model.h card/card_completer_proxy_model.h card/card_search_model.h card_set/card_sets_model.h @@ -9,12 +12,13 @@ set(HEADERS token/token_edit_model.h ) +qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) + add_library( libcockatrice_models_database STATIC - ${HEADERS} + ${MOC_SOURCES} card_database_model.cpp card_database_display_model.cpp - card_database_visual_display_model.cpp card/card_completer_proxy_model.cpp card/card_search_model.cpp card_set/card_sets_model.cpp diff --git a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp b/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp index 9ec0afd9c..5573deb18 100644 --- a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp +++ b/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp @@ -21,7 +21,7 @@ class QObject; CardDatabaseDisplayModel::CardDatabaseDisplayModel(QObject *parent) - : QSortFilterProxyModel(parent), isToken(ShowAll), filterString(nullptr), cardModel(nullptr), + : QSortFilterProxyModel(parent), isToken(ShowAll), filterString(nullptr), collator(NaturalSort::makeNaturalSortCollator()) { filterTree = nullptr; @@ -33,37 +33,22 @@ CardDatabaseDisplayModel::CardDatabaseDisplayModel(QObject *parent) invalidate(); emit modelDirty(); }); + + loadedRowCount = 0; } void CardDatabaseDisplayModel::setSourceModel(QAbstractItemModel *model) { - cardModel = qobject_cast(model); QSortFilterProxyModel::setSourceModel(model); connect(model, &QAbstractItemModel::rowsInserted, this, [this]() { dirty(); }); connect(model, &QAbstractItemModel::rowsRemoved, this, [this]() { dirty(); }); - connect(model, &QAbstractItemModel::modelReset, this, [this]() { dirty(); }); -} - -QVariant CardDatabaseDisplayModel::data(const QModelIndex &index, int role) const -{ - if (role == CardInfoRole) { - return QVariant::fromValue(cardInfoAt(index)); - } - - return QSortFilterProxyModel::data(index, role); -} - -CardInfoPtr CardDatabaseDisplayModel::cardInfoAt(const QModelIndex &index) const -{ - if (!index.isValid() || cardModel == nullptr) { - return {}; - } - - const QModelIndex sourceIndex = mapToSource(index); - return sourceIndex.isValid() ? cardModel->getCard(sourceIndex.row()) : CardInfoPtr(); + connect(model, &QAbstractItemModel::modelReset, this, [this]() { + loadedRowCount = 0; + dirty(); + }); } QMap CardDatabaseDisplayModel::characterTranslation = {{L'“', L'\"'}, @@ -71,6 +56,32 @@ QMap CardDatabaseDisplayModel::characterTranslation = {{L'“' {L'‘', L'\''}, {L'’', L'\''}}; +bool CardDatabaseDisplayModel::canFetchMore(const QModelIndex &index) const +{ + return loadedRowCount < sourceModel()->rowCount(index); +} + +void CardDatabaseDisplayModel::fetchMore(const QModelIndex &index) +{ + int remainder = sourceModel()->rowCount(index) - loadedRowCount; + int itemsToFetch = qMin(100, remainder); + + if (itemsToFetch == 0) { + return; + } + + const auto startIndex = qMin(rowCount(QModelIndex()), loadedRowCount); + beginInsertRows(QModelIndex(), startIndex, startIndex + itemsToFetch - 1); + + loadedRowCount += itemsToFetch; + endInsertRows(); +} + +int CardDatabaseDisplayModel::rowCount(const QModelIndex &parent) const +{ + return QSortFilterProxyModel::rowCount(parent); +} + bool CardDatabaseDisplayModel::lessThan(const QModelIndex &left, const QModelIndex &right) const { const QString leftString = sourceModel()->data(left, CardDatabaseModel::SortRole).toString(); diff --git a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.h b/libcockatrice_models/libcockatrice/models/database/card_database_display_model.h index 3a9bbc6ab..343a7482e 100644 --- a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.h +++ b/libcockatrice_models/libcockatrice/models/database/card_database_display_model.h @@ -21,7 +21,6 @@ #include #include -class CardDatabaseModel; class FilterTree; class QObject; template class QMap; @@ -37,25 +36,13 @@ public: ShowAll }; - enum Role - { - /** - * @brief The CardInfoPtr behind a proxy row. - * - * Saves views from looking the card up again through its name, and keeps - * them from depending on the source model's column layout. - */ - CardInfoRole = Qt::UserRole + 1 - }; - private: FilterBool isToken; QString cardName, cardText; QSet cardNameSet, cardTypes, cardColors; FilterTree *filterTree; FilterString *filterString; - /// The source model, kept typed so CardInfoRole does not cast per row. - CardDatabaseModel *cardModel; + int loadedRowCount; QTimer dirtyTimer; CardSearchLanguage searchLanguage; QString searchText; @@ -98,16 +85,9 @@ public: dirtyTimer.start(20); } void clearFilterAll(); - [[nodiscard]] QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; - - /** - * @brief Returns the card behind a proxy row, without the QVariant wrapper of CardInfoRole. - * - * The visual grid calls this for every row on each rebuild; CardInfoRole stays the - * generic way in for consumers that only see the model through data(). - */ - [[nodiscard]] CardInfoPtr cardInfoAt(const QModelIndex &index) const; - + [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override; + [[nodiscard]] bool canFetchMore(const QModelIndex &parent) const override; + void fetchMore(const QModelIndex &parent) override; signals: void modelDirty(); diff --git a/libcockatrice_models/libcockatrice/models/database/card_database_model.cpp b/libcockatrice_models/libcockatrice/models/database/card_database_model.cpp index a83b7c83d..1ede554f8 100644 --- a/libcockatrice_models/libcockatrice/models/database/card_database_model.cpp +++ b/libcockatrice_models/libcockatrice/models/database/card_database_model.cpp @@ -27,18 +27,14 @@ CardDatabaseModel::CardDatabaseModel(CardDatabase *_db, bool _showOnlyCardsFromE CardDatabaseModel::~CardDatabaseModel() = default; -int CardDatabaseModel::rowCount(const QModelIndex &parent) const +int CardDatabaseModel::rowCount(const QModelIndex & /*parent*/) const { - // A list model's card rows are leaves; returning the full card count for a - // valid parent makes every row claim all cards as children. - return parent.isValid() ? 0 : cardList.size(); + return cardList.size(); } -int CardDatabaseModel::columnCount(const QModelIndex &parent) const +int CardDatabaseModel::columnCount(const QModelIndex & /*parent*/) const { - // Card rows are leaves, so a valid parent holds no columns. Reporting the - // row width for a card index would claim child cells that do not exist. - return parent.isValid() ? 0 : CARDDBMODEL_COLUMNS; + return CARDDBMODEL_COLUMNS; } QVariant CardDatabaseModel::data(const QModelIndex &index, int role) const diff --git a/libcockatrice_models/libcockatrice/models/database/card_database_visual_display_model.cpp b/libcockatrice_models/libcockatrice/models/database/card_database_visual_display_model.cpp deleted file mode 100644 index f6a3a925c..000000000 --- a/libcockatrice_models/libcockatrice/models/database/card_database_visual_display_model.cpp +++ /dev/null @@ -1,123 +0,0 @@ -#include "card_database_visual_display_model.h" - -#include "card_database_display_model.h" -#include "libcockatrice/card/database/card_database_querier.h" - -#include -#include -#include -#include - -/// Coalesces the bursts of proxy signals a filter, sort or database load produces. -static constexpr int REBUILD_COALESCE_MS = 30; - -CardDatabaseVisualDisplayModel::CardDatabaseVisualDisplayModel(CardDatabaseDisplayModel *_displayModel, - CardDatabaseQuerier *_querier, - QObject *parent) - : QAbstractListModel(parent), displayModel(_displayModel), querier(_querier) -{ - rebuildTimer.setSingleShot(true); - rebuildTimer.setInterval(REBUILD_COALESCE_MS); - connect(&rebuildTimer, &QTimer::timeout, this, &CardDatabaseVisualDisplayModel::rebuild); - - if (displayModel == nullptr) { - return; - } - - connect(displayModel, &QAbstractItemModel::modelReset, this, &CardDatabaseVisualDisplayModel::scheduleRebuild); - connect(displayModel, &QAbstractItemModel::layoutChanged, this, &CardDatabaseVisualDisplayModel::scheduleRebuild); - connect(displayModel, &QAbstractItemModel::rowsInserted, this, &CardDatabaseVisualDisplayModel::scheduleRebuild); - connect(displayModel, &QAbstractItemModel::rowsRemoved, this, &CardDatabaseVisualDisplayModel::scheduleRebuild); - connect(displayModel, &QAbstractItemModel::dataChanged, this, &CardDatabaseVisualDisplayModel::scheduleRebuild); -} - -void CardDatabaseVisualDisplayModel::setSetFilterTerms(const QStringList &terms) -{ - if (setFilterTerms == terms) { - return; - } - - setFilterTerms = terms; - refresh(); -} - -void CardDatabaseVisualDisplayModel::refresh() -{ - rebuildTimer.stop(); - rebuild(); -} - -void CardDatabaseVisualDisplayModel::scheduleRebuild() -{ - rebuildTimer.start(); -} - -void CardDatabaseVisualDisplayModel::rebuild() -{ - beginResetModel(); - entries.clear(); - - if (displayModel != nullptr) { - const int proxyRows = displayModel->rowCount(); - entries.reserve(proxyRows); - for (int row = 0; row < proxyRows; ++row) { - const CardInfoPtr info = displayModel->cardInfoAt(displayModel->index(row, 0)); - if (info) { - appendPrintingsFor(info); - } - } - } - - endResetModel(); -} - -void CardDatabaseVisualDisplayModel::appendPrintingsFor(const CardInfoPtr &info) -{ - if (setFilterTerms.isEmpty()) { - entries.append({info, PrintingInfo()}); - return; - } - - const auto &printingsBySet = info->getSets(); - for (const QString &term : setFilterTerms) { - const auto printings = printingsBySet.constFind(term); - if (printings == printingsBySet.constEnd()) { - continue; - } - for (const PrintingInfo &printing : printings.value()) { - entries.append({info, printing}); - } - } -} - -int CardDatabaseVisualDisplayModel::rowCount(const QModelIndex &parent) const -{ - return parent.isValid() ? 0 : static_cast(entries.size()); -} - -QVariant CardDatabaseVisualDisplayModel::data(const QModelIndex &index, int role) const -{ - if (!index.isValid() || index.row() >= entries.size()) { - return {}; - } - - if (role == Qt::DisplayRole || role == Qt::AccessibleTextRole) { - return cardAt(index.row()).getName(); - } - - return {}; -} - -ExactCard CardDatabaseVisualDisplayModel::cardAt(int row) const -{ - if (row < 0 || row >= entries.size()) { - return {}; - } - - const Entry &entry = entries.at(row); - if (entry.printing.isEmpty() && setFilterTerms.isEmpty()) { - return querier != nullptr ? querier->getPreferredCard(entry.info) : ExactCard(entry.info); - } - - return ExactCard(entry.info, entry.printing); -} diff --git a/libcockatrice_models/libcockatrice/models/database/card_database_visual_display_model.h b/libcockatrice_models/libcockatrice/models/database/card_database_visual_display_model.h deleted file mode 100644 index 1303b6464..000000000 --- a/libcockatrice_models/libcockatrice/models/database/card_database_visual_display_model.h +++ /dev/null @@ -1,90 +0,0 @@ -/** - * @file card_database_visual_display_model.h - * @ingroup CardDatabaseModels - * @brief A list model of the exact cards a visual card grid paints. - * - * The filtered and sorted CardDatabaseDisplayModel holds one row per card name. - * A visual grid shows one picture per *printing* instead, so this model flattens - * the proxy rows into ExactCards: the preferred printing per card normally, and - * every printing of the selected sets while set filters are active. - */ - -#ifndef COCKATRICE_CARD_DATABASE_VISUAL_DISPLAY_MODEL_H -#define COCKATRICE_CARD_DATABASE_VISUAL_DISPLAY_MODEL_H - -#include "libcockatrice/card/card_info.h" -#include "libcockatrice/card/printing/exact_card.h" -#include "libcockatrice/card/printing/printing_info.h" - -#include -#include -#include -#include -#include -#include -#include - -class CardDatabaseDisplayModel; -class CardDatabaseQuerier; - -class CardDatabaseVisualDisplayModel : public QAbstractListModel -{ - Q_OBJECT - -public: - /** - * @brief Flattens _displayModel into the cards a visual grid displays. - * @param _displayModel The filtered and sorted proxy model of the card database. - * @param _querier Resolves the preferred printing of a card. - * @param parent Parent object. - */ - explicit CardDatabaseVisualDisplayModel(CardDatabaseDisplayModel *_displayModel, - CardDatabaseQuerier *_querier, - QObject *parent = nullptr); - - /** - * @brief Sets the set shorthand names of the active set filters. - * - * With no terms every card is shown with its preferred printing. With terms - * every printing belonging to one of the named sets is shown instead, in term - * order. Rebuilds immediately when the terms change. - */ - void setSetFilterTerms(const QStringList &terms); - - /** - * @brief Rebuilds the row list from the proxy model right away. - * - * Proxy model changes normally rebuild on a short coalescing timer; call this - * when the caller needs the new rows before returning. - */ - void refresh(); - - [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override; - [[nodiscard]] QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; - - /** - * @brief Returns the card painted at @p row, with its preferred printing resolved. - * @param row Row in this model, not in the proxy model. - */ - [[nodiscard]] ExactCard cardAt(int row) const; - -private: - struct Entry - { - CardInfoPtr info; - /// Empty when the entry follows the preferred printing rather than a set filter. - PrintingInfo printing; - }; - - void scheduleRebuild(); - void rebuild(); - void appendPrintingsFor(const CardInfoPtr &info); - - QPointer displayModel; - CardDatabaseQuerier *querier; - QStringList setFilterTerms; - QList entries; - QTimer rebuildTimer; -}; - -#endif // COCKATRICE_CARD_DATABASE_VISUAL_DISPLAY_MODEL_H diff --git a/libcockatrice_models/libcockatrice/models/deck_list/CMakeLists.txt b/libcockatrice_models/libcockatrice/models/deck_list/CMakeLists.txt index ce5c4d54b..324bed102 100644 --- a/libcockatrice_models/libcockatrice/models/deck_list/CMakeLists.txt +++ b/libcockatrice_models/libcockatrice/models/deck_list/CMakeLists.txt @@ -1,7 +1,13 @@ +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + set(HEADERS deck_list_model.h deck_list_sort_filter_proxy_model.h) +qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) + add_library( - libcockatrice_models_deck_list STATIC ${HEADERS} deck_list_model.cpp deck_list_model_custom_zones.cpp + libcockatrice_models_deck_list STATIC ${MOC_SOURCES} deck_list_model.cpp deck_list_model_custom_zones.cpp deck_list_sort_filter_proxy_model.cpp ) diff --git a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp index f3c4545d7..4b4088972 100644 --- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp +++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp @@ -134,13 +134,6 @@ void DeckListModel::rebuildTree() int DeckListModel::rowCount(const QModelIndex &parent) const { - // Only column 0 carries children. Column 1 and later indexes are siblings - // used by views for the remaining cells of a row, and a model that hangs - // children off them breaks QAbstractItemModelTester and proxy models. - if (parent.isValid() && parent.column() != 0) { - return 0; - } - // debugIndexInfo("rowCount", parent); auto *node = getNode(parent); if (node) { @@ -289,7 +282,7 @@ QVariant DeckListModel::headerData(const int section, const Qt::Orientation orie QModelIndex DeckListModel::index(int row, int column, const QModelIndex &parent) const { // debugIndexInfo("index", parent); - if ((parent.isValid() && parent.column() != 0) || !hasIndex(row, column, parent)) { + if (!hasIndex(row, column, parent)) { return {}; } @@ -746,8 +739,7 @@ QModelIndex DeckListModel::nodeToIndex(AbstractDecklistNode *node) const void DeckListModel::sortShadowTree(InnerDecklistNode *node, Qt::SortOrder order) { // The mapping is not needed: fresh shadow nodes have no persistent indices yet. - (void)DeckListModelCustomZones::sortWithCustomZonesLast( - root, node, order, activeGroupCriteria == DeckListModelGroupCriteria::MANA_COST && lastKnownColumn != 0); + (void)DeckListModelCustomZones::sortWithCustomZonesLast(root, node, order); for (int i = node->size() - 1; i >= 0; --i) { if (auto *subNode = dynamic_cast(node->at(i))) { @@ -760,8 +752,7 @@ void DeckListModel::sortHelper(InnerDecklistNode *node, Qt::SortOrder order) { // Sort children (custom zones always sorted after groups within a board) and // use the movement mapping to update the list of persistent indices. - const auto mapping = DeckListModelCustomZones::sortWithCustomZonesLast( - root, node, order, activeGroupCriteria == DeckListModelGroupCriteria::MANA_COST && lastKnownColumn != 0); + const auto mapping = DeckListModelCustomZones::sortWithCustomZonesLast(root, node, order); QModelIndexList from, to; int columns = columnCount(); diff --git a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.cpp b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.cpp index 523708cbd..419c38b04 100644 --- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.cpp +++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.cpp @@ -8,8 +8,6 @@ #include #include #include -#include -#include #include namespace DeckListModelCustomZones @@ -113,7 +111,7 @@ QList> plainSort(InnerDecklistNode *node, Qt::SortOrder order) * * @return The (preSortRow, finalRow) mapping covering both the sort and the shift. */ -QList> boardSort(InnerDecklistNode *node, Qt::SortOrder order, bool numericGroups) +QList> boardSort(InnerDecklistNode *node, Qt::SortOrder order) { const QVector> sortResult = node->sort(order); @@ -134,27 +132,6 @@ QList> boardSort(InnerDecklistNode *node, Qt::SortOrder order, b } } - if (numericGroups) { - // Only criteria groups are numeric. Mixing numeric and lexical fallback - // comparisons with custom zone names would not define a strict ordering. - std::sort(groups.begin(), groups.end(), [order](const auto *left, const auto *right) { - const QString leftName = left->getName(); - const QString rightName = right->getName(); - bool leftIsNumber, rightIsNumber; - const double leftValue = leftName.toDouble(&leftIsNumber); - const double rightValue = rightName.toDouble(&rightIsNumber); - leftIsNumber = leftIsNumber && std::isfinite(leftValue); - rightIsNumber = rightIsNumber && std::isfinite(rightValue); - if (leftIsNumber != rightIsNumber) { - return leftIsNumber; - } - if (leftIsNumber && leftValue != rightValue) { - return order == Qt::AscendingOrder ? leftValue < rightValue : leftValue > rightValue; - } - return order == Qt::AscendingOrder ? leftName < rightName : leftName > rightName; - }); - } - QVector ordered = groups + customZones; for (int i = 0; i < ordered.size(); ++i) { node->replace(i, ordered[i]); @@ -170,11 +147,10 @@ QList> boardSort(InnerDecklistNode *node, Qt::SortOrder order, b } // namespace -QList> -sortWithCustomZonesLast(InnerDecklistNode *root, InnerDecklistNode *node, Qt::SortOrder order, bool numericGroups) +QList> sortWithCustomZonesLast(InnerDecklistNode *root, InnerDecklistNode *node, Qt::SortOrder order) { const bool isBoardZone = (node != root) && (node->getParent() == root); - return isBoardZone ? boardSort(node, order, numericGroups) : plainSort(node, order); + return isBoardZone ? boardSort(node, order) : plainSort(node, order); } } // namespace DeckListModelCustomZones diff --git a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.h b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.h index d3f477450..53bdeaa1e 100644 --- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.h +++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.h @@ -91,15 +91,10 @@ void mirrorCustomZones(const InnerDecklistNode *deckBoardZone, InnerDecklistNode * @param root Root of the shadow tree (used to classify board zones). * @param node The shadow node whose children are reordered. * @param order Sort order to apply. - * @param numericGroups Compare criteria-group names as mana values. Custom zone - * names and card names retain their normal comparison; nonnumeric groups follow - * numeric groups in either sort direction. * @return A list of (preSortRow, finalRow) pairs describing how each node moved. */ -[[nodiscard]] QList> sortWithCustomZonesLast(InnerDecklistNode *root, - InnerDecklistNode *node, - Qt::SortOrder order, - bool numericGroups = false); +[[nodiscard]] QList> +sortWithCustomZonesLast(InnerDecklistNode *root, InnerDecklistNode *node, Qt::SortOrder order); } // namespace DeckListModelCustomZones diff --git a/libcockatrice_network/CMakeLists.txt b/libcockatrice_network/CMakeLists.txt index 925e4d445..3069c0db4 100644 --- a/libcockatrice_network/CMakeLists.txt +++ b/libcockatrice_network/CMakeLists.txt @@ -1,3 +1,7 @@ +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + add_subdirectory(libcockatrice/network/client) add_subdirectory(libcockatrice/network/server) diff --git a/libcockatrice_network/libcockatrice/network/client/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/client/CMakeLists.txt index cf8d9fc4d..bcf62463c 100644 --- a/libcockatrice_network/libcockatrice/network/client/CMakeLists.txt +++ b/libcockatrice_network/libcockatrice/network/client/CMakeLists.txt @@ -1,3 +1,7 @@ +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + add_subdirectory(abstract) add_subdirectory(local) add_subdirectory(remote) diff --git a/libcockatrice_network/libcockatrice/network/client/abstract/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/client/abstract/CMakeLists.txt index 33812e0bf..53ad524b4 100644 --- a/libcockatrice_network/libcockatrice/network/client/abstract/CMakeLists.txt +++ b/libcockatrice_network/libcockatrice/network/client/abstract/CMakeLists.txt @@ -1,8 +1,14 @@ +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + set(HEADERS abstract_client.h latency_tracker.h) set(SOURCES abstract_client.cpp latency_tracker.cpp) -add_library(libcockatrice_network_client_abstract STATIC ${HEADERS} ${SOURCES}) +qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) + +add_library(libcockatrice_network_client_abstract STATIC ${MOC_SOURCES} ${SOURCES}) add_dependencies(libcockatrice_network_client_abstract libcockatrice_protocol libcockatrice_network_server_remote) @@ -11,7 +17,7 @@ target_include_directories(libcockatrice_network_client_abstract PUBLIC .) target_link_libraries( libcockatrice_network_client_abstract PUBLIC ${COCKATRICE_QT_VERSION_NAME}::Network ${COCKATRICE_QT_VERSION_NAME}::WebSockets libcockatrice_protocol - libcockatrice_network_server_remote libcockatrice_utility + libcockatrice_network_server_remote ) target_precompile_headers(libcockatrice_network_client_abstract PRIVATE "${CMAKE_SOURCE_DIR}/cmake/pch/qtcore_pch.h") diff --git a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp b/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp index 04e6beda0..0c523d776 100644 --- a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp +++ b/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp @@ -10,7 +10,6 @@ #include "libcockatrice/protocol/pb/serverinfo_user.pb.h" #include "libcockatrice/protocol/pb/session_commands.pb.h" #include "libcockatrice/protocol/pb/session_event.pb.h" -#include "libcockatrice/utility/passwordhasher.h" #include #include @@ -81,26 +80,6 @@ AbstractClient::~AbstractClient() { } -Command_AccountPassword AbstractClient::makeAccountPasswordCommand(const QString &oldPassword, - const QString &newPassword) const -{ - Command_AccountPassword cmd; - cmd.set_old_password(oldPassword.toStdString()); - if (getServerSupportsChallengeResponse()) { - // A verifier lets the server upgrade the stored credential without ever seeing the - // password, and it is what a challenge-response server expects for a new password. - cmd.set_hashed_new_password(PasswordHasher::generatePasswordVerifier(newPassword).toStdString()); - } else if (getServerSupportsPasswordHash()) { - // The server hashes the password itself with its own salt; a salted hash is the - // strongest form it accepts, so the plaintext never goes on the wire. - const QString passwordSalt = PasswordHasher::generateRandomSalt(); - cmd.set_hashed_new_password(PasswordHasher::computeHash(newPassword, passwordSalt).toStdString()); - } else { - cmd.set_new_password(newPassword.toStdString()); - } - return cmd; -} - void AbstractClient::processProtocolItem(const ServerMessage &item) { switch (item.message_type()) { diff --git a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h b/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h index 005587ccc..7efd67972 100644 --- a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h +++ b/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h @@ -47,7 +47,6 @@ class Event_UserJoined; class Event_UserLeft; class Event_ServerMessage; class Event_ListRooms; -class Command_AccountPassword; class Event_GameJoined; class Event_UserMessage; class Event_NotifyUser; @@ -68,9 +67,6 @@ enum ClientStatus StatusSubmitForgotPasswordReset, StatusSubmitForgotPasswordChallenge, StatusGettingPasswordSalt, - //! The server accepted the credentials but keeps the session open until the account - //! password is replaced; the connection must survive for `Command_AccountPassword`. - StatusPasswordChangeRequired, }; class AbstractClient : public QObject @@ -175,16 +171,6 @@ public: { return serverSupportsChallengeResponse; } - - /** - * @brief Builds the account-password command in the form this server understands. - * - * Challenge-response servers take a scrypt verifier; servers that only advertise - * SupportsPasswordHash take a salted SHA-512 hash; anything older gets the plaintext, - * which is the only form it understands. Both password-change paths go through here so - * the two cannot drift apart and hand a plaintext password to a server that can hash it. - */ - Command_AccountPassword makeAccountPasswordCommand(const QString &oldPassword, const QString &newPassword) const; const QString &getUserName() const { return userName; diff --git a/libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt index 3eff7943a..08c12b7f8 100644 --- a/libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt +++ b/libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt @@ -1,8 +1,14 @@ +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + set(HEADERS local_client.h) set(SOURCES local_client.cpp) -add_library(libcockatrice_network_client_local STATIC ${HEADERS} ${SOURCES}) +qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) + +add_library(libcockatrice_network_client_local STATIC ${MOC_SOURCES} ${SOURCES}) add_dependencies(libcockatrice_network_client_local libcockatrice_network_client_abstract) diff --git a/libcockatrice_network/libcockatrice/network/client/local/local_client.cpp b/libcockatrice_network/libcockatrice/network/client/local/local_client.cpp index b9a1566f8..f7d8645e8 100644 --- a/libcockatrice_network/libcockatrice/network/client/local/local_client.cpp +++ b/libcockatrice_network/libcockatrice/network/client/local/local_client.cpp @@ -33,18 +33,16 @@ LocalClient::LocalClient(LocalServerInterface *_lsi, sendCommand(prepareSessionCommand(joinCmd)); } +LocalClient::~LocalClient() +{ +} + void LocalClient::sendCommandContainer(const CommandContainer &cont) { if (LocalClientLog().isDebugEnabled()) { qCDebug(LocalClientLog).noquote() << userName << "OUT" << getSafeDebugString(cont); } - if (lsi.isNull()) { - qCWarning(LocalClientLog).noquote() - << userName << "dropping command, local server interface no longer exists:" << getSafeDebugString(cont); - return; - } - lsi->itemFromClient(cont); } diff --git a/libcockatrice_network/libcockatrice/network/client/local/local_client.h b/libcockatrice_network/libcockatrice/network/client/local/local_client.h index 15b36d3db..3ae570255 100644 --- a/libcockatrice_network/libcockatrice/network/client/local/local_client.h +++ b/libcockatrice_network/libcockatrice/network/client/local/local_client.h @@ -10,7 +10,6 @@ #include "../abstract/abstract_client.h" #include -#include #include #include @@ -25,15 +24,14 @@ class LocalClient : public AbstractClient { Q_OBJECT private: - // Guarded pointer: the LocalServer (and its interfaces) may be destroyed while this client - // still has pending commands queued on the event loop. - QPointer lsi; + LocalServerInterface *lsi; public: LocalClient(LocalServerInterface *_lsi, const QString &_playerName, const QString &_clientId, QObject *parent = nullptr); + ~LocalClient() override; void sendCommandContainer(const CommandContainer &cont) override; private slots: diff --git a/libcockatrice_network/libcockatrice/network/client/remote/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/client/remote/CMakeLists.txt index 006c18d42..c32ca0aa8 100644 --- a/libcockatrice_network/libcockatrice/network/client/remote/CMakeLists.txt +++ b/libcockatrice_network/libcockatrice/network/client/remote/CMakeLists.txt @@ -1,8 +1,14 @@ +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + set(HEADERS remote_client.h) set(SOURCES remote_client.cpp) -add_library(libcockatrice_network_client_remote STATIC ${HEADERS} ${SOURCES}) +qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) + +add_library(libcockatrice_network_client_remote STATIC ${MOC_SOURCES} ${SOURCES}) add_dependencies(libcockatrice_network_client_remote libcockatrice_network_client_abstract libcockatrice_protocol) diff --git a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp index 636c603c6..7eab58668 100644 --- a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp +++ b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp @@ -50,12 +50,11 @@ namespace // The server warns that this account still uses the legacy password hash while this client // holds a scrypt verifier. Sending the verifier would downgrade the proof, so the client // stops; the login only succeeds after the saved verifier is gone and the user types the -// password, which also upgrades the account. Unticking "Save password" drops the verifier -// for the next connection. +// password, which also upgrades the account. constexpr const char *const LOGIN_ABORT_AUTH_DOWNGRADE = QT_TRANSLATE_NOOP( "RemoteClient", "The server still uses an old password format for this account, so the saved login on this computer cannot be " - "used. Untick 'Save password' in the Connect window and log in with your password."); + "used. Untick 'Save password' in the Connect window and connect; when it opens again, type your password."); // The account is still on the legacy hash and only the plaintext password can produce it. constexpr const char *const LOGIN_ABORT_PASSWORD_REQUIRED = QT_TRANSLATE_NOOP("RemoteClient", @@ -126,7 +125,6 @@ RemoteClient::RemoteClient(QObject *parent, INetworkSettingsProvider *_networkSe &RemoteClient::doSubmitForgotPasswordResetToServer); connect(this, &RemoteClient::sigSubmitForgotPasswordChallengeToServer, this, &RemoteClient::doSubmitForgotPasswordChallengeToServer); - connect(this, &RemoteClient::sigChangePasswordToServer, this, &RemoteClient::doChangePasswordToServer); } RemoteClient::~RemoteClient() @@ -138,7 +136,6 @@ RemoteClient::~RemoteClient() void RemoteClient::slotSocketError(QAbstractSocket::SocketError /*error*/) { QString errorString = socket->errorString(); - qCWarning(RemoteClientLog) << "Server connection error:" << errorString; doDisconnectFromServer(); emit socketError(errorString); } @@ -148,7 +145,6 @@ void RemoteClient::slotWebSocketError(QAbstractSocket::SocketError /*error*/) QString errorString = websocket->errorString(); if (getStatus() != ClientStatus::StatusDisconnected) { - qCWarning(RemoteClientLog) << "Server connection error:" << errorString; doDisconnectFromServer(); emit socketError(errorString); } @@ -156,7 +152,6 @@ void RemoteClient::slotWebSocketError(QAbstractSocket::SocketError /*error*/) void RemoteClient::slotConnected() { - qCInfo(RemoteClientLog) << "Server transport connected"; timeRunning = lastDataReceived = 0; timer->start(); @@ -170,12 +165,6 @@ void RemoteClient::slotConnected() void RemoteClient::processServerIdentificationEvent(const Event_ServerIdentification &event) { - // Identification arrives before login, including when protocol versions differ. - // Quote the server-supplied strings in the log and limit their size. - const QString serverName = QString::fromStdString(event.server_name()).left(256); - const QString serverVersion = QString::fromStdString(event.server_version()).left(256); - qCInfo(RemoteClientLog) << "Server identification:" << serverName << "version" << serverVersion - << "protocol version" << event.protocol_version(); if (event.protocol_version() != protocolVersion) { emit protocolVersionMismatch(protocolVersion, event.protocol_version()); setStatus(StatusDisconnecting); @@ -365,29 +354,6 @@ void RemoteClient::submitPasswordVerifierResponse(const Response &response) } } -void RemoteClient::changePasswordToServer(const QString &oldPassword, const QString &newPassword) -{ - emit sigChangePasswordToServer(oldPassword, newPassword); -} - -void RemoteClient::doChangePasswordToServer(const QString &oldPassword, const QString &newPassword) -{ - const Command_AccountPassword cmd = makeAccountPasswordCommand(oldPassword, newPassword); - - PendingCommand *pend = prepareSessionCommand(cmd); - connect(pend, &PendingCommand::finished, this, &RemoteClient::accountPasswordResponse); - sendCommand(pend); -} - -void RemoteClient::accountPasswordResponse(const Response &response) -{ - if (response.response_code() == Response::RespOk) { - emit sigPasswordChangeSuccess(); - } else { - emit sigPasswordChangeError(response.response_code()); - } -} - void RemoteClient::processConnectionClosedEvent(const Event_ConnectionClosed & /*event*/) { doDisconnectFromServer(); @@ -509,23 +475,6 @@ void RemoteClient::loginResponse(const Response &response) emit notifyUserAboutUpdate(); } - } else if (response.response_code() == Response::RespPasswordChangeRequired) { - // The credentials were accepted: the server keeps this session open and serves - // nothing but ping and Command_AccountPassword until the password is replaced. - // Treating it as a failed login would disconnect before the dialog that collects - // the new password (queued to the UI thread behind this slot) can send anything: - // the command would sit in pendingCommands forever, because the ping timer that - // times it out stops with the connection. Keep the session and let the controller - // report the outcome through accountPasswordResponse(). - QList missingFeatures; - if (resp.missing_features_size() > 0) { - for (int i = 0; i < resp.missing_features_size(); ++i) { - missingFeatures << QString::fromStdString(resp.missing_features(i)); - } - } - setStatus(StatusPasswordChangeRequired); - emit loginError(response.response_code(), QString::fromStdString(resp.denied_reason_str()), - static_cast(resp.denied_end_time()), missingFeatures); } else if (response.response_code() != Response::RespNotConnected) { QList missingFeatures; if (resp.missing_features_size() > 0) { @@ -708,8 +657,6 @@ void RemoteClient::sendCommandContainer(const CommandContainer &cont) void RemoteClient::connectToHost(const QString &hostname, unsigned int port) { usingWebSocket = port == 443 || port == 80 || port == 4748 || port == 8080; - qCInfo(RemoteClientLog) << "Connecting to server" << hostname << "port" << port - << (usingWebSocket ? "using WebSocket" : "using TCP"); if (usingWebSocket) { QUrl url(QString("%1://%2:%3/servatrice").arg(port == 443 ? "wss" : "ws").arg(hostname).arg(port)); websocket->open(url); diff --git a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.h b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.h index 1cf40491c..d0c0a18ce 100644 --- a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.h +++ b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.h @@ -71,11 +71,6 @@ signals: //! should only store it for the connection it is currently negotiating, so //! the hostname and user name are intentionally not part of the signal. void sigPasswordVerifierReady(const QString &verifier); - //! \brief Outcome of the password change the server demanded at login. - void sigPasswordChangeSuccess(); - void sigPasswordChangeError(int responseCode); - //! \brief Request a password change; queued to the client thread like the other requests. - void sigChangePasswordToServer(const QString &oldPassword, const QString &newPassword); private slots: void slotConnected(); void readData(); @@ -104,8 +99,6 @@ private slots: Command_Login generateCommandLogin(); void doSubmitPasswordVerifier(); void submitPasswordVerifierResponse(const Response &response); - void accountPasswordResponse(const Response &response); - void doChangePasswordToServer(const QString &oldPassword, const QString &newPassword); void doDisconnectFromServer(); void doActivateToServer(const QString &_token); void doRequestForgotPasswordToServer(const QString &hostname, unsigned int port, const QString &_userName); @@ -208,10 +201,6 @@ public: unsigned int port, const QString &_userName, const QString &_email); - //! \brief Change the password of the account that just logged in, following the - //! server's forced-password-change reply. Emits sigPasswordChangeSuccess or - //! sigPasswordChangeError when the server answers. - void changePasswordToServer(const QString &oldPassword, const QString &newPassword); }; #endif diff --git a/libcockatrice_network/libcockatrice/network/server/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/server/CMakeLists.txt index b59d61572..cbb717ad8 100644 --- a/libcockatrice_network/libcockatrice/network/server/CMakeLists.txt +++ b/libcockatrice_network/libcockatrice/network/server/CMakeLists.txt @@ -1,3 +1,7 @@ +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + add_subdirectory(local) add_subdirectory(remote) diff --git a/libcockatrice_network/libcockatrice/network/server/local/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/server/local/CMakeLists.txt index 4055efa64..020753d7f 100644 --- a/libcockatrice_network/libcockatrice/network/server/local/CMakeLists.txt +++ b/libcockatrice_network/libcockatrice/network/server/local/CMakeLists.txt @@ -1,8 +1,14 @@ +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + set(HEADERS local_server.h local_server_interface.h) set(SOURCES local_server.cpp local_server_interface.cpp) -add_library(libcockatrice_network_server_local STATIC ${HEADERS} ${SOURCES}) +qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) + +add_library(libcockatrice_network_server_local STATIC ${MOC_SOURCES} ${SOURCES}) add_dependencies(libcockatrice_network_server_local libcockatrice_protocol) diff --git a/libcockatrice_network/libcockatrice/network/server/remote/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/server/remote/CMakeLists.txt index 181218e1a..2127487d2 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/CMakeLists.txt +++ b/libcockatrice_network/libcockatrice/network/server/remote/CMakeLists.txt @@ -1,3 +1,7 @@ +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + set(HEADERS game/dump_zone_range.h game/server_abstract_participant.h @@ -8,7 +12,6 @@ set(HEADERS game/server_cardzone.h game/server_counter.h game/game_config.h - game/role_info.h game/server_deck_validation_strategy.h game/server_game.h game/server_game_lifecycle_strategy.h @@ -26,9 +29,11 @@ set(HEADERS serverinfo_user_container.h ) +qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) + add_library( libcockatrice_network_server_remote STATIC - ${HEADERS} + ${MOC_SOURCES} game/dump_zone_range.cpp game/server_abstract_participant.cpp game/server_abstract_player.cpp diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/game_config.h b/libcockatrice_network/libcockatrice/network/server/remote/game/game_config.h index 0661bd2aa..baf946632 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/game/game_config.h +++ b/libcockatrice_network/libcockatrice/network/server/remote/game/game_config.h @@ -21,7 +21,6 @@ struct GameConfig bool spectatorsSeeEverything = true; int startingLifeTotal = 20; bool shareDecklistsOnLoad = true; - bool shufflePlayers = false; }; #endif diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/role_info.h b/libcockatrice_network/libcockatrice/network/server/remote/game/role_info.h deleted file mode 100644 index ef8692361..000000000 --- a/libcockatrice_network/libcockatrice/network/server/remote/game/role_info.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef COCKATRICE_ROLE_INFO_H -#define COCKATRICE_ROLE_INFO_H - -/** - * @brief Represents information about a participant's roles. - */ -struct RoleInfo -{ - bool isJudge = false; ///< Whether the participant joined as a judge - bool isSpectator = false; ///< Whether the participant joined as a spectator -}; - -#endif // COCKATRICE_ROLE_INFO_H diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.cpp index dcd14d14c..5b8d901bb 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.cpp +++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.cpp @@ -43,7 +43,6 @@ #include #include #include -#include #include #include #include @@ -62,10 +61,10 @@ Server_AbstractParticipant::Server_AbstractParticipant(Server_Game *_game, int _playerId, const ServerInfo_User &_userInfo, - const RoleInfo &_roleInfo, + bool _judge, Server_AbstractUserInterface *_userInterface) : ServerInfo_User_Container(_userInfo), game(_game), userInterface(_userInterface), pingTime(0), - playerId(_playerId), roleInfo(_roleInfo) + playerId(_playerId), judge(_judge) { } @@ -99,8 +98,8 @@ void Server_AbstractParticipant::getProperties(ServerInfo_PlayerProperties &resu if (withUserInfo) { copyUserInfo(*(result.mutable_user_info()), true); } - result.set_spectator(isSpectator()); - result.set_judge(isJudge()); + result.set_spectator(spectator); + result.set_judge(judge); result.set_ping_seconds(pingTime); getPlayerProperties(result); } @@ -177,7 +176,7 @@ Response::ResponseCode Server_AbstractParticipant::cmdUnconcede(const Command_Un Response::ResponseCode Server_AbstractParticipant::cmdJudge(const Command_Judge &cmd, ResponseContainer &rc, GameEventStorage &ges) { - if (!isJudge()) { + if (!judge) { return Response::RespFunctionNotAllowed; } @@ -205,7 +204,7 @@ Response::ResponseCode Server_AbstractParticipant::cmdReadyStart(const Command_R Response::ResponseCode Server_AbstractParticipant::cmdGameSay(const Command_GameSay &cmd, ResponseContainer & /*rc*/, GameEventStorage &ges) { - if (isSpectator()) { + if (spectator) { /* Spectators can only talk if: * (a) the game creator allows it * (b) the spectator is a moderator/administrator @@ -366,7 +365,7 @@ Response::ResponseCode Server_AbstractParticipant::cmdNextTurn(const Command_Nex return Response::RespGameNotStarted; } - if (!isJudge()) { + if (!judge) { return Response::RespFunctionNotAllowed; } @@ -382,7 +381,7 @@ Response::ResponseCode Server_AbstractParticipant::cmdSetActivePhase(const Comma return Response::RespGameNotStarted; } - if (!isJudge()) { + if (!judge) { return Response::RespFunctionNotAllowed; } @@ -416,8 +415,8 @@ Response::ResponseCode Server_AbstractParticipant::cmdReverseTurn(const Command_ ResponseContainer & /*rc*/, GameEventStorage &ges) { - if (!isJudge()) { - if (isSpectator()) { + if (!judge) { + if (spectator) { return Response::RespFunctionNotAllowed; } @@ -435,33 +434,6 @@ Response::ResponseCode Server_AbstractParticipant::cmdReverseTurn(const Command_ return Response::RespOk; } -Response::ResponseCode Server_AbstractParticipant::cmdSetPlayerOrder(const Command_SetPlayerOrder &cmd, - ResponseContainer & /*rc*/, - GameEventStorage & /*ges*/) -{ - if ((game->getHostId() != playerId) && !(userInfo->user_level() & ServerInfo_User::IsModerator)) { - return Response::RespFunctionNotAllowed; - } - - if (game->getGameStarted()) { - return Response::RespContextError; - } - - if (cmd.randomize()) { - game->shufflePlayerSeats(); - } else { - QList playerNames; - for (int i = 0; i < cmd.player_names_size(); ++i) { - playerNames.append(QString::fromStdString(cmd.player_names(i))); - } - game->reorderPlayerSeats(playerNames); - } - - // Clients learn the new seating from the Event_PlayerOrderChanged that - // reseatPlayers broadcasts; no full game state resend is needed for it. - return Response::RespOk; -} - Response::ResponseCode Server_AbstractParticipant::processGameCommand(const GameCommand &command, ResponseContainer &rc, GameEventStorage &ges) { @@ -571,9 +543,6 @@ Server_AbstractParticipant::processGameCommand(const GameCommand &command, Respo case GameCommand::SET_PLAYMAT: return cmdSetPlaymat(command.GetExtension(Command_SetPlaymat::ext), rc, ges); break; - case GameCommand::SET_PLAYER_ORDER: - return cmdSetPlayerOrder(command.GetExtension(Command_SetPlayerOrder::ext), rc, ges); - break; default: return Response::RespInvalidCommand; } @@ -608,7 +577,7 @@ void Server_AbstractParticipant::setUserInterface(Server_AbstractUserInterface * void Server_AbstractParticipant::disconnectClient() { bool isRegistered = userInfo->user_level() & ServerInfo_User::IsRegistered; - if (!isRegistered || isSpectator()) { + if (!isRegistered || spectator) { game->removeParticipant(this, Event_Leave::USER_DISCONNECTED); } else { setUserInterface(nullptr); diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.h index 316b9727c..195da9b7f 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.h +++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.h @@ -2,7 +2,6 @@ #define ABSTRACT_PARTICIPANT_H #include "../serverinfo_user_container.h" -#include "role_info.h" #include "server_arrowtarget.h" #include @@ -53,7 +52,6 @@ class Command_DeckSelect; class Command_SetSideboardLock; class Command_ChangeZoneProperties; class Command_SetPlaymat; -class Command_SetPlayerOrder; class Server_AbstractParticipant : public Server_ArrowTarget, public ServerInfo_User_Container { @@ -63,7 +61,8 @@ protected: Server_AbstractUserInterface *userInterface; int pingTime; int playerId; - RoleInfo roleInfo; + bool spectator; + bool judge; virtual void getPlayerProperties(ServerInfo_PlayerProperties &result); mutable QMutex playerMutex; @@ -71,7 +70,7 @@ public: Server_AbstractParticipant(Server_Game *_game, int _playerId, const ServerInfo_User &_userInfo, - const RoleInfo &_roleInfo, + bool _judge, Server_AbstractUserInterface *_handler); ~Server_AbstractParticipant() override; virtual void prepareDestroy() @@ -90,17 +89,13 @@ public: { return playerId; } - void setPlayerId(int _playerId) - { - playerId = _playerId; - } bool isSpectator() const { - return roleInfo.isSpectator; + return spectator; } bool isJudge() const { - return roleInfo.isJudge; + return judge; } Server_Game *getGame() const { @@ -178,8 +173,6 @@ public: virtual Response::ResponseCode cmdReverseTurn(const Command_ReverseTurn & /*cmd*/, ResponseContainer & /*rc*/, GameEventStorage &ges); virtual Response::ResponseCode - cmdSetPlayerOrder(const Command_SetPlayerOrder &cmd, ResponseContainer &rc, GameEventStorage &ges); - virtual Response::ResponseCode cmdChangeZoneProperties(const Command_ChangeZoneProperties &cmd, ResponseContainer &rc, GameEventStorage &ges); Response::ResponseCode processGameCommand(const GameCommand &command, ResponseContainer &rc, GameEventStorage &ges); diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.cpp index b5a620798..c03f1e966 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.cpp +++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.cpp @@ -81,9 +81,10 @@ Server_AbstractPlayer::Server_AbstractPlayer(Server_Game *_game, const ServerInfo_User &_userInfo, bool _judge, Server_AbstractUserInterface *_userInterface) - : Server_AbstractParticipant(_game, _playerId, _userInfo, {.isJudge = _judge}, _userInterface), conceded(false), - deck(nullptr), sideboardLocked(true), readyStart(false), nextCardId(0) + : Server_AbstractParticipant(_game, _playerId, _userInfo, _judge, _userInterface), conceded(false), deck(nullptr), + sideboardLocked(true), readyStart(false), nextCardId(0) { + spectator = false; } Server_AbstractPlayer::~Server_AbstractPlayer() = default; @@ -294,7 +295,7 @@ Response::ResponseCode Server_AbstractPlayer::moveCard(GameEventStorage &ges, { // Disallow controller change to other zones than the table. if (((targetzone->getType() != ServerInfo_Zone::PublicZone) || !targetzone->hasCoords()) && - (startzone->getPlayer() != targetzone->getPlayer()) && !isJudge()) { + (startzone->getPlayer() != targetzone->getPlayer()) && !judge) { return Response::RespContextError; } @@ -807,7 +808,7 @@ Server_AbstractPlayer::cmdMoveCard(const Command_MoveCard &cmd, ResponseContaine return Response::RespNameNotFound; } - if ((startPlayer != this) && (!startZone->getPlayersWithWritePermission().contains(playerId)) && !isJudge()) { + if ((startPlayer != this) && (!startZone->getPlayersWithWritePermission().contains(playerId)) && !judge) { return Response::RespContextError; } @@ -820,7 +821,7 @@ Server_AbstractPlayer::cmdMoveCard(const Command_MoveCard &cmd, ResponseContaine return Response::RespNameNotFound; } - if ((startPlayer != this) && (targetPlayer != this) && !isJudge()) { + if ((startPlayer != this) && (targetPlayer != this) && !judge) { return Response::RespContextError; } @@ -1597,7 +1598,7 @@ Server_AbstractPlayer::cmdRevealCards(const Command_RevealCards &cmd, ResponseCo zone->addWritePermission(cmd.player_id()); } - if (isJudge()) { + if (judge) { ges.setOverwriteOwnership(true); } diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp index e2724523e..b1863c91e 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp +++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp @@ -41,7 +41,6 @@ #include "libcockatrice/protocol/pb/serverinfo_replay_match.pb.h" #include "libcockatrice/protocol/pb/serverinfo_user.pb.h" #include "libcockatrice/protocol/pb/session_event.pb.h" -#include "role_info.h" #include "server_abstract_player.h" #include "server_abstractuserinterface.h" #include "server_arrow.h" @@ -73,13 +72,11 @@ #include #include #include -#include #include #include #include #include #include -#include #include #include #include @@ -93,8 +90,8 @@ Server_Game::Server_Game(const GameConfig &config, Server_Room *_room) spectatorsAllowed(config.spectatorsAllowed), spectatorsNeedPassword(config.spectatorsNeedPassword), spectatorsCanTalk(config.spectatorsCanTalk), spectatorsSeeEverything(config.spectatorsSeeEverything), startingLifeTotal(config.startingLifeTotal), shareDecklistsOnLoad(config.shareDecklistsOnLoad), - shufflePlayers(config.shufflePlayers), inactivityCounter(0), startTimeOfThisGame(0), secondsElapsed(0), - firstGameStarted(false), turnOrderReversed(false), startTime(QDateTime::currentDateTime()), pingClock(nullptr), + inactivityCounter(0), startTimeOfThisGame(0), secondsElapsed(0), firstGameStarted(false), + turnOrderReversed(false), startTime(QDateTime::currentDateTime()), pingClock(nullptr), deckValidationStrategy(new Server_DefaultDeckValidationStrategy), lifecycleStrategy(new Server_DefaultLifecycleStrategy), matchResultStrategy(new Server_NullMatchResultStrategy), gameMutex() @@ -294,32 +291,6 @@ int Server_Game::getSpectatorCount() const return result; } -QList Server_Game::getParticipantsInSeatOrder() const -{ - // Players in seat order first (fall back to id order for seats predating - // seatOrder), then spectators. Player ids are stable; only the ordering - // changes on shuffle/reorder. - QList ordered; - ordered.reserve(participants.size()); - for (int id : seatOrder) { - auto *participant = participants.value(id, nullptr); - if (participant && !participant->isSpectator() && !ordered.contains(participant)) { - ordered.append(participant); - } - } - for (auto *participant : participants.values()) { - if (!participant->isSpectator() && !ordered.contains(participant)) { - ordered.append(participant); - } - } - for (auto *participant : participants.values()) { - if (participant->isSpectator()) { - ordered.append(participant); - } - } - return ordered; -} - void Server_Game::createGameStateChangedEvent(Event_GameStateChanged *event, Server_AbstractParticipant *recipient, bool omniscient, @@ -334,24 +305,16 @@ void Server_Game::createGameStateChangedEvent(Event_GameStateChanged *event, event->set_game_started(false); } - // Emit the player list in seat order so every client (including old ones - // that ignore Event_PlayerOrderChanged) sees the current seating. Player - // ids are stable; only this ordering changes on shuffle/reorder. - QList ordered = getParticipantsInSeatOrder(); - for (Server_AbstractParticipant *participant : ordered) { + for (Server_AbstractParticipant *participant : participants.values()) { participant->getInfo(event->add_player_list(), recipient, omniscient, withUserInfo); } - - if (recipient != nullptr) { - event->set_local_player_id(recipient->getPlayerId()); - } } void Server_Game::sendGameStateToPlayers() { // game state information for replay and omniscient spectators Event_GameStateChanged omniscientEvent; - createGameStateChangedEvent(&omniscientEvent, nullptr, true, true); + createGameStateChangedEvent(&omniscientEvent, nullptr, true, false); GameEventContainer *replayCont = prepareGameEvent(omniscientEvent, -1); replayCont->set_seconds_elapsed(secondsElapsed - startTimeOfThisGame); @@ -363,7 +326,7 @@ void Server_Game::sendGameStateToPlayers() // the data we used for the replay. All spectators are equal, so we don't need to make a createGameStateChangedEvent // call for each one. Event_GameStateChanged spectatorNormalEvent; - createGameStateChangedEvent(&spectatorNormalEvent, nullptr, false, true); + createGameStateChangedEvent(&spectatorNormalEvent, nullptr, false, false); // send game state info to clients according to their role in the game for (auto *participant : participants.values()) { @@ -376,7 +339,7 @@ void Server_Game::sendGameStateToPlayers() } } else { Event_GameStateChanged event; - createGameStateChangedEvent(&event, participant, participant->isJudge(), true); + createGameStateChangedEvent(&event, participant, participant->isJudge(), false); gec = prepareGameEvent(event, -1); } @@ -416,11 +379,6 @@ void Server_Game::doStartGameIfReady(bool forceStartGame) return; } - if (shufflePlayers && players.size() > 1) { - shufflePlayerSeats(); - players = getPlayers(); - } - for (Server_AbstractPlayer *player : players.values()) { player->setupZones(); } @@ -474,116 +432,6 @@ void Server_Game::startGameIfReady(bool forceStartGame) emit sigStartGameIfReady(forceStartGame); } -void Server_Game::shufflePlayerSeats() -{ - QMutexLocker locker(&gameMutex); - - // Collect players in current seat order (fall back to id order for seats - // predating seatOrder). Spectators keep their seats. - QList players; - for (int id : seatOrder) { - auto *participant = participants.value(id, nullptr); - if (participant && !participant->isSpectator()) { - players.append(participant); - } - } - for (auto *participant : participants.values()) { - if (!participant->isSpectator() && !players.contains(participant)) { - players.append(participant); - } - } - QList spectators; - for (auto *participant : participants.values()) { - if (participant->isSpectator()) { - spectators.append(participant); - } - } - - // Fisher-Yates shuffle of the players. - QList shuffledPlayers; - while (!players.isEmpty()) { - const int index = rng->rand(0, players.size() - 1); - shuffledPlayers.append(players.takeAt(index)); - } - - reseatPlayers(shuffledPlayers + spectators, true); -} - -void Server_Game::reorderPlayerSeats(const QList &orderedNames) -{ - QMutexLocker locker(&gameMutex); - - // Collect players in current seat order (fall back to id order for seats - // predating seatOrder). Spectators keep their seats. - QList players; - for (int id : seatOrder) { - auto *participant = participants.value(id, nullptr); - if (participant && !participant->isSpectator()) { - players.append(participant); - } - } - for (auto *participant : participants.values()) { - if (!participant->isSpectator() && !players.contains(participant)) { - players.append(participant); - } - } - QList spectators; - for (auto *participant : participants.values()) { - if (participant->isSpectator()) { - spectators.append(participant); - } - } - - // Order the players according to the given names, appending any player that - // was not listed (should not happen) in their current seat order. - QList orderedPlayers; - QSet placed; - for (const QString &name : orderedNames) { - for (auto *participant : players) { - if (!placed.contains(participant) && (QString::fromStdString(participant->getUserInfo()->name()) == name)) { - orderedPlayers.append(participant); - placed.insert(participant); - break; - } - } - } - for (auto *participant : players) { - if (!placed.contains(participant)) { - orderedPlayers.append(participant); - } - } - - reseatPlayers(orderedPlayers + spectators, false); -} - -void Server_Game::reseatPlayers(const QList &orderedParticipants, bool randomized) -{ - QMutexLocker locker(&gameMutex); - - // Keep player ids stable and only reorder the seating/turn order. Changing - // ids would break old clients (stale localPlayerId from Event_GameJoined - // duplicates their own seat as an opponent), invalidate the home-server - // per-user game/seat mapping used for ISL command routing, and orphan the - // host id. All of those maps stay valid because ids never change here. - // The current host therefore keeps its id and needs no re-key tracking. - seatOrder.clear(); - for (auto *participant : orderedParticipants) { - if (!participant->isSpectator()) { - seatOrder.append(participant->getPlayerId()); - } - } - - // Broadcast the new seating order so that every client can display it. - Event_PlayerOrderChanged event; - for (auto *participant : orderedParticipants) { - if (!participant->isSpectator()) { - event.add_player_names(QString::fromStdString(participant->getUserInfo()->name()).toStdString()); - } - } - event.set_randomized(randomized); - sendGameEventContainer(prepareGameEvent(event, -1)); -} - void Server_Game::stopGameIfFinished() { QMutexLocker locker(&gameMutex); @@ -631,8 +479,9 @@ void Server_Game::stopGameIfFinished() Response::ResponseCode Server_Game::checkJoin(ServerInfo_User *user, const QString &_password, - const RoleInfo &roleInfo, - bool overrideRestrictions) + bool spectator, + bool overrideRestrictions, + bool asJudge) { Server_DatabaseInterface *databaseInterface = room->getServer()->getDatabaseInterface(); for (auto *participant : participants.values()) { @@ -641,11 +490,11 @@ Response::ResponseCode Server_Game::checkJoin(ServerInfo_User *user, } } - if (roleInfo.isJudge && !(user->user_level() & ServerInfo_User::IsJudge)) { + if (asJudge && !(user->user_level() & ServerInfo_User::IsJudge)) { return Response::RespUserLevelTooLow; } if (!(overrideRestrictions && (user->user_level() & (ServerInfo_User::IsModerator | ServerInfo_User::IsJudge)))) { - if ((_password != password) && !(roleInfo.isSpectator && !spectatorsNeedPassword)) { + if ((_password != password) && !(spectator && !spectatorsNeedPassword)) { return Response::RespWrongPassword; } if (!(user->user_level() & ServerInfo_User::IsRegistered) && onlyRegistered) { @@ -661,13 +510,13 @@ Response::ResponseCode Server_Game::checkJoin(ServerInfo_User *user, QString::fromStdString(user->name()))) { return Response::RespInIgnoreList; } - if (roleInfo.isSpectator) { + if (spectator) { if (!spectatorsAllowed) { return Response::RespSpectatorsNotAllowed; } } } - if (!roleInfo.isSpectator && (gameStarted || (getPlayerCount() >= getMaxPlayers()))) { + if (!spectator && (gameStarted || (getPlayerCount() >= getMaxPlayers()))) { return Response::RespGameFull; } @@ -688,18 +537,19 @@ bool Server_Game::containsUser(const QString &userName) const void Server_Game::addPlayer(Server_AbstractUserInterface *userInterface, ResponseContainer &rc, - const RoleInfo &roleInfo, + bool spectator, + bool judge, bool broadcastUpdate) { QMutexLocker locker(&gameMutex); Server_AbstractParticipant *newParticipant; - if (roleInfo.isSpectator) { + if (spectator) { newParticipant = new Server_Spectator(this, nextPlayerId++, userInterface->copyUserInfo(true, true, true), - roleInfo.isJudge, userInterface); + judge, userInterface); } else { - newParticipant = new Server_Player(this, nextPlayerId++, userInterface->copyUserInfo(true, true, true), - roleInfo.isJudge, userInterface); + newParticipant = new Server_Player(this, nextPlayerId++, userInterface->copyUserInfo(true, true, true), judge, + userInterface); } newParticipant->moveToThread(thread()); @@ -710,11 +560,10 @@ void Server_Game::addPlayer(Server_AbstractUserInterface *userInterface, const QString playerName = QString::fromStdString(newParticipant->getUserInfo()->name()); participants.insert(newParticipant->getPlayerId(), newParticipant); - if (roleInfo.isSpectator) { + if (spectator) { allSpectatorsEver.insert(playerName); } else { allPlayersEver.insert(playerName); - seatOrder.append(newParticipant->getPlayerId()); // if the original creator of the game joins, give them host status back //! \todo Transferring host to spectators has side effects. @@ -730,7 +579,7 @@ void Server_Game::addPlayer(Server_AbstractUserInterface *userInterface, emit gameInfoChanged(gameInfo); } - if ((newParticipant->getUserInfo()->user_level() & ServerInfo_User::IsRegistered) && !roleInfo.isSpectator) { + if ((newParticipant->getUserInfo()->user_level() & ServerInfo_User::IsRegistered) && !spectator) { room->getServer()->addPersistentPlayer(playerName, room->getId(), gameId, newParticipant->getPlayerId()); } @@ -744,7 +593,6 @@ void Server_Game::removeParticipant(Server_AbstractParticipant *participant, Eve room->getServer()->removePersistentPlayer(QString::fromStdString(participant->getUserInfo()->name()), room->getId(), gameId, participant->getPlayerId()); participants.remove(participant->getPlayerId()); - seatOrder.removeAll(participant->getPlayerId()); bool spectator = participant->isSpectator(); GameEventStorage ges; @@ -764,20 +612,10 @@ void Server_Game::removeParticipant(Server_AbstractParticipant *participant, Eve participant->prepareDestroy(); if (playerHost) { - // Pass host to the next player in seat order so the game always keeps - // a host while players remain. int newHostId = -1; - for (int id : seatOrder) { - if (participants.contains(id)) { - newHostId = id; - break; - } - } - if (newHostId == -1) { - for (auto *otherPlayer : getPlayers().values()) { - newHostId = otherPlayer->getPlayerId(); - break; - } + for (auto *otherPlayer : getPlayers().values()) { + newHostId = otherPlayer->getPlayerId(); + break; } if (newHostId != -1) { hostId = newHostId; @@ -934,20 +772,7 @@ void Server_Game::nextTurn() } auto players = getPlayers(); - // Advance in seat order, not id order, so shuffles/reorders change the - // turn sequence while ids stay stable. - QList keys; - keys.reserve(players.size()); - for (int id : seatOrder) { - if (players.contains(id)) { - keys.append(id); - } - } - for (int id : players.keys()) { - if (!keys.contains(id)) { - keys.append(id); - } - } + const QList keys = players.keys(); int listPos = -1; if (activePlayer != -1) { listPos = keys.indexOf(activePlayer); @@ -997,7 +822,7 @@ void Server_Game::createGameJoinedEvent(Server_AbstractParticipant *joiningParti event2.set_active_phase(activePhase); bool omniscient = (joiningParticipant->isSpectator() && spectatorsSeeEverything) || joiningParticipant->isJudge(); - for (auto *participant : getParticipantsInSeatOrder()) { + for (auto *participant : participants.values()) { participant->getInfo(event2.add_player_list(), joiningParticipant, omniscient, true); } @@ -1046,13 +871,6 @@ void Server_Game::createGameJoinedEvent(Server_AbstractParticipant *joiningParti } } -bool Server_Game::canSeePrivateEventsFor(const Server_AbstractParticipant *participant, int privatePlayerId) const -{ - return participant->getPlayerId() == privatePlayerId // same player - || participant->isJudge() // judges see everything - || (participant->isSpectator() && spectatorsSeeEverything); // spectators see everything -} - void Server_Game::sendGameEventContainer(GameEventContainer *cont, GameEventStorageItem::EventRecipients recipients, int privatePlayerId) @@ -1061,7 +879,8 @@ void Server_Game::sendGameEventContainer(GameEventContainer *cont, cont->set_game_id(gameId); for (auto *participant : participants.values()) { - const bool playerPrivate = canSeePrivateEventsFor(participant, privatePlayerId); + const bool playerPrivate = (participant->getPlayerId() == privatePlayerId) || participant->isJudge() || + (participant->isSpectator() && spectatorsSeeEverything); if ((recipients.testFlag(GameEventStorageItem::SendToPrivate) && playerPrivate) || (recipients.testFlag(GameEventStorageItem::SendToOthers) && !playerPrivate)) { participant->sendGameEvent(*cont); @@ -1126,7 +945,6 @@ void Server_Game::getInfo(ServerInfo_Game &result) const result.set_spectators_can_chat(spectatorsCanTalk); result.set_spectators_omniscient(spectatorsSeeEverything); result.set_share_decklists_on_load(shareDecklistsOnLoad); - result.set_shuffle_players(shufflePlayers); result.set_spectators_count(getSpectatorCount()); result.set_start_time(startTime.toSecsSinceEpoch()); } diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.h index 23ba96598..c7f8d0929 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.h +++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.h @@ -62,7 +62,6 @@ class Message; } // namespace protobuf } // namespace google struct GameConfig; -struct RoleInfo; class Server_Game : public QObject { @@ -74,11 +73,6 @@ private: int hostId; ServerInfo_User *creatorInfo; QMap participants; - // Seating/turn order as an ordered list of player ids. Player ids themselves - // are stable for the lifetime of the participant; shuffling or reordering - // only permutes this list so old clients, ISL routes and persistent - // references (all keyed by player id) keep working. - QList seatOrder; QSet allPlayersEver, allSpectatorsEver; bool gameStarted; bool gameClosed; @@ -95,7 +89,6 @@ private: bool spectatorsSeeEverything; int startingLifeTotal; bool shareDecklistsOnLoad; - bool shufflePlayers; int inactivityCounter; int startTimeOfThisGame, secondsElapsed; bool firstGameStarted; @@ -115,10 +108,7 @@ private: Server_AbstractParticipant *recipient, bool omniscient, bool withUserInfo); - QList getParticipantsInSeatOrder() const; - void reseatPlayers(const QList &orderedParticipants, bool randomized); void storeGameInformation(); - bool canSeePrivateEventsFor(const Server_AbstractParticipant *participant, int privatePlayerId) const; signals: void sigStartGameIfReady(bool override); void gameInfoChanged(ServerInfo_Game gameInfo); @@ -157,10 +147,6 @@ public: { return participants; } - QList getSeatOrder() const - { - return seatOrder; - } int getGameId() const { return gameId; @@ -201,16 +187,13 @@ public: { return shareDecklistsOnLoad; } - bool getShufflePlayers() const - { - return shufflePlayers; - } Response::ResponseCode - checkJoin(ServerInfo_User *user, const QString &_password, const RoleInfo &roleInfo, bool overrideRestrictions); + checkJoin(ServerInfo_User *user, const QString &_password, bool spectator, bool overrideRestrictions, bool asJudge); bool containsUser(const QString &userName) const; void addPlayer(Server_AbstractUserInterface *userInterface, ResponseContainer &rc, - const RoleInfo &roleInfo, + bool spectator, + bool judge, bool broadcastUpdate = true); void removeParticipant(Server_AbstractParticipant *participant, Event_Leave::LeaveReason reason); void removeArrowsRelatedToPlayer(GameEventStorage &ges, Server_AbstractPlayer *player); @@ -218,8 +201,6 @@ public: bool kickParticipant(int playerId); void startGameIfReady(bool forceStartGame); void stopGameIfFinished(); - void shufflePlayerSeats(); - void reorderPlayerSeats(const QList &orderedNames); int getActivePlayer() const { return activePlayer; diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp index b40dae09b..949d04b4b 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp +++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp @@ -573,7 +573,7 @@ Server_Player::cmdNextTurn(const Command_NextTurn & /*cmd*/, ResponseContainer & return Response::RespGameNotStarted; } - if (conceded && !isJudge()) { + if (conceded && !judge) { return Response::RespContextError; } @@ -589,7 +589,7 @@ Response::ResponseCode Server_Player::cmdSetActivePhase(const Command_SetActiveP return Response::RespGameNotStarted; } - if (!isJudge()) { + if (!judge) { if (conceded) { return Response::RespContextError; } @@ -623,7 +623,7 @@ Response::ResponseCode Server_Player::cmdReverseTurn(const Command_ReverseTurn &cmd, ResponseContainer &rc, GameEventStorage &ges) { - if (!isJudge() && conceded) { + if (!judge && conceded) { return Response::RespContextError; } return Server_AbstractParticipant::cmdReverseTurn(cmd, rc, ges); diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.cpp index 164a4af5e..d1c369949 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.cpp +++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.cpp @@ -11,6 +11,7 @@ Server_Spectator::Server_Spectator(Server_Game *_game, const ServerInfo_User &_userInfo, bool _judge, Server_AbstractUserInterface *_userInterface) - : Server_AbstractParticipant(_game, _playerId, _userInfo, {.isJudge = _judge, .isSpectator = true}, _userInterface) + : Server_AbstractParticipant(_game, _playerId, _userInfo, _judge, _userInterface) { + spectator = true; } diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server.cpp index 8ea2cd993..63989bbfa 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/server.cpp +++ b/libcockatrice_network/libcockatrice/network/server/remote/server.cpp @@ -131,16 +131,6 @@ AuthenticationResult Server::loginUser(Server_ProtocolHandler *session, return authState; } - if (authState == PasswordChangeRequired) { - // The credentials were right, but the account must choose a new password before it may - // use the server. Give the session an identity so it can complete that change, without - // registering a user session or announcing the user as logged in. - ServerInfo_User pendingData = databaseInterface->getUserData(name, true); - pendingData.set_address(session->getAddress().toStdString()); - session->setUserInfo(pendingData); - return authState; - } - ServerInfo_User data = databaseInterface->getUserData(name, true); data.set_address(session->getAddress().toStdString()); name = QString::fromStdString(data.name()); // Compensate for case indifference @@ -306,9 +296,7 @@ void Server::removeClient(Server_ProtocolHandler *client) QWriteLocker locker(&clientsLock); clients.removeAt(clientIndex); ServerInfo_User *data = client->getUserInfo(); - // A session that never completed login (for example one that still owes a password change) - // has no session id: it was never announced as joined, so it must not be announced as leaving. - if (data && data->has_session_id()) { + if (data) { Event_UserLeft event; event.set_name(data->name()); SessionEvent *se = Server_ProtocolHandler::prepareSessionEvent(event); @@ -323,10 +311,12 @@ void Server::removeClient(Server_ProtocolHandler *client) users.remove(QString::fromStdString(data->name())); qDebug() << "Server::removeClient: name=" << QString::fromStdString(data->name()); - const qint64 sessionId = data->session_id(); - usersBySessionId.remove(sessionId); - emit endSession(sessionId); - qDebug() << "closed session id:" << sessionId; + if (data->has_session_id()) { + const qint64 sessionId = data->session_id(); + usersBySessionId.remove(sessionId); + emit endSession(sessionId); + qDebug() << "closed session id:" << sessionId; + } } qDebug() << "Server::removeClient: removed" << (void *)client << ";" << clients.size() << "clients; " << users.size() << "users left"; @@ -340,9 +330,7 @@ QList Server::getOnlineModeratorList() const ServerInfo_User *data = client->getUserInfo(); //! \todo This line should be updated in the event there is any type of new user level created. - // A session that still owes a forced password change has user info but no session id: - // it never joined, so it must not be reported as an online moderator either. - if (data && data->has_session_id() && + if (data && (data->user_level() & ServerInfo_User::IsModerator || data->user_level() & ServerInfo_User::IsAdmin)) { results << QString::fromStdString(data->name()).simplified(); } diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp index 78b9d955f..dd074a517 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp +++ b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp @@ -64,9 +64,8 @@ Server_ProtocolHandler::Server_ProtocolHandler(Server *_server, Server_DatabaseInterface *_databaseInterface, QObject *parent) : QObject(parent), Server_AbstractUserInterface(_server), deleted(false), databaseInterface(_databaseInterface), - authState(NotLoggedIn), usingRealPassword(false), passwordChangePending(false), acceptsUserListChanges(false), - acceptsRoomListChanges(false), idleClientWarningSent(false), timeRunning(0), lastDataReceived(0), - lastActionReceived(0) + authState(NotLoggedIn), usingRealPassword(false), acceptsUserListChanges(false), acceptsRoomListChanges(false), + idleClientWarningSent(false), timeRunning(0), lastDataReceived(0), lastActionReceived(0) { connect(server, &Server::pingClockTimeout, this, &Server_ProtocolHandler::pingClockTimeout); @@ -213,10 +212,7 @@ Response::ResponseCode Server_ProtocolHandler::processSessionCommandContainer(co logDebugMessage(getSafeDebugString(sc)); } const auto commandType = static_cast(num); - if (passwordChangePending && commandType != SessionCommand::PING && - commandType != SessionCommand::ACCOUNT_PASSWORD) { - resp = Response::RespFunctionNotAllowed; - } else if (authState == NotLoggedIn && !isPreAuthSessionCommand(commandType)) { + if (authState == NotLoggedIn && !isPreAuthSessionCommand(commandType)) { resp = Response::RespLoginNeeded; } else { switch (commandType) { @@ -493,19 +489,6 @@ void Server_ProtocolHandler::processCommandContainer(const CommandContainer &con lastDataReceived = timeRunning; - // A session that still owes a forced password change may only reach the session family, - // where processSessionCommandContainer narrows it further to ping and the change itself. - // Every other family is rejected here, including a container that also carries a session - // command: the dispatch below prefers game/room over session, so testing only for the - // absence of a session command would let such a container through. - if (passwordChangePending && - (cont.game_command_size() || cont.room_command_size() || cont.moderator_command_size() || - cont.admin_command_size() || cont.developer_command_size())) { - sendResponseContainer(ResponseContainer(cont.has_cmd_id() ? cont.cmd_id() : -1), - Response::RespFunctionNotAllowed); - return; - } - ResponseContainer responseContainer(cont.has_cmd_id() ? cont.cmd_id() : -1); Response::ResponseCode finalResponseCode; @@ -713,11 +696,6 @@ Response::ResponseCode Server_ProtocolHandler::cmdLogin(const Command_Login &cmd server->recordFailedLogin(getAddress(), userName); return Response::RespAccountNotActivated; case PasswordChangeRequired: - // The credentials were right, but the account must choose a new password first. - // Keep the session authenticated just far enough for the client to do that: - // processCommandContainer refuses everything except the change itself. - authState = PasswordRight; - passwordChangePending = true; return Response::RespPasswordChangeRequired; default: server->clearFailedLogins(getAddress(), userName); @@ -1116,7 +1094,6 @@ Server_ProtocolHandler::cmdCreateGame(const Command_CreateGame &cmd, Server_Room int startingLifeTotal = cmd.has_starting_life_total() ? cmd.starting_life_total() : 20; bool shareDecklistsOnLoad = cmd.has_share_decklists_on_load() ? cmd.share_decklists_on_load() : false; - bool shufflePlayers = cmd.has_shuffle_players() ? cmd.shuffle_players() : false; const int gameId = databaseInterface->getNextGameId(); if (gameId == -1) { @@ -1138,13 +1115,11 @@ Server_ProtocolHandler::cmdCreateGame(const Command_CreateGame &cmd, Server_Room .spectatorsCanTalk = cmd.spectators_can_talk(), .spectatorsSeeEverything = cmd.spectators_see_everything(), .startingLifeTotal = startingLifeTotal, - .shareDecklistsOnLoad = shareDecklistsOnLoad, - .shufflePlayers = shufflePlayers}; + .shareDecklistsOnLoad = shareDecklistsOnLoad}; auto *game = new Server_Game(config, room); - RoleInfo roleInfo{.isJudge = asJudge, .isSpectator = asSpectator}; - game->addPlayer(this, rc, roleInfo, false); + game->addPlayer(this, rc, asSpectator, asJudge, false); room->addGame(game); return Response::RespOk; diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h index 8ce110354..266c4b26c 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h +++ b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h @@ -46,12 +46,6 @@ protected: Server_DatabaseInterface *databaseInterface; AuthenticationResult authState; bool usingRealPassword; - /** - * @brief True when the credentials were right but the account must choose a new password - * before it may use the server. Only ping, the password change and disconnecting - * are served while this is set. - */ - bool passwordChangePending; bool acceptsUserListChanges; bool acceptsRoomListChanges; bool idleClientWarningSent; diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_room.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server_room.cpp index 78ef2b289..68b137cd4 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/server_room.cpp +++ b/libcockatrice_network/libcockatrice/network/server/remote/server_room.cpp @@ -1,6 +1,5 @@ #include "server_room.h" -#include "game/role_info.h" #include "game/server_game.h" #include "libcockatrice/protocol/pb/response.pb.h" #include "libcockatrice/protocol/pb/room_event.pb.h" @@ -373,11 +372,11 @@ Response::ResponseCode Server_Room::processJoinGameCommand(const Command_JoinGam QMutexLocker gameLocker(&game->gameMutex); - RoleInfo roleInfo{.isJudge = cmd.join_as_judge(), .isSpectator = cmd.spectator()}; - Response::ResponseCode result = game->checkJoin( - userInterface->getUserInfo(), QString::fromStdString(cmd.password()), roleInfo, cmd.override_restrictions()); + Response::ResponseCode result = + game->checkJoin(userInterface->getUserInfo(), QString::fromStdString(cmd.password()), cmd.spectator(), + cmd.override_restrictions(), cmd.join_as_judge()); if (result == Response::RespOk) { - game->addPlayer(userInterface, rc, roleInfo); + game->addPlayer(userInterface, rc, cmd.spectator(), cmd.join_as_judge()); } return result; diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt b/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt index 5fba2631d..059e83096 100644 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt +++ b/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt @@ -66,7 +66,6 @@ set(PROTO_FILES command_set_card_attr.proto command_set_card_counter.proto command_set_counter.proto - command_set_player_order.proto command_set_playmat.proto command_set_sideboard_lock.proto command_set_sideboard_plan.proto @@ -111,7 +110,6 @@ set(PROTO_FILES event_list_rooms.proto event_move_card.proto event_notify_user.proto - event_player_order_changed.proto event_player_properties_changed.proto event_remove_from_list.proto event_remove_messages.proto diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_set_player_order.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_set_player_order.proto deleted file mode 100644 index 97e27038f..000000000 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/command_set_player_order.proto +++ /dev/null @@ -1,15 +0,0 @@ -syntax = "proto2"; -import "game_commands.proto"; -message Command_SetPlayerOrder { - extend GameCommand { - optional Command_SetPlayerOrder ext = 1206; - } - - // The desired seating order, expressed as player names. Only used when - // randomize is false. - repeated string player_names = 1; - - // When set, the server shuffles the seating order instead of using - // player_names. - optional bool randomize = 2; -} diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_game_state_changed.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_game_state_changed.proto index bbf2d0f98..5c8aee3fe 100644 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/event_game_state_changed.proto +++ b/libcockatrice_protocol/libcockatrice/protocol/pb/event_game_state_changed.proto @@ -24,9 +24,4 @@ message Event_GameStateChanged { // the amount of seconds since the game started optional uint32 seconds_elapsed = 5; - - // the id of the player this event is addressed to. Used to re-identify the - // local player after seats have been shuffled. Only set for events sent to - // a specific participant, never for omniscient/replay events. - optional sint32 local_player_id = 6; } diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_player_order_changed.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_player_order_changed.proto deleted file mode 100644 index d119398b7..000000000 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/event_player_order_changed.proto +++ /dev/null @@ -1,13 +0,0 @@ -syntax = "proto2"; -import "game_event.proto"; -message Event_PlayerOrderChanged { - extend GameEvent { - optional Event_PlayerOrderChanged ext = 2023; - } - - // The new seating order, expressed as player names. - repeated string player_names = 1; - - // Whether the order was obtained by randomizing rather than set explicitly. - optional bool randomized = 2; -} diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/game_commands.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/game_commands.proto index eb399ffb9..2e5b88978 100644 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/game_commands.proto +++ b/libcockatrice_protocol/libcockatrice/protocol/pb/game_commands.proto @@ -180,11 +180,6 @@ message GameCommand { /// Server: Server_Player::cmdSetPlaymat /// Client: reflected via player properties changed event SET_PLAYMAT = 1035; - - /// Set the seating (turn) order of the players. - /// Server: Server_AbstractParticipant::cmdSetPlayerOrder - /// Client: reflected via Event_PlayerOrderChanged - SET_PLAYER_ORDER = 1206; } extensions 100 to max; diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/game_event.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/game_event.proto index 573d26453..7d3147701 100644 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/game_event.proto +++ b/libcockatrice_protocol/libcockatrice/protocol/pb/game_event.proto @@ -34,7 +34,6 @@ message GameEvent { CHANGE_ZONE_PROPERTIES = 2020; REVERSE_TURN = 2021; GAME_LOG_NOTICE = 2022; - PLAYER_ORDER_CHANGED = 2023; } optional sint32 player_id = 1 [default = -1]; extensions 100 to max; diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/moderator_commands.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/moderator_commands.proto index 04cb31d98..292917fa9 100644 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/moderator_commands.proto +++ b/libcockatrice_protocol/libcockatrice/protocol/pb/moderator_commands.proto @@ -87,16 +87,14 @@ message Command_ViewLogHistory { extend DeveloperCommand { optional Command_ViewLogHistory dev_ext = 1001; } - optional string user_name = 1; // user that created message - optional string ip_address = 2; // ip address of user that created message - optional string game_name = 3; // client id of user that created the message - optional string game_id = 4; // game number the message was sent to - optional string message = 5; // raw message that was sent - repeated string log_location = 6; // destination of message (ex: main room, game room, private chat) - required uint32 date_range = 7; // the length of time (in minutes) to look back for - optional uint32 maximum_results = 8; // the maximum number of query results (page size when paginating) - optional uint32 offset = 9 [default = 0]; // rows to skip for pagination, ORDER BY log_time DESC - optional string before_time = 10; // page those rows against this `log_time` snapshot (newest first page row) + optional string user_name = 1; // user that created message + optional string ip_address = 2; // ip address of user that created message + optional string game_name = 3; // client id of user that created the message + optional string game_id = 4; // game number the message was sent to + optional string message = 5; // raw message that was sent + repeated string log_location = 6; // destination of message (ex: main room, game room, private chat) + required uint32 date_range = 7; // the length of time (in minutes) to look back for + optional uint32 maximum_results = 8; // the maximum number of query results } message Command_GrantReplayAccess { diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_viewlog_history.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_viewlog_history.proto index 1041bca74..2ec0aff28 100644 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/response_viewlog_history.proto +++ b/libcockatrice_protocol/libcockatrice/protocol/pb/response_viewlog_history.proto @@ -7,5 +7,4 @@ message Response_ViewLogHistory { optional Response_ViewLogHistory ext = 1015; } repeated ServerInfo_ChatMessage log_message = 1; - optional bool has_more = 2 [default = false]; // true when more rows exist past this page } diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/room_commands.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/room_commands.proto index 3be7e4e64..9d9c6d277 100644 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/room_commands.proto +++ b/libcockatrice_protocol/libcockatrice/protocol/pb/room_commands.proto @@ -78,9 +78,6 @@ message Command_CreateGame { // share decklists with all players when selected optional bool share_decklists_on_load = 14; - - // shuffle the player order (seats) before each game starts - optional bool shuffle_players = 15; } message Command_JoinGame { diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_game.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_game.proto index 39ec79914..9989ae18a 100644 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_game.proto +++ b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_game.proto @@ -48,9 +48,6 @@ message ServerInfo_Game { // decklists are sent to all players when loaded optional bool share_decklists_on_load = 15; - // players are shuffled into new seats before each game starts - optional bool shuffle_players = 16; - // the current player count optional uint32 player_count = 30; diff --git a/libcockatrice_rng/CMakeLists.txt b/libcockatrice_rng/CMakeLists.txt index 77165122c..6128e3f6e 100644 --- a/libcockatrice_rng/CMakeLists.txt +++ b/libcockatrice_rng/CMakeLists.txt @@ -1,7 +1,13 @@ +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + set(HEADERS libcockatrice/rng/rng_abstract.h libcockatrice/rng/rng_sfmt.h libcockatrice/rng/sfmt/SFMT.h) +qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) + add_library( - libcockatrice_rng STATIC ${HEADERS} libcockatrice/rng/rng_abstract.cpp libcockatrice/rng/rng_sfmt.cpp + libcockatrice_rng STATIC ${MOC_SOURCES} libcockatrice/rng/rng_abstract.cpp libcockatrice/rng/rng_sfmt.cpp libcockatrice/rng/sfmt/SFMT.c ) diff --git a/libcockatrice_settings/CMakeLists.txt b/libcockatrice_settings/CMakeLists.txt index a3b9a68db..5a2fa42a9 100644 --- a/libcockatrice_settings/CMakeLists.txt +++ b/libcockatrice_settings/CMakeLists.txt @@ -1,3 +1,7 @@ +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + set(HEADERS libcockatrice/settings/appearance_settings.h libcockatrice/settings/cache_storage_settings.h @@ -27,9 +31,11 @@ set(HEADERS libcockatrice/settings/visual_deck_storage_settings.h ) +qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) + add_library( libcockatrice_settings STATIC - ${HEADERS} + ${MOC_SOURCES} libcockatrice/settings/appearance_settings.cpp libcockatrice/settings/cache_storage_settings.cpp libcockatrice/settings/card_database_settings.cpp diff --git a/libcockatrice_settings/libcockatrice/settings/game_settings.cpp b/libcockatrice_settings/libcockatrice/settings/game_settings.cpp index 89fe7b85e..c8c6463e3 100644 --- a/libcockatrice_settings/libcockatrice/settings/game_settings.cpp +++ b/libcockatrice_settings/libcockatrice/settings/game_settings.cpp @@ -71,11 +71,6 @@ bool GameSettings::getShareDecklistsOnLoad() const return getValue("shareDecklistsOnLoad", "game").toBool(); } -bool GameSettings::getShufflePlayers() const -{ - return getValue("shuffleplayers", "game").toBool(); -} - bool GameSettings::getRememberGameSettings() const { return getValue("rememberGameSettings", "game", QString(), true).toBool(); @@ -156,11 +151,6 @@ void GameSettings::setShareDecklistsOnLoad(bool _shareDecklistsOnLoad) setValue(_shareDecklistsOnLoad, "shareDecklistsOnLoad", "game"); } -void GameSettings::setShufflePlayers(bool _shufflePlayers) -{ - setValue(_shufflePlayers, "shuffleplayers", "game"); -} - void GameSettings::setRememberGameSettings(bool _rememberGameSettings) { setValue(_rememberGameSettings, "rememberGameSettings", "game"); diff --git a/libcockatrice_settings/libcockatrice/settings/game_settings.h b/libcockatrice_settings/libcockatrice/settings/game_settings.h index 45ec8554b..3e64234fc 100644 --- a/libcockatrice_settings/libcockatrice/settings/game_settings.h +++ b/libcockatrice_settings/libcockatrice/settings/game_settings.h @@ -27,7 +27,6 @@ public: [[nodiscard]] bool getCreateGameAsSpectator() const override; [[nodiscard]] int getDefaultStartingLifeTotal() const override; [[nodiscard]] bool getShareDecklistsOnLoad() const override; - [[nodiscard]] bool getShufflePlayers() const override; [[nodiscard]] bool getRememberGameSettings() const override; [[nodiscard]] bool getLocalGameRememberSettings() const override; [[nodiscard]] int getLocalGameMaxPlayers() const override; @@ -45,7 +44,6 @@ public: void setCreateGameAsSpectator(bool _createGameAsSpectator); void setDefaultStartingLifeTotal(int _defaultStartingLifeTotal); void setShareDecklistsOnLoad(bool _shareDecklistsOnLoad); - void setShufflePlayers(bool _shufflePlayers); void setRememberGameSettings(bool _rememberGameSettings); void setLocalGameRememberSettings(bool value); void setLocalGameMaxPlayers(int value); diff --git a/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp b/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp index 38b87b97c..4595da2a2 100644 --- a/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp +++ b/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp @@ -5,118 +5,16 @@ #include #include #include -#include -#include +#include #include -#include -#include +#include #include -namespace -{ -constexpr auto SERVER_GROUP = "server"; -constexpr auto SERVER_DETAILS_GROUP = "server_details"; -constexpr auto SERVERS_ARRAY = "servers"; - -QString legacyKey(const char *field, int index) -{ - return QStringLiteral("%1/%2%3") - .arg(QString::fromLatin1(SERVER_DETAILS_GROUP), QString::fromLatin1(field)) - .arg(index); -} - -//! Expects \a settings to be positioned on the server group. -QList readServerArray(QSettings &settings) -{ - QList servers; - - settings.beginGroup(SERVER_DETAILS_GROUP); - const int size = settings.beginReadArray(SERVERS_ARRAY); - servers.reserve(size); - for (int i = 0; i < size; ++i) { - settings.setArrayIndex(i); - ServersSettings::ServerEntry entry; - entry.saveName = settings.value("saveName").toString(); - entry.host = settings.value("server").toString(); - entry.port = settings.value("port").toString(); - entry.username = settings.value("username").toString(); - entry.password = settings.value("password").toString(); - entry.savePassword = settings.value("savePassword").toBool(); - entry.site = settings.value("site").toString(); - servers.append(entry); - } - settings.endArray(); - settings.endGroup(); - - return servers; -} - -//! Expects \a settings to be positioned on the server group. -QList readLegacyServers(QSettings &settings, int lastIndex) -{ - QList servers; - - for (int i = 0; i <= lastIndex; ++i) { - ServersSettings::ServerEntry entry; - entry.saveName = settings.value(legacyKey("saveName", i)).toString(); - entry.host = settings.value(legacyKey("server", i)).toString(); - entry.port = settings.value(legacyKey("port", i)).toString(); - entry.username = settings.value(legacyKey("username", i)).toString(); - entry.password = settings.value(legacyKey("password", i)).toString(); - entry.savePassword = settings.value(legacyKey("savePassword", i)).toBool(); - entry.site = settings.value(legacyKey("site", i)).toString(); - - // Older builds could leave the unused index 0 behind. - if (!entry.saveName.isEmpty() || !entry.host.isEmpty()) { - servers.append(entry); - } - } - - return servers; -} - -void writeServerArray(QSettings &settings, const QList &servers) -{ - settings.beginGroup(SERVER_DETAILS_GROUP); - // beginWriteArray() never drops entries past the new size, so without this - // a removed profile would keep its slot - including its saved password - - // in servers.ini forever. The legacy keys live beside the array, not in it. - settings.remove(SERVERS_ARRAY); - settings.beginWriteArray(SERVERS_ARRAY, servers.size()); - for (int i = 0; i < servers.size(); ++i) { - settings.setArrayIndex(i); - const ServersSettings::ServerEntry &entry = servers.at(i); - settings.setValue("saveName", entry.saveName); - settings.setValue("server", entry.host); - settings.setValue("port", entry.port); - settings.setValue("username", entry.username); - settings.setValue("password", entry.password); - settings.setValue("savePassword", entry.savePassword); - settings.setValue("site", entry.site); - } - settings.endArray(); - settings.endGroup(); -} -} // namespace +class QObject; ServersSettings::ServersSettings(const QString &settingPath, QObject *parent) - : SettingsManager(settingPath + "servers.ini", SERVER_GROUP, QString(), parent) + : SettingsManager(settingPath + "servers.ini", "server", QString(), parent) { - migrateLegacyServers(); -} - -QList ServersSettings::getServers() const -{ - return loadServers(); -} - -std::optional ServersSettings::getServer(int index) const -{ - const QList servers = loadServers(); - if (index < 0 || index >= servers.size()) { - return std::nullopt; - } - return servers.at(index); } void ServersSettings::setPreviousHostLogin(int previous) @@ -147,14 +45,16 @@ void ServersSettings::setPrevioushostName(const QString &name) QString ServersSettings::getSaveName(QString defaultname) { - const auto server = getServer(getPrevioushostindex(getPrevioushostName())); - return server ? server->saveName : std::move(defaultname); + int index = getPrevioushostindex(getPrevioushostName()); + QVariant saveName = getValue(QString("saveName%1").arg(index), "server", "server_details"); + return saveName == QVariant() ? std::move(defaultname) : saveName.toString(); } QString ServersSettings::getSite(QString defaultSite) { - const auto server = getServer(getPrevioushostindex(getPrevioushostName())); - return server ? server->site : std::move(defaultSite); + int index = getPrevioushostindex(getPrevioushostName()); + QVariant site = getValue(QString("site%1").arg(index), "server", "server_details"); + return site == QVariant() ? std::move(defaultSite) : site.toString(); } QString ServersSettings::getPrevioushostName() const @@ -165,9 +65,10 @@ QString ServersSettings::getPrevioushostName() const int ServersSettings::getPrevioushostindex(const QString &saveName) const { - const QList servers = loadServers(); - for (int i = 0; i < servers.size(); ++i) { - if (servers.at(i).saveName == saveName) { + int size = getValue("totalServers", "server", "server_details").toInt(); + + for (int i = 0; i <= size; ++i) { + if (saveName == getValue(QString("saveName%1").arg(i), "server", "server_details").toString()) { return i; } } @@ -177,38 +78,43 @@ int ServersSettings::getPrevioushostindex(const QString &saveName) const QString ServersSettings::getHostname(QString defaultHost) const { - const auto server = getServer(getPrevioushostindex(getPrevioushostName())); - return server ? server->host : std::move(defaultHost); + int index = getPrevioushostindex(getPrevioushostName()); + QVariant hostname = getValue(QString("server%1").arg(index), "server", "server_details"); + return hostname == QVariant() ? std::move(defaultHost) : hostname.toString(); } QString ServersSettings::getPort(QString defaultPort) const { - const auto server = getServer(getPrevioushostindex(getPrevioushostName())); - qCDebug(ServersSettingsLog) << "getPort() found server = " << server.has_value(); - return server ? server->port : std::move(defaultPort); + int index = getPrevioushostindex(getPrevioushostName()); + QVariant port = getValue(QString("port%1").arg(index), "server", "server_details"); + qCDebug(ServersSettingsLog) << "getPort() index = " << index << " port.val = " << port.toString(); + return port == QVariant() ? std::move(defaultPort) : port.toString(); } QString ServersSettings::getPlayerName(QString defaultName) const { - const auto server = getServer(getPrevioushostindex(getPrevioushostName())); - qCDebug(ServersSettingsLog) << "getPlayerName() found server = " << server.has_value(); - return server ? server->username : std::move(defaultName); + int index = getPrevioushostindex(getPrevioushostName()); + QVariant name = getValue(QString("username%1").arg(index), "server", "server_details"); + qCDebug(ServersSettingsLog) << "getPlayerName() index = " << index << " name.val = " << name.toString(); + return name == QVariant() ? std::move(defaultName) : name.toString(); } QString ServersSettings::getPassword() { - const auto server = getServer(getPrevioushostindex(getPrevioushostName())); - if (!server || !server->savePassword) { - return QString(); + int index = getPrevioushostindex(getPrevioushostName()); + + if (getSavePassword()) { + return getValue(QString("password%1").arg(index), "server", "server_details").toString(); } - return server->password; + return QString(); } bool ServersSettings::getSavePassword() const { - const auto server = getServer(getPrevioushostindex(getPrevioushostName())); - return server && server->savePassword; + int index = getPrevioushostindex(getPrevioushostName()); + bool save = getValue(QString("savePassword%1").arg(index), "server", "server_details").toBool(); + return save; } void ServersSettings::setAutoConnect(int autoconnect) @@ -251,19 +157,15 @@ void ServersSettings::setFPPlayerName(QString playerName) void ServersSettings::setServerPassword(const QString &saveName, const QString &password) { - QList servers = loadServers(); - for (ServerEntry &server : servers) { - if (server.saveName == saveName) { - server.password = password; - storeServers(servers); - return; - } + const int index = getPrevioushostindex(saveName); + if (index >= 0) { + setValue(password, QString("password%1").arg(index), "server", "server_details"); + } else { + // A credential write that silently no-ops is hard to diagnose from a + // bug report; surface a mismatched profile name instead. + qCWarning(ServersSettingsLog) << "setServerPassword() could not find profile:" << saveName + << "- password not saved"; } - - // A credential write that silently no-ops is hard to diagnose from a bug - // report; surface a mismatched profile name instead. - qCWarning(ServersSettingsLog) << "setServerPassword() could not find profile:" << saveName - << "- password not saved"; } QString ServersSettings::getFPPlayerName(QString defaultName) const @@ -300,29 +202,62 @@ void ServersSettings::addNewServer(const QString &saveName, return; } - QList servers = loadServers(); - ServerEntry entry; - entry.saveName = saveName; - entry.host = serv; - entry.port = port; - entry.username = username; - entry.password = password; - entry.savePassword = savePassword; - entry.site = site; - servers.append(entry); - storeServers(servers); + int index = getValue("totalServers", "server", "server_details").toInt() + 1; + + setValue(saveName, QString("saveName%1").arg(index), "server", "server_details"); + setValue(serv, QString("server%1").arg(index), "server", "server_details"); + setValue(port, QString("port%1").arg(index), "server", "server_details"); + setValue(username, QString("username%1").arg(index), "server", "server_details"); + setValue(savePassword, QString("savePassword%1").arg(index), "server", "server_details"); + setValue(index, "totalServers", "server", "server_details"); + setValue(password, QString("password%1").arg(index), "server", "server_details"); + setValue(site, QString("site%1").arg(index), "server", "server_details"); } void ServersSettings::removeServer(QString servAddr) { - QList servers = loadServers(); - for (int i = 0; i < servers.size(); ++i) { - if (servers.at(i).host == servAddr) { - servers.removeAt(i); - storeServers(servers); - return; + int size = getValue("totalServers", "server", "server_details").toInt(); + + bool found = false; + for (int i = 0; i <= size; ++i) { + if (!found) { + // find entry and overwrite it + if (servAddr == getValue(QString("server%1").arg(i), "server", "server_details").toString()) { + found = true; + } + } else { + // move all other entries after it one back, overwriting the previous one + int previous = i - 1; // we delete only one entry + setValue(getValue(QString("server%1").arg(i), "server", "server_details"), + QString("server%1").arg(previous), "server", "server_details"); + setValue(getValue(QString("port%1").arg(i), "server", "server_details"), QString("port%1").arg(previous), + "server", "server_details"); + setValue(getValue(QString("username%1").arg(i), "server", "server_details"), + QString("username%1").arg(previous), "server", "server_details"); + setValue(getValue(QString("savePassword%1").arg(i), "server", "server_details"), + QString("savePassword%1").arg(previous), "server", "server_details"); + setValue(getValue(QString("password%1").arg(i), "server", "server_details"), + QString("password%1").arg(previous), "server", "server_details"); + setValue(getValue(QString("saveName%1").arg(i), "server", "server_details"), + QString("saveName%1").arg(previous), "server", "server_details"); + setValue(getValue(QString("site%1").arg(i), "server", "server_details"), QString("site%1").arg(previous), + "server", "server_details"); } } + + // if we have deleted an entry, adjust the total + if (found) { + setValue(size - 1, "totalServers", "server", "server_details"); + + // delete last value + deleteValue(QString("server%1").arg(size), "server", "server_details"); + deleteValue(QString("port%1").arg(size), "server", "server_details"); + deleteValue(QString("username%1").arg(size), "server", "server_details"); + deleteValue(QString("savePassword%1").arg(size), "server", "server_details"); + deleteValue(QString("password%1").arg(size), "server", "server_details"); + deleteValue(QString("saveName%1").arg(size), "server", "server_details"); + deleteValue(QString("site%1").arg(size), "server", "server_details"); + } } /** @@ -330,23 +265,23 @@ void ServersSettings::removeServer(QString servAddr) */ bool ServersSettings::updateExistingServerWithoutLoss(QString saveName, QString serv, QString port, QString site) { - QList servers = loadServers(); - for (ServerEntry &server : servers) { - if (server.host != serv) { - continue; - } + int size = getValue("totalServers", "server", "server_details").toInt(); - if (!port.isEmpty()) { - server.port = port; + for (int i = 0; i <= size; ++i) { + if (serv == getValue(QString("server%1").arg(i), "server", "server_details").toString()) { + if (!port.isEmpty()) { + setValue(port, QString("port%1").arg(i), "server", "server_details"); + } + + if (!site.isEmpty()) { + setValue(site, QString("site%1").arg(i), "server", "server_details"); + } + + setValue(saveName, QString("saveName%1").arg(i), "server", "server_details"); + + return true; } - if (!site.isEmpty()) { - server.site = site; - } - server.saveName = saveName; - storeServers(servers); - return true; } - return false; } @@ -358,13 +293,17 @@ bool ServersSettings::updateExistingServer(QString saveName, bool savePassword, QString site) { - const int index = findServerIndex(serv, port); - if (index < 0) { - return false; - } + int size = getValue("totalServers", "server", "server_details").toInt(); - updateServerFields(index, saveName, username, password, savePassword, site); - return true; + for (int i = 0; i <= size; ++i) { + if (serv == getValue(QString("server%1").arg(i), "server", "server_details").toString()) { + setValue(port, QString("port%1").arg(i), "server", "server_details"); + updateServerFields(i, saveName, username, password, savePassword, site); + + return true; + } + } + return false; } void ServersSettings::updateServerFields(int index, @@ -374,33 +313,33 @@ void ServersSettings::updateServerFields(int index, bool savePassword, const QString &site) { - QList servers = loadServers(); - if (index < 0 || index >= servers.size()) { - return; + if (!username.isEmpty()) { + setValue(username, QString("username%1").arg(index), "server", "server_details"); } - ServerEntry &server = servers[index]; - if (!username.isEmpty()) { - server.username = username; - } if (savePassword && !password.isEmpty()) { - server.password = password; + setValue(password, QString("password%1").arg(index), "server", "server_details"); } else { - server.password.clear(); + setValue(QString(), QString("password%1").arg(index), "server", "server_details"); } + if (!site.isEmpty()) { - server.site = site; + setValue(site, QString("site%1").arg(index), "server", "server_details"); } - server.savePassword = savePassword; - server.saveName = saveName; - storeServers(servers); + + setValue(savePassword, QString("savePassword%1").arg(index), "server", "server_details"); + setValue(saveName, QString("saveName%1").arg(index), "server", "server_details"); } int ServersSettings::findServerIndex(const QString &host, const QString &port) const { - const QList servers = loadServers(); - for (int i = 0; i < servers.size(); ++i) { - if (servers.at(i).host == host && servers.at(i).port == port) { + int size = getValue("totalServers", "server", "server_details").toInt(); + + for (int i = 0; i <= size; ++i) { + QString storedHost = getValue(QString("server%1").arg(i), "server", "server_details").toString(); + QString storedPort = getValue(QString("port%1").arg(i), "server", "server_details").toString(); + + if (storedHost == host && storedPort == port) { return i; } } @@ -410,9 +349,12 @@ int ServersSettings::findServerIndex(const QString &host, const QString &port) c int ServersSettings::findHostIndex(const QString &host) const { - const QList servers = loadServers(); - for (int i = 0; i < servers.size(); ++i) { - if (servers.at(i).host.compare(host, Qt::CaseInsensitive) == 0) { + int size = getValue("totalServers", "server", "server_details").toInt(); + + for (int i = 0; i <= size; ++i) { + QString storedHost = getValue(QString("server%1").arg(i), "server", "server_details").toString(); + + if (storedHost.compare(host, Qt::CaseInsensitive) == 0) { return i; } } @@ -422,100 +364,29 @@ int ServersSettings::findHostIndex(const QString &host) const bool ServersSettings::hasUsername(const QString &host, const QString &port) const { - const auto server = getServer(findServerIndex(host, port)); - return server && !server->username.isEmpty(); + int index = findServerIndex(host, port); + if (index < 0) { + return false; + } + + QString user = getValue(QString("username%1").arg(index), "server", "server_details").toString(); + return !user.isEmpty(); } bool ServersSettings::hasCredentials(const QString &host, const QString &port) const { - const auto server = getServer(findServerIndex(host, port)); - return server && server->savePassword && !server->password.isEmpty(); + int index = findServerIndex(host, port); + if (index < 0) { + return false; + } + + bool save = getValue(QString("savePassword%1").arg(index), "server", "server_details").toBool(); + QString password = getValue(QString("password%1").arg(index), "server", "server_details").toString(); + + return save && !password.isEmpty(); } bool ServersSettings::hasLoginData(const QString &host, const QString &port) const { return hasUsername(host, port) && hasCredentials(host, port); } - -QList ServersSettings::loadServers() const -{ - QSettings settings = getSettings(); - settings.beginGroup(SERVER_GROUP); - const QList servers = readServerArray(settings); - settings.endGroup(); - - return servers; -} - -void ServersSettings::storeServers(const QList &servers) -{ - batchWrite([&servers](QSettings &settings) { - settings.beginGroup(SERVER_GROUP); - writeServerArray(settings, servers); - settings.endGroup(); - }); -} - -void ServersSettings::migrateLegacyServers() -{ - { - QSettings settings = getSettings(); - settings.beginGroup(SERVER_GROUP); - // Only builds that predate the array format write this marker. Once it - // is gone there is nothing left to import and no reason to touch the - // file (a sync on every start is a needless open-and-write). - const bool hasLegacy = settings.contains(QStringLiteral("%1/totalServers").arg(SERVER_DETAILS_GROUP)); - settings.endGroup(); - - if (!hasLegacy) { - return; - } - } - - const QSettings::Status status = batchWrite([](QSettings &settings) { - settings.beginGroup(SERVER_GROUP); - - const int lastLegacyIndex = - settings.value(QStringLiteral("%1/totalServers").arg(SERVER_DETAILS_GROUP), -1).toInt(); - - QList servers = readServerArray(settings); - - // An older build can write the legacy keys again after the array - // migration, so the array is not automatically complete: append every - // legacy profile the array does not already hold instead of dropping it. - int imported = 0; - const QList legacyServers = readLegacyServers(settings, lastLegacyIndex); - for (const ServersSettings::ServerEntry &entry : legacyServers) { - const bool known = - std::any_of(servers.cbegin(), servers.cend(), [&entry](const ServersSettings::ServerEntry &existing) { - return existing.host == entry.host && existing.port == entry.port; - }); - if (!known) { - servers.append(entry); - ++imported; - } - } - - writeServerArray(settings, servers); - if (imported > 0) { - qCDebug(ServersSettingsLog) << "Migrated" << imported << "server profiles to the array format"; - } - - // The array (freshly written or already present) is authoritative now. - for (int i = 0; i <= lastLegacyIndex; ++i) { - settings.remove(legacyKey("saveName", i)); - settings.remove(legacyKey("server", i)); - settings.remove(legacyKey("port", i)); - settings.remove(legacyKey("username", i)); - settings.remove(legacyKey("password", i)); - settings.remove(legacyKey("savePassword", i)); - settings.remove(legacyKey("site", i)); - } - settings.remove(QStringLiteral("%1/totalServers").arg(SERVER_DETAILS_GROUP)); - settings.endGroup(); - }); - - if (status != QSettings::NoError) { - qCWarning(ServersSettingsLog) << "Failed to migrate server profiles:" << status; - } -} diff --git a/libcockatrice_settings/libcockatrice/settings/servers_settings.h b/libcockatrice_settings/libcockatrice/settings/servers_settings.h index b403b1cea..38bb02876 100644 --- a/libcockatrice_settings/libcockatrice/settings/servers_settings.h +++ b/libcockatrice_settings/libcockatrice/settings/servers_settings.h @@ -9,11 +9,9 @@ #include "settings_manager.h" -#include #include #include #include -#include #include class QObject; @@ -29,22 +27,6 @@ class ServersSettings : public SettingsManager friend class SettingsCache; public: - struct ServerEntry - { - QString saveName; - QString host; - QString port; - QString username; - QString password; - bool savePassword = false; - QString site; - }; - - explicit ServersSettings(const QString &settingPath, QObject *parent = nullptr); - - QList getServers() const; - std::optional getServer(int index) const; - int getPreviousHostLogin() const; int getPrevioushostindex(const QString &) const; QStringList getPreviousHostList() const; @@ -106,11 +88,8 @@ public: bool getClearDebugLogStatus(bool abDefaultValue) const; private: + explicit ServersSettings(const QString &settingPath, QObject *parent = nullptr); ServersSettings(const ServersSettings & /*other*/); - - QList loadServers() const; - void storeServers(const QList &servers); - void migrateLegacyServers(); }; #endif // SERVERSSETTINGS_H diff --git a/libcockatrice_settings/libcockatrice/settings/settings_manager.cpp b/libcockatrice_settings/libcockatrice/settings/settings_manager.cpp index 7cc1fd7be..f98778ca0 100644 --- a/libcockatrice_settings/libcockatrice/settings/settings_manager.cpp +++ b/libcockatrice_settings/libcockatrice/settings/settings_manager.cpp @@ -193,12 +193,13 @@ QVariant SettingsManager::getValue(const QString &name, return value; } -QSettings::Status SettingsManager::batchWrite(std::function batchWriteFunction) +void SettingsManager::batchWrite(std::function batchWriteFunction) { auto settings = getSettings(); + settings.setAtomicSyncRequired(false); batchWriteFunction(settings); settings.sync(); // single flush - return settings.status(); + settings.setAtomicSyncRequired(true); } /** diff --git a/libcockatrice_settings/libcockatrice/settings/settings_manager.h b/libcockatrice_settings/libcockatrice/settings/settings_manager.h index 760d095e6..8d3110106 100644 --- a/libcockatrice_settings/libcockatrice/settings/settings_manager.h +++ b/libcockatrice_settings/libcockatrice/settings/settings_manager.h @@ -28,9 +28,7 @@ public: QVariant getValue(const QString &name, const QString &group, const QString &subGroup = QString()) const; QVariant getValue(const QString &name, const QString &group, const QString &subGroup, const QVariant &defaultValue) const; - //! \brief Runs \a batchWriteFunction on a temporary QSettings and syncs once. - //! \return the status of the underlying file after the final sync. - QSettings::Status batchWrite(std::function batchWriteFunction); + void batchWrite(std::function batchWriteFunction); void sync(); diff --git a/libcockatrice_utility/CMakeLists.txt b/libcockatrice_utility/CMakeLists.txt index 98ad40e69..55f1daf24 100644 --- a/libcockatrice_utility/CMakeLists.txt +++ b/libcockatrice_utility/CMakeLists.txt @@ -1,6 +1,10 @@ cmake_minimum_required(VERSION 3.16) project(Utility VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + set(UTILITY_SOURCES libcockatrice/utility/cryptoutil.cpp libcockatrice/utility/expression.cpp @@ -8,7 +12,6 @@ set(UTILITY_SOURCES libcockatrice/utility/passwordhasher.cpp libcockatrice/utility/report_categories.cpp libcockatrice/utility/server_rate_limiter.cpp - libcockatrice/utility/svg_recolor.cpp libcockatrice/utility/translation_loader.cpp libcockatrice/utility/user_data_backup.cpp libcockatrice/utility/warning_categories.cpp @@ -35,7 +38,6 @@ set(UTILITY_HEADERS libcockatrice/utility/zone_names.h libcockatrice/utility/days_years_between.h libcockatrice/utility/server_rate_limiter.h - libcockatrice/utility/svg_recolor.h libcockatrice/utility/translation_loader.h libcockatrice/utility/user_data_backup.h libcockatrice/utility/warning_categories.h diff --git a/libcockatrice_utility/libcockatrice/utility/passwordhasher.cpp b/libcockatrice_utility/libcockatrice/utility/passwordhasher.cpp index 8e876d5bc..a7106aadc 100644 --- a/libcockatrice_utility/libcockatrice/utility/passwordhasher.cpp +++ b/libcockatrice_utility/libcockatrice/utility/passwordhasher.cpp @@ -62,11 +62,9 @@ QByteArray PasswordHasher::deriveKey(const QString &password, const QByteArray & { QByteArray key(SCRYPT_VERIFIER_LENGTH, '\0'); const QByteArray passwordUtf8 = password.toUtf8(); - // EVP_PBE_scrypt aborts unless maxmem covers the required working memory: V is 128 * n * - // r bytes, B is 128 * r * p, and XY is 256 * r. Under-budgeting XY makes OpenSSL fail - // for r >= 17, which costParamsAreSane still accepts. - const auto maxmem = - static_cast(128) * n * r + static_cast(128) * r * p + static_cast(256) * r + 4096; + // EVP_PBE_scrypt aborts unless maxmem covers the required working memory, + // which is roughly 128 * n * r bytes (plus the small Salsa20/8 block array). + const auto maxmem = static_cast(128) * n * r + static_cast(128) * r * p + 4096; if (EVP_PBE_scrypt(passwordUtf8.constData(), passwordUtf8.size(), reinterpret_cast(salt.constData()), salt.size(), n, r, p, maxmem, reinterpret_cast(key.data()), key.size()) != 1) { diff --git a/libcockatrice_utility/libcockatrice/utility/svg_recolor.cpp b/libcockatrice_utility/libcockatrice/utility/svg_recolor.cpp deleted file mode 100644 index 041e289fe..000000000 --- a/libcockatrice_utility/libcockatrice/utility/svg_recolor.cpp +++ /dev/null @@ -1,44 +0,0 @@ -#include "svg_recolor.h" - -#include - -namespace -{ -constexpr QByteArrayView SENTINEL = "currentColor"; - -/// Case-insensitive byte search for the sentinel, starting at @p from. -/// QByteArray::indexOf() only matches case-sensitively for QByteArrayView, and -/// its char overload cannot match a word. -qsizetype findSentinel(const QByteArray &bytes, qsizetype from) -{ - // QByteArrayView::sliced() is a view, so the scan does not allocate a copy - // at every byte position (QByteArray::sliced() would). - const QByteArrayView view(bytes); - for (qsizetype i = from; i + SENTINEL.size() <= view.size(); ++i) { - if (view.sliced(i, SENTINEL.size()).compare(SENTINEL, Qt::CaseInsensitive) == 0) { - return i; - } - } - return -1; -} -} // namespace - -QByteArray resolveSvgColorSentinel(const QByteArray &svg, const QByteArray &color) -{ - // The sentinel and the replacement are both ASCII, so stay in bytes: a - // QString round trip would decode the whole document (and mangle bytes that - // are not valid UTF-8) even on the no-op path. - qsizetype pos = findSentinel(svg, 0); - if (pos < 0) { - return svg; - } - - QByteArray resolved = svg; - while (pos >= 0) { - resolved.replace(pos, SENTINEL.size(), color); - // Skip past the inserted color: a caller's color never contains the - // sentinel, and this keeps the scan linear. - pos = findSentinel(resolved, pos + color.size()); - } - return resolved; -} diff --git a/libcockatrice_utility/libcockatrice/utility/svg_recolor.h b/libcockatrice_utility/libcockatrice/utility/svg_recolor.h deleted file mode 100644 index 56d609b87..000000000 --- a/libcockatrice_utility/libcockatrice/utility/svg_recolor.h +++ /dev/null @@ -1,31 +0,0 @@ -/** - * @file svg_recolor.h - * @ingroup Core - */ - -#ifndef SVG_RECOLOR_H -#define SVG_RECOLOR_H - -#include - -/** - * @brief Resolves the `currentColor` sentinel in authored SVG data. - * - * Qt's SVG renderer has no CSS cascade or ambient color context, so the - * sentinel is not resolved by Qt. Callers pass the concrete color they want - * (for example a QPalette role serialized to #RRGGBB) and receive SVG bytes - * that are safe to hand to QSvgRenderer. - * - * Matching is a plain, case-insensitive substring search, not a CSS parse: an - * identifier that merely starts with the sentinel (for example - * `id="currentColorStop"`) is rewritten too. That is acceptable for the assets - * this project authors, and keeps the resolver dependency-free. - * - * @param svg SVG source bytes, expected to be UTF-8. Invalid UTF-8 is preserved - * byte-for-byte, since the resolver never decodes the document. - * @param color Concrete SVG color (for example "#ff00ff"), as ASCII bytes. - * @return The recolored SVG source; the input is left untouched. - */ -QByteArray resolveSvgColorSentinel(const QByteArray &svg, const QByteArray &color); - -#endif // SVG_RECOLOR_H diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt index 4ca2acd07..0df345812 100644 --- a/oracle/CMakeLists.txt +++ b/oracle/CMakeLists.txt @@ -17,7 +17,6 @@ set(ORACLE_WIN32_QM_INSTALL_DIR "translations") # Sources # ------------------------ set(oracle_SOURCES - src/database_writer.cpp src/main.cpp src/oraclewizard.cpp src/oracleimporter.cpp @@ -31,7 +30,6 @@ set(oracle_SOURCES ../cockatrice/src/client/network/update/client/release_channel.cpp ../cockatrice/src/interface/pixel_map_generator.cpp ../cockatrice/src/interface/theme_config.cpp - ../cockatrice/src/interface/theme_icon.cpp ../cockatrice/src/interface/theme_manager.cpp ${VERSION_STRING_CPP} ) @@ -65,7 +63,7 @@ set(oracle_RESOURCES oracle.qrc) # ------------------------ # Qt resources # ------------------------ -qt_add_resources(oracle_RESOURCES_RCC ${oracle_RESOURCES}) +qt6_add_resources(oracle_RESOURCES_RCC ${oracle_RESOURCES}) # ------------------------ # Include directories @@ -110,7 +108,7 @@ set(ORACLE_UNIX_QM_INSTALL_DIR "share/oracle/translations") set(ORACLE_WIN32_QM_INSTALL_DIR "translations") # Qt6 Translations are linked after the executable is created in manual mode -qt_add_executable( +qt6_add_executable( oracle WIN32 MACOSX_BUNDLE @@ -285,7 +283,7 @@ endif() if(Qt6LinguistTools_FOUND) #Qt6 Translations happen after the executable is built up if(UPDATE_TRANSLATIONS) - qt_add_translations( + qt6_add_translations( oracle TS_FILES ${oracle_TS} @@ -295,7 +293,7 @@ if(Qt6LinguistTools_FOUND) oracle_QM ) else() - qt_add_translations(oracle TS_FILES ${oracle_TS} QM_FILES_OUTPUT_VARIABLE oracle_QM) + qt6_add_translations(oracle TS_FILES ${oracle_TS} QM_FILES_OUTPUT_VARIABLE oracle_QM) endif() if(UNIX) @@ -321,4 +319,4 @@ if(Qt6LinguistTools_FOUND) endforeach() endif() -qt_finalize_target(oracle) +qt6_finalize_target(oracle) diff --git a/oracle/src/database_writer.cpp b/oracle/src/database_writer.cpp deleted file mode 100644 index e80aa853a..000000000 --- a/oracle/src/database_writer.cpp +++ /dev/null @@ -1,52 +0,0 @@ -#include "database_writer.h" - -#include -#include -#include -#include - -namespace OracleDatabase -{ -QString validateXml(const QByteArray &data) -{ - QXmlStreamReader xml(data); - if (!xml.readNextStartElement() || xml.name() != QLatin1String("cockatrice_carddatabase")) { - return QCoreApplication::translate("OracleDatabase", "The download is not a Cockatrice card database."); - } - const auto version = xml.attributes().value("version"); - if (version != QLatin1String("3") && version != QLatin1String("4")) { - return QCoreApplication::translate("OracleDatabase", "The downloaded card database version is not supported."); - } - while (!xml.atEnd()) { - xml.readNext(); - } - if (xml.hasError()) { - return QCoreApplication::translate("OracleDatabase", - "The downloaded card database is incomplete or invalid: %1") - .arg(xml.errorString()); - } - return {}; -} - -bool saveXml(const QString &fileName, const QByteArray &data, QString *error) -{ - const QString validationError = validateXml(data); - if (!validationError.isEmpty()) { - if (error) { - *error = validationError; - } - return false; - } - QSaveFile file(fileName); - if (!file.open(QIODevice::WriteOnly) || file.write(data) != data.size() || !file.commit()) { - if (error) { - *error = file.errorString(); - } - return false; - } - if (error) { - error->clear(); - } - return true; -} -} // namespace OracleDatabase diff --git a/oracle/src/database_writer.h b/oracle/src/database_writer.h deleted file mode 100644 index 173fd23ab..000000000 --- a/oracle/src/database_writer.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef ORACLE_DATABASE_WRITER_H -#define ORACLE_DATABASE_WRITER_H - -#include -#include - -namespace OracleDatabase -{ -// Validate the complete downloaded document without allocating a card database. -// Empty string means valid; otherwise returns a diagnostic suitable for the wizard. -QString validateXml(const QByteArray &data); -// Never truncate the installed database: validate, write a sibling temporary file, -// check the complete write and atomically commit it. -bool saveXml(const QString &fileName, const QByteArray &data, QString *error = nullptr); -} // namespace OracleDatabase - -#endif diff --git a/oracle/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp index c83c962e3..477c54d21 100644 --- a/oracle/src/oracleimporter.cpp +++ b/oracle/src/oracleimporter.cpp @@ -100,10 +100,6 @@ static CardSet::Priority getSetPriority(const QString &setType, const QString &s bool OracleImporter::readSetsFromByteArray(QByteArray data) { - importSuccessful = false; - importError.clear(); - allSets.clear(); - rawSetsData.clear(); const RawJson::ScanProgressCallback progress = progressReporting ? [this]( @@ -768,15 +764,7 @@ int OracleImporter::startImport() { static ICardSetPriorityController *noOpController = new NoopCardSetPriorityController(); - importSuccessful = false; - importError.clear(); - sets.clear(); - cards.clear(); - localizedEntries.clear(); - splitLocalizedTexts.clear(); - if (allSets.isEmpty()) { - return failImport(tr("No set has been selected for import.")); - } + importCancelled.storeRelease(0); // Pre-allocate the cards hash to avoid rehashing during import. Keys are // distinct card names while raw ranges only count printings (AllPrintings @@ -798,7 +786,9 @@ int OracleImporter::startImport() for (const SetToDownload &curSetToParse : allSets) { if (importCancelled.loadAcquire()) { - return failImport(tr("The card database import was cancelled.")); + // The wizard was closed mid-import: stop at the next set boundary so + // the caller can wait for this future without processing every set. + break; } CardSetPtr newSet = CardSet::newInstance(noOpController, curSetToParse.getShortName(), @@ -808,20 +798,30 @@ int OracleImporter::startImport() // parse only this set's slice of the raw document so the whole JSON tree is // never kept in memory at once const RawJson::SetDataRange &rawRange = curSetToParse.getRawRange(); - if (rawRange.start < 0 || rawRange.length <= 0 || rawRange.start > rawSetsData.size() || - rawRange.length > rawSetsData.size() - rawRange.start) { - return failImport(tr("The source data for set %1 is unavailable. Load the sets file again.") - .arg(curSetToParse.getShortName())); + const qsizetype rangeEnd = rawRange.start + rawRange.length; + if (rawRange.start < 0 || rawRange.length <= 0 || rangeEnd > rawSetsData.size()) { + // rawSetsData is cleared by releaseSetData() while SetToDownload copies + // taken from getSets() keep their ranges, and nothing else enforces the + // pairing — so never index past the buffer on stale/mismatched ranges. + qWarning() << "error: out-of-bounds raw range for set" << curSetToParse.getShortName() << "skipping"; + ++setIndex; + emit setIndexChanged(0, setIndex, curSetToParse.getLongName()); + continue; } + // sliced() shares the buffer instead of deep-copying the slice; the largest + // sets in AllPrintings are tens of MB, so the copy is worth avoiding here. const QByteArray setBytes = rawSetsData.sliced(rawRange.start, rawRange.length); QJsonParseError parseError; const QJsonDocument setDoc = QJsonDocument::fromJson(setBytes, &parseError); if (parseError.error != QJsonParseError::NoError) { - return failImport( - tr("Could not import set %1: %2").arg(curSetToParse.getShortName(), parseError.errorString())); - } - if (!setDoc.isObject() || !setDoc.object().value("cards").isArray()) { - return failImport(tr("Set %1 does not contain a card list.").arg(curSetToParse.getShortName())); + qWarning() << "error: parsing card data for set" << curSetToParse.getShortName() << ":" + << parseError.errorString(); + ++setIndex; + // Keep the progress accounting honest: a set that failed to parse + // still advanced the index, so report it (with zero imported cards) + // rather than letting SaveSetsPage's bar stall per failed set. + emit setIndexChanged(0, setIndex, curSetToParse.getLongName()); + continue; } // Only add the set to the database once its slice parsed cleanly; @@ -838,14 +838,7 @@ int OracleImporter::startImport() emit setIndexChanged(numCardsInSet, setIndex, curSetToParse.getLongName()); } - if (importCancelled.loadAcquire()) { - return failImport(tr("The card database import was cancelled.")); - } - if (cards.isEmpty()) { - return failImport(tr("No cards were imported. The existing card database has been kept.")); - } applyLocalizedData(); - importSuccessful = true; emit setIndexChanged(0, setIndex, QString()); @@ -853,23 +846,8 @@ int OracleImporter::startImport() return setIndex; } -int OracleImporter::failImport(const QString &message) -{ - importSuccessful = false; - importError = message; - sets.clear(); - cards.clear(); - localizedEntries.clear(); - splitLocalizedTexts.clear(); - qWarning() << message; - return 0; -} - bool OracleImporter::saveToFile(const QString &fileName, const QString &sourceUrl, const QString &sourceVersion) { - if (!importSuccessful) { - return false; - } CockatriceXml4Parser parser(new NoopCardSetPriorityController()); return parser.saveToFile(createDefaultMagicFormats(), sets, cards, fileName, sourceUrl, sourceVersion); @@ -883,7 +861,6 @@ void OracleImporter::releaseSetData() void OracleImporter::clear() { - prepareImport(); sets.clear(); cards.clear(); allSets.clear(); diff --git a/oracle/src/oracleimporter.h b/oracle/src/oracleimporter.h index 5ebe9cf36..d872e184e 100644 --- a/oracle/src/oracleimporter.h +++ b/oracle/src/oracleimporter.h @@ -198,11 +198,6 @@ private: * the whole import (or racing it). */ QAtomicInt importCancelled; - bool importSuccessful = false; - QString importError; - - // Discard the incomplete in-memory database; the installed file is untouched. - int failImport(const QString &message); /** * The ISO-639 language code whose foreignData is imported; "en" by default. @@ -283,24 +278,7 @@ public: * the wizard can hand over its decompressed buffer without copying it. */ bool readSetsFromByteArray(QByteArray data); - // Returns the complete selected-set count on success, zero on failure or cancellation. int startImport(); - bool hasSuccessfulImport() const - { - return importSuccessful; - } - const QString &getImportError() const - { - return importError; - } - // Call on the owning thread before scheduling a worker, so a cancellation - // arriving before that worker starts is not lost. - void prepareImport() - { - importCancelled.storeRelease(0); - importSuccessful = false; - importError.clear(); - } /** * @brief Requests an in-flight startImport() to stop at the next set boundary. * diff --git a/oracle/src/oraclewizard.cpp b/oracle/src/oraclewizard.cpp index dc8c7ecb3..c33d821a5 100644 --- a/oracle/src/oraclewizard.cpp +++ b/oracle/src/oraclewizard.cpp @@ -1,7 +1,6 @@ #include "oraclewizard.h" #include "client/settings/cache_settings.h" -#include "database_writer.h" #include "main.h" #include "oracleimporter.h" #include "pages.h" @@ -142,13 +141,6 @@ void OracleWizard::reject() } QWizard::reject(); - // A hidden wizard does not close the application's last visible window. - // Stop background refreshes explicitly so the hosting client receives a verdict, - // using the same rule as main(): a reject after the database was written is still - // a successful update, only a reject that wrote nothing counts as a failure. - if (backgroundMode) { - QCoreApplication::exit(hasSavedDatabase() ? 0 : 1); - } } void OracleWizard::runInBackground() @@ -220,10 +212,17 @@ void OracleWizard::disableButtons() bool OracleWizard::saveTokensToFile(const QString &fileName) { - QString error; - if (!OracleDatabase::saveXml(fileName, tokensData, &error)) { - qWarning() << error; + QFile file(fileName); + if (!file.open(QIODevice::WriteOnly)) { + qDebug() << "File open (w) failed for" << fileName; return false; } + + if (file.write(tokensData) == -1) { + qDebug() << "File write (w) failed for" << fileName; + return false; + } + + file.close(); return true; } diff --git a/oracle/src/pages.cpp b/oracle/src/pages.cpp index f5c38be1c..4c664a38c 100644 --- a/oracle/src/pages.cpp +++ b/oracle/src/pages.cpp @@ -1,7 +1,6 @@ #include "pages.h" #include "client/settings/cache_settings.h" -#include "database_writer.h" #include "main.h" #include "oracleimporter.h" #include "oraclewizard.h" @@ -44,7 +43,6 @@ #include #include #include -#include #include #include #include @@ -171,16 +169,7 @@ LoadSetsResult loadSetsData(const QPointer &importer, QByteArray break; } - // Test the first non-space byte in place: trimmed() would duplicate the whole - // payload, which on the plain-XML path is the largest download we handle. - const auto firstNonSpace = std::find_if_not(data.cbegin(), data.cend(), - [](char c) { return c == ' ' || c == '\t' || c == '\n' || c == '\r'; }); - const bool looksLikeXml = firstNonSpace != data.cend() && *firstNonSpace == '<'; - if (looksLikeXml) { - result.errorMessage = OracleDatabase::validateXml(data); - if (!result.errorMessage.isEmpty()) { - return result; - } + if (data.startsWith("<")) { result.ok = true; result.plainXml = true; result.xmlData = std::move(data); @@ -662,10 +651,6 @@ void LoadSetsPage::importFinished() } else if (!result.ok && !result.plainXml) { qWarning() << tr("The file was retrieved successfully, but it does not contain any sets data."); } - if (!result.ok) { - wizard()->reject(); - return; - } emit readyToContinue(); return; } @@ -732,7 +717,7 @@ SaveSetsPage::SaveSetsPage(QWidget *parent) : OracleWizardPage(parent) bool SaveSetsPage::isComplete() const { - return !importActive && importReady; + return !importActive; } void SaveSetsPage::cleanupPage() @@ -745,11 +730,8 @@ void SaveSetsPage::cleanupPage() void SaveSetsPage::initializePage() { - importReady = false; retranslateUi(); if (wizard()->downloadedPlainXml) { - importReady = true; - emit completeChanged(); messageLog->hide(); progressBar->hide(); if (wizard()->backgroundMode) { @@ -775,9 +757,6 @@ void SaveSetsPage::initializePage() emit completeChanged(); const QPointer importer = wizard()->importer; - if (auto *activeImporter = importer.data()) { - activeImporter->prepareImport(); - } importFuture = QtConcurrent::run([importer] { return importer ? importer->startImport() : 0; }); importWatcher.setFuture(importFuture); } @@ -809,28 +788,22 @@ void SaveSetsPage::importFinished() const int setsImported = importWatcher.result(); const QPointer importer = wizard()->importer; - importReady = importer && importer->hasSuccessfulImport() && setsImported == totalSets; - const QString error = importer ? importer->getImportError() : tr("The card database importer is unavailable."); if (importer) { importer->releaseSetData(); } - wizard()->button(QWizard::NextButton)->setEnabled(importReady); - emit completeChanged(); - if (!importReady) { - const QString message = error.isEmpty() ? tr("No set has been imported.") : error; - if (wizard()->backgroundMode) { - qWarning() << message; - wizard()->reject(); - } else { - QMessageBox::critical(this, tr("Error"), message); + if (wizard()->backgroundMode) { + if (setsImported == 0) { + qWarning() << tr("No set has been imported."); } + emit readyToContinue(); return; } progressBar->setValue(progressBar->maximum()); - if (wizard()->backgroundMode) { - emit readyToContinue(); + + if (setsImported == 0) { + QMessageBox::critical(this, tr("Error"), tr("No set has been imported.")); } } @@ -881,18 +854,6 @@ void SaveSetsPage::updateTotalProgress(int cardsImported, int setIndex, const QS bool SaveSetsPage::validatePage() { - if (!isComplete()) { - return false; - } - const auto failSave = [this](const QString &message) { - qWarning() << message; - if (wizard()->backgroundMode) { - wizard()->reject(); - } else { - QMessageBox::critical(this, tr("Error"), message); - } - return false; - }; QString defaultPath = SettingsCache::instance().getCardDatabasePath(); QString windowName = tr("Save card database"); QString fileType = tr("XML; card database (*.xml)"); @@ -911,21 +872,24 @@ bool SaveSetsPage::validatePage() QFileInfo fi(fileName); QDir fileDir(fi.path()); if (!fileDir.exists() && !fileDir.mkpath(fileDir.absolutePath())) { - return failSave(tr("The database directory could not be created: %1").arg(fileDir.absolutePath())); + return false; } if (wizard()->downloadedPlainXml) { - QString error; - if (!OracleDatabase::saveXml(fileName, wizard()->xmlData, &error)) { - return failSave(tr("The file could not be saved to %1: %2").arg(fileName, error)); + QFile file(fileName); + if (!file.open(QIODevice::WriteOnly)) { + qDebug() << "File write (w) failed for" << fileName; + return false; + } + if (file.write(wizard()->xmlData) < 1) { + qDebug() << "File write (w) failed for" << fileName; + return false; } wizard()->xmlData.clear(); } else if (!wizard()->importer->saveToFile(fileName, wizard()->getCardSourceUrl(), wizard()->getCardSourceVersion())) { - // The importer refuses to write a database whose import did not finish, and - // reports the reason there; do not dress an import failure up as a disk failure. - const QString importError = wizard()->importer->getImportError(); - return failSave(importError.isEmpty() ? tr("The file could not be saved to %1").arg(fileName) : importError); + QMessageBox::critical(this, tr("Error"), tr("The file could not be saved to %1").arg(fileName)); + return false; } wizard()->markDatabaseSaved(); diff --git a/oracle/src/pages.h b/oracle/src/pages.h index e29a8e84a..0530010ba 100644 --- a/oracle/src/pages.h +++ b/oracle/src/pages.h @@ -128,7 +128,6 @@ private: QFuture importFuture; int totalSets = 0; bool importActive = false; - bool importReady = false; protected: void initializePage() override; diff --git a/oracle/src/pagetemplates.cpp b/oracle/src/pagetemplates.cpp index 7e5f30bb7..dcc8e070c 100644 --- a/oracle/src/pagetemplates.cpp +++ b/oracle/src/pagetemplates.cpp @@ -1,6 +1,5 @@ #include "pagetemplates.h" -#include "database_writer.h" #include "oraclewizard.h" #include @@ -185,17 +184,9 @@ void SimpleDownloadFilePage::actDownloadFinished() } QNetworkReply::NetworkError errorCode = reply->error(); if (errorCode != QNetworkReply::NoError) { - const QString message = tr("Network error: %1.").arg(reply->errorString()); - reply->deleteLater(); - // A hidden wizard cannot show a modal box: without an explicit stop it would sit - // here forever and the hosting client would wait with no timeout. - if (wizard()->backgroundMode) { - qWarning() << message; - wizard()->reject(); - return; - } - QMessageBox::critical(this, tr("Error"), message); + QMessageBox::critical(this, tr("Error"), tr("Network error: %1.").arg(reply->errorString())); wizard()->enableButtons(); + reply->deleteLater(); return; } @@ -227,15 +218,6 @@ void SimpleDownloadFilePage::actDownloadFinished() bool SimpleDownloadFilePage::saveToFile() { - const auto failSave = [this](const QString &message) { - qWarning() << message; - if (wizard()->backgroundMode) { - wizard()->reject(); - } else { - QMessageBox::critical(this, tr("Error"), message); - } - return false; - }; QString defaultPath = getDefaultSavePath(); QString windowName = getWindowTitle(); QString fileType = getFileType(); @@ -254,11 +236,12 @@ bool SimpleDownloadFilePage::saveToFile() QFileInfo fi(fileName); QDir fileDir(fi.path()); if (!fileDir.exists() && !fileDir.mkpath(fileDir.absolutePath())) { - return failSave(tr("The database directory could not be created: %1").arg(fileDir.absolutePath())); + return false; } if (!internalSaveToFile(fileName)) { - return failSave(tr("The file could not be saved to %1").arg(fileName)); + QMessageBox::critical(this, tr("Error"), tr("The file could not be saved to %1").arg(fileName)); + return false; } // clean saved downloadData @@ -269,10 +252,17 @@ bool SimpleDownloadFilePage::saveToFile() bool SimpleDownloadFilePage::internalSaveToFile(const QString &fileName) { - QString error; - if (!OracleDatabase::saveXml(fileName, downloadData, &error)) { - qWarning() << error; + QFile file(fileName); + if (!file.open(QIODevice::WriteOnly)) { + qDebug() << "File open (w) failed for" << fileName; return false; } + + if (file.write(downloadData) == -1) { + qDebug() << "File write (w) failed for" << fileName; + return false; + } + + file.close(); return true; } diff --git a/oracle/translations/oracle_de.ts b/oracle/translations/oracle_de.ts index 50a5f8e20..faf08d5ce 100644 --- a/oracle/translations/oracle_de.ts +++ b/oracle/translations/oracle_de.ts @@ -137,22 +137,22 @@ Downloading (0 MB) - Herunterladen (0 MB) + Downloading (%1 MB) - Herunterladen (%1 MB) + Parsing file (%1%) - Datei wird verarbeitet (%1%) + Extracting file... - Extrahiere Datei... + @@ -168,7 +168,7 @@ Parsing file (100%) - Datei wird verarbeitet (100%) + @@ -348,7 +348,7 @@ A Cockatrice card database file of %1 MB has been downloaded. - Eine Cockatrice-Kartendatenbankdatei der Größe %1 MB wurde heruntergeladen. + @@ -434,7 +434,7 @@ Downloading (0 MB) Downloading (0MB) - Herunterladen (0 MB) + diff --git a/servatrice/CMakeLists.txt b/servatrice/CMakeLists.txt index 9d8dd46d2..255469934 100644 --- a/servatrice/CMakeLists.txt +++ b/servatrice/CMakeLists.txt @@ -56,7 +56,7 @@ if(APPLE) set(servatrice_SOURCES ${servatrice_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns) endif(APPLE) -qt_add_resources(servatrice_RESOURCES_RCC ${servatrice_RESOURCES}) +qt6_add_resources(servatrice_RESOURCES_RCC ${servatrice_RESOURCES}) set(QT_DONT_USE_QTGUI TRUE) diff --git a/servatrice/servatrice.ini.example b/servatrice/servatrice.ini.example index ac291fd7f..021f5157f 100644 --- a/servatrice/servatrice.ini.example +++ b/servatrice/servatrice.ini.example @@ -455,11 +455,9 @@ authentication_strictness=mixed ; the scrypt verifier, so old clients can still log in during the window below without ; the database holding a fast-crackable hash in the clear. ; Generate with: openssl rand -hex 32 -; If unset there is no downgrade path at all: a migrated account keeps only a scrypt -; verifier, and an administrator's password reset stores a verifier too, so pre-challenge -; clients cannot log in with the temporary password either. Set the key if you still serve -; them. Rotating the key invalidates existing backups (they become unusable immediately; -; expired ones are still purged). +; If unset, migrated accounts have no downgrade window: old clients must use a password +; reset to get back in. Rotating the key invalidates existing backups (they become +; unusable immediately; expired ones are still purged). legacy_backup_key= ; Days a legacy password backup may go unused before it is purged from the database. diff --git a/servatrice/src/isl_interface.cpp b/servatrice/src/isl_interface.cpp index 1898cd5fa..7121bfa48 100644 --- a/servatrice/src/isl_interface.cpp +++ b/servatrice/src/isl_interface.cpp @@ -58,16 +58,17 @@ void IslInterface::sharedCtor(const QSslCertificate &cert, const QSslKey &privat socket->setLocalCertificate(cert); socket->setPrivateKey(privateKey); - connect(socket, &QSslSocket::readyRead, this, &IslInterface::readClient, Qt::QueuedConnection); - connect(socket, &QAbstractSocket::errorOccurred, this, &IslInterface::catchSocketError); - connect(this, &IslInterface::outputBufferChanged, this, &IslInterface::flushOutputBuffer, Qt::QueuedConnection); + connect(socket, SIGNAL(readyRead()), this, SLOT(readClient()), Qt::QueuedConnection); + connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), this, + SLOT(catchSocketError(QAbstractSocket::SocketError))); + connect(this, SIGNAL(outputBufferChanged()), this, SLOT(flushOutputBuffer()), Qt::QueuedConnection); } IslInterface::IslInterface(int _socketDescriptor, const QSslCertificate &cert, const QSslKey &privateKey, Servatrice *_server) - : QObject(), serverId(-1), socketDescriptor(_socketDescriptor), server(_server), messageInProgress(false) + : QObject(), socketDescriptor(_socketDescriptor), server(_server), messageInProgress(false) { sharedCtor(cert, privateKey); } diff --git a/servatrice/src/main.cpp b/servatrice/src/main.cpp index 4d513d026..eb019a2b7 100644 --- a/servatrice/src/main.cpp +++ b/servatrice/src/main.cpp @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include @@ -163,15 +162,14 @@ int main(int argc, char *argv[]) configPath = SettingsCache::guessConfigurationPath(); } else if (!QFile::exists(configPath)) { qCritical() << "Could not find configuration file at" << configPath; - return EXIT_FAILURE; + return 1; } qWarning() << "Using configuration file: " << configPath; settingsCache = new SettingsCache(configPath); loggerThread = new QThread; loggerThread->setObjectName("logger"); - logger = new ServerLogger(logToConsole, settingsCache->value("server/writelog", 1).toBool(), - settingsCache->value("server/logfilters").toString()); + logger = new ServerLogger(logToConsole); logger->moveToThread(loggerThread); loggerThread->start(); @@ -216,16 +214,8 @@ int main(int argc, char *argv[]) std::cerr << "Server quit." << std::endl; std::cerr << "-------------------------" << std::endl; - } else { - // initServer() logged the reason; a failed startup must not look like a clean exit. - std::cerr << "Server initialization failed, exiting." << std::endl; - retval = EXIT_FAILURE; } - // The handler reads the logger and settingsCache globals torn down below; leaving it - // installed lets Qt's own shutdown warnings dereference freed memory. - qInstallMessageHandler(nullptr); - delete smtpClient; delete rng; delete signalhandler; diff --git a/servatrice/src/servatrice.cpp b/servatrice/src/servatrice.cpp index afe028f32..b6eaf11f4 100644 --- a/servatrice/src/servatrice.cpp +++ b/servatrice/src/servatrice.cpp @@ -100,10 +100,8 @@ Servatrice_GameServer::Servatrice_GameServer(Servatrice *_server, newThread->start(); server->watchWorkerThread(newThread); - QMetaObject::invokeMethod( - newDatabaseInterface, - [newDatabaseInterface, _sqlDatabase] { newDatabaseInterface->initDatabase(_sqlDatabase); }, - Qt::BlockingQueuedConnection); + QMetaObject::invokeMethod(newDatabaseInterface, "initDatabase", Qt::BlockingQueuedConnection, + Q_ARG(QSqlDatabase, _sqlDatabase)); connectionPools.append(newPool); } @@ -127,10 +125,9 @@ void Servatrice_GameServer::incomingConnection(qintptr socketDescriptor) auto ssi = new TcpServerSocketInterface(server, pool->getDatabaseInterface()); ssi->moveToThread(pool->thread()); pool->addClient(); - connect(ssi, &QObject::destroyed, pool, &Servatrice_ConnectionPool::removeClient); + connect(ssi, SIGNAL(destroyed()), pool, SLOT(removeClient())); - QMetaObject::invokeMethod( - ssi, [ssi, socketDescriptor] { ssi->initConnection(socketDescriptor); }, Qt::QueuedConnection); + QMetaObject::invokeMethod(ssi, "initConnection", Qt::QueuedConnection, Q_ARG(int, socketDescriptor)); } Servatrice_ConnectionPool *Servatrice_GameServer::findLeastUsedConnectionPool() @@ -171,15 +168,13 @@ Servatrice_WebsocketGameServer::Servatrice_WebsocketGameServer(Servatrice *_serv newThread->start(); server->watchWorkerThread(newThread); - QMetaObject::invokeMethod( - newDatabaseInterface, - [newDatabaseInterface, _sqlDatabase] { newDatabaseInterface->initDatabase(_sqlDatabase); }, - Qt::BlockingQueuedConnection); + QMetaObject::invokeMethod(newDatabaseInterface, "initDatabase", Qt::BlockingQueuedConnection, + Q_ARG(QSqlDatabase, _sqlDatabase)); connectionPools.append(newPool); - } - connect(this, &QWebSocketServer::newConnection, this, &Servatrice_WebsocketGameServer::onNewConnection); + connect(this, SIGNAL(newConnection()), this, SLOT(onNewConnection())); + } } Servatrice_WebsocketGameServer::~Servatrice_WebsocketGameServer() @@ -204,10 +199,9 @@ void Servatrice_WebsocketGameServer::onNewConnection() */ // ssi->moveToThread(pool->thread()); pool->addClient(); - connect(ssi, &QObject::destroyed, pool, &Servatrice_ConnectionPool::removeClient); + connect(ssi, SIGNAL(destroyed()), pool, SLOT(removeClient())); - void *socket = nextPendingConnection(); - QMetaObject::invokeMethod(ssi, [ssi, socket] { ssi->initConnection(socket); }, Qt::QueuedConnection); + QMetaObject::invokeMethod(ssi, "initConnection", Qt::QueuedConnection, Q_ARG(void *, nextPendingConnection())); } Servatrice_ConnectionPool *Servatrice_WebsocketGameServer::findLeastUsedConnectionPool() @@ -230,14 +224,14 @@ Servatrice_ConnectionPool *Servatrice_WebsocketGameServer::findLeastUsedConnecti void Servatrice_IslServer::incomingConnection(qintptr socketDescriptor) { auto thread = new QThread; - connect(thread, &QThread::finished, thread, &QObject::deleteLater); + connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater())); auto interface = new IslInterface(static_cast(socketDescriptor), cert, privateKey, server); interface->moveToThread(thread); - connect(interface, &QObject::destroyed, thread, &QThread::quit); + connect(interface, SIGNAL(destroyed()), thread, SLOT(quit())); thread->start(); - QMetaObject::invokeMethod(interface, [interface] { interface->initServer(); }, Qt::QueuedConnection); + QMetaObject::invokeMethod(interface, "initServer", Qt::QueuedConnection); } Servatrice::Servatrice(QObject *parent) @@ -314,8 +308,7 @@ bool Servatrice::initServer() authenticationMethod = AuthenticationPassword; } else { if (getRegOnlyServerEnabled()) { - qCCritical(ServatriceLog) << "Registration only server enabled but no authentication method defined; " - "refusing to start."; + qDebug() << "Registration only server enabled but no authentication method defined: Error."; return false; } qDebug() << "Authenticating method: none"; @@ -386,7 +379,7 @@ bool Servatrice::initServer() bool dbOpened = servatriceDatabaseInterface->initDatabase( "QMYSQL", getDBHostNameString(), getDBDatabaseNameString(), getDBUserNameString(), getDBPasswordString()); if (!dbOpened) { - qCCritical(ServatriceLog) << "Failed to open the database; refusing to start."; + qDebug() << "Failed to open database"; return false; } updateServerList(); @@ -591,16 +584,15 @@ bool Servatrice::initServer() auto *thread = new QThread; thread->setObjectName("isl_" + QString::number(prop.id)); - connect(thread, &QThread::finished, thread, &QObject::deleteLater); + connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater())); IslInterface *interface = new IslInterface(prop.id, prop.hostname, prop.address.toString(), prop.controlPort, prop.cert, cert, key, this); interface->moveToThread(thread); - connect(interface, &QObject::destroyed, thread, &QThread::quit); + connect(interface, SIGNAL(destroyed()), thread, SLOT(quit())); thread->start(); - QMetaObject::invokeMethod( - interface, [interface] { interface->initClient(); }, Qt::BlockingQueuedConnection); + QMetaObject::invokeMethod(interface, "initClient", Qt::BlockingQueuedConnection); } qDebug() << "Starting ISL server on port" << getISLNetworkPort(); @@ -608,27 +600,27 @@ bool Servatrice::initServer() if (islServer->listen(QHostAddress::Any, static_cast(getISLNetworkPort()))) { qDebug() << "ISL server listening."; } else { - throw islServer->errorString(); + throw QString("islServer->listen()"); } } } catch (QString &error) { - qCCritical(ServatriceLog) << "Failed to start the ISL server:" << error; + qDebug() << "ERROR --" << error; return false; } pingClock = new QTimer(this); - connect(pingClock, &QTimer::timeout, this, &Servatrice::pingClockTimeout); + connect(pingClock, SIGNAL(timeout()), this, SIGNAL(pingClockTimeout())); pingClock->start(getClientKeepAlive() * 1000); statusUpdateClock = new QTimer(this); - connect(statusUpdateClock, &QTimer::timeout, this, &Servatrice::statusUpdate); + connect(statusUpdateClock, SIGNAL(timeout()), this, SLOT(statusUpdate())); if (getServerStatusUpdateTime() != 0) { qDebug() << "Starting status update clock, interval" << getServerStatusUpdateTime() << "ms"; statusUpdateClock->start(getServerStatusUpdateTime()); } deckShareCleanupClock = new QTimer(this); - connect(deckShareCleanupClock, &QTimer::timeout, this, &Servatrice::cleanupExpiredDeckShares); + connect(deckShareCleanupClock, SIGNAL(timeout()), this, SLOT(cleanupExpiredDeckShares())); const int deckShareCleanupInterval = getDeckShareCleanupInterval(); if (deckShareCleanupInterval > 0) { qDebug() << "Starting deck share cleanup clock, interval" << deckShareCleanupInterval << "ms"; @@ -649,7 +641,7 @@ bool Servatrice::initServer() if (gameServer->listen(tcpHost, static_cast(getServerTCPPort()))) { qDebug() << "Server listening."; } else { - qCCritical(ServatriceLog) << "Failed to listen for TCP clients:" << gameServer->errorString(); + qDebug() << "gameServer->listen(): Error:" << gameServer->errorString(); return false; } } @@ -665,8 +657,7 @@ bool Servatrice::initServer() if (websocketGameServer->listen(webSocketHost, static_cast(getServerWebSocketPort()))) { qDebug() << "Websocket server listening."; } else { - qCCritical(ServatriceLog) << "Failed to listen for websocket clients:" - << websocketGameServer->errorString(); + qDebug() << "websocketGameServer->listen(): Error:" << websocketGameServer->errorString(); return false; } } @@ -1045,7 +1036,7 @@ void Servatrice::scheduleShutdown(const QString &reason, int minutes) nextShutdownMessageMinutes = shutdownMinutes; if (minutes > 0) { shutdownTimer = new QTimer; - connect(shutdownTimer, &QTimer::timeout, this, &Servatrice::shutdownTimeout); + connect(shutdownTimer, SIGNAL(timeout()), this, SLOT(shutdownTimeout())); shutdownTimer->start(60000); } shutdownStateMutex.unlock(); @@ -1108,19 +1099,25 @@ void Servatrice::addIslInterface(int _serverId, IslInterface *interface) { // Only call with islLock locked for writing islInterfaces.insert(_serverId, interface); - connect(interface, &IslInterface::externalUserJoined, this, &Servatrice::externalUserJoined); - connect(interface, &IslInterface::externalUserLeft, this, &Servatrice::externalUserLeft); - connect(interface, &IslInterface::externalRoomUserJoined, this, &Servatrice::externalRoomUserJoined); - connect(interface, &IslInterface::externalRoomUserLeft, this, &Servatrice::externalRoomUserLeft); - connect(interface, &IslInterface::externalRoomSay, this, &Servatrice::externalRoomSay); - connect(interface, &IslInterface::externalRoomRemoveMessages, this, &Servatrice::externalRoomRemoveMessages); - connect(interface, &IslInterface::externalRoomGameListChanged, this, &Servatrice::externalRoomGameListChanged); - connect(interface, &IslInterface::joinGameCommandReceived, this, &Servatrice::externalJoinGameCommandReceived); - connect(interface, &IslInterface::gameCommandContainerReceived, this, - &Servatrice::externalGameCommandContainerReceived); - connect(interface, &IslInterface::responseReceived, this, &Servatrice::externalResponseReceived); - connect(interface, &IslInterface::gameEventContainerReceived, this, - &Servatrice::externalGameEventContainerReceived); + connect(interface, SIGNAL(externalUserJoined(ServerInfo_User)), this, SLOT(externalUserJoined(ServerInfo_User))); + connect(interface, SIGNAL(externalUserLeft(QString)), this, SLOT(externalUserLeft(QString))); + connect(interface, SIGNAL(externalRoomUserJoined(int, ServerInfo_User)), this, + SLOT(externalRoomUserJoined(int, ServerInfo_User))); + connect(interface, SIGNAL(externalRoomUserLeft(int, QString)), this, SLOT(externalRoomUserLeft(int, QString))); + connect(interface, SIGNAL(externalRoomSay(int, QString, QString, QString)), this, + SLOT(externalRoomSay(int, QString, QString, QString))); + connect(interface, SIGNAL(externalRoomRemoveMessages(int, QString, int)), this, + SLOT(externalRoomRemoveMessages(int, QString, int))); + connect(interface, SIGNAL(externalRoomGameListChanged(int, ServerInfo_Game)), this, + SLOT(externalRoomGameListChanged(int, ServerInfo_Game))); + connect(interface, SIGNAL(joinGameCommandReceived(Command_JoinGame, int, int, int, qint64)), this, + SLOT(externalJoinGameCommandReceived(Command_JoinGame, int, int, int, qint64))); + connect(interface, SIGNAL(gameCommandContainerReceived(CommandContainer, int, int, qint64)), this, + SLOT(externalGameCommandContainerReceived(CommandContainer, int, int, qint64))); + connect(interface, SIGNAL(responseReceived(Response, qint64)), this, + SLOT(externalResponseReceived(Response, qint64))); + connect(interface, SIGNAL(gameEventContainerReceived(GameEventContainer, qint64)), this, + SLOT(externalGameEventContainerReceived(GameEventContainer, qint64))); } void Servatrice::removeIslInterface(int _serverId) diff --git a/servatrice/src/servatrice_database_interface.cpp b/servatrice/src/servatrice_database_interface.cpp index a4f184e38..b5c45065c 100644 --- a/servatrice/src/servatrice_database_interface.cpp +++ b/servatrice/src/servatrice_database_interface.cpp @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -483,10 +482,6 @@ AuthenticationResult Servatrice_DatabaseInterface::checkUserPassword(Server_Prot const QByteArray expected = PasswordHasher::computeResponse(key, nonce); handler->clearAuthNonce(); if (PasswordHasher::constantTimeEquals(expected, response)) { - if (forceChange) { - qCDebug(DatabaseInterfaceLog) << "Login accepted but password change required"; - return PasswordChangeRequired; - } qCDebug(DatabaseInterfaceLog) << "Login accepted: challenge-response password right"; return PasswordRight; } @@ -760,20 +755,6 @@ QString Servatrice_DatabaseInterface::getUserPasswordData(const QString &user) return query->value(0).toString(); } -QString Servatrice_DatabaseInterface::sealLegacyBackup(const QString &storedName, const QString &credential) -{ - const QByteArray key = server->getLegacyBackupKey(); - if (key.isEmpty()) { - return {}; - } - const QByteArray aad = storedName.simplified().toUtf8(); - const QString sealed = CryptoUtil::encryptSecret(credential.toUtf8(), key, aad); - if (sealed.isEmpty() || sealed.length() > MAX_LEGACY_BACKUP_LENGTH) { - return {}; - } - return sealed; -} - bool Servatrice_DatabaseInterface::submitPasswordVerifier(const QString &user, const QString &passwordVerifier) { if (server->getAuthenticationMethod() != Servatrice::AuthenticationSql) { @@ -798,13 +779,18 @@ bool Servatrice_DatabaseInterface::submitPasswordVerifier(const QString &user, c QString sealedBackup; QDateTime backupUsedAt; - if (PasswordHasher::isLegacyFormat(currentCredential) && !server->getLegacyBackupKey().isEmpty()) { - sealedBackup = sealLegacyBackup(storedName, currentCredential); - if (sealedBackup.isEmpty()) { - qCWarning(DatabaseInterfaceLog) - << "Failed to seal legacy backup for user" << user << "- account migrates without a downgrade path"; - } else { - backupUsedAt = QDateTime::currentDateTimeUtc(); + if (PasswordHasher::isLegacyFormat(currentCredential)) { + const QByteArray key = server->getLegacyBackupKey(); + if (!key.isEmpty()) { + const QByteArray aad = storedName.simplified().toUtf8(); + sealedBackup = CryptoUtil::encryptSecret(currentCredential.toUtf8(), key, aad); + if (sealedBackup.isEmpty() || sealedBackup.length() > MAX_LEGACY_BACKUP_LENGTH) { + qCWarning(DatabaseInterfaceLog) + << "Failed to seal legacy backup for user" << user << "- account migrates without a downgrade path"; + sealedBackup.clear(); + } else { + backupUsedAt = QDateTime::currentDateTimeUtc(); + } } } @@ -1658,54 +1644,6 @@ bool Servatrice_DatabaseInterface::changeUserPassword(const QString &user, return passwordQuery->numRowsAffected() > 0; } -bool Servatrice_DatabaseInterface::changeUserPasswordWithLegacyBackup(const QString &user, - const QString &passwordVerifier, - const QString &legacyCredential) -{ - if (server->getAuthenticationMethod() != Servatrice::AuthenticationSql) { - return false; - } - - if (!checkSql()) { - return false; - } - - // Seal against the stored row name, not the caller-supplied one: the name column is - // case-insensitive, so a differently-cased name would fail the tag check on open. - QSqlQuery *nameQuery = prepareQuery("SELECT name FROM {prefix}_users WHERE name = :name"); - nameQuery->bindValue(":name", user); - if (!execSqlQuery(nameQuery) || !nameQuery->next()) { - return false; - } - const QString storedName = nameQuery->value(0).toString(); - - const QString sealedBackup = sealLegacyBackup(storedName, legacyCredential); - const QDateTime backupUsedAt = sealedBackup.isEmpty() ? QDateTime() : QDateTime::currentDateTimeUtc(); - if (sealedBackup.isEmpty()) { - // Without a backup a pre-challenge client has nothing to authenticate against: the - // row holds a verifier and the legacy hash it would send cannot match it. Say so, - // because the symptom - the temporary password appearing not to work - shows up on - // a different machine from the one that reset it. - qCWarning(DatabaseInterfaceLog) << "Stored a verifier without a legacy backup for user" << user - << "- pre-challenge clients cannot use this password" - << "- check security/legacy_backup_key"; - } - - QSqlQuery *query = prepareQuery("update {prefix}_users set password_sha512=:password, " - "password_legacy_backup=:backup, password_legacy_backup_used_at=:used_at, " - "passwordLastChangedDate = NOW() where name = :name"); - query->bindValue(":password", passwordVerifier); - query->bindValue(":backup", sealedBackup); - query->bindValue(":used_at", backupUsedAt.isValid() - ? QVariant(backupUsedAt.toString(QStringLiteral("yyyy-MM-dd HH:mm:ss"))) - : QVariant()); - query->bindValue(":name", storedName); - if (!execSqlQuery(query)) { - return false; - } - return query->numRowsAffected() > 0; -} - void Servatrice_DatabaseInterface::setForcePasswordChange(const QString &user, bool force) { if (!checkSql()) { @@ -2250,14 +2188,8 @@ QList Servatrice_DatabaseInterface::getMessageLogHistory bool &game, bool &room, int &range, - int &maxresults, - int offset, - const QString &beforeTime, - bool *hasMore) + int &maxresults) { - if (hasMore != nullptr) { - *hasMore = false; - } QList results; ServerInfo_ChatMessage chatMessage; @@ -2266,31 +2198,8 @@ QList Servatrice_DatabaseInterface::getMessageLogHistory return results; } - // Page size guard: always bound the scan so a filter-less browse of room - // history cannot become a 50M-row fetch. Zero means "client did not set a - // size", so fall back to one smooth-scroll page. - const int pageSize = maxresults <= 0 ? 200 : qBound(1, maxresults, 1000); - maxresults = pageSize; - const int safeOffset = qMax(0, offset); - - const bool hasIndexedFilter = !user.isEmpty() || !ipaddress.isEmpty() || !gameid.isEmpty() || !gamename.isEmpty(); - const bool hasLocationFilter = chat || game || room; - if (!hasLocationFilter) { - // No target_type restriction would mix private chat into a room/game - // browse, so refuse rather than leak. - return results; - } - // A browse narrowed only by a message substring has no index to serve it, and `range` - // has no upper bound on the wire: the client offers 20 days, but a hand-built command - // can ask for any value and every LIKE candidate in it is a row the server examines. - // Clamping here keeps the guard independent of what the client happens to send. - constexpr int maxFilterlessRangeHours = 20 * 24; - if (!hasIndexedFilter && range > maxFilterlessRangeHours) { - range = maxFilterlessRangeHours; - } - if (!hasIndexedFilter && range <= 0) { - // Filter-less browse must stay time-bounded (idx_log_time) so the - // query stays an index range scan instead of a full table scan. + if (user.isEmpty() && ipaddress.isEmpty() && gameid.isEmpty() && gamename.isEmpty()) { + // To ensure quick results and minimal lag, require an indexed field return results; } @@ -2345,23 +2254,10 @@ QList Servatrice_DatabaseInterface::getMessageLogHistory queryString.append(" AND log_time >= DATE_SUB(now(), INTERVAL :range_time HOUR)"); } - if (!beforeTime.isEmpty()) { - // Pages after the first run against the snapshot fixed by the first one, so rows - // logged while the moderator scrolls can no longer push the OFFSET window down and - // repeat a row already on screen. - queryString.append(" AND log_time <= :before_time"); + if (maxresults) { + queryString.append(" LIMIT :limit_size"); } - // Newest-first keeps "going back from today" stable across pages and lets - // the client append older rows at the bottom for smooth infinite scroll. - queryString.append(" ORDER BY log_time DESC"); - - // Fetch one extra row when the caller wants a has_more cursor so a full - // page does not need a second empty round-trip to prove exhaustion. - const bool detectMore = (hasMore != nullptr); - const int fetchSize = detectMore ? pageSize + 1 : pageSize; - queryString.append(" LIMIT :limit_size OFFSET :offset_size"); - QSqlQuery *query = prepareQuery(queryString); if (!user.isEmpty()) { query->bindValue(":user_name", user); @@ -2381,11 +2277,9 @@ QList Servatrice_DatabaseInterface::getMessageLogHistory if (range) { query->bindValue(":range_time", range); } - if (!beforeTime.isEmpty()) { - query->bindValue(":before_time", beforeTime); + if (maxresults) { + query->bindValue(":limit_size", maxresults); } - query->bindValue(":limit_size", fetchSize); - query->bindValue(":offset_size", safeOffset); if (!execSqlQuery(query)) { qCWarning(DatabaseInterfaceLog) << "Failed to collect log history information: SQL Error"; @@ -2405,11 +2299,6 @@ QList Servatrice_DatabaseInterface::getMessageLogHistory results << chatMessage; } - if (detectMore && results.size() > pageSize) { - results.removeLast(); - *hasMore = true; - } - return results; } diff --git a/servatrice/src/servatrice_database_interface.h b/servatrice/src/servatrice_database_interface.h index eb74063ac..6b38384e4 100644 --- a/servatrice/src/servatrice_database_interface.h +++ b/servatrice/src/servatrice_database_interface.h @@ -62,9 +62,6 @@ private: bool checkUserIsIpBanned(const QString &ipAddress, QString &banReason, int &banSecondsRemaining); /** Must be called after checkSql and server is known to be in auth mode. */ bool checkUserIsNameBanned(QString const &userName, QString &banReason, int &banSecondsRemaining); - /** Seal a legacy credential for the account's downgrade backup; empty when the - * backup key is unset or the sealed value does not fit the column. */ - QString sealLegacyBackup(const QString &storedName, const QString &credential); bool isStrictModeEnabled(bool &ok) const; protected: @@ -195,11 +192,6 @@ public: const QString &targetName, const QString &channel = QString()) override; bool changeUserPassword(const QString &user, const QString &password, bool passwordNeedsHash) override; - /** Replace a credential with an already-derived verifier, keeping a sealed legacy hash of the - * same password as the downgrade backup for pre-challenge clients. */ - bool changeUserPasswordWithLegacyBackup(const QString &user, - const QString &passwordVerifier, - const QString &legacyCredential); bool changeUserPassword(const QString &user, const QString &oldPassword, bool oldPasswordNeedsHash, @@ -219,10 +211,7 @@ public: bool &game, bool &room, int &range, - int &maxresults, - int offset = 0, - const QString &beforeTime = QString(), - bool *hasMore = nullptr); + int &maxresults); QList getUserSessions(const QString &userName, int limit); QList getUserAlts(const QString &userName); QList getModeratorLastLogins(); diff --git a/servatrice/src/server_logger.cpp b/servatrice/src/server_logger.cpp index 09453b7ee..1c83299b8 100644 --- a/servatrice/src/server_logger.cpp +++ b/servatrice/src/server_logger.cpp @@ -1,45 +1,42 @@ #include "server_logger.h" +#include "settingscache.h" + #include #include #include #include #include #include -#include #include #include +#include #include #include #include #include #include -ServerLogger::ServerLogger(bool _logToConsole, bool _writeLog, const QString &_logFilters, QObject *parent) +ServerLogger::ServerLogger(bool _logToConsole, QObject *parent) : QObject(parent), logToConsole(_logToConsole), flushRunning(false) { - reloadConfig(_writeLog, _logFilters); - connect(this, SIGNAL(sigFlushBuffer()), this, SLOT(flushBuffer()), Qt::QueuedConnection); } ServerLogger::~ServerLogger() { flushBuffer(); - // logFile is a child of this object and is closed and deleted by ~QObject. // This does not work with the destroyed() signal as this destructor is called after the main event loop is done. thread()->quit(); } void ServerLogger::startLog(const QString &logFileName) { - delete logFile; - logFile = nullptr; - if (!logFileName.isEmpty()) { QFileInfo fi(logFileName); QDir fileDir(fi.path()); if (!fileDir.exists() && !fileDir.mkpath(fileDir.absolutePath())) { std::cerr << "ERROR: logfile folder doesn't exist and i can't create it." << std::endl; + logFile = 0; return; } @@ -47,81 +44,60 @@ void ServerLogger::startLog(const QString &logFileName) if (!logFile->open(QIODevice::Append)) { std::cerr << "ERROR: can't open() logfile." << std::endl; delete logFile; - logFile = nullptr; + logFile = 0; return; } + } else { + logFile = 0; } -} -void ServerLogger::reloadConfig(bool _writeLog, const QString &_logFilters) -{ - const bool filterActive = !_logFilters.trimmed().isEmpty(); - const QStringList filters = _logFilters.split(QStringLiteral(","), Qt::SkipEmptyParts); - - configMutex.lock(); - writeLog = _writeLog; - messageFilterActive = filterActive; - logFilters = filters; - configMutex.unlock(); + connect(this, SIGNAL(sigFlushBuffer()), this, SLOT(flushBuffer()), Qt::QueuedConnection); } bool ServerLogger::isLoggingEnabled() const { - // Mirror logMessage(): the console is an independent sink and the logfile needs writeLog. - QMutexLocker locker(&configMutex); - return logToConsole || (logFile != nullptr && writeLog); + return logFile != nullptr && settingsCache->value("server/writelog", 1).toBool(); } void ServerLogger::logMessage(const QString &message, void *caller) { + if (!logFile) { + return; + } + QString callerString; if (caller) { - callerString = QString::number(reinterpret_cast(caller), 16) + " "; + callerString = QString::number((qulonglong)caller, 16) + " "; } - const QString line = QDateTime::currentDateTime().toString() + " " + callerString + message; - bool queued = false; + // filter out all log entries based on values in configuration file + bool shouldWeWriteLog = settingsCache->value("server/writelog", 1).toBool(); + QString logFilters = settingsCache->value("server/logfilters").toString(); + QStringList listlogFilters = logFilters.split(",", Qt::SkipEmptyParts); + bool shouldWeSkipLine = false; - // The console is an independent sink: writelog and logfilters only describe the logfile - // (see servatrice.ini.example), so a disabled or unopenable logfile must not swallow - // startup errors such as a refused database connection. Lines are buffered for the logger - // thread instead of written here, so a stalled stdout reader cannot stall game threads. - if (logToConsole) { - bufferMutex.lock(); - consoleBuffer.append(line); - bufferMutex.unlock(); - queued = true; + if (!shouldWeWriteLog) { + return; } - configMutex.lock(); - const bool shouldWriteFile = writeLog; - const bool filterMessages = messageFilterActive; - const QStringList filters = logFilters; - configMutex.unlock(); - - if (logFile && shouldWriteFile) { - // filter out all log entries based on values in configuration file - bool shouldWriteLine = !filterMessages; - if (filterMessages) { - for (const QString &logFilter : filters) { - if (message.contains(logFilter, Qt::CaseInsensitive)) { - shouldWriteLine = true; - break; - } + if (!logFilters.trimmed().isEmpty()) { + shouldWeSkipLine = true; + for (const QString &logFilter : listlogFilters) { + if (message.contains(logFilter, Qt::CaseInsensitive)) { + shouldWeSkipLine = false; + break; } } - - if (shouldWriteLine) { - bufferMutex.lock(); - buffer.append(line); - bufferMutex.unlock(); - queued = true; - } } - if (queued) { - emit sigFlushBuffer(); + if (shouldWeSkipLine) { + return; } + + bufferMutex.lock(); + buffer.append(QDateTime::currentDateTime().toString() + " " + callerString + message); + bufferMutex.unlock(); + emit sigFlushBuffer(); } void ServerLogger::flushBuffer() @@ -131,42 +107,25 @@ void ServerLogger::flushBuffer() } flushRunning = true; - - bufferMutex.lock(); - QStringList consoleLines; - consoleLines.swap(consoleBuffer); - bufferMutex.unlock(); - - for (const QString &line : consoleLines) { - std::cout << line.toStdString() << '\n'; - } - if (!consoleLines.isEmpty()) { - std::cout.flush(); - } - - if (logFile) { - QTextStream stream(logFile); - forever - { - bufferMutex.lock(); - if (buffer.isEmpty()) { - bufferMutex.unlock(); - break; - } - QString message = buffer.takeFirst(); - bufferMutex.unlock(); - - stream << message << "\n"; - stream.flush(); - } - } else { - // No logfile to write to; do not let the buffer grow without bound. + QTextStream stream(logFile); + forever + { bufferMutex.lock(); - buffer.clear(); + if (buffer.isEmpty()) { + bufferMutex.unlock(); + flushRunning = false; + return; + } + QString message = buffer.takeFirst(); bufferMutex.unlock(); - } - flushRunning = false; + stream << message << "\n"; + stream.flush(); + + if (logToConsole) { + std::cout << message.toStdString() << std::endl; + } + } } void ServerLogger::rotateLogs() @@ -182,3 +141,5 @@ void ServerLogger::rotateLogs() std::cerr << "ERROR: Failed to open log file for writing!" << std::endl; } } + +QFile *ServerLogger::logFile; diff --git a/servatrice/src/server_logger.h b/servatrice/src/server_logger.h index 40df9fd62..e0be4b712 100644 --- a/servatrice/src/server_logger.h +++ b/servatrice/src/server_logger.h @@ -14,7 +14,7 @@ class ServerLogger : public QObject { Q_OBJECT public: - ServerLogger(bool _logToConsole, bool _writeLog, const QString &_logFilters, QObject *parent = nullptr); + ServerLogger(bool _logToConsole, QObject *parent = 0); ~ServerLogger(); /** @@ -27,7 +27,6 @@ public: public slots: void startLog(const QString &logFileName); - void reloadConfig(bool _writeLog, const QString &_logFilters); void logMessage(const QString &message, void *caller = 0); void rotateLogs(); private slots: @@ -37,17 +36,9 @@ signals: private: bool logToConsole; - bool writeLog = true; - bool messageFilterActive = false; - QStringList logFilters; - // Guards writeLog/messageFilterActive/logFilters: SIGHUP rewrites them while other threads log. - mutable QMutex configMutex; - QFile *logFile = nullptr; + static QFile *logFile; bool flushRunning; QStringList buffer; - // Console lines wait here for the logger thread, so game threads never block on stdout. - QStringList consoleBuffer; - // Guards buffer and consoleBuffer. QMutex bufferMutex; }; diff --git a/servatrice/src/serversocketinterface.cpp b/servatrice/src/serversocketinterface.cpp index c38d790b1..2cb4df8ba 100644 --- a/servatrice/src/serversocketinterface.cpp +++ b/servatrice/src/serversocketinterface.cpp @@ -199,8 +199,7 @@ AbstractServerSocketInterface::AbstractServerSocketInterface(Servatrice *_server // Never call flushOutputQueue directly from outputQueueChanged. In case of a socket error, // it could lead to this object being destroyed while another function is still on the call stack. -> mutex // deadlocks etc. - connect(this, &AbstractServerSocketInterface::outputQueueChanged, this, - &AbstractServerSocketInterface::flushOutputQueue, Qt::QueuedConnection); + connect(this, SIGNAL(outputQueueChanged()), this, SLOT(flushOutputQueue()), Qt::QueuedConnection); } bool AbstractServerSocketInterface::initSession() @@ -1743,17 +1742,12 @@ Response::ResponseCode AbstractServerSocketInterface::cmdGetLogHistory(const Com int dateRange = cmd.date_range(); int maximumResults = cmd.maximum_results(); - const int offset = cmd.has_offset() ? static_cast(cmd.offset()) : 0; - const QString beforeTime = cmd.has_before_time() ? QString::fromStdString(cmd.before_time()) : QString(); Response_ViewLogHistory *re = new Response_ViewLogHistory; if (servatrice->getEnableLogQuery()) { - bool hasMore = false; - QList history = - sqlInterface->getMessageLogHistory(userName, ipAddress, gameName, gameID, message, chatType, gameType, - roomType, dateRange, maximumResults, offset, beforeTime, &hasMore); - QListIterator messageIterator(history); + QListIterator messageIterator(sqlInterface->getMessageLogHistory( + userName, ipAddress, gameName, gameID, message, chatType, gameType, roomType, dateRange, maximumResults)); while (messageIterator.hasNext()) { ServerInfo_ChatMessage chatMessage = messageIterator.next(); if (!allowPrivateChat) { @@ -1761,7 +1755,6 @@ Response::ResponseCode AbstractServerSocketInterface::cmdGetLogHistory(const Com } re->add_log_message()->CopyFrom(chatMessage); } - re->set_has_more(hasMore); } else { ServerInfo_ChatMessage chatMessage; @@ -1989,8 +1982,7 @@ Response::ResponseCode AbstractServerSocketInterface::cmdBanFromServer(const Com SessionEvent *se = userList[i]->prepareSessionEvent(event); userList[i]->sendProtocolItem(*se); delete se; - QMetaObject::invokeMethod( - userList[i], [user = userList[i]] { user->prepareDestroy(); }, Qt::QueuedConnection); + QMetaObject::invokeMethod(userList[i], "prepareDestroy", Qt::QueuedConnection); } } @@ -2649,15 +2641,7 @@ Response::ResponseCode AbstractServerSocketInterface::cmdResetUserPassword(const } const QString tempPassword = PasswordHasher::generateRandomSalt(); - // Store a scrypt verifier rather than a legacy salt+hash: a legacy row makes the next - // login look like an authentication downgrade, which modern clients refuse when they - // still hold a verifier for the account. Where security/legacy_backup_key is configured, - // keep a sealed legacy hash of the same temporary password as the downgrade backup so - // pre-challenge clients keep the path the reset used to provide; without the key they - // have none, which changeUserPasswordWithLegacyBackup warns about. - const QString verifier = PasswordHasher::generatePasswordVerifier(tempPassword); - const QString legacyCredential = PasswordHasher::computeHash(tempPassword, PasswordHasher::generateRandomSalt()); - if (!sqlInterface->changeUserPasswordWithLegacyBackup(userName, verifier, legacyCredential)) { + if (!sqlInterface->changeUserPassword(userName, tempPassword, true)) { return Response::RespInternalError; } sqlInterface->setForcePasswordChange(userName, true); @@ -3795,9 +3779,6 @@ Response::ResponseCode AbstractServerSocketInterface::cmdAccountPassword(const C } databaseInterface->setForcePasswordChange(userName, false); - // The forced change is done, but this session never completed login (see - // Server_ProtocolHandler::cmdLogin). It stays restricted to ping and another password - // change; the client reconnects with the new password to actually enter the server. return Response::RespOk; } @@ -4199,15 +4180,15 @@ Response::ResponseCode AbstractServerSocketInterface::cmdUpdateServerMessage(const Command_UpdateServerMessage & /*cmd*/, ResponseContainer & /*rc*/) { - QMetaObject::invokeMethod(servatrice, [srv = servatrice] { srv->updateLoginMessage(); }); + QMetaObject::invokeMethod(server, "updateLoginMessage"); return Response::RespOk; } Response::ResponseCode AbstractServerSocketInterface::cmdShutdownServer(const Command_ShutdownServer &cmd, ResponseContainer & /*rc*/) { - QMetaObject::invokeMethod(servatrice, [srv = servatrice, reason = textFromStdString(cmd.reason()), - minutes = cmd.minutes()] { srv->scheduleShutdown(reason, minutes); }); + QMetaObject::invokeMethod(server, "scheduleShutdown", Q_ARG(QString, textFromStdString(cmd.reason())), + Q_ARG(int, cmd.minutes())); return Response::RespOk; } @@ -4216,9 +4197,7 @@ Response::ResponseCode AbstractServerSocketInterface::cmdReloadConfig(const Comm { logDebugMessage("Received admin command: reloading configuration"); settingsCache->sync(); - QMetaObject::invokeMethod(servatrice, [srv = servatrice, features = servatrice->getRequiredFeatures()] { - srv->setRequiredFeatures(features); - }); + QMetaObject::invokeMethod(server, "setRequiredFeatures", Q_ARG(QString, server->getRequiredFeatures())); return Response::RespOk; } @@ -4270,7 +4249,7 @@ bool AbstractServerSocketInterface::removeAdminFlagFromUser(const QString &userN delete se; } - QMetaObject::invokeMethod(user, [user] { user->prepareDestroy(); }, Qt::QueuedConnection); + QMetaObject::invokeMethod(user, "prepareDestroy", Qt::QueuedConnection); return true; } @@ -4445,10 +4424,10 @@ TcpServerSocketInterface::TcpServerSocketInterface(Servatrice *_server, { socket = new QTcpSocket(this); socket->setSocketOption(QAbstractSocket::LowDelayOption, 1); - connect(socket, &QTcpSocket::readyRead, this, [this] { readClient(); }); - connect(socket, &QTcpSocket::disconnected, this, [this] { catchSocketDisconnected(); }); - connect(socket, &QTcpSocket::errorOccurred, this, - [this](QAbstractSocket::SocketError error) { catchSocketError(error); }); + connect(socket, SIGNAL(readyRead()), this, SLOT(readClient())); + connect(socket, SIGNAL(disconnected()), this, SLOT(catchSocketDisconnected())); + connect(socket, SIGNAL(errorOccurred(QAbstractSocket::SocketError)), this, + SLOT(catchSocketError(QAbstractSocket::SocketError))); } TcpServerSocketInterface::~TcpServerSocketInterface() @@ -4670,17 +4649,11 @@ void WebsocketServerSocketInterface::initConnection(void *_socket) } } - connect(socket, &QWebSocket::binaryMessageReceived, this, &WebsocketServerSocketInterface::binaryMessageReceived); - // QWebSocket::errorOccurred was added in Qt 6.5 (error() is deprecated from 6.5 on), - // so a typed connect cannot compile against the 6.4 floor. -#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) - connect(socket, &QWebSocket::errorOccurred, this, - [this](QAbstractSocket::SocketError error) { catchSocketError(error); }); -#else + connect(socket, SIGNAL(binaryMessageReceived(const QByteArray &)), this, + SLOT(binaryMessageReceived(const QByteArray &))); connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(catchSocketError(QAbstractSocket::SocketError))); -#endif - connect(socket, &QWebSocket::disconnected, this, [this] { catchSocketDisconnected(); }); + connect(socket, SIGNAL(disconnected()), this, SLOT(catchSocketDisconnected())); // Add this object to the server's list of connections before it can receive socket events. // Otherwise, in case of a socket error, it could be removed from the list before it is added. diff --git a/servatrice/src/signalhandler.cpp b/servatrice/src/signalhandler.cpp index b8a7e3538..32cd5b206 100644 --- a/servatrice/src/signalhandler.cpp +++ b/servatrice/src/signalhandler.cpp @@ -73,8 +73,6 @@ void SignalHandler::internalSigHupHandler() logger->rotateLogs(); settingsCache->sync(); - logger->reloadConfig(settingsCache->value("server/writelog", 1).toBool(), - settingsCache->value("server/logfilters").toString()); snHup->setEnabled(true); } diff --git a/servatrice/src/smtpclient.cpp b/servatrice/src/smtpclient.cpp index bfdfae905..82824e496 100644 --- a/servatrice/src/smtpclient.cpp +++ b/servatrice/src/smtpclient.cpp @@ -25,7 +25,7 @@ static const qint64 IDLE_TIMEOUT_MS = 60000; // 60 seconds // MAX_RETRY_DELAY cap is applied, preventing unbounded intermediate values. static const int MAX_BACKOFF_SHIFT = 10; -inline Q_LOGGING_CATEGORY(SmtpClientLog, "smtp_client"); +inline Q_LOGGING_CATEGORY(SmtpClientLog, "smtp_client") static QString pendingKey(const QString &userName, EmailType type, const QString &token) { @@ -55,23 +55,24 @@ SmtpClient::SmtpClient(QObject *parent) : QObject(parent) idleTimer = new QTimer(this); idleTimer->setSingleShot(true); - connect(idleTimer, &QTimer::timeout, this, &SmtpClient::idleTimeout); + connect(idleTimer, SIGNAL(timeout()), this, SLOT(idleTimeout())); - connect(smtp, &QxtSmtp::authenticated, this, &SmtpClient::authenticated); - connect(smtp, qOverload(&QxtSmtp::authenticationFailed), this, - &SmtpClient::authenticationFailed); - connect(smtp, &QxtSmtp::connected, this, &SmtpClient::connected); - connect(smtp, qOverload(&QxtSmtp::connectionFailed), this, &SmtpClient::connectionFailed); - connect(smtp, &QxtSmtp::disconnected, this, &SmtpClient::disconnected); - connect(smtp, &QxtSmtp::encrypted, this, &SmtpClient::encrypted); - connect(smtp, qOverload(&QxtSmtp::encryptionFailed), this, &SmtpClient::encryptionFailed); - connect(smtp, &QxtSmtp::finished, this, &SmtpClient::finished); - connect(smtp, qOverload(&QxtSmtp::mailFailed), this, &SmtpClient::mailFailed); - connect(smtp, &QxtSmtp::mailSent, this, &SmtpClient::mailSent); - connect(smtp, qOverload(&QxtSmtp::recipientRejected), this, - &SmtpClient::recipientRejected); - connect(smtp, qOverload(&QxtSmtp::senderRejected), this, - &SmtpClient::senderRejected); + connect(smtp, SIGNAL(authenticated()), this, SLOT(authenticated())); + connect(smtp, SIGNAL(authenticationFailed(const QByteArray &)), this, + SLOT(authenticationFailed(const QByteArray &))); + connect(smtp, SIGNAL(connected()), this, SLOT(connected())); + connect(smtp, SIGNAL(connectionFailed(const QByteArray &)), this, SLOT(connectionFailed(const QByteArray &))); + connect(smtp, SIGNAL(disconnected()), this, SLOT(disconnected())); + connect(smtp, SIGNAL(encrypted()), this, SLOT(encrypted())); + connect(smtp, SIGNAL(encryptionFailed(const QByteArray &)), this, SLOT(encryptionFailed(const QByteArray &))); + connect(smtp, SIGNAL(finished()), this, SLOT(finished())); + connect(smtp, SIGNAL(mailFailed(int, int, const QByteArray &)), this, + SLOT(mailFailed(int, int, const QByteArray &))); + connect(smtp, SIGNAL(mailSent(int)), this, SLOT(mailSent(int))); + connect(smtp, SIGNAL(recipientRejected(int, const QString &, const QByteArray &)), this, + SLOT(recipientRejected(int, const QString &, const QByteArray &))); + connect(smtp, SIGNAL(senderRejected(int, const QString &, const QByteArray &)), this, + SLOT(senderRejected(int, const QString &, const QByteArray &))); } SmtpClient::~SmtpClient() diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 84b9f02bf..19f9268ee 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -177,29 +177,7 @@ cockatrice_add_test(NAME test_age_formatting SOURCES test_age_formatting.cpp LIB cockatrice_add_test(NAME user_data_backup_test SOURCES user_data_backup_test.cpp LIBS libcockatrice_utility) cockatrice_add_test(NAME password_hash_test SOURCES password_hash_test.cpp LIBS libcockatrice_utility) cockatrice_add_test(NAME report_categories_test SOURCES report_categories_test.cpp LIBS libcockatrice_utility) -cockatrice_add_test(NAME svg_recolor_test SOURCES svg_recolor_test.cpp LIBS libcockatrice_utility) cockatrice_add_test(NAME warning_categories_test SOURCES warning_categories_test.cpp LIBS libcockatrice_utility) -cockatrice_add_test( - NAME - user_games_model_test - SOURCES - ${CMAKE_SOURCE_DIR}/cockatrice/src/interface/widgets/server/user/user_games_model.cpp - user_games_model_test.cpp - LIBS - libcockatrice_network_client_abstract - INCLUDE_DIRS - ${CMAKE_SOURCE_DIR}/cockatrice/src - ${CMAKE_SOURCE_DIR}/libcockatrice_network -) -cockatrice_add_test( - NAME - spoiler_file_test - SOURCES - ${CMAKE_SOURCE_DIR}/cockatrice/src/client/network/update/card_spoiler/spoiler_file.cpp - spoiler_file_test.cpp - INCLUDE_DIRS - ${CMAKE_SOURCE_DIR}/cockatrice/src -) # The installer's holder probe is Windows-only, but the wording it produces and the # question which programs are the payload's own are plain C++ and are what a stuck user # has to act on, so they are tested everywhere. @@ -230,18 +208,6 @@ cockatrice_add_test( libcockatrice_deck_list libcockatrice_utility ) -cockatrice_add_test( - NAME - card_art_crop_test - SOURCES - ${CMAKE_SOURCE_DIR}/cockatrice/src/interface/widgets/cards/card_art_utils.cpp - ${VERSION_STRING_CPP} - card_art_crop_test.cpp - LIBS - libcockatrice_card - INCLUDE_DIRS - ${CMAKE_SOURCE_DIR}/cockatrice/src -) cockatrice_add_test( NAME server_rate_limiter_test @@ -285,17 +251,6 @@ cockatrice_add_test( LABELS server ) -cockatrice_add_test( - NAME - server_logger_test - SOURCES - ${CMAKE_SOURCE_DIR}/servatrice/src/server_logger.cpp - server_logger_test.cpp - INCLUDE_DIRS - ${CMAKE_SOURCE_DIR}/servatrice/src - LABELS - server -) cockatrice_add_test( NAME server_card_counter_test @@ -362,40 +317,6 @@ cockatrice_add_test( LABELS server ) -cockatrice_add_test( - NAME - server_forced_password_change_test - SOURCES - server_forced_password_change_test.cpp - LIBS - libcockatrice_network_server_remote - libcockatrice_rng - LABELS - server -) -cockatrice_add_test( - NAME - client_login_status_test - SOURCES - ${VERSION_STRING_CPP} - client_login_status_test.cpp - LIBS - libcockatrice_network_client_remote - LABELS - ci -) -# The local game runs one client and one server in the same process. -# Either of them can be destroyed first; the survivor has to stay usable. -cockatrice_add_test( - NAME - local_client_lifetime_test - SOURCES - local_client_lifetime_test.cpp - LIBS - libcockatrice_network - LABELS - ci -) cockatrice_add_test( NAME server_room_channels_test @@ -448,10 +369,18 @@ cockatrice_add_test( ) cockatrice_add_test( NAME - font_config_test + loader_local_matching_test SOURCES - ${CMAKE_SOURCE_DIR}/cockatrice/src/interface/theme_config.cpp - font_config_test.cpp + ${CMAKE_SOURCE_DIR}/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp + ${CMAKE_SOURCE_DIR}/cockatrice/src/client/settings/cache_settings.cpp + ${CMAKE_SOURCE_DIR}/cockatrice/src/client/settings/card_counter_settings.cpp + ${CMAKE_SOURCE_DIR}/cockatrice/src/client/settings/shortcuts_settings.cpp + ${CMAKE_SOURCE_DIR}/cockatrice/src/client/network/update/client/release_channel.cpp + ${VERSION_STRING_CPP} + loader_local_matching_test.cpp + LIBS + libcockatrice_network + libcockatrice_settings INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/cockatrice/src ) @@ -506,19 +435,6 @@ endif() # Guard must match the condition for src/single_instance_manager.cpp in cockatrice/CMakeLists.txt. if(WITH_CLIENT) - cockatrice_add_test( - NAME - moxfield_signature_spells_test - SOURCES - ${VERSION_STRING_CPP} - ${CMAKE_SOURCE_DIR}/cockatrice/src/interface/deck_loader/card_node_function.cpp - moxfield_signature_spells_test.cpp - LIBS - libcockatrice_card - libcockatrice_deck_list - INCLUDE_DIRS - ${CMAKE_SOURCE_DIR}/cockatrice/src - ) cockatrice_add_test( NAME single_instance_manager_test @@ -566,18 +482,11 @@ add_subdirectory(card_zone_algorithms) add_subdirectory(carddatabase) add_subdirectory(deck_list_model) add_subdirectory(deck_list_zones) -add_subdirectory(icon_assets) add_subdirectory(loading_from_clipboard) -add_subdirectory(model_contract) add_subdirectory(movecard_tests) add_subdirectory(oracle) add_subdirectory(settings) -# libcockatrice_game only exists when the client is built. -if(WITH_CLIENT) - add_subdirectory(game) -endif() - # theme_migration_test compiles client sources, whose headers are only reachable from a client build. if(WITH_CLIENT) add_subdirectory(theme_migration) @@ -588,46 +497,3 @@ endif() if(WITH_ORACLE OR WITH_CLIENT) add_subdirectory(picture_loader_benchmark) endif() - -# loader_local_matching_test and deck_state_manager_test links libcockatrice_settings, -# which only exists when a client/UI-capable target is being built. -if(WITH_ORACLE OR WITH_CLIENT) - set(SETTINGS_SOURCES - ${CMAKE_SOURCE_DIR}/cockatrice/src/client/network/update/client/release_channel.cpp - ${CMAKE_SOURCE_DIR}/cockatrice/src/client/settings/cache_settings.cpp - ${CMAKE_SOURCE_DIR}/cockatrice/src/client/settings/card_counter_settings.cpp - ${CMAKE_SOURCE_DIR}/cockatrice/src/client/settings/shortcuts_settings.cpp - ${VERSION_STRING_CPP} - ) - set(SETTINGS_LIBS libcockatrice_network libcockatrice_settings) - set(SETTINGS_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/cockatrice/src) - - cockatrice_add_test( - NAME - loader_local_matching_test - SOURCES - ${CMAKE_SOURCE_DIR}/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp - ${SETTINGS_SOURCES} - loader_local_matching_test.cpp - LIBS - ${SETTINGS_LIBS} - INCLUDE_DIRS - ${SETTINGS_INCLUDE_DIRS} - ) - cockatrice_add_test( - NAME - deck_state_manager_test - SOURCES - ${CMAKE_SOURCE_DIR}/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp - ${SETTINGS_SOURCES} - deck_state_manager_test.cpp - LIBS - libcockatrice_card - libcockatrice_deck_list - libcockatrice_models - libcockatrice_utility - ${SETTINGS_LIBS} - INCLUDE_DIRS - ${SETTINGS_INCLUDE_DIRS} - ) -endif() diff --git a/tests/card_art_crop_test.cpp b/tests/card_art_crop_test.cpp deleted file mode 100644 index 1c4a9ff8d..000000000 --- a/tests/card_art_crop_test.cpp +++ /dev/null @@ -1,92 +0,0 @@ -#include "interface/widgets/cards/card_art_utils.h" - -#include -#include -#include -#include -#include -#include -#include - -namespace -{ -ExactCard makeCard(bool landscape) -{ - CardInfo::UiAttributes attributes; - attributes.landscapeOrientation = landscape; - return ExactCard(CardInfo::newInstance("Artwork", "", false, {}, {}, {}, {}, attributes)); -} - -QPixmap landscapeCardWithFrame() -{ - // Normalized landscape frame: the title reaches 14% down the upright - // image, and the Battle type line starts at 56%. Artwork has two colors - // so the test also detects a wrong or missing rotation. - QImage upright(1400, 1000, QImage::Format_RGB32); - upright.fill(Qt::red); - QPainter painter(&upright); - painter.fillRect(QRect(70, 140, 1260, 420), Qt::green); - painter.fillRect(QRect(700, 140, 630, 420), Qt::blue); - painter.end(); - QTransform storedOrientation; - storedOrientation.rotate(-90); - return QPixmap::fromImage(upright.transformed(storedOrientation)); -} - -TEST(CardArtCrop, LandscapeCropExcludesNameAndRulesBoxesAndRotatesUpright) -{ - const QImage crop = CardArtUtils::cropCardArt(landscapeCardWithFrame(), makeCard(true)).toImage(); - ASSERT_GT(crop.width(), crop.height()); - ASSERT_FALSE(crop.isNull()); - for (int y = 0; y < crop.height(); ++y) { - for (int x = 0; x < crop.width(); ++x) { - EXPECT_EQ(x < crop.width() / 2 ? QColor(Qt::green) : QColor(Qt::blue), crop.pixelColor(x, y)); - } - } -} - -TEST(CardArtCrop, PortraitCropRetainsItsExistingArtworkBounds) -{ - QImage source(745, 1040, QImage::Format_RGB32); - for (int y = 0; y < source.height(); ++y) { - for (int x = 0; x < source.width(); ++x) { - source.setPixelColor(x, y, QColor(x % 256, y % 256, (x + y) % 256)); - } - } - const QPixmap input = QPixmap::fromImage(source); - const QImage crop = CardArtUtils::cropCardArt(input, makeCard(false)).toImage(); - EXPECT_EQ(source.copy(QRect(52, 114, 641, 458)), crop); -} - -TEST(CardArtCrop, DevicePixelRatioDoesNotChangeTheArtworkPixels) -{ - QPixmap source = landscapeCardWithFrame(); - const QPixmap normal = CardArtUtils::cropCardArt(source, makeCard(true)); - source.setDevicePixelRatio(2.0); - const QPixmap highDpi = CardArtUtils::cropCardArt(source, makeCard(true)); - EXPECT_EQ(normal.size(), highDpi.size()); - EXPECT_EQ(2.0, highDpi.devicePixelRatio()); - QImage normalPixels = normal.toImage(); - QImage highDpiPixels = highDpi.toImage(); - normalPixels.setDevicePixelRatio(1.0); - highDpiPixels.setDevicePixelRatio(1.0); - EXPECT_EQ(normalPixels, highDpiPixels); -} - -TEST(CardArtCrop, EmptyAndSmallImagesStayWithinTheirBounds) -{ - EXPECT_TRUE(CardArtUtils::cropCardArt({}, makeCard(true)).isNull()); - QPixmap small(1, 1); - small.fill(Qt::green); - EXPECT_EQ(small.toImage(), CardArtUtils::cropCardArt(small, makeCard(true)).toImage()); - EXPECT_EQ(small.toImage(), CardArtUtils::cropCardArt(small, makeCard(false)).toImage()); -} -} // namespace - -int main(int argc, char **argv) -{ - qputenv("QT_QPA_PLATFORM", "offscreen"); - QApplication app(argc, argv); - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/tests/card_zone_algorithms/CMakeLists.txt b/tests/card_zone_algorithms/CMakeLists.txt index 2418092de..945f8a0ed 100644 --- a/tests/card_zone_algorithms/CMakeLists.txt +++ b/tests/card_zone_algorithms/CMakeLists.txt @@ -1,4 +1,4 @@ cockatrice_add_test( NAME card_zone_algorithms_test SOURCES card_zone_algorithms_test.cpp INCLUDE_DIRS - ${CMAKE_SOURCE_DIR}/libcockatrice_game/libcockatrice/game/zones + ${CMAKE_SOURCE_DIR}/cockatrice/src/game/zones ) diff --git a/tests/card_zone_algorithms/card_zone_algorithms_test.cpp b/tests/card_zone_algorithms/card_zone_algorithms_test.cpp index 3d4baa430..4f5282235 100644 --- a/tests/card_zone_algorithms/card_zone_algorithms_test.cpp +++ b/tests/card_zone_algorithms/card_zone_algorithms_test.cpp @@ -16,6 +16,7 @@ struct MockCard bool cardRefWasCalled = false; bool resetStateCalled = false; bool resetStateKeepAnnotations = false; + bool visibleSet = false; void setId(int id) { @@ -34,6 +35,11 @@ struct MockCard resetStateCalled = true; resetStateKeepAnnotations = keepAnnotations; } + + void setVisible(bool visible) + { + visibleSet = visible; + } }; class MockCardList @@ -103,6 +109,7 @@ TEST_F(AddCardAlgorithmTest, ContentsKnownPreservesIdentity) EXPECT_FALSE(card.idWasCalled); EXPECT_FALSE(card.cardRefWasCalled); + EXPECT_TRUE(card.visibleSet); } TEST_F(AddCardAlgorithmTest, ContentsUnknownClearsIdentity) diff --git a/tests/carddatabase/CMakeLists.txt b/tests/carddatabase/CMakeLists.txt index 012081fd2..22171a9e8 100644 --- a/tests/carddatabase/CMakeLists.txt +++ b/tests/carddatabase/CMakeLists.txt @@ -21,12 +21,10 @@ cockatrice_add_test( ) # ------------------------ -# Guard to match condition for libcockatrice_filters in the root CMakeLists.txt +# Filter String Test +# (guard must match the condition for libcockatrice_filters in the root CMakeLists.txt) # ------------------------ if(WITH_ORACLE OR WITH_CLIENT) - # ------------------------ - # Filter String Test - # ------------------------ cockatrice_add_test( NAME filter_string_test @@ -37,49 +35,6 @@ if(WITH_ORACLE OR WITH_CLIENT) LIBS libcockatrice_filters ) - - # ------------------------ - # Filter Tree Test - # ------------------------ - cockatrice_add_test( - NAME - filter_tree_test - SOURCES - ${VERSION_STRING_CPP} - filter_tree_test.cpp - mocks.cpp - LIBS - libcockatrice_filters - ) - - # ------------------------ - # Filter Mode Test - # ------------------------ - cockatrice_add_test( - NAME - filter_mode_test - SOURCES - ${VERSION_STRING_CPP} - filter_mode_test.cpp - mocks.cpp - LIBS - libcockatrice_filters - ) - - # ------------------------ - # Visual Display Model Test - # ------------------------ - cockatrice_add_test( - NAME - visual_display_model_test - SOURCES - ${VERSION_STRING_CPP} - visual_display_model_test.cpp - mocks.cpp - LIBS - libcockatrice_card - libcockatrice_models - ) endif() # ------------------------ diff --git a/tests/carddatabase/carddatabase_test.cpp b/tests/carddatabase/carddatabase_test.cpp index 350d9be7e..eb522434d 100644 --- a/tests/carddatabase/carddatabase_test.cpp +++ b/tests/carddatabase/carddatabase_test.cpp @@ -1,4 +1,3 @@ -#include "../support/scoped_file_size_limit.h" #include "libcockatrice/card/database/card_database.h" #include "libcockatrice/card/database/card_database_loader.h" #include "libcockatrice/card/database/card_database_querier.h" @@ -18,12 +17,10 @@ #include #include #include -#include #include #include #include #include -#include #include #include #include @@ -205,57 +202,6 @@ TEST(CardDatabaseTest, Xml4LocalizedDataRoundTrip) ASSERT_EQ(printings.first().getProperty("manacost"), "1R"); } -#ifdef Q_OS_UNIX -/** - * @brief A failed write keeps the previously installed card database intact. - * - * This is the writer Oracle uses to install a refreshed database, so the truncation - * bug has to be covered here and not only through OracleDatabase::saveXml. - */ -TEST(CardDatabaseTest, Xml4ShortWriteKeepsInstalledFile) -{ - NoopCardSetPriorityController controller; - CardSetPtr set = - CardSet::newInstance(&controller, "TST", "Test Set", "expansion", QDate(), CardSet::PriorityPrimary); - - QHash props; - props["manacost"] = "1R"; - PrintingInfo printing(set, LazyPropertiesHash(props)); - SetToPrintingsMap setsInfo; - setsInfo["TST"].append(printing); - - CardInfo::UiAttributes attributes = {.tableRow = 1}; - CardInfoPtr card = - CardInfo::newInstance("Lightning Bolt", QString(1024, 'x'), false, {}, {}, {}, setsInfo, attributes); - - SetNameMap sets; - sets.insert("TST", set); - CardNameMap cards; - cards.insert("Lightning Bolt", card); - - QTemporaryDir tempDir; - ASSERT_TRUE(tempDir.isValid()); - const QString fileName = tempDir.filePath("cards.xml"); - - QFile installed(fileName); - ASSERT_TRUE(installed.open(QIODevice::WriteOnly)); - ASSERT_EQ(installed.write("installed database"), 18); - installed.close(); - - // A real filesystem write failure: the soft file-size cap makes the writer's own - // flush fail without filling a disk. The cap is scoped rather than forked, because a - // death-test child under RLIMIT_FSIZE is killed by SIGSEGV on macOS. - test_support::ScopedFileSizeLimit fileSizeCap(128); - ASSERT_TRUE(fileSizeCap.isValid()); - - CockatriceXml4Parser writer(&controller); - EXPECT_FALSE(writer.saveToFile({}, sets, cards, fileName)); - - ASSERT_TRUE(installed.open(QIODevice::ReadOnly)); - EXPECT_EQ(installed.readAll(), "installed database"); -} -#endif - /** * @brief Path provider serving a sandboxed copy of the test card database. */ @@ -662,110 +608,6 @@ TEST_F(CardDatabaseCacheInvalidationTest, MarkAllSetsAsKnownIsBatched) // Ignored sets keep their known state but are enabled. EXPECT_TRUE(controller.isEnabled("XXX")); } - -TEST_F(CardDatabaseCacheInvalidationTest, ReloadReleasesPreviousSnapshot) -{ - NoopCardPreferenceProvider prefs; - SandboxPathProvider pathProvider(root); - CardDatabase db(nullptr, &prefs, &pathProvider, &controller); - - db.loadCardDatabases(); - CardInfoPtr card = db.getCardList().value("Cat"); - ASSERT_FALSE(card.isNull()); - QWeakPointer weakCard(card); - card.clear(); - - db.reloadCardDatabasesAndNotify(); - - // CardSet holds strong CardInfoPtrs and CardInfo holds the CardSetPtr through its printings; if that - // cycle is not broken, the previous snapshot survives the reload. - EXPECT_TRUE(weakCard.isNull()) << "a reload must release the previous card snapshot"; -} - -TEST_F(CardDatabaseCacheInvalidationTest, ClearReleasesCards) -{ - NoopCardPreferenceProvider prefs; - SandboxPathProvider pathProvider(root); - CardDatabase db(nullptr, &prefs, &pathProvider, &controller); - - db.loadCardDatabases(); - CardInfoPtr card = db.getCardList().value("Cat"); - ASSERT_FALSE(card.isNull()); - QWeakPointer weakCard(card); - card.clear(); - - db.clear(); - - EXPECT_TRUE(weakCard.isNull()) << "clear() must release cards held by set membership"; -} - -TEST_F(CardDatabaseCacheInvalidationTest, RemoveCardDetachesItFromItsSet) -{ - // removeCard() is the one teardown path a caller can trigger for a single card (the token editor - // uses it). Without the detach the set's strong reference keeps the removed card alive forever. - NoopCardPreferenceProvider prefs; - SandboxPathProvider pathProvider(root); - CardDatabase db(nullptr, &prefs, &pathProvider, &controller); - - db.loadCardDatabases(); - CardInfoPtr card = db.getCardList().value("Cat"); - ASSERT_FALSE(card.isNull()); - const CardSetPtr catSet = db.getSet("CAT"); - ASSERT_TRUE(catSet->contains(card)); - - db.removeCard(card); - - EXPECT_FALSE(catSet->contains(card)) << "removeCard() must detach the card from its set"; - QWeakPointer weakCard(card); - card.clear(); - EXPECT_TRUE(weakCard.isNull()) << "a removed card must not stay alive through its set"; -} - -TEST_F(CardDatabaseCacheInvalidationTest, RemoveSelfPointerStillNotifiesDatabaseCard) -{ - // cardInfoChanged() used to be emitted through a self pointer stored on the card. Without it the - // card must still notify its observers whenever its properties change. - NoopCardPreferenceProvider prefs; - SandboxPathProvider pathProvider(root); - CardDatabase db(nullptr, &prefs, &pathProvider, &controller); - - db.loadCardDatabases(); - const CardInfoPtr card = db.getCardList().value("Cat"); - ASSERT_FALSE(card.isNull()); - QSignalSpy spy(card.data(), &CardInfo::cardInfoChanged); - - card->setProperty("manacost", "1G"); - - ASSERT_EQ(spy.count(), 1) << "a property change on a database card must still emit cardInfoChanged"; - const QList arguments = spy.takeFirst(); - ASSERT_EQ(arguments.size(), 1); - EXPECT_EQ(arguments.first().value().data(), card.data()) - << "the signal must carry the card that changed"; -} - -TEST_F(CardDatabaseCacheInvalidationTest, RemoveSelfPointerCloneNotifiesAsItself) -{ - // A clone owns its own shared reference, so its changes must be reported as the clone's, never the - // original's: decks and views listening to the original must not be invalidated by a clone edit. - NoopCardPreferenceProvider prefs; - SandboxPathProvider pathProvider(root); - CardDatabase db(nullptr, &prefs, &pathProvider, &controller); - - db.loadCardDatabases(); - const CardInfoPtr original = db.getCardList().value("Cat"); - ASSERT_FALSE(original.isNull()); - const CardInfoPtr clone = original->clone(); - QSignalSpy originalSpy(original.data(), &CardInfo::cardInfoChanged); - QSignalSpy cloneSpy(clone.data(), &CardInfo::cardInfoChanged); - - clone->setProperty("manacost", "1G"); - - ASSERT_EQ(cloneSpy.count(), 1) << "the clone must notify its own observers"; - EXPECT_EQ(cloneSpy.first().first().value().data(), clone.data()) - << "the clone's signal must carry the clone"; - EXPECT_EQ(originalSpy.count(), 0) << "the clone must not notify the original's observers"; -} - } // namespace int main(int argc, char **argv) diff --git a/tests/carddatabase/filter_mode_test.cpp b/tests/carddatabase/filter_mode_test.cpp deleted file mode 100644 index 3fec7e25d..000000000 --- a/tests/carddatabase/filter_mode_test.cpp +++ /dev/null @@ -1,147 +0,0 @@ -#include "libcockatrice/filters/filter_mode.h" - -#include - -class FilterModeTest : public ::testing::Test -{ -protected: - ~FilterModeTest() override - { - for (CardFilter *filter : owned) { - delete filter; - } - } - - /** @brief Create a filter owned by the fixture and append it to the set under test. */ - const CardFilter * - add(const QString &term, CardFilter::Type type, CardFilter::Attr attr = CardFilter::Attr::AttrColor) - { - owned.append(new CardFilter(term, type, attr)); - filters.append(owned.last()); - return owned.last(); - } - - QList owned; - QList filters; -}; - -TEST(FilterModeInfoTest, EachModeDescribesItsOwnFilters) -{ - EXPECT_EQ(getFilterModeInfo(FilterMode::Includes).includeType, CardFilter::Type::TypeOr); - EXPECT_EQ(getFilterModeInfo(FilterMode::Includes).excludeType, CardFilter::Type::TypeEnd); - EXPECT_EQ(getFilterModeInfo(FilterMode::Includes).attr, CardFilter::Attr::AttrColor); - - EXPECT_EQ(getFilterModeInfo(FilterMode::Excludes).includeType, CardFilter::Type::TypeAndNot); - EXPECT_EQ(getFilterModeInfo(FilterMode::Excludes).excludeType, CardFilter::Type::TypeEnd); - - EXPECT_EQ(getFilterModeInfo(FilterMode::IncludeExclude).includeType, CardFilter::Type::TypeOr); - EXPECT_EQ(getFilterModeInfo(FilterMode::IncludeExclude).excludeType, CardFilter::Type::TypeAndNot); - - EXPECT_EQ(getFilterModeInfo(FilterMode::ExactMatch).includeType, CardFilter::Type::TypeAnd); - EXPECT_EQ(getFilterModeInfo(FilterMode::ExactMatch).excludeType, CardFilter::Type::TypeAndNot); - - // Color identity only excludes: the selected colors must be the identity, so nothing is included positively. - EXPECT_EQ(getFilterModeInfo(FilterMode::ColorIdentity).includeType, CardFilter::Type::TypeEnd); - EXPECT_EQ(getFilterModeInfo(FilterMode::ColorIdentity).excludeType, CardFilter::Type::TypeAndNot); - EXPECT_EQ(getFilterModeInfo(FilterMode::ColorIdentity).attr, CardFilter::Attr::AttrColorIdentity); - - EXPECT_EQ(getFilterModeInfo(FilterMode::Custom).attr, CardFilter::Attr::AttrEnd); -} - -TEST_F(FilterModeTest, EmptyFilterSetKeepsACompatibleMode) -{ - // Includes and Color identity both allow an empty set, so the live mode is not swapped for another. - EXPECT_EQ(deriveFilterMode(filters, FilterMode::Includes), FilterMode::Includes); - EXPECT_EQ(deriveFilterMode(filters, FilterMode::ColorIdentity), FilterMode::ColorIdentity); -} - -// Include / Exclude and Exact match always hold one filter per color, so an empty set cannot have come from -// them and falls back to the first mode that can describe it. -TEST_F(FilterModeTest, EmptyFilterSetFallsBackWhenTheModeNeedsOneFilterPerColor) -{ - EXPECT_EQ(deriveFilterMode(filters, FilterMode::IncludeExclude), FilterMode::Includes); - EXPECT_EQ(deriveFilterMode(filters, FilterMode::ExactMatch), FilterMode::Includes); -} - -TEST_F(FilterModeTest, IncludesFromOrFilters) -{ - add("W", CardFilter::Type::TypeOr); - - EXPECT_EQ(deriveFilterMode(filters, FilterMode::Includes), FilterMode::Includes); - // A single OR filter cannot come from Excludes, so the first mode that can produce it is selected. - EXPECT_EQ(deriveFilterMode(filters, FilterMode::Excludes), FilterMode::Includes); -} - -TEST_F(FilterModeTest, ExcludesFromAndNotFilters) -{ - add("W", CardFilter::Type::TypeAndNot); - - EXPECT_EQ(deriveFilterMode(filters, FilterMode::Excludes), FilterMode::Excludes); - // Includes needs an OR or an end filter, so an AND NOT filter selects Excludes. - EXPECT_EQ(deriveFilterMode(filters, FilterMode::Includes), FilterMode::Excludes); -} - -TEST_F(FilterModeTest, IncludeExcludeNeedsOneFilterPerColor) -{ - add("W", CardFilter::Type::TypeOr); - for (const QChar color : QString("UBRG")) { - add(QString(color), CardFilter::Type::TypeAndNot); - } - - EXPECT_EQ(deriveFilterMode(filters, FilterMode::IncludeExclude), FilterMode::IncludeExclude); -} - -TEST_F(FilterModeTest, IncludeExcludeRejectsAnIncompleteColorSet) -{ - add("W", CardFilter::Type::TypeOr); - add("U", CardFilter::Type::TypeAndNot); - - EXPECT_EQ(deriveFilterMode(filters, FilterMode::IncludeExclude), FilterMode::Custom); -} - -TEST_F(FilterModeTest, ExactMatchFromAndAndAndNotFilters) -{ - add("W", CardFilter::Type::TypeAnd); - for (const QChar color : QString("UBRG")) { - add(QString(color), CardFilter::Type::TypeAndNot); - } - - EXPECT_EQ(deriveFilterMode(filters, FilterMode::ExactMatch), FilterMode::ExactMatch); -} - -TEST_F(FilterModeTest, ColorIdentityFromIdentityAndNotFilters) -{ - for (const QChar color : QString("BRG")) { - add(QString(color), CardFilter::Type::TypeAndNot, CardFilter::Attr::AttrColorIdentity); - } - - EXPECT_EQ(deriveFilterMode(filters, FilterMode::ColorIdentity), FilterMode::ColorIdentity); -} - -TEST_F(FilterModeTest, MixedAttributesAreCustom) -{ - add("W", CardFilter::Type::TypeOr, CardFilter::Attr::AttrColor); - add("U", CardFilter::Type::TypeAndNot, CardFilter::Attr::AttrColorIdentity); - - EXPECT_EQ(deriveFilterMode(filters, FilterMode::Includes), FilterMode::Custom); -} - -TEST_F(FilterModeTest, CustomLeavesAsSoonAsAModeCanExplainTheFilters) -{ - add("W", CardFilter::Type::TypeOr); - - EXPECT_EQ(deriveFilterMode(filters, FilterMode::Custom), FilterMode::Includes); -} - -// Exact match with no color selected stores one AND NOT filter per color. That is a legitimate Exact match -// state, so the live mode is kept; a mode that cannot produce the set re-derives to Excludes, which produces -// the identical filters. -TEST_F(FilterModeTest, FullyExcludedColorSetIsExactMatchOrExcludes) -{ - for (const QChar color : QString("WUBRG")) { - add(QString(color), CardFilter::Type::TypeAndNot); - } - - EXPECT_EQ(deriveFilterMode(filters, FilterMode::ExactMatch), FilterMode::ExactMatch); - EXPECT_EQ(deriveFilterMode(filters, FilterMode::Includes), FilterMode::Excludes); -} diff --git a/tests/carddatabase/filter_string_test.cpp b/tests/carddatabase/filter_string_test.cpp index 931cb7e0c..e561db590 100644 --- a/tests/carddatabase/filter_string_test.cpp +++ b/tests/carddatabase/filter_string_test.cpp @@ -123,25 +123,6 @@ CardInfoPtr greenIdentityCard() return CardInfo::newInstance("Identity Cat", "", false, {{"colors", "G"}, {"coloridentity", "G"}}, {}, {}, {}, {}); } -// A card whose color identity differs from its colors, so that a query reading the wrong one is visible. -CardInfoPtr splitIdentityCard() -{ - return CardInfo::newInstance("Split Identity", "", false, {{"colors", "G"}, {"coloridentity", "W"}}, {}, {}, {}, - {}); -} - -// "ci!" (exactly these color identities) used to read the camelCase "colorIdentity" property instead of the -// lowercase "coloridentity" key, so it matched the empty string and rejected every card. -TEST_F(CardQuery, ColorIdentityExactReadsTheColorIdentityProperty) -{ - const CardData card = splitIdentityCard(); - ASSERT_TRUE(FilterString("ci!w").check(card)); - ASSERT_FALSE(FilterString("ci!g").check(card)); - // "c!" still reads colors, not identity. - ASSERT_TRUE(FilterString("c!g").check(card)); - ASSERT_FALSE(FilterString("c!w").check(card)); -} - // Whitespace belongs around the separator, never inside an operator token: "c i: g" must not // be read as the color-identity operator "ci" (it is a generic "c" AND a field query on "i"). TEST_F(CardQuery, ColorIdentityOperatorIsNotSplitByWhitespace) diff --git a/tests/carddatabase/filter_tree_test.cpp b/tests/carddatabase/filter_tree_test.cpp deleted file mode 100644 index 8d3706071..000000000 --- a/tests/carddatabase/filter_tree_test.cpp +++ /dev/null @@ -1,204 +0,0 @@ - -#include "libcockatrice/filters/filter_tree.h" - -#include -#include -#include - -namespace -{ -class FilterTreeTest : public ::testing::Test -{ -protected: - void SetUp() override - { - language = CardSearchLanguage{}; - - island = CardInfo::newInstance("Island", "", false, {{"colors", ""}, {"coloridentity", "U"}}, {}, {}, {}, {}); - artifact = - CardInfo::newInstance("Artifact", "", false, {{"colors", ""}, {"coloridentity", ""}}, {}, {}, {}, {}); - truth = CardInfo::newInstance("Truth", "", false, {{"colors", "U"}, {"coloridentity", "U"}}, {}, {}, {}, {}); - notDead = - CardInfo::newInstance("Not Dead", "", false, {{"colors", "B"}, {"coloridentity", "B"}}, {}, {}, {}, {}); - wallOfDenial = CardInfo::newInstance("Wall of Denial", "", false, {{"colors", "WU"}, {"coloridentity", "WU"}}, - {}, {}, {}, {}); - maelstromAngel = CardInfo::newInstance("Maelstrom Archangel", "", false, - {{"colors", "WUBRG"}, {"coloridentity", "WUBRG"}}, {}, {}, {}, {}); - } - - CardSearchLanguage language; - - CardData island; // c/u - CardData artifact; // c - CardData truth; // u - CardData notDead; // b - CardData wallOfDenial; // wu - CardData maelstromAngel; // wubrg -}; -} // namespace - -// ===================================================================================================================== -// acceptColor -// ===================================================================================================================== - -TEST_F(FilterTreeTest, Color) -{ - FilterTree filterTree; - filterTree.termNode(CardFilter::Attr::AttrColor, CardFilter::Type::TypeAnd, "wu"); - ASSERT_FALSE(filterTree.acceptsCard(island, language)); - ASSERT_FALSE(filterTree.acceptsCard(artifact, language)); - ASSERT_FALSE(filterTree.acceptsCard(truth, language)); - ASSERT_FALSE(filterTree.acceptsCard(notDead, language)); - ASSERT_TRUE(filterTree.acceptsCard(wallOfDenial, language)); - ASSERT_TRUE(filterTree.acceptsCard(maelstromAngel, language)); -} - -TEST_F(FilterTreeTest, ColorColorless) -{ - FilterTree filterTree; - filterTree.termNode(CardFilter::Attr::AttrColor, CardFilter::Type::TypeAnd, "c"); - ASSERT_TRUE(filterTree.acceptsCard(island, language)); - ASSERT_TRUE(filterTree.acceptsCard(artifact, language)); - ASSERT_FALSE(filterTree.acceptsCard(truth, language)); - ASSERT_FALSE(filterTree.acceptsCard(notDead, language)); - ASSERT_FALSE(filterTree.acceptsCard(wallOfDenial, language)); - ASSERT_FALSE(filterTree.acceptsCard(maelstromAngel, language)); -} - -TEST_F(FilterTreeTest, ColorNot) -{ - FilterTree filterTree; - filterTree.termNode(CardFilter::Attr::AttrColor, CardFilter::Type::TypeAndNot, "b"); - ASSERT_TRUE(filterTree.acceptsCard(island, language)); - ASSERT_TRUE(filterTree.acceptsCard(artifact, language)); - ASSERT_TRUE(filterTree.acceptsCard(truth, language)); - ASSERT_FALSE(filterTree.acceptsCard(notDead, language)); - ASSERT_TRUE(filterTree.acceptsCard(wallOfDenial, language)); - ASSERT_FALSE(filterTree.acceptsCard(maelstromAngel, language)); -} - -TEST_F(FilterTreeTest, ColorAliases) -{ - FilterTree filterTree; - - filterTree.termNode(CardFilter::Attr::AttrColor, CardFilter::Type::TypeAnd, "green"); - ASSERT_FALSE(filterTree.acceptsCard(truth, language)); - ASSERT_TRUE(filterTree.acceptsCard(maelstromAngel, language)); - filterTree.clear(); - - filterTree.termNode(CardFilter::Attr::AttrColor, CardFilter::Type::TypeAnd, "grn"); - ASSERT_FALSE(filterTree.acceptsCard(truth, language)); - ASSERT_TRUE(filterTree.acceptsCard(maelstromAngel, language)); - filterTree.clear(); - - filterTree.termNode(CardFilter::Attr::AttrColor, CardFilter::Type::TypeAnd, "blue"); - ASSERT_TRUE(filterTree.acceptsCard(truth, language)); - ASSERT_FALSE(filterTree.acceptsCard(notDead, language)); - filterTree.clear(); - - filterTree.termNode(CardFilter::Attr::AttrColor, CardFilter::Type::TypeAnd, "blu"); - ASSERT_TRUE(filterTree.acceptsCard(truth, language)); - ASSERT_FALSE(filterTree.acceptsCard(notDead, language)); - filterTree.clear(); - - filterTree.termNode(CardFilter::Attr::AttrColor, CardFilter::Type::TypeAnd, "black"); - ASSERT_FALSE(filterTree.acceptsCard(truth, language)); - ASSERT_TRUE(filterTree.acceptsCard(notDead, language)); - filterTree.clear(); - - filterTree.termNode(CardFilter::Attr::AttrColor, CardFilter::Type::TypeAnd, "blk"); - ASSERT_FALSE(filterTree.acceptsCard(truth, language)); - ASSERT_TRUE(filterTree.acceptsCard(notDead, language)); - filterTree.clear(); - - filterTree.termNode(CardFilter::Attr::AttrColor, CardFilter::Type::TypeAnd, "red"); - ASSERT_FALSE(filterTree.acceptsCard(truth, language)); - ASSERT_TRUE(filterTree.acceptsCard(maelstromAngel, language)); - filterTree.clear(); - - filterTree.termNode(CardFilter::Attr::AttrColor, CardFilter::Type::TypeAnd, "white"); - ASSERT_FALSE(filterTree.acceptsCard(truth, language)); - ASSERT_TRUE(filterTree.acceptsCard(wallOfDenial, language)); - filterTree.clear(); - - filterTree.termNode(CardFilter::Attr::AttrColor, CardFilter::Type::TypeAnd, "wht"); - ASSERT_FALSE(filterTree.acceptsCard(truth, language)); - ASSERT_TRUE(filterTree.acceptsCard(wallOfDenial, language)); - filterTree.clear(); - - filterTree.termNode(CardFilter::Attr::AttrColor, CardFilter::Type::TypeAnd, "colorless"); - ASSERT_FALSE(filterTree.acceptsCard(truth, language)); - ASSERT_TRUE(filterTree.acceptsCard(artifact, language)); - filterTree.clear(); - - filterTree.termNode(CardFilter::Attr::AttrColor, CardFilter::Type::TypeAnd, "colourless"); - ASSERT_FALSE(filterTree.acceptsCard(truth, language)); - ASSERT_TRUE(filterTree.acceptsCard(artifact, language)); - filterTree.clear(); - - filterTree.termNode(CardFilter::Attr::AttrColor, CardFilter::Type::TypeAnd, "none"); - ASSERT_FALSE(filterTree.acceptsCard(truth, language)); - ASSERT_TRUE(filterTree.acceptsCard(artifact, language)); - filterTree.clear(); -} - -// ===================================================================================================================== -// acceptColorIdentity -// ===================================================================================================================== - -TEST_F(FilterTreeTest, ColorIdentity) -{ - FilterTree filterTree; - filterTree.termNode(CardFilter::Attr::AttrColorIdentity, CardFilter::Type::TypeAnd, "wu"); - ASSERT_FALSE(filterTree.acceptsCard(island, language)); - ASSERT_FALSE(filterTree.acceptsCard(artifact, language)); - ASSERT_FALSE(filterTree.acceptsCard(truth, language)); - ASSERT_FALSE(filterTree.acceptsCard(notDead, language)); - ASSERT_TRUE(filterTree.acceptsCard(wallOfDenial, language)); - ASSERT_TRUE(filterTree.acceptsCard(maelstromAngel, language)); -} - -TEST_F(FilterTreeTest, ColorIdentityColorless) -{ - FilterTree filterTree; - filterTree.termNode(CardFilter::Attr::AttrColorIdentity, CardFilter::Type::TypeAnd, "c"); - ASSERT_FALSE(filterTree.acceptsCard(island, language)); - ASSERT_TRUE(filterTree.acceptsCard(artifact, language)); - ASSERT_FALSE(filterTree.acceptsCard(truth, language)); - ASSERT_FALSE(filterTree.acceptsCard(notDead, language)); - ASSERT_FALSE(filterTree.acceptsCard(wallOfDenial, language)); - ASSERT_FALSE(filterTree.acceptsCard(maelstromAngel, language)); -} - -TEST_F(FilterTreeTest, ColorIdentityNot) -{ - FilterTree filterTree; - filterTree.termNode(CardFilter::Attr::AttrColorIdentity, CardFilter::Type::TypeAndNot, "b"); - ASSERT_TRUE(filterTree.acceptsCard(island, language)); - ASSERT_TRUE(filterTree.acceptsCard(artifact, language)); - ASSERT_TRUE(filterTree.acceptsCard(truth, language)); - ASSERT_FALSE(filterTree.acceptsCard(notDead, language)); - ASSERT_TRUE(filterTree.acceptsCard(wallOfDenial, language)); - ASSERT_FALSE(filterTree.acceptsCard(maelstromAngel, language)); -} - -TEST_F(FilterTreeTest, ColorIdentityMultiple) -{ - // Simulate a WU commander. - FilterTree filterTree; - filterTree.termNode(CardFilter::Attr::AttrColorIdentity, CardFilter::Type::TypeAndNot, "b"); - filterTree.termNode(CardFilter::Attr::AttrColorIdentity, CardFilter::Type::TypeAndNot, "r"); - filterTree.termNode(CardFilter::Attr::AttrColorIdentity, CardFilter::Type::TypeAndNot, "g"); - ASSERT_TRUE(filterTree.acceptsCard(island, language)); - ASSERT_TRUE(filterTree.acceptsCard(artifact, language)); - ASSERT_TRUE(filterTree.acceptsCard(truth, language)); - ASSERT_FALSE(filterTree.acceptsCard(notDead, language)); - ASSERT_TRUE(filterTree.acceptsCard(wallOfDenial, language)); - ASSERT_FALSE(filterTree.acceptsCard(maelstromAngel, language)); -} - -int main(int argc, char **argv) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/tests/carddatabase/visual_display_model_test.cpp b/tests/carddatabase/visual_display_model_test.cpp deleted file mode 100644 index 5fa554bb3..000000000 --- a/tests/carddatabase/visual_display_model_test.cpp +++ /dev/null @@ -1,188 +0,0 @@ -/** - * @file visual_display_model_test.cpp - * @brief Tests for the flattened model behind the visual card database grid. - */ - -#include "card_database_display_model.h" -#include "card_database_model.h" -#include "card_database_visual_display_model.h" -#include "libcockatrice/card/card_info.h" -#include "libcockatrice/card/database/card_database.h" -#include "libcockatrice/card/database/card_database_querier.h" -#include "libcockatrice/card/printing/exact_card.h" -#include "libcockatrice/card/printing/printing_info.h" -#include "libcockatrice/card/set/card_set.h" -#include "libcockatrice/interfaces/noop_card_preference_provider.h" -#include "libcockatrice/interfaces/noop_card_set_priority_controller.h" -#include "test_card_database_path_provider.h" - -#include "gtest/gtest.h" -#include -#include -#include -#include -#include -#include -#include -#include - -namespace -{ -// GTest's main() creates no QCoreApplication, which QTimer needs for its event loop. -const QCoreApplication &application() -{ - static int argc = 1; - static char executable[] = "visual_display_model_test"; - static char *argv[] = {executable, nullptr}; - static const QCoreApplication app(argc, argv); - return app; -} - -/// Lets the rebuild timer fire, as it would in the running client. -void waitForRebuild() -{ - QEventLoop loop; - QTimer::singleShot(100, &loop, &QEventLoop::quit); - loop.exec(); -} - -class CardDatabaseVisualDisplayModelTest : public ::testing::Test -{ -protected: - void SetUp() override - { - (void)application(); - - db = std::make_unique(nullptr, new NoopCardPreferenceProvider(), - new TestCardDatabasePathProvider(), new NoopCardSetPriorityController()); - db->loadCardDatabases(); - - cardModel = std::make_unique(db.get(), false); - displayModel = std::make_unique(); - displayModel->setSourceModel(cardModel.get()); - visualModel = std::make_unique(displayModel.get(), db->query()); - visualModel->refresh(); - } - - /** - * @brief Builds a card with @p printingCount printings in each named set. - * @param printingCountPerSet Set short name to the number of printings in that set. - */ - [[nodiscard]] CardInfoPtr makeCard(const QString &name, const QMap &printingCountPerSet) - { - SetToPrintingsMap setsInfo; - for (auto it = printingCountPerSet.constBegin(); it != printingCountPerSet.constEnd(); ++it) { - CardSetPtr set = CardSet::newInstance(&setController, it.key(), it.key() + " test set", "expansion", - QDate(), CardSet::PriorityPrimary); - for (int printing = 0; printing < it.value(); ++printing) { - QHash properties; - properties["uuid"] = QString("%1-%2-%3").arg(it.key(), name).arg(printing); - setsInfo[it.key()].append(PrintingInfo(set, LazyPropertiesHash(properties))); - } - } - - CardInfo::UiAttributes attributes = {.tableRow = 1}; - return CardInfo::newInstance(name, "", false, {}, {}, {}, setsInfo, attributes); - } - - NoopCardSetPriorityController setController; - std::unique_ptr db; - std::unique_ptr cardModel; - std::unique_ptr displayModel; - std::unique_ptr visualModel; -}; - -TEST_F(CardDatabaseVisualDisplayModelTest, ExposesTheCardInfoBehindAProxyRow) -{ - ASSERT_GT(displayModel->rowCount(), 0); - - const QVariant info = displayModel->data(displayModel->index(0, CardDatabaseModel::NameColumn), - CardDatabaseDisplayModel::CardInfoRole); - ASSERT_TRUE(info.isValid()); - EXPECT_FALSE(info.value().isNull()); -} - -TEST_F(CardDatabaseVisualDisplayModelTest, FlattensOneRowPerProxyCardWithoutSetFilters) -{ - ASSERT_GT(displayModel->rowCount(), 0); - EXPECT_EQ(displayModel->rowCount(), visualModel->rowCount()); - - for (int row = 0; row < visualModel->rowCount(); ++row) { - const ExactCard card = visualModel->cardAt(row); - ASSERT_TRUE(card) << "row " << row; - EXPECT_EQ( - displayModel->data(displayModel->index(row, CardDatabaseModel::NameColumn), Qt::DisplayRole).toString(), - card.getName()) - << "row " << row; - } -} - -TEST_F(CardDatabaseVisualDisplayModelTest, ShowsOneRowPerCardWhenNoSetIsFiltered) -{ - const int rowsBefore = visualModel->rowCount(); - - db->addCard(makeCard("Multi", {{"TST", 2}, {"OTH", 1}})); - visualModel->refresh(); - - EXPECT_EQ(rowsBefore + 1, visualModel->rowCount()); - EXPECT_EQ("Multi", visualModel->cardAt(visualModel->rowCount() - 1).getName()); -} - -TEST_F(CardDatabaseVisualDisplayModelTest, ShowsEveryPrintingOfAFilteredSet) -{ - db->addCard(makeCard("Multi", {{"TST", 2}, {"OTH", 1}})); - visualModel->refresh(); - - visualModel->setSetFilterTerms({"TST"}); - - ASSERT_EQ(2, visualModel->rowCount()); - for (int row = 0; row < visualModel->rowCount(); ++row) { - const ExactCard card = visualModel->cardAt(row); - ASSERT_TRUE(card) << "row " << row; - EXPECT_EQ("Multi", card.getName()); - ASSERT_FALSE(card.getPrinting().isEmpty()) << "row " << row; - EXPECT_EQ("TST", card.getPrinting().getSet()->getShortName()) << "row " << row; - } - EXPECT_NE(visualModel->cardAt(0).getPrinting(), visualModel->cardAt(1).getPrinting()); -} - -TEST_F(CardDatabaseVisualDisplayModelTest, HidesCardsWithoutAPrintingInTheFilteredSets) -{ - visualModel->setSetFilterTerms({"NO SUCH SET"}); - - EXPECT_EQ(0, visualModel->rowCount()); -} - -TEST_F(CardDatabaseVisualDisplayModelTest, RestoresOneRowPerCardWhenTheSetTermsClear) -{ - db->addCard(makeCard("Multi", {{"TST", 2}, {"OTH", 1}})); - visualModel->refresh(); - const int rowsBefore = visualModel->rowCount(); - - visualModel->setSetFilterTerms({"TST"}); - ASSERT_EQ(2, visualModel->rowCount()); - - visualModel->setSetFilterTerms({}); - EXPECT_EQ(rowsBefore, visualModel->rowCount()); -} - -TEST_F(CardDatabaseVisualDisplayModelTest, RebuildsByItselfWhenTheProxyGainsARow) -{ - const int rowsBefore = visualModel->rowCount(); - - db->addCard(makeCard("Late", {{"TST", 1}})); - waitForRebuild(); - - EXPECT_EQ(rowsBefore + 1, visualModel->rowCount()); -} - -TEST_F(CardDatabaseVisualDisplayModelTest, ReportsTheCardNameForDisplayAndAccessibleText) -{ - ASSERT_GT(visualModel->rowCount(), 0); - const QString expected = visualModel->cardAt(0).getName(); - - EXPECT_EQ(expected, visualModel->data(visualModel->index(0), Qt::DisplayRole).toString()); - EXPECT_EQ(expected, visualModel->data(visualModel->index(0), Qt::AccessibleTextRole).toString()); - EXPECT_FALSE(visualModel->data(QModelIndex(), Qt::DisplayRole).isValid()); -} -} // namespace diff --git a/tests/client_login_status_test.cpp b/tests/client_login_status_test.cpp deleted file mode 100644 index d8ea63550..000000000 --- a/tests/client_login_status_test.cpp +++ /dev/null @@ -1,116 +0,0 @@ -/** @file client_login_status_test.cpp - * @brief The login response state machine must keep the session a forced password change needs. - * @ingroup Tests - */ - -#include "abstract_client.h" -#include "libcockatrice/interfaces/interface_network_settings_provider.h" -#include "libcockatrice/protocol/pb/response.pb.h" -#include "libcockatrice/protocol/pb/response_login.pb.h" -#include "remote_client.h" - -#include -#include -#include -#include - -namespace -{ - -class StubNetworkSettingsProvider : public INetworkSettingsProvider -{ -public: - QString getClientID() override - { - return {}; - } - [[nodiscard]] int getTimeOut() const override - { - return 1000; - } - [[nodiscard]] int getKeepAlive() const override - { - return 60; - } - [[nodiscard]] bool getNotifyAboutUpdates() const override - { - return false; - } - void setKnownMissingFeatures(const QString &) override - { - } - QString getKnownMissingFeatures() override - { - return {}; - } -}; - -/** - * @brief Feeds a login response to RemoteClient without a socket. - * - * `loginResponse` is the slot the socket thread runs for the login command's answer, so - * invoking it directly exercises the status transition that decides whether `readData()` - * tears the connection down right after it. - */ -class ClientLoginStatusTest : public ::testing::Test -{ -protected: - void SetUp() override - { - client = new RemoteClient(nullptr, &provider); - } - - void TearDown() override - { - delete client; - client = nullptr; - } - - void deliverLoginResponse(Response::ResponseCode code) - { - Response response; - response.set_response_code(code); - response.MutableExtension(Response_Login::ext); - ASSERT_TRUE( - QMetaObject::invokeMethod(client, "loginResponse", Qt::DirectConnection, Q_ARG(Response, response))); - } - - StubNetworkSettingsProvider provider; - RemoteClient *client = nullptr; -}; - -/** - * @brief A required password change is not a failed login. - * - * The server keeps the session open and accepts only ping and Command_AccountPassword until - * the password is replaced. StatusDisconnecting would make readData() close the socket right - * after this slot returns - before the dialog that collects the new password (queued to the - * UI thread) can send anything - and the pending command would never be answered because the - * ping timer that times it out dies with the connection. StatusLoggedIn would start the - * normal post-login flow for a session that cannot serve it. - */ -TEST_F(ClientLoginStatusTest, PasswordChangeRequiredKeepsTheSessionOpen) -{ - deliverLoginResponse(Response::RespPasswordChangeRequired); - - EXPECT_EQ(client->getStatus(), StatusPasswordChangeRequired); - EXPECT_NE(client->getStatus(), StatusDisconnecting); - EXPECT_NE(client->getStatus(), StatusLoggedIn); -} - -/** @brief Every other login error still ends the connection, as it did before. */ -TEST_F(ClientLoginStatusTest, OtherLoginErrorsDisconnect) -{ - deliverLoginResponse(Response::RespWrongPassword); - - EXPECT_EQ(client->getStatus(), StatusDisconnecting); -} - -} // namespace - -int main(int argc, char **argv) -{ - QCoreApplication app(argc, argv); - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/tests/deck_list_model/deck_list_model_custom_zones_test.cpp b/tests/deck_list_model/deck_list_model_custom_zones_test.cpp index d4e44125c..95df74702 100644 --- a/tests/deck_list_model/deck_list_model_custom_zones_test.cpp +++ b/tests/deck_list_model/deck_list_model_custom_zones_test.cpp @@ -278,37 +278,6 @@ TEST(DeckListModelCustomZones, SortPlainNodeDoesNotReorderCustomZones) EXPECT_EQ(mapping[1].second, 1); } -TEST(DeckListModelCustomZones, ManaGroupsUseNumericOrderWithoutChangingOtherNodes) -{ - InnerDecklistNode root; - auto *board = new InnerDecklistNode(DECK_ZONE_MAIN, &root); - const QStringList original = {"10", "2", "0.5", "1000000", "1", "unknown", "nan"}; - for (const auto &name : original) { - new InnerDecklistNode(name, board); - } - auto *custom = new DecklistModelSubZoneNode("1x", board); - new InnerDecklistNode("10", custom); - new InnerDecklistNode("2", custom); - root.setSortMethod(DeckSortMethod::ByName); - - const auto mapping = DeckListModelCustomZones::sortWithCustomZonesLast(&root, board, Qt::AscendingOrder, true); - EXPECT_EQ(childNames(board), (QStringList{"0.5", "1", "2", "10", "1000000", "nan", "unknown", "1x"})); - QStringList before = original; - before.append("1x"); - for (const auto &move : mapping) { - EXPECT_EQ(board->at(move.second)->getName(), before.at(move.first)); - } - - (void)DeckListModelCustomZones::sortWithCustomZonesLast(&root, board, Qt::DescendingOrder, true); - EXPECT_EQ(childNames(board), (QStringList{"1000000", "10", "2", "1", "0.5", "unknown", "nan", "1x"})); - - // The numeric flag only affects groups directly under a board. - (void)DeckListModelCustomZones::sortWithCustomZonesLast(&root, custom, Qt::AscendingOrder, true); - EXPECT_EQ(childNames(custom), (QStringList{"10", "2"})); - (void)DeckListModelCustomZones::sortWithCustomZonesLast(&root, board, Qt::AscendingOrder); - EXPECT_EQ(childNames(board), (QStringList{"0.5", "1", "10", "1000000", "2", "nan", "unknown", "1x"})); -} - int main(int argc, char **argv) { ::testing::InitGoogleTest(&argc, argv); diff --git a/tests/deck_list_zones/deck_list_zones_test.cpp b/tests/deck_list_zones/deck_list_zones_test.cpp index a67e689cf..1903b70df 100644 --- a/tests/deck_list_zones/deck_list_zones_test.cpp +++ b/tests/deck_list_zones/deck_list_zones_test.cpp @@ -393,28 +393,6 @@ TEST(DeckListZones, MaybeboardCustomZoneCardsAreExcludedFromHash) EXPECT_EQ(deck.getDeckHash(), expected.getDeckHash()); } -TEST(DeckListZones, PlainExportPutsMainFirstWithoutReorderingSavedZones) -{ - DeckList deck; - auto *tree = deck.getTree(); - ASSERT_NE(tree->addCustomZone(DECK_ZONE_SIDE, "Side Tech"), nullptr); - tree->addCard("Side Card", 2, "Side Tech", -1); - tree->addCard("Token Card", 1, DECK_ZONE_TOKENS, -1); - ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr); - tree->addCard("Main Card", 3, "Removal", -1); - ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAYBEBOARD, "Candidates"), nullptr); - tree->addCard("Maybe Card", 4, "Candidates", -1); - - const QString native = deck.writeToString_Native(); - EXPECT_EQ(deck.writeToString_Plain(true, false), QString("3 Main Card\nSB: 2 Side Card\n1 Token Card\n")); - EXPECT_EQ(deck.writeToString_Plain(false, false), QString("3 Main Card\n2 Side Card\n1 Token Card\n")); - EXPECT_EQ(deck.writeToString_Native(), native); - - DeckList reopened(native); - EXPECT_EQ(reopened.getZoneNodes().first()->getName(), DECK_ZONE_SIDE); - EXPECT_EQ(reopened.writeToString_Plain(true, false), deck.writeToString_Plain(true, false)); -} - int main(int argc, char **argv) { ::testing::InitGoogleTest(&argc, argv); diff --git a/tests/deck_state_manager_test.cpp b/tests/deck_state_manager_test.cpp deleted file mode 100644 index ddd17912c..000000000 --- a/tests/deck_state_manager_test.cpp +++ /dev/null @@ -1,190 +0,0 @@ -/** @file deck_state_manager_test.cpp - * @brief Tests for DeckStateManager operations. - * @ingroup Tests - */ - -#include "libcockatrice/card/database/card_database.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace -{ - -/** - * @brief Assert that the DeckStateManager's deck list contains only the given zone, - * and that that zone only contains the given number of cards, all with the given card name. - * - * @param manager the DeckStateManager - * @param restrictToZones In which zones to look for the zone and cards. Empty means use the entire deck - * @param zone The only zone that should exist in the deck - * @param cardName The name of the only card that should exist in the deck - * @param cardNumber The number of cards that should be in the deck - */ -static void containsExactly(const DeckStateManager &manager, - const QSet &restrictToZones, - QString zone, - QString cardName, - int cardNumber) -{ - QList zones = manager.getDeckList().getZoneNodes(restrictToZones); - ASSERT_EQ(zones.size(), 1); - ASSERT_EQ(zones[0]->getName(), zone); - ASSERT_EQ(zones[0]->size(), 1); - const DecklistCardNode *card = dynamic_cast((*zones[0])[0]); - ASSERT_NE(card, nullptr); - ASSERT_EQ(card->getName(), cardName); - ASSERT_EQ(card->getNumber(), cardNumber); -} - -/** @brief Return CardInfo of a token with the given name. */ -static CardInfoPtr makeToken(QString name) -{ - return CardInfo::newInstance(name, "", true, {}, {}, {}, {}, {}); -} - -// ===================================================================================================================== -// addCard -// ===================================================================================================================== - -TEST(DeckStateManager, AddCards) -{ - DeckStateManager manager; - manager.addCard(ExactCard(CardInfo::newInstance("Lightning Bolt")), DECK_ZONE_MAIN); - containsExactly(manager, {}, DECK_ZONE_MAIN, "Lightning Bolt", 1); - manager.addCard(ExactCard(CardInfo::newInstance("Lightning Bolt")), DECK_ZONE_MAIN); - containsExactly(manager, {}, DECK_ZONE_MAIN, "Lightning Bolt", 2); -} - -TEST(DeckStateManager, AddCardZones) -{ - DeckStateManager manager; - manager.addCard(ExactCard(CardInfo::newInstance("Grizzly Bears")), DECK_ZONE_MAIN); - manager.addCard(ExactCard(CardInfo::newInstance("Lightning Bolt")), DECK_ZONE_SIDE); - manager.addCard(ExactCard(CardInfo::newInstance("Swords to Plowshares")), DECK_ZONE_MAYBEBOARD); - - // Check if the cards got put into the correct zones. - ASSERT_EQ(manager.getDeckList().getZoneNodes().size(), 3); - containsExactly(manager, {DECK_ZONE_MAIN}, DECK_ZONE_MAIN, "Grizzly Bears", 1); - containsExactly(manager, {DECK_ZONE_SIDE}, DECK_ZONE_SIDE, "Lightning Bolt", 1); - containsExactly(manager, {DECK_ZONE_MAYBEBOARD}, DECK_ZONE_MAYBEBOARD, "Swords to Plowshares", 1); -} - -TEST(DeckStateManager, AddTokens) -{ - DeckStateManager manager; - manager.addCard(ExactCard(makeToken("Beast")), DECK_ZONE_MAIN); - manager.addCard(ExactCard(makeToken("Beast")), DECK_ZONE_SIDE); - manager.addCard(ExactCard(makeToken("Beast")), DECK_ZONE_MAYBEBOARD); - manager.addCard(ExactCard(makeToken("Beast")), DECK_ZONE_TOKENS); - - // A token should always be put into the tokens zone. - containsExactly(manager, {}, DECK_ZONE_TOKENS, "Beast", 4); -} - -// ===================================================================================================================== -// decrementCard -// ===================================================================================================================== - -TEST(DeckStateManager, DecrementCards) -{ - DeckStateManager manager; - manager.addCard(ExactCard(CardInfo::newInstance("Lightning Bolt")), DECK_ZONE_MAIN); - manager.addCard(ExactCard(CardInfo::newInstance("Lightning Bolt")), DECK_ZONE_MAIN); - containsExactly(manager, {}, DECK_ZONE_MAIN, "Lightning Bolt", 2); - - // Removing from the sideboard should do nothing, as there is nothing in the side board. - manager.decrementCard(ExactCard(CardInfo::newInstance("Lightning Bolt")), DECK_ZONE_SIDE); - containsExactly(manager, {}, DECK_ZONE_MAIN, "Lightning Bolt", 2); - - // Remove the first card. - manager.decrementCard(ExactCard(CardInfo::newInstance("Lightning Bolt")), DECK_ZONE_MAIN); - containsExactly(manager, {}, DECK_ZONE_MAIN, "Lightning Bolt", 1); - - // Removing the second card should also remove the zone. - manager.decrementCard(ExactCard(CardInfo::newInstance("Lightning Bolt")), DECK_ZONE_MAIN); - ASSERT_EQ(manager.getDeckList().getZoneNodes().size(), 0); -} - -TEST(DeckStateManager, DecrementTokens) -{ - DeckStateManager manager; - manager.addCard(ExactCard(makeToken("Beast")), DECK_ZONE_MAIN); - manager.addCard(ExactCard(makeToken("Beast")), DECK_ZONE_SIDE); - manager.addCard(ExactCard(makeToken("Beast")), DECK_ZONE_TOKENS); - containsExactly(manager, {}, DECK_ZONE_TOKENS, "Beast", 3); - - manager.decrementCard(ExactCard(makeToken("Beast")), DECK_ZONE_TOKENS); - containsExactly(manager, {}, DECK_ZONE_TOKENS, "Beast", 2); - - // Removing tokens from a given zone should remove them from the - // token zone if the given zone does not contain the token. - manager.decrementCard(ExactCard(makeToken("Beast")), DECK_ZONE_SIDE); - containsExactly(manager, {}, DECK_ZONE_TOKENS, "Beast", 1); - - manager.decrementCard(ExactCard(makeToken("Beast")), DECK_ZONE_MAIN); - ASSERT_EQ(manager.getDeckList().getZoneNodes().size(), 0); -} - -TEST(DeckStateManager, DecrementTokenMainboard) -{ - DeckStateManager manager; - - // Add cards to the deck list directly so tokens are not - // automatically added to the token zone. - manager.getDeckListShared()->addCard("Beast", DECK_ZONE_MAIN); - manager.getDeckListShared()->addCard("Beast", DECK_ZONE_TOKENS); - ASSERT_EQ(manager.getDeckList().getZoneNodes().size(), 2); - containsExactly(manager, {DECK_ZONE_MAIN}, DECK_ZONE_MAIN, "Beast", 1); - containsExactly(manager, {DECK_ZONE_TOKENS}, DECK_ZONE_TOKENS, "Beast", 1); - - // decrementCard uses the model to find the card, so we need to rebuild it. - manager.getModel()->rebuildTree(); - - // Tokens should be removed from the main zone first. - manager.decrementCard(ExactCard(makeToken("Beast")), DECK_ZONE_MAIN); - ASSERT_EQ(manager.getDeckList().getZoneNodes({DECK_ZONE_MAIN}).size(), 0); - containsExactly(manager, {DECK_ZONE_TOKENS}, DECK_ZONE_TOKENS, "Beast", 1); - - // If the main zone is empty they can be removed from the token zone. - manager.decrementCard(ExactCard(makeToken("Beast")), DECK_ZONE_MAIN); - ASSERT_EQ(manager.getDeckList().getZoneNodes().size(), 0); -} -} // namespace - -int main(int argc, char **argv) -{ - // Redirect SettingsCache reads/writes (app-data location) away from the real user profile. - QStandardPaths::setTestModeEnabled(true); - QCoreApplication app(argc, argv); - QCoreApplication::setOrganizationName(QStringLiteral("CockatriceTest")); - QCoreApplication::setApplicationName( - QStringLiteral("deck-state-manager-test-%1").arg(QCoreApplication::applicationPid())); - - ::testing::InitGoogleTest(&argc, argv); - - // Add cards to the card database - auto *db = CardDatabaseManager::getInstance(); - db->addCard(CardInfo::newInstance("Lightning Bolt")); - db->addCard(CardInfo::newInstance("Grizzly Bears")); - db->addCard(CardInfo::newInstance("Swords to Plowshares")); - db->addCard(makeToken("Beast")); - - int result = RUN_ALL_TESTS(); - - // Clean up the settings directory in ~/.qttest if the tests ran. - if (!::testing::GTEST_FLAG(list_tests)) { - QDir(SettingsCache::instance().getDataPath()).removeRecursively(); - QDir(SettingsCache::instance().getCachePath()).removeRecursively(); - } - - return result; -} diff --git a/tests/font_config_test.cpp b/tests/font_config_test.cpp deleted file mode 100644 index c8b1fb10d..000000000 --- a/tests/font_config_test.cpp +++ /dev/null @@ -1,195 +0,0 @@ -#include "interface/theme_config.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace -{ -// Writes content to a file inside tmp, creating parents as needed. -QString writeTempFile(QTemporaryDir &tmp, const QString &relativePath, const QString &content) -{ - const QString filePath = QDir(tmp.path()).absoluteFilePath(relativePath); - EXPECT_TRUE(QDir().mkpath(QFileInfo(filePath).absolutePath())); - QFile file(filePath); - EXPECT_TRUE(file.open(QIODevice::WriteOnly | QIODevice::Text)); - QTextStream out(&file); - out << content; - file.close(); - return filePath; -} - -QFont makeFont(const QString &family, int pointSize) -{ - QFont font(family); - font.setPointSize(pointSize); - return font; -} -} // namespace - -TEST(FontConfigTest, FileNameIsFontsToml) -{ - EXPECT_EQ(FontConfig::fileName(), QStringLiteral("fonts.toml")); -} - -TEST(FontConfigTest, EmptyByDefault) -{ - FontConfig cfg; - EXPECT_FALSE(cfg.hasFonts()); - EXPECT_TRUE(cfg.toToml().isEmpty()); - EXPECT_EQ(cfg, FontConfig()); - EXPECT_EQ(cfg, FontConfig::fromFile("/nonexistent/path/fonts.toml")); - EXPECT_EQ(cfg, FontConfig::fromThemeDir(QString())); -} - -TEST(FontConfigTest, RoundTripPreservesFamilyAndSize) -{ - QTemporaryDir tmp; - ASSERT_TRUE(tmp.isValid()); - - FontConfig cfg; - cfg.fonts[AppFont::InterfaceDefault] = makeFont("Inter", 10); - cfg.fonts[AppFont::ChatLog] = makeFont("JetBrains Mono", 9); - cfg.fonts[AppFont::CardText] = makeFont("Noto Serif", 11); - cfg.fonts[AppFont::DeckList] = makeFont("Roboto", 12); - ASSERT_TRUE(cfg.hasFonts()); - - const QString filePath = writeTempFile(tmp, "fonts.toml", cfg.toToml()); - const FontConfig loaded = FontConfig::fromFile(filePath); - - EXPECT_EQ(loaded, cfg); - EXPECT_EQ(loaded.fonts[AppFont::InterfaceDefault].family(), QStringLiteral("Inter")); - EXPECT_EQ(loaded.fonts[AppFont::InterfaceDefault].pointSize(), 10); - EXPECT_EQ(loaded.fonts[AppFont::ChatLog].family(), QStringLiteral("JetBrains Mono")); - EXPECT_EQ(loaded.fonts[AppFont::ChatLog].pointSize(), 9); - EXPECT_EQ(loaded.fonts[AppFont::CardText].family(), QStringLiteral("Noto Serif")); - EXPECT_EQ(loaded.fonts[AppFont::CardText].pointSize(), 11); - EXPECT_EQ(loaded.fonts[AppFont::DeckList].family(), QStringLiteral("Roboto")); - EXPECT_EQ(loaded.fonts[AppFont::DeckList].pointSize(), 12); -} - -TEST(FontConfigTest, RoundTripStripsWeightAndItalic) -{ - QTemporaryDir tmp; - ASSERT_TRUE(tmp.isValid()); - - QFont styled("Inter"); - styled.setPointSize(10); - styled.setBold(true); - styled.setItalic(true); - - FontConfig cfg; - cfg.fonts[AppFont::ChatLog] = styled; - - const QString filePath = writeTempFile(tmp, "fonts.toml", cfg.toToml()); - const FontConfig loaded = FontConfig::fromFile(filePath); - - ASSERT_TRUE(loaded.fonts.contains(AppFont::ChatLog)); - EXPECT_EQ(loaded.fonts[AppFont::ChatLog].family(), QStringLiteral("Inter")); - EXPECT_EQ(loaded.fonts[AppFont::ChatLog].pointSize(), 10); - EXPECT_FALSE(loaded.fonts[AppFont::ChatLog].bold()); - EXPECT_FALSE(loaded.fonts[AppFont::ChatLog].italic()); - EXPECT_EQ(loaded.fonts[AppFont::ChatLog], makeFont("Inter", 10)); -} - -TEST(FontConfigTest, ToTomlFormat) -{ - FontConfig cfg; - cfg.fonts[AppFont::InterfaceDefault] = makeFont("Inter", 10); - - const QString toml = cfg.toToml(); - EXPECT_TRUE(toml.contains(QStringLiteral("[Fonts]"))); - EXPECT_TRUE(toml.contains(QStringLiteral("InterfaceDefault"))); - EXPECT_TRUE(toml.contains(QStringLiteral("\"Inter, 10\""))); -} - -TEST(FontConfigTest, MalformedLinesAreSkipped) -{ - QTemporaryDir tmp; - ASSERT_TRUE(tmp.isValid()); - - const QString filePath = writeTempFile(tmp, "fonts.toml", - "# a comment\n" - "; another comment\n" - "\n" - "StrayBeforeSection = \"Inter, 10\"\n" - "\n" - "[Other]\n" - "ChatLog = \"ShouldBeIgnored, 10\"\n" - "\n" - "[Fonts]\n" - "InterfaceDefault = \"Inter, 10\"\n" - "ChatLog = \"JetBrains Mono\", 9 # inline comment\n" - "CardText = Noto Serif, 11\n" - "AppFont::DeckList = \"Roboto, 12\"\n" - "UnknownRole = \"Inter, 10\"\n" - "QPalette::Window = \"Inter, 10\"\n" - "NoComma = \"Inter\"\n" - "EmptyFamily = \", 10\"\n" - "ZeroSize = \"Inter, 0\"\n" - "NegativeSize = \"Inter, -3\"\n" - "NotANumber = \"Inter, big\"\n" - "NotAnEntry\n"); - - const FontConfig loaded = FontConfig::fromFile(filePath); - - ASSERT_TRUE(loaded.hasFonts()); - EXPECT_EQ(loaded.fonts.size(), 4); - EXPECT_EQ(loaded.fonts[AppFont::InterfaceDefault], makeFont("Inter", 10)); - EXPECT_EQ(loaded.fonts[AppFont::ChatLog], makeFont("JetBrains Mono", 9)); - EXPECT_EQ(loaded.fonts[AppFont::CardText], makeFont("Noto Serif", 11)); - EXPECT_EQ(loaded.fonts[AppFont::DeckList], makeFont("Roboto", 12)); -} - -TEST(FontConfigTest, FromThemeDirReadsFontsToml) -{ - QTemporaryDir tmp; - ASSERT_TRUE(tmp.isValid()); - - const QString themeDir = QDir(tmp.path()).absoluteFilePath("MyTheme"); - ASSERT_TRUE(QDir().mkpath(themeDir)); - - FontConfig cfg; - cfg.fonts[AppFont::CardText] = makeFont("Noto Serif", 11); - writeTempFile(tmp, "MyTheme/fonts.toml", cfg.toToml()); - - const FontConfig loaded = FontConfig::fromThemeDir(themeDir); - EXPECT_EQ(loaded, cfg); - - // A theme directory without fonts.toml loads as empty. - const QString bareDir = QDir(tmp.path()).absoluteFilePath("BareTheme"); - ASSERT_TRUE(QDir().mkpath(bareDir)); - EXPECT_FALSE(FontConfig::fromThemeDir(bareDir).hasFonts()); -} - -TEST(FontConfigTest, InequalityComparesRoles) -{ - FontConfig left; - left.fonts[AppFont::InterfaceDefault] = makeFont("Inter", 10); - - FontConfig right = left; - EXPECT_EQ(left, right); - EXPECT_FALSE(left != right); - - right.fonts[AppFont::InterfaceDefault] = makeFont("Inter", 11); - EXPECT_NE(left, right); - - right = left; - right.fonts[AppFont::ChatLog] = makeFont("Inter", 10); - EXPECT_NE(left, right); -} - -// Every test brings its own main(): GTest is not guaranteed to be found on the build machines, and -// the fallback then links the bare gtest library without gtest_main. -int main(int argc, char **argv) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/tests/game/CMakeLists.txt b/tests/game/CMakeLists.txt deleted file mode 100644 index 42c935c8f..000000000 --- a/tests/game/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -cockatrice_add_test( - NAME - game_logic_test - SOURCES - game_test_main.cpp - card_state_test.cpp - card_zone_logic_test.cpp - game_event_handler_test.cpp - player_actions_test.cpp - replay_test.cpp - ${VERSION_STRING_CPP} - LIBS - libcockatrice_game - INCLUDE_DIRS - ${CMAKE_CURRENT_SOURCE_DIR} - DEFINITIONS - GAME_TEST_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data" -) diff --git a/tests/game/card_state_test.cpp b/tests/game/card_state_test.cpp deleted file mode 100644 index 2f2c43bf4..000000000 --- a/tests/game/card_state_test.cpp +++ /dev/null @@ -1,110 +0,0 @@ -#include "gtest/gtest.h" -#include -#include -#include -#include -#include - -namespace -{ - -CardRef cardRefFor(const QString &name) -{ - CardRef cardRef; - cardRef.name = name; - return cardRef; -} - -} // namespace - -TEST(CardStateTest, AttachmentGraphKeepsBothEndsConsistent) -{ - CardState host(nullptr, nullptr, cardRefFor(QStringLiteral("Host")), 1); - CardState guest(nullptr, nullptr, cardRefFor(QStringLiteral("Guest")), 2); - - guest.setAttachedTo(&host); - host.addAttachedCard(&guest); - - EXPECT_EQ(guest.getAttachedTo(), &host); - ASSERT_EQ(host.getAttachedCards().size(), 1); - EXPECT_EQ(host.getAttachedCards().first(), &guest); - - host.removeAttachedCard(&guest); - guest.setAttachedTo(nullptr); - - EXPECT_TRUE(host.getAttachedCards().isEmpty()); - EXPECT_EQ(guest.getAttachedTo(), nullptr); -} - -TEST(CardStateTest, CountersAddUpdateAndClear) -{ - CardState card(nullptr, nullptr, cardRefFor(QStringLiteral("Cat")), 1); - int changes = 0; - QObject::connect(&card, &CardState::countersChanged, [&changes]() { ++changes; }); - - card.insertCounter(1, 2); - EXPECT_EQ(card.getCounters().value(1), 2); - - card.setCounter(1, 3); - EXPECT_EQ(card.getCounters().value(1), 3); - - card.setCounter(1, 0); - EXPECT_FALSE(card.getCounters().contains(1)); - - card.setCounter(2, 1); - card.clearCounters(); - EXPECT_TRUE(card.getCounters().isEmpty()); - - EXPECT_EQ(changes, 5); -} - -TEST(CardStateTest, TapFlipAttackingAndReset) -{ - CardState card(nullptr, nullptr, cardRefFor(QStringLiteral("Cat")), 1); - card.setTapped(true); - card.setFaceDown(true); - card.setAttacking(true); - card.setAnnotation(QStringLiteral("note")); - card.setPT(QStringLiteral("4/4")); - card.setDoesntUntap(true); - card.setDestroyOnZoneChange(true); - card.setColor(QStringLiteral("red")); - card.insertCounter(1, 2); - - card.resetState(true); - - EXPECT_FALSE(card.getTapped()); - EXPECT_FALSE(card.getAttacking()); - EXPECT_TRUE(card.getCounters().isEmpty()); - EXPECT_TRUE(card.getPT().isEmpty()); - EXPECT_FALSE(card.getDoesntUntap()); - EXPECT_EQ(card.getAnnotation(), QStringLiteral("note")); - // resetState() deliberately leaves these three alone. - EXPECT_TRUE(card.getFaceDown()); - EXPECT_EQ(card.getColor(), QStringLiteral("red")); - EXPECT_TRUE(card.getDestroyOnZoneChange()); - - card.setAnnotation(QStringLiteral("other")); - card.resetState(false); - EXPECT_TRUE(card.getAnnotation().isEmpty()); -} - -TEST(CardStateTest, ParsePT) -{ - const QVariantList plain = CardState::parsePT(QStringLiteral("3/3")); - ASSERT_EQ(plain.size(), 2); - EXPECT_EQ(plain.at(0).toString(), QStringLiteral("3")); - EXPECT_EQ(plain.at(1).toString(), QStringLiteral("3")); - - const QVariantList negative = CardState::parsePT(QStringLiteral("-1/2")); - ASSERT_EQ(negative.size(), 2); - EXPECT_EQ(negative.at(0).typeId(), QMetaType::Int); - EXPECT_EQ(negative.at(0).toInt(), -1); - EXPECT_EQ(negative.at(1).toString(), QStringLiteral("2")); - - const QVariantList star = CardState::parsePT(QStringLiteral("*")); - ASSERT_EQ(star.size(), 1); - EXPECT_EQ(star.at(0).toString(), QStringLiteral("*")); - - EXPECT_TRUE(CardState::parsePT(QString()).isEmpty()); -} diff --git a/tests/game/card_zone_logic_test.cpp b/tests/game/card_zone_logic_test.cpp deleted file mode 100644 index 7f0c39b47..000000000 --- a/tests/game/card_zone_logic_test.cpp +++ /dev/null @@ -1,107 +0,0 @@ -#include "gtest/gtest.h" -#include -#include -#include -#include -#include -#include - -namespace -{ - -CardRef cardRefFor(const QString &name) -{ - CardRef cardRef; - cardRef.name = name; - return cardRef; -} - -} // namespace - -TEST(CardZoneLogicTest, AddsAndTakesCardsWithoutAGraphicsSide) -{ - HandZoneLogic zone(nullptr, QStringLiteral("hand"), false, false, true); - CardState card(nullptr, nullptr, cardRefFor(QStringLiteral("Lightning Bolt")), 7); - - QSignalSpy cardAddedSpy(&zone, &CardZoneLogic::cardAdded); - QSignalSpy cardCountSpy(&zone, &CardZoneLogic::cardCountChanged); - - zone.addCard(&card, false, 0); - - ASSERT_EQ(zone.getCards().size(), 1); - EXPECT_EQ(zone.getCards().first(), &card); - EXPECT_EQ(card.getZone(), &zone); - EXPECT_EQ(cardAddedSpy.count(), 1); - EXPECT_GE(cardCountSpy.count(), 1); - - EXPECT_EQ(zone.takeCard(0, 7), &card); - EXPECT_TRUE(zone.getCards().isEmpty()); - EXPECT_EQ(card.getId(), 7); -} - -TEST(CardZoneLogicTest, AsksTheGraphicsSideToCreateCards) -{ - HandZoneLogic zone(nullptr, QStringLiteral("library"), false, true, true); - // The graphics side owns the view logic and registers it on the zone it - // shows; adding a card then goes through prepareAddCard and the request - // signal instead of the test emitting the signal itself. - ZoneViewZoneLogic view(nullptr, &zone, 1, true, false, false); - zone.getViews().append(&view); - - QSignalSpy requestSpy(&view, &CardZoneLogic::createCardRequested); - - CardState card(nullptr, nullptr, cardRefFor(QStringLiteral("Lightning Bolt")), 7); - zone.addCard(&card, true, 0, 0); - - ASSERT_EQ(requestSpy.count(), 1); - const QList arguments = requestSpy.takeFirst(); - const ServerInfo_Card cardInfo = arguments.at(0).value(); - EXPECT_EQ(cardInfo.id(), 7); - EXPECT_EQ(cardInfo.name(), "Lightning Bolt"); - EXPECT_TRUE(arguments.at(1).toBool()); - EXPECT_EQ(card.getZone(), &zone); - EXPECT_EQ(zone.getCards().size(), 1); -} - -TEST(CardZoneLogicTest, MoveBetweenZonesUpdatesCardZone) -{ - HandZoneLogic first(nullptr, QStringLiteral("hand"), false, false, true); - HandZoneLogic second(nullptr, QStringLiteral("grave"), false, false, true); - CardState card(nullptr, nullptr, cardRefFor(QStringLiteral("Cat")), 7); - - first.addCard(&card, false, 0); - ASSERT_EQ(first.getCards().size(), 1); - - CardState *taken = first.takeCard(0, 7); - ASSERT_EQ(taken, &card); - EXPECT_TRUE(first.getCards().isEmpty()); - - second.addCard(taken, false, 0); - EXPECT_EQ(second.getCards().size(), 1); - EXPECT_EQ(card.getZone(), &second); -} - -TEST(CardZoneLogicTest, GetCardFindsById) -{ - HandZoneLogic zone(nullptr, QStringLiteral("hand"), false, false, true); - CardState first(nullptr, nullptr, cardRefFor(QStringLiteral("Cat")), 7); - CardState second(nullptr, nullptr, cardRefFor(QStringLiteral("Dog")), 8); - - zone.addCard(&first, false, 0); - zone.addCard(&second, false, 0); - - EXPECT_EQ(zone.getCard(7), &first); - EXPECT_EQ(zone.getCard(8), &second); - EXPECT_EQ(zone.getCard(99), nullptr); -} - -TEST(CardZoneLogicTest, ReorganizeSignalFiresOnAdd) -{ - HandZoneLogic zone(nullptr, QStringLiteral("hand"), false, false, true); - CardState card(nullptr, nullptr, cardRefFor(QStringLiteral("Cat")), 7); - QSignalSpy reorganizeSpy(&zone, &CardZoneLogic::reorganizeCards); - - zone.addCard(&card, true, 0); - - EXPECT_EQ(reorganizeSpy.count(), 1); -} diff --git a/tests/game/data/cards.xml b/tests/game/data/cards.xml deleted file mode 100644 index e315dbf48..000000000 --- a/tests/game/data/cards.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - Cat - CAT - 0 - Meow! - - 111 - G - 2G - 2 - Creature — Cat - Creature - 3/3 - - - - Grizzly Bears - LEA - 0 - 1 - - - 112 - G - 1G - 2 - Creature — Bear - Creature - 2/2 - - - - Lightning Bolt - LEA - 3 - Lightning Bolt deals 3 damage to any target. - - 113 - R - R - 1 - Instant - Instant - - - - Forest - LEA - 2 - (Add G.) - - 114 - G - - 0 - Land - Land - - - - diff --git a/tests/game/data/spoilers.xml b/tests/game/data/spoilers.xml deleted file mode 100644 index 414ae10d4..000000000 --- a/tests/game/data/spoilers.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/tests/game/data/tokens.xml b/tests/game/data/tokens.xml deleted file mode 100644 index 30edbb24c..000000000 --- a/tests/game/data/tokens.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - Kitten - CAT - 0 - - 1 - - 211 - G - - - Token - Token - 1/1 - - - - diff --git a/tests/game/game_event_handler_test.cpp b/tests/game/game_event_handler_test.cpp deleted file mode 100644 index 2db6a1660..000000000 --- a/tests/game/game_event_handler_test.cpp +++ /dev/null @@ -1,566 +0,0 @@ -#include "game_test_fixture.h" - -#include "gtest/gtest.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace -{ - -/** - * Wraps one player-scoped event in the container the server would send and - * pushes it through the real dispatcher, so the test exercises the same - * GameEventHandler -> PlayerEventHandler path as a live client. - */ -template -void sendGameEvent(GameHarness &harness, - int playerId, - const EventType &message, - const GameEventContext *context = nullptr) -{ - GameEventContainer container; - container.set_game_id(42); - if (context != nullptr) { - container.mutable_context()->CopyFrom(*context); - } - - GameEvent *event = container.add_event_list(); - event->set_player_id(playerId); - event->MutableExtension(EventType::ext)->CopyFrom(message); - - harness.game()->getGameEventHandler()->processGameEventContainer(container, harness.client(), - EventProcessingOptions()); -} - -Event_SetCardAttr cardAttrEvent(const char *zoneName, int cardId, CardAttribute attribute, const char *value) -{ - Event_SetCardAttr event; - event.set_zone_name(zoneName); - event.set_card_id(cardId); - event.set_attribute(attribute); - event.set_attr_value(value); - return event; -} - -} // namespace - -TEST(GameEventHandlerTest, MoveCardMovesBetweenZones) -{ - GameHarness harness; - CardState *cat = harness.addCardToZone(ZoneNames::HAND, QStringLiteral("Cat"), 7); - ASSERT_NE(cat, nullptr); - - Event_MoveCard event; - event.set_card_id(7); - event.set_start_player_id(1); - event.set_start_zone(ZoneNames::HAND); - event.set_position(0); - event.set_target_player_id(1); - event.set_target_zone(ZoneNames::TABLE); - event.set_x(0); - event.set_y(TableZoneLogic::tableRowToGridY(0)); - event.set_new_card_id(7); - event.set_face_down(false); - - sendGameEvent(harness, 1, event); - - EXPECT_TRUE(harness.zone(ZoneNames::HAND)->getCards().isEmpty()); - CardZoneLogic *table = harness.zone(ZoneNames::TABLE); - ASSERT_EQ(table->getCards().size(), 1); - EXPECT_EQ(table->getCards().first(), cat); - EXPECT_EQ(cat->getZone(), table); - EXPECT_EQ(cat->getId(), 7); - EXPECT_EQ(cat->getCardRef().name, QStringLiteral("Cat")); - EXPECT_FALSE(cat->getFaceDown()); - EXPECT_EQ(cat->getPT(), QStringLiteral("3/3")); - EXPECT_EQ(cat->getGridPoint(), QPoint(0, TableZoneLogic::tableRowToGridY(0))); -} - -TEST(GameEventHandlerTest, MoveCardFaceDownKeepsTheCardHidden) -{ - GameHarness harness; - CardState *cat = harness.addCardToZone(ZoneNames::HAND, QStringLiteral("Cat"), 7); - ASSERT_NE(cat, nullptr); - - Event_MoveCard event; - event.set_card_id(7); - event.set_start_player_id(1); - event.set_start_zone(ZoneNames::HAND); - event.set_position(0); - event.set_target_player_id(1); - event.set_target_zone(ZoneNames::TABLE); - event.set_x(1); - event.set_y(TableZoneLogic::tableRowToGridY(2)); - event.set_new_card_id(7); - event.set_face_down(true); - - sendGameEvent(harness, 1, event); - - ASSERT_EQ(harness.zone(ZoneNames::TABLE)->getCards().size(), 1); - EXPECT_TRUE(cat->getFaceDown()); - // A face-down card keeps whatever P/T it had instead of picking up the - // printed one from the card database. - EXPECT_TRUE(cat->getPT().isEmpty()); -} - -TEST(GameEventHandlerTest, SetCardAttrUpdatesSingleCard) -{ - GameHarness harness; - CardState *cat = harness.addCardToZone(ZoneNames::TABLE, QStringLiteral("Cat"), 7); - ASSERT_NE(cat, nullptr); - - sendGameEvent(harness, 1, cardAttrEvent(ZoneNames::TABLE, 7, AttrTapped, "1")); - sendGameEvent(harness, 1, cardAttrEvent(ZoneNames::TABLE, 7, AttrAttacking, "1")); - sendGameEvent(harness, 1, cardAttrEvent(ZoneNames::TABLE, 7, AttrPT, "5/5")); - sendGameEvent(harness, 1, cardAttrEvent(ZoneNames::TABLE, 7, AttrAnnotation, "note")); - sendGameEvent(harness, 1, cardAttrEvent(ZoneNames::TABLE, 7, AttrColor, "red")); - sendGameEvent(harness, 1, cardAttrEvent(ZoneNames::TABLE, 7, AttrDoesntUntap, "1")); - sendGameEvent(harness, 1, cardAttrEvent(ZoneNames::TABLE, 7, AttrFaceDown, "1")); - - EXPECT_TRUE(cat->getTapped()); - EXPECT_TRUE(cat->getAttacking()); - EXPECT_EQ(cat->getPT(), QStringLiteral("5/5")); - EXPECT_EQ(cat->getAnnotation(), QStringLiteral("note")); - EXPECT_EQ(cat->getColor(), QStringLiteral("red")); - EXPECT_TRUE(cat->getDoesntUntap()); - EXPECT_TRUE(cat->getFaceDown()); -} - -TEST(GameEventHandlerTest, SetCardAttrWithoutCardIdTouchesEveryCardInZone) -{ - GameHarness harness; - CardState *cat = harness.addCardToZone(ZoneNames::TABLE, QStringLiteral("Cat"), 7); - CardState *bears = harness.addCardToZone(ZoneNames::TABLE, QStringLiteral("Grizzly Bears"), 9); - ASSERT_NE(cat, nullptr); - ASSERT_NE(bears, nullptr); - - Event_SetCardAttr event; - event.set_zone_name(ZoneNames::TABLE); - event.set_attribute(AttrAnnotation); - event.set_attr_value("marked"); - - sendGameEvent(harness, 1, event); - - EXPECT_EQ(cat->getAnnotation(), QStringLiteral("marked")); - EXPECT_EQ(bears->getAnnotation(), QStringLiteral("marked")); -} - -TEST(GameEventHandlerTest, UntapAllLeavesDoesntUntapCardsTapped) -{ - GameHarness harness; - CardState *cat = harness.addCardToZone(ZoneNames::TABLE, QStringLiteral("Cat"), 7); - CardState *bears = harness.addCardToZone(ZoneNames::TABLE, QStringLiteral("Grizzly Bears"), 9); - ASSERT_NE(cat, nullptr); - ASSERT_NE(bears, nullptr); - cat->setDoesntUntap(true); - - sendGameEvent(harness, 1, cardAttrEvent(ZoneNames::TABLE, 7, AttrTapped, "1")); - sendGameEvent(harness, 1, cardAttrEvent(ZoneNames::TABLE, 9, AttrTapped, "1")); - - Event_SetCardAttr untapAll; - untapAll.set_zone_name(ZoneNames::TABLE); - untapAll.set_attribute(AttrTapped); - untapAll.set_attr_value("0"); - - sendGameEvent(harness, 1, untapAll); - - EXPECT_TRUE(cat->getTapped()); - EXPECT_FALSE(bears->getTapped()); -} - -TEST(GameEventHandlerTest, SetCardCounterAddsAndRemoves) -{ - GameHarness harness; - CardState *cat = harness.addCardToZone(ZoneNames::HAND, QStringLiteral("Cat"), 7); - ASSERT_NE(cat, nullptr); - - Event_SetCardCounter add; - add.set_zone_name(ZoneNames::HAND); - add.set_card_id(7); - add.set_counter_id(1); - add.set_counter_value(2); - - sendGameEvent(harness, 1, add); - - EXPECT_EQ(cat->getCounters().value(1), 2); - - Event_SetCardCounter remove = add; - remove.set_counter_value(0); - - sendGameEvent(harness, 1, remove); - - EXPECT_FALSE(cat->getCounters().contains(1)); -} - -TEST(GameEventHandlerTest, AttachCardLinksBothEndsAndUnattachClearsThem) -{ - GameHarness harness; - CardState *host = harness.addCardToZone(ZoneNames::TABLE, QStringLiteral("Cat"), 7); - CardState *guest = harness.addCardToZone(ZoneNames::TABLE, QStringLiteral("Grizzly Bears"), 9); - ASSERT_NE(host, nullptr); - ASSERT_NE(guest, nullptr); - - Event_AttachCard attach; - attach.set_start_zone(ZoneNames::TABLE); - attach.set_card_id(9); - attach.set_target_player_id(1); - attach.set_target_zone(ZoneNames::TABLE); - attach.set_target_card_id(7); - - sendGameEvent(harness, 1, attach); - - EXPECT_EQ(guest->getAttachedTo(), host); - ASSERT_EQ(host->getAttachedCards().size(), 1); - EXPECT_EQ(host->getAttachedCards().first(), guest); - - Event_AttachCard detach; - detach.set_start_zone(ZoneNames::TABLE); - detach.set_card_id(9); - - sendGameEvent(harness, 1, detach); - - EXPECT_EQ(guest->getAttachedTo(), nullptr); - EXPECT_TRUE(host->getAttachedCards().isEmpty()); -} - -TEST(GameEventHandlerTest, ChangeZonePropertiesUpdatesReveal) -{ - GameHarness harness; - CardZoneLogic *deck = harness.zone(ZoneNames::DECK); - ASSERT_NE(deck, nullptr); - - Event_ChangeZoneProperties reveal; - reveal.set_zone_name(ZoneNames::DECK); - reveal.set_always_reveal_top_card(true); - - sendGameEvent(harness, 1, reveal); - EXPECT_TRUE(deck->getAlwaysRevealTopCard()); - - reveal.set_always_reveal_top_card(false); - sendGameEvent(harness, 1, reveal); - EXPECT_FALSE(deck->getAlwaysRevealTopCard()); -} - -TEST(GameEventHandlerTest, DrawCardsMovesNamedCardsFromDeckToHand) -{ - GameHarness harness; - ASSERT_NE(harness.addCardToZone(ZoneNames::DECK, QStringLiteral("Cat"), 7), nullptr); - - Event_DrawCards draw; - draw.set_number(1); - ServerInfo_Card *cardInfo = draw.add_cards(); - cardInfo->set_id(7); - cardInfo->set_name("Cat"); - - sendGameEvent(harness, 1, draw); - - EXPECT_TRUE(harness.zone(ZoneNames::DECK)->getCards().isEmpty()); - ASSERT_EQ(harness.zone(ZoneNames::HAND)->getCards().size(), 1); - CardState *drawn = harness.zone(ZoneNames::HAND)->getCards().first(); - EXPECT_EQ(drawn->getId(), 7); - EXPECT_EQ(drawn->getName(), QStringLiteral("Cat")); -} - -TEST(GameEventHandlerTest, FlipCardHidesAndRevealsTheCard) -{ - GameHarness harness; - CardState *cat = harness.addCardToZone(ZoneNames::TABLE, QStringLiteral("Cat"), 7); - ASSERT_NE(cat, nullptr); - - Event_FlipCard flip; - flip.set_zone_name(ZoneNames::TABLE); - flip.set_card_id(7); - flip.set_face_down(true); - - sendGameEvent(harness, 1, flip); - - EXPECT_TRUE(cat->getFaceDown()); - // Flipping face down does not touch the card reference: the client must not - // learn (or overwrite) the name of a card it is not allowed to see. - EXPECT_EQ(cat->getName(), QStringLiteral("Cat")); - - // Turning it face up carries the real printing, so the state picks it up. - flip.set_face_down(false); - flip.set_card_name("Grizzly Bears"); - - sendGameEvent(harness, 1, flip); - - EXPECT_FALSE(cat->getFaceDown()); - EXPECT_EQ(cat->getName(), QStringLiteral("Grizzly Bears")); -} - -TEST(GameEventHandlerTest, DestroyCardRemovesItAndDetachesAttachedCards) -{ - GameHarness harness; - CardState *host = harness.addCardToZone(ZoneNames::TABLE, QStringLiteral("Cat"), 7); - CardState *guest = harness.addCardToZone(ZoneNames::TABLE, QStringLiteral("Grizzly Bears"), 9); - ASSERT_NE(host, nullptr); - ASSERT_NE(guest, nullptr); - - guest->setAttachedTo(host); - ASSERT_EQ(guest->getAttachedTo(), host); - ASSERT_EQ(host->getAttachedCards().size(), 1); - - Event_DestroyCard destroy; - destroy.set_zone_name(ZoneNames::TABLE); - destroy.set_card_id(7); - - sendGameEvent(harness, 1, destroy); - - CardZoneLogic *table = harness.zone(ZoneNames::TABLE); - ASSERT_EQ(table->getCards().size(), 1); - EXPECT_EQ(table->getCards().first(), guest); - EXPECT_FALSE(table->getCards().contains(host)); - - // The attached card survives the host and is left un-attached, ready to be - // laid out again by the zone. - EXPECT_EQ(guest->getAttachedTo(), nullptr); - EXPECT_TRUE(host->getAttachedCards().isEmpty()); - EXPECT_EQ(guest->getZone(), table); -} - -TEST(GameEventHandlerTest, CreateTokenUsesDatabasePTUnlessFaceDown) -{ - GameHarness harness; - CardZoneLogic *table = harness.zone(ZoneNames::TABLE); - ASSERT_NE(table, nullptr); - - QList created; - QObject::connect(table, &CardZoneLogic::createCardRequested, table, - [&created](const ServerInfo_Card &cardInfo, bool) { created.append(cardInfo); }); - - Event_CreateToken token; - token.set_zone_name(ZoneNames::TABLE); - token.set_card_id(11); - token.set_card_name("Kitten"); - token.set_x(2); - token.set_y(1); - token.set_color("green"); - token.set_annotation("a kitten"); - token.set_destroy_on_zone_change(true); - - sendGameEvent(harness, 1, token); - - ASSERT_EQ(created.size(), 1); - // The event carries no P/T, so the token takes the printed one. - EXPECT_EQ(created.first().pt(), "1/1"); - EXPECT_EQ(created.first().name(), "Kitten"); - EXPECT_EQ(created.first().x(), 2); - EXPECT_EQ(created.first().y(), 1); - EXPECT_EQ(created.first().color(), "green"); - EXPECT_EQ(created.first().annotation(), "a kitten"); - EXPECT_TRUE(created.first().destroy_on_zone_change()); - EXPECT_FALSE(created.first().face_down()); - - // An explicit P/T always wins over the database. - Event_CreateToken explicitPt = token; - explicitPt.set_card_id(12); - explicitPt.set_pt("3/3"); - - sendGameEvent(harness, 1, explicitPt); - - ASSERT_EQ(created.size(), 2); - EXPECT_EQ(created.last().pt(), "3/3"); - - // A face-down token must not leak the printed P/T. - Event_CreateToken faceDown = token; - faceDown.set_card_id(13); - faceDown.set_face_down(true); - - sendGameEvent(harness, 1, faceDown); - - ASSERT_EQ(created.size(), 3); - EXPECT_TRUE(created.last().face_down()); - EXPECT_TRUE(created.last().pt().empty()); -} - -TEST(GameEventHandlerTest, ConcedeAndUnconcedeUpdatePlayerState) -{ - GameHarness harness; - ASSERT_NE(harness.addCardToZone(ZoneNames::TABLE, QStringLiteral("Cat"), 7), nullptr); - EXPECT_FALSE(harness.player()->getConceded()); - - Event_PlayerPropertiesChanged properties; - properties.mutable_player_properties()->set_player_id(1); - properties.mutable_player_properties()->set_conceded(true); - - GameEventContext concedeContext; - concedeContext.MutableExtension(Context_Concede::ext); - - sendGameEvent(harness, 1, properties, &concedeContext); - - EXPECT_TRUE(harness.player()->getConceded()); - // Conceding tears the board down for that player. - EXPECT_TRUE(harness.zone(ZoneNames::TABLE)->getCards().isEmpty()); - - Event_PlayerPropertiesChanged back = properties; - back.mutable_player_properties()->set_conceded(false); - - GameEventContext unconcedeContext; - unconcedeContext.MutableExtension(Context_Unconcede::ext); - - sendGameEvent(harness, 1, back, &unconcedeContext); - - EXPECT_FALSE(harness.player()->getConceded()); -} - -TEST(GameEventHandlerTest, SetActivePlayerAndPhaseUpdateGameState) -{ - GameHarness harness; - GameState *state = harness.game()->getGameState(); - ASSERT_NE(state, nullptr); - EXPECT_EQ(state->getActivePlayer(), -1); - EXPECT_EQ(state->getCurrentPhase(), -1); - - Event_SetActivePlayer setPlayer; - setPlayer.set_active_player_id(1); - - sendGameEvent(harness, 1, setPlayer); - - EXPECT_EQ(state->getActivePlayer(), 1); - - Event_SetActivePhase setPhase; - setPhase.set_phase(3); - - sendGameEvent(harness, 1, setPhase); - - EXPECT_EQ(state->getCurrentPhase(), 3); -} - -TEST(GameEventHandlerTest, CreateSetAndDeletePlayerCounter) -{ - GameHarness harness; - - ServerInfo_Counter counter; - counter.set_id(1); - counter.set_name("life"); - counter.set_radius(1); - counter.set_count(20); - - Event_CreateCounter create; - create.mutable_counter_info()->CopyFrom(counter); - - sendGameEvent(harness, 1, create); - - CounterState *state = harness.player()->getCounters().value(1); - ASSERT_NE(state, nullptr); - EXPECT_EQ(state->getName(), QStringLiteral("life")); - EXPECT_EQ(state->getValue(), 20); - EXPECT_EQ(harness.player()->getLifeCounter(), state); - - Event_SetCounter set; - set.set_counter_id(1); - set.set_value(15); - - sendGameEvent(harness, 1, set); - - EXPECT_EQ(state->getValue(), 15); - - // Updating a counter that does not exist is a no-op, not a crash. - Event_SetCounter unknown = set; - unknown.set_counter_id(99); - sendGameEvent(harness, 1, unknown); - - EXPECT_FALSE(harness.player()->getCounters().contains(99)); - - Event_DelCounter remove; - remove.set_counter_id(1); - - sendGameEvent(harness, 1, remove); - - EXPECT_FALSE(harness.player()->getCounters().contains(1)); - EXPECT_EQ(harness.player()->getLifeCounter(), nullptr); -} - -TEST(GameEventHandlerTest, LeaveRemovesThePlayer) -{ - GameHarness harness; - ASSERT_NE(harness.addCardToZone(ZoneNames::TABLE, QStringLiteral("Cat"), 7), nullptr); - ASSERT_NE(harness.game()->getPlayerManager()->getPlayer(1), nullptr); - - Event_Leave leave; - leave.set_reason(Event_Leave::USER_LEFT); - - sendGameEvent(harness, 1, leave); - - EXPECT_EQ(harness.game()->getPlayerManager()->getPlayer(1), nullptr); - EXPECT_TRUE(harness.game()->getPlayerManager()->getPlayers().isEmpty()); -} - -TEST(GameEventHandlerTest, KickedSignalsGameClosed) -{ - GameHarness harness; - - bool closed = false; - QObject::connect(harness.game()->getGameEventHandler(), &GameEventHandler::gameClosed, - [&closed] { closed = true; }); - - sendGameEvent(harness, 1, Event_Kicked()); - - EXPECT_TRUE(closed); -} - -TEST(GameEventHandlerTest, GameClosedMarksTheSessionClosed) -{ - GameHarness harness; - ASSERT_FALSE(harness.game()->getGameState()->isGameClosed()); - - Event_GameStateChanged started; - started.set_game_started(true); - sendGameEvent(harness, 1, started); - ASSERT_TRUE(harness.game()->getGameMetaInfo()->started()); - - sendGameEvent(harness, 1, Event_GameClosed()); - - EXPECT_TRUE(harness.game()->getGameState()->isGameClosed()); - EXPECT_FALSE(harness.game()->getGameMetaInfo()->started()); -} - -TEST(GameEventHandlerTest, GameHostChangedMovesTheHostRole) -{ - GameHarness harness; - - ServerInfo_User bob; - bob.set_name("Bob"); - bob.set_user_level(ServerInfo_User::IsUser); - ASSERT_NE(harness.game()->getPlayerManager()->addPlayer(2, bob), nullptr); - - sendGameEvent(harness, 2, Event_GameHostChanged()); - - EXPECT_EQ(harness.game()->getGameState()->getHostId(), 2); -} diff --git a/tests/game/game_test_fixture.h b/tests/game/game_test_fixture.h deleted file mode 100644 index e4703c917..000000000 --- a/tests/game/game_test_fixture.h +++ /dev/null @@ -1,129 +0,0 @@ -/** - * @file game_test_fixture.h - * - * Fixtures for tests that need a complete game/player/zone graph without the - * client, a server or any graphics object. Commands are captured on a recording - * AbstractClient, which is the same seam the real client uses. - */ - -#ifndef COCKATRICE_TESTS_GAME_TEST_FIXTURE_H -#define COCKATRICE_TESTS_GAME_TEST_FIXTURE_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/** - * Captures every command the game logic sends, instead of writing it to a socket. - * - * AbstractClient::sendCommand uses a direct signal/slot connection in the same - * thread, so a command is in `sent` as soon as sendCommand returns. - */ -class RecordingClient : public AbstractClient -{ -public: - QList sent; - -protected: - void sendCommandContainer(const CommandContainer &cont) override - { - sent.append(cont); - } -}; - -/** - * Owns a local, single-client Game with one local player, plus the cards added - * to its zones. - */ -class GameHarness -{ -public: - explicit GameHarness(int playerId = 1) : playerId_(playerId), client_(std::make_unique()) - { - Event_GameJoined event; - event.set_host_id(playerId_); - event.set_player_id(playerId_); - event.mutable_game_info()->set_game_id(42); - event.mutable_game_info()->set_started(true); - - QList clients{client_.get()}; - QMap roomGameTypes; - game_ = std::make_unique(nullptr, true, clients, event, roomGameTypes); - - ServerInfo_User user; - user.set_name("Alice"); - user.set_user_level(ServerInfo_User::IsUser | ServerInfo_User::IsRegistered); - game_->getPlayerManager()->addPlayer(playerId_, user); - } - - ~GameHarness() - { - qDeleteAll(ownedCards_); - ownedCards_.clear(); - } - - GameHarness(const GameHarness &) = delete; - GameHarness &operator=(const GameHarness &) = delete; - - [[nodiscard]] Game *game() const - { - return game_.get(); - } - - [[nodiscard]] RecordingClient *client() const - { - return client_.get(); - } - - [[nodiscard]] PlayerLogic *player() const - { - return game_->getPlayerManager()->getPlayer(playerId_); - } - - [[nodiscard]] CardZoneLogic *zone(const QString &zoneName) const - { - return player()->getZones().value(zoneName); - } - - CardState *addCardToZone(const QString &zoneName, const QString &cardName, int cardId) - { - CardZoneLogic *targetZone = zone(zoneName); - if (!targetZone) { - return nullptr; - } - - auto *card = new CardState(nullptr, targetZone, CardRef{cardName, QString()}, cardId); - // The constructor only stores the ref; this is what fills in the card - // data (table row, P/T, ...) the actions read. - card->refreshCardInfo(); - targetZone->addCard(card, false, 0); - ownedCards_.append(card); - return card; - } - - [[nodiscard]] const CommandContainer &lastCommand() const - { - return client_->sent.last(); - } - -private: - int playerId_; - std::unique_ptr client_; - std::unique_ptr game_; - QList ownedCards_; -}; - -#endif // COCKATRICE_TESTS_GAME_TEST_FIXTURE_H diff --git a/tests/game/game_test_main.cpp b/tests/game/game_test_main.cpp deleted file mode 100644 index 47b9a6b8e..000000000 --- a/tests/game/game_test_main.cpp +++ /dev/null @@ -1,126 +0,0 @@ -/** - * @file game_test_main.cpp - * - * Test entry point for the headless game-logic suite. The game library has no - * graphics dependency, so a QCoreApplication is enough; the only process-wide - * setup left is the card database, which the game logic still reaches through - * CardDatabaseManager and which therefore has to exist before the first zone is - * constructed. - */ - -#include "gtest/gtest.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace -{ - -class GameTestPathProvider : public ICardDatabasePathProvider -{ -public: - explicit GameTestPathProvider(QString baseDir) : baseDir_(std::move(baseDir)) - { - } - - QString getCardDatabasePath() const override - { - return baseDir_ + QStringLiteral("/cards.xml"); - } - - QString getCustomCardDatabasePath() const override - { - return baseDir_ + QStringLiteral("/customsets/"); - } - - QString getTokenDatabasePath() const override - { - return baseDir_ + QStringLiteral("/tokens.xml"); - } - - QString getSpoilerCardDatabasePath() const override - { - return baseDir_ + QStringLiteral("/spoilers.xml"); - } - -private: - QString baseDir_; -}; - -bool copyFixture(const QString &fileName, const QString &targetDir) -{ - const QString source = QString::fromUtf8(GAME_TEST_DATA_DIR) + QLatin1Char('/') + fileName; - const QString target = targetDir + QLatin1Char('/') + fileName; - if (QFile::copy(source, target)) { - return true; - } - - std::fprintf(stderr, "Failed to copy test fixture %s to %s\n", qPrintable(source), qPrintable(target)); - return false; -} - -} // namespace - -int main(int argc, char **argv) -{ - ::testing::InitGoogleTest(&argc, argv); - - // gtest_discover_tests runs the binary with --gtest_list_tests while the - // build is still in progress. No test runs there, and building the card - // database would leave process-lifetime allocations that the sanitizer - // leg's default leak detection reports at exit, failing discovery. - if (::testing::GTEST_FLAG(list_tests)) { - return RUN_ALL_TESTS(); - } - - QStandardPaths::setTestModeEnabled(true); - - QTemporaryDir home; - if (!home.isValid()) { - std::fprintf(stderr, "Failed to create a temporary home directory\n"); - return EXIT_FAILURE; - } - qputenv("HOME", home.path().toLocal8Bit()); - - QCoreApplication app(argc, argv); - QLoggingCategory::setFilterRules(QStringLiteral("card_database.loading=false\n" - "card_database.loading.success_or_failure=false\n" - "settings_cache.*=false")); - - // Copy the fixtures so the database loader never writes its .cache file into - // the source tree, then point the singleton at the copy. - QTemporaryDir dataDir; - if (!dataDir.isValid() || !QDir().mkpath(dataDir.filePath(QStringLiteral("customsets")))) { - std::fprintf(stderr, "Failed to create a temporary card database directory\n"); - return EXIT_FAILURE; - } - if (!copyFixture(QStringLiteral("cards.xml"), dataDir.path()) || - !copyFixture(QStringLiteral("tokens.xml"), dataDir.path()) || - !copyFixture(QStringLiteral("spoilers.xml"), dataDir.path())) { - return EXIT_FAILURE; - } - - // Function-local static: constructed before the CardDatabase singleton below, - // so it is destroyed after it and the raw pointer stored in the manager stays - // valid for the database's lifetime. - static GameTestPathProvider pathProvider(dataDir.path()); - CardDatabaseManager::setCardDatabasePathProvider(&pathProvider); - - CardDatabase *database = CardDatabaseManager::getInstance(); - database->loadCardDatabases(); - if (database->getLoadStatus() != Ok) { - std::fprintf(stderr, "Failed to load the game test card database (status %d)\n", - static_cast(database->getLoadStatus())); - return EXIT_FAILURE; - } - - return RUN_ALL_TESTS(); -} diff --git a/tests/game/player_actions_test.cpp b/tests/game/player_actions_test.cpp deleted file mode 100644 index 11ae7338d..000000000 --- a/tests/game/player_actions_test.cpp +++ /dev/null @@ -1,119 +0,0 @@ -#include "game_test_fixture.h" - -#include "gtest/gtest.h" -#include -#include -#include -#include -#include -#include - -TEST(PlayerActionsTest, PlayCreatureSendsMoveToTable) -{ - GameHarness harness; - CardState *cat = harness.addCardToZone(ZoneNames::HAND, QStringLiteral("Cat"), 7); - ASSERT_NE(cat, nullptr); - - harness.player()->getPlayerActions()->playCard(cat, false); - - ASSERT_FALSE(harness.client()->sent.isEmpty()); - const CommandContainer &container = harness.lastCommand(); - ASSERT_EQ(container.game_command_size(), 1); - const Command_MoveCard command = container.game_command(0).GetExtension(Command_MoveCard::ext); - - EXPECT_EQ(command.start_player_id(), 1); - EXPECT_EQ(command.start_zone(), std::string(ZoneNames::HAND)); - EXPECT_EQ(command.target_player_id(), 1); - EXPECT_EQ(command.target_zone(), std::string(ZoneNames::TABLE)); - EXPECT_EQ(command.x(), -1); - EXPECT_EQ(command.y(), TableZoneLogic::tableRowToGridY(0)); - - ASSERT_EQ(command.cards_to_move().card_size(), 1); - const CardToMove &card = command.cards_to_move().card(0); - EXPECT_EQ(card.card_id(), 7); - EXPECT_TRUE(card.has_face_down()); - EXPECT_FALSE(card.face_down()); - EXPECT_TRUE(card.has_pt()); - EXPECT_EQ(card.pt(), "3/3"); - EXPECT_TRUE(card.has_tapped()); - EXPECT_FALSE(card.tapped()); -} - -TEST(PlayerActionsTest, PlayInstantSendsMoveToStack) -{ - GameHarness harness; - CardState *bolt = harness.addCardToZone(ZoneNames::HAND, QStringLiteral("Lightning Bolt"), 8); - ASSERT_NE(bolt, nullptr); - - harness.player()->getPlayerActions()->playCard(bolt, false); - - ASSERT_FALSE(harness.client()->sent.isEmpty()); - const CommandContainer &container = harness.lastCommand(); - ASSERT_EQ(container.game_command_size(), 1); - const Command_MoveCard command = container.game_command(0).GetExtension(Command_MoveCard::ext); - - EXPECT_EQ(command.target_zone(), std::string(ZoneNames::STACK)); - EXPECT_EQ(command.x(), -1); - EXPECT_EQ(command.y(), 0); - - ASSERT_EQ(command.cards_to_move().card_size(), 1); - const CardToMove &card = command.cards_to_move().card(0); - EXPECT_EQ(card.card_id(), 8); - // The stack branch deliberately leaves the other attributes unset. - EXPECT_FALSE(card.has_face_down()); - EXPECT_FALSE(card.has_pt()); - EXPECT_FALSE(card.has_tapped()); -} - -TEST(PlayerActionsTest, PlayFaceDownCreatureUsesFaceDownRow) -{ - GameHarness harness; - CardState *cat = harness.addCardToZone(ZoneNames::HAND, QStringLiteral("Cat"), 7); - ASSERT_NE(cat, nullptr); - - harness.player()->getPlayerActions()->playCard(cat, true); - - ASSERT_FALSE(harness.client()->sent.isEmpty()); - const CommandContainer &container = harness.lastCommand(); - ASSERT_EQ(container.game_command_size(), 1); - const Command_MoveCard command = container.game_command(0).GetExtension(Command_MoveCard::ext); - - EXPECT_EQ(command.target_zone(), std::string(ZoneNames::TABLE)); - EXPECT_EQ(command.x(), -1); - EXPECT_EQ(command.y(), TableZoneLogic::tableRowToGridY(2)); - - ASSERT_EQ(command.cards_to_move().card_size(), 1); - const CardToMove &card = command.cards_to_move().card(0); - EXPECT_EQ(card.card_id(), 7); - EXPECT_TRUE(card.has_face_down()); - EXPECT_TRUE(card.face_down()); - EXPECT_FALSE(card.has_pt()); - EXPECT_TRUE(card.has_tapped()); - EXPECT_FALSE(card.tapped()); -} - -TEST(PlayerActionsTest, PlayCiptCreatureSendsTapped) -{ - GameHarness harness; - CardState *bears = harness.addCardToZone(ZoneNames::HAND, QStringLiteral("Grizzly Bears"), 9); - ASSERT_NE(bears, nullptr); - - harness.player()->getPlayerActions()->playCard(bears, false); - - ASSERT_FALSE(harness.client()->sent.isEmpty()); - const CommandContainer &container = harness.lastCommand(); - ASSERT_EQ(container.game_command_size(), 1); - const Command_MoveCard command = container.game_command(0).GetExtension(Command_MoveCard::ext); - - EXPECT_EQ(command.target_zone(), std::string(ZoneNames::TABLE)); - - ASSERT_EQ(command.cards_to_move().card_size(), 1); - const CardToMove &card = command.cards_to_move().card(0); - EXPECT_EQ(card.card_id(), 9); - EXPECT_TRUE(card.has_face_down()); - EXPECT_FALSE(card.face_down()); - EXPECT_TRUE(card.has_pt()); - EXPECT_EQ(card.pt(), "2/2"); - EXPECT_TRUE(card.has_tapped()); - EXPECT_TRUE(card.tapped()); -} diff --git a/tests/game/replay_test.cpp b/tests/game/replay_test.cpp deleted file mode 100644 index 218ffdf51..000000000 --- a/tests/game/replay_test.cpp +++ /dev/null @@ -1,349 +0,0 @@ -/** - * @file replay_test.cpp - * - * Replays a synthetic GameReplay through the real dispatcher. This is the only - * place that exercises PlayerLogic::processPlayerInfo / processCardAttachment - * end to end: the game state arrives as a GAME_STATE_CHANGED event and the - * graphics side is replaced by a small materializer that mirrors what - * CardZone::onCreateCardRequested does with the logic objects. - * - * The replay is built in code rather than from a .cor file: event application - * is deterministic (the client never shuffles on its own for a replay), and a - * checked-in binary fixture would be opaque about what it asserts. - */ - -#include "gtest/gtest.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace -{ - -ServerInfo_Card makeCard(int id, const QString &name, int x = -1, int y = -1) -{ - ServerInfo_Card card; - card.set_id(id); - card.set_name(name.toStdString()); - card.set_x(x); - card.set_y(y); - return card; -} - -ServerInfo_Zone makeZone(const char *name, - ServerInfo_Zone::ZoneType type, - bool withCoords, - const QList &cards, - int cardCount = 0) -{ - ServerInfo_Zone zone; - zone.set_name(name); - zone.set_type(type); - zone.set_with_coords(withCoords); - for (const auto &card : cards) { - zone.add_card_list()->CopyFrom(card); - } - if (cardCount > 0) { - zone.set_card_count(cardCount); - } - return zone; -} - -ServerInfo_Player makePlayer(int playerId, const QString &name, const QList &zones) -{ - ServerInfo_Player player; - ServerInfo_PlayerProperties *properties = player.mutable_properties(); - properties->set_player_id(playerId); - properties->mutable_user_info()->set_name(name.toStdString()); - properties->mutable_user_info()->set_user_level(ServerInfo_User::IsUser); - for (const auto &zone : zones) { - player.add_zone_list()->CopyFrom(zone); - } - return player; -} - -template GameEventContainer makeContainer(int playerId, const EventType &message) -{ - GameEventContainer container; - container.set_game_id(42); - - GameEvent *event = container.add_event_list(); - event->set_player_id(playerId); - event->MutableExtension(EventType::ext)->CopyFrom(message); - - return container; -} - -/** - * Stands in for the graphics side of a replay: when the logic asks for a card - * item, create the CardState and add it to the zone, copying the state fields - * the real CardItem::processCardInfo applies. - * - * The production view owns the visual item; the state itself is all a headless - * test needs, and this is the smallest thing that lets processPlayerInfo build - * a real zone. - */ -class HeadlessZoneView : public QObject -{ -public: - using QObject::QObject; - - ~HeadlessZoneView() override - { - qDeleteAll(cards_); - cards_.clear(); - } - - void attach(PlayerLogic *player) - { - for (CardZoneLogic *zone : player->getZones()) { - connect(zone, &CardZoneLogic::createCardRequested, this, - [this, zone](const ServerInfo_Card &cardInfo, bool reorganize) { - materialize(zone, cardInfo, reorganize); - }); - } - } - -private: - void materialize(CardZoneLogic *zone, const ServerInfo_Card &info, bool reorganize) - { - const CardRef cardRef{QString::fromStdString(info.name()), QString::fromStdString(info.provider_id())}; - auto *card = new CardState(nullptr, zone, cardRef, info.id()); - // The real CardItem constructor refreshes the card info before - // processCardInfo overwrites the state fields. - card->refreshCardInfo(); - - card->clearCounters(); - for (int i = 0; i < info.counter_list_size(); ++i) { - card->insertCounter(info.counter_list(i).id(), info.counter_list(i).value()); - } - card->setAttacking(info.attacking()); - card->setFaceDown(info.face_down()); - card->setPT(QString::fromStdString(info.pt())); - card->setAnnotation(QString::fromStdString(info.annotation())); - card->setColor(QString::fromStdString(info.color())); - card->setTapped(info.tapped()); - card->setDestroyOnZoneChange(info.destroy_on_zone_change()); - card->setDoesntUntap(info.doesnt_untap()); - - zone->addCard(card, reorganize, info.x(), info.y()); - cards_.append(card); - } - - QList cards_; -}; - -/** Owns a Replay built from a GameReplay and feeds its containers through it. */ -class ReplayHarness -{ -public: - explicit ReplayHarness(GameReplay replay) - : replayProto_(std::move(replay)), view_(std::make_unique()), - replay_(std::make_unique(nullptr, &replayProto_, false)) - { - QObject::connect(replay_->getPlayerManager(), &PlayerManager::playerAdded, view_.get(), - &HeadlessZoneView::attach); - } - - ReplayHarness(const ReplayHarness &) = delete; - ReplayHarness &operator=(const ReplayHarness &) = delete; - - void processAll() - { - for (const GameEventContainer &container : replayProto_.event_list()) { - replay_->getGameEventHandler()->processGameEventContainer(container, nullptr, EventProcessingOptions()); - } - } - - [[nodiscard]] Replay *replay() const - { - return replay_.get(); - } - - [[nodiscard]] PlayerLogic *player(int playerId) const - { - return replay_->getPlayerManager()->getPlayer(playerId); - } - -private: - GameReplay replayProto_; - std::unique_ptr view_; - std::unique_ptr replay_; -}; - -GameReplay makeReplay(const QList &containers) -{ - GameReplay replay; - replay.mutable_game_info()->set_game_id(42); - replay.mutable_game_info()->set_started(true); - for (const auto &container : containers) { - replay.add_event_list()->CopyFrom(container); - } - return replay; -} - -Event_GameStateChanged initialGameState() -{ - Event_GameStateChanged state; - state.set_game_started(true); - state.set_active_player_id(1); - state.set_active_phase(0); - return state; -} - -} // namespace - -TEST(ReplayTest, MaterializesGameStateZonesAndAttachments) -{ - Event_GameStateChanged state = initialGameState(); - - ServerInfo_Card cat = makeCard(7, QStringLiteral("Cat")); - // Cross-player attachment: Alice's card is attached to Bob's creature. - cat.set_attach_player_id(2); - cat.set_attach_zone(ZoneNames::TABLE); - cat.set_attach_card_id(9); - - const ServerInfo_Player alice = makePlayer(1, QStringLiteral("Alice"), - {makeZone(ZoneNames::HAND, ServerInfo_Zone::PrivateZone, false, {cat}), - makeZone(ZoneNames::TABLE, ServerInfo_Zone::PublicZone, true, - {makeCard(9, QStringLiteral("Grizzly Bears"), 2, 1)}), - makeZone(ZoneNames::DECK, ServerInfo_Zone::HiddenZone, false, {}, 2)}); - const ServerInfo_Player bob = makePlayer(2, QStringLiteral("Bob"), - {makeZone(ZoneNames::TABLE, ServerInfo_Zone::PublicZone, true, - {makeCard(9, QStringLiteral("Grizzly Bears"), 1, 0)})}); - - state.add_player_list()->CopyFrom(alice); - state.add_player_list()->CopyFrom(bob); - - ReplayHarness harness(makeReplay({makeContainer(-1, state)})); - harness.processAll(); - - PlayerLogic *aliceLogic = harness.player(1); - PlayerLogic *bobLogic = harness.player(2); - ASSERT_NE(aliceLogic, nullptr); - ASSERT_NE(bobLogic, nullptr); - - CardZoneLogic *hand = aliceLogic->getZones().value(ZoneNames::HAND); - CardZoneLogic *table = aliceLogic->getZones().value(ZoneNames::TABLE); - CardZoneLogic *deck = aliceLogic->getZones().value(ZoneNames::DECK); - ASSERT_NE(hand, nullptr); - ASSERT_NE(table, nullptr); - ASSERT_NE(deck, nullptr); - - ASSERT_EQ(hand->getCards().size(), 1); - CardState *catState = hand->getCards().first(); - EXPECT_EQ(catState->getId(), 7); - EXPECT_EQ(catState->getName(), QStringLiteral("Cat")); - - ASSERT_EQ(table->getCards().size(), 1); - CardState *host = table->getCards().first(); - EXPECT_EQ(host->getName(), QStringLiteral("Grizzly Bears")); - EXPECT_EQ(host->getGridPoint(), QPoint(2, 1)); - - // The hidden deck only carries a count, and the view materializes that many - // unknown cards. - EXPECT_EQ(deck->getCards().size(), 2); - for (const CardState *hidden : deck->getCards()) { - EXPECT_EQ(hidden->getId(), -1); - } - - // processCardAttachment links both sides after every player is materialized. - CardZoneLogic *bobTable = bobLogic->getZones().value(ZoneNames::TABLE); - ASSERT_NE(bobTable, nullptr); - ASSERT_EQ(bobTable->getCards().size(), 1); - CardState *bobHost = bobTable->getCards().first(); - EXPECT_EQ(catState->getAttachedTo(), bobHost); - ASSERT_EQ(bobHost->getAttachedCards().size(), 1); - EXPECT_EQ(bobHost->getAttachedCards().first(), catState); - // The identically numbered card on Alice's own table is a different card. - EXPECT_TRUE(host->getAttachedCards().isEmpty()); - - EXPECT_TRUE(harness.replay()->getGameState()->isGameStateKnown()); -} - -TEST(ReplayTest, AppliesMovesAttributesAndCountersInOrder) -{ - Event_GameStateChanged state = initialGameState(); - state.add_player_list()->CopyFrom(makePlayer( - 1, QStringLiteral("Alice"), - {makeZone(ZoneNames::HAND, ServerInfo_Zone::PrivateZone, false, {makeCard(7, QStringLiteral("Cat"))}), - makeZone(ZoneNames::TABLE, ServerInfo_Zone::PublicZone, true, - {makeCard(9, QStringLiteral("Grizzly Bears"), 0, TableZoneLogic::tableRowToGridY(0))}), - makeZone(ZoneNames::DECK, ServerInfo_Zone::HiddenZone, false, {}, 2)})); - - Event_MoveCard move; - move.set_card_id(7); - move.set_start_player_id(1); - move.set_start_zone(ZoneNames::HAND); - move.set_position(0); - move.set_target_player_id(1); - move.set_target_zone(ZoneNames::TABLE); - move.set_x(3); - move.set_y(TableZoneLogic::tableRowToGridY(1)); - move.set_new_card_id(7); - move.set_face_down(false); - - Event_SetCardAttr tap; - tap.set_zone_name(ZoneNames::TABLE); - tap.set_card_id(7); - tap.set_attribute(AttrTapped); - tap.set_attr_value("1"); - - Event_SetCardCounter counter; - counter.set_zone_name(ZoneNames::TABLE); - counter.set_card_id(7); - counter.set_counter_id(1); - counter.set_counter_value(2); - - ReplayHarness harness(makeReplay( - {makeContainer(-1, state), makeContainer(1, move), makeContainer(1, tap), makeContainer(1, counter)})); - harness.processAll(); - - PlayerLogic *alice = harness.player(1); - ASSERT_NE(alice, nullptr); - CardZoneLogic *hand = alice->getZones().value(ZoneNames::HAND); - CardZoneLogic *table = alice->getZones().value(ZoneNames::TABLE); - ASSERT_NE(hand, nullptr); - ASSERT_NE(table, nullptr); - - EXPECT_TRUE(hand->getCards().isEmpty()); - ASSERT_EQ(table->getCards().size(), 2); - - CardState *moved = table->getCard(7); - ASSERT_NE(moved, nullptr); - EXPECT_EQ(moved->getGridPoint(), QPoint(3, TableZoneLogic::tableRowToGridY(1))); - EXPECT_EQ(moved->getPT(), QStringLiteral("3/3")); - EXPECT_TRUE(moved->getTapped()); - EXPECT_EQ(moved->getCounters().value(1), 2); - - // The untouched creature keeps its own position and state. - CardState *bears = table->getCard(9); - ASSERT_NE(bears, nullptr); - EXPECT_EQ(bears->getGridPoint(), QPoint(0, TableZoneLogic::tableRowToGridY(0))); - EXPECT_FALSE(bears->getTapped()); -} diff --git a/tests/icon_assets/CMakeLists.txt b/tests/icon_assets/CMakeLists.txt deleted file mode 100644 index da9776f8e..000000000 --- a/tests/icon_assets/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -cockatrice_add_test( - NAME icon_assets_test SOURCES icon_assets_test.cpp DEFINITIONS COCKATRICE_SOURCE_DIR="${CMAKE_SOURCE_DIR}" -) diff --git a/tests/icon_assets/icon_assets_test.cpp b/tests/icon_assets/icon_assets_test.cpp deleted file mode 100644 index f0b06d5cc..000000000 --- a/tests/icon_assets/icon_assets_test.cpp +++ /dev/null @@ -1,241 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace -{ -const QString ICONS_RELATIVE_PATH = QStringLiteral("cockatrice/resources/icons"); - -QString iconsDir() -{ - return QDir(QStringLiteral(COCKATRICE_SOURCE_DIR)).absoluteFilePath(ICONS_RELATIVE_PATH); -} - -/** @brief True for content art that is allowed to carry full color. */ -bool isContentArt(const QString &relativePath) -{ - return relativePath.startsWith(QStringLiteral("mana/")); -} - -QString violation(const QString &rule, const QString &relativePath) -{ - return rule + QLatin1Char(' ') + relativePath; -} - -/** - * @brief Reads one SVG and returns true when the root carries a usable viewBox. - * - * Also reports malformed XML and editor-only metadata through the out params. - */ -bool inspectSvg(const QString &absolutePath, - bool &validXml, - bool &hasViewBox, - bool &hasEditorMetadata, - bool &hasPhysicalSize) -{ - validXml = false; - hasViewBox = false; - hasEditorMetadata = false; - hasPhysicalSize = false; - - QFile file(absolutePath); - if (!file.open(QIODevice::ReadOnly)) { - return false; - } - - QXmlStreamReader reader(&file); - bool sawRoot = false; - - while (!reader.atEnd()) { - reader.readNext(); - - if (reader.hasError()) { - return false; - } - - if (!reader.isStartElement()) { - continue; - } - - if (!sawRoot) { - sawRoot = true; - if (reader.name() != QStringLiteral("svg")) { - return false; - } - const QString viewBox = reader.attributes().value(QStringLiteral("viewBox")).toString().simplified(); - hasViewBox = viewBox == QStringLiteral("0 0 24 24"); - hasPhysicalSize = !reader.attributes().value(QStringLiteral("width")).isEmpty() || - !reader.attributes().value(QStringLiteral("height")).isEmpty(); - } - - if (reader.name() == QStringLiteral("metadata") || reader.name() == QStringLiteral("namedview")) { - hasEditorMetadata = true; - } - - for (const QXmlStreamAttribute &attribute : reader.attributes()) { - const QString prefix = attribute.prefix().toString(); - if (prefix == QStringLiteral("inkscape") || prefix == QStringLiteral("sodipodi") || - prefix == QStringLiteral("dc") || prefix == QStringLiteral("cc") || prefix == QStringLiteral("rdf")) { - hasEditorMetadata = true; - } - } - } - - validXml = sawRoot && !reader.hasError(); - return validXml; -} - -bool isAllowedPaintValue(const QString &value) -{ - const QString normalized = value.trimmed().toLower(); - return normalized.isEmpty() || normalized == QStringLiteral("none") || - normalized == QStringLiteral("currentcolor") || normalized == QStringLiteral("inherit") || - normalized == QStringLiteral("context-fill") || normalized == QStringLiteral("context-stroke") || - normalized.startsWith(QStringLiteral("url(")); -} - -QRegularExpression paintValuePattern() -{ - static const QRegularExpression pattern( - QStringLiteral(R"re((?:fill|stroke|stop-color|color)\s*[:=]\s*["']?\s*([^"'\s;>]+))re"), - QRegularExpression::CaseInsensitiveOption); - return pattern; -} - -bool hasHardcodedColor(const QString &absolutePath) -{ - QFile file(absolutePath); - if (!file.open(QIODevice::ReadOnly)) { - return false; - } - - const QString content = QString::fromUtf8(file.readAll()); - auto matches = paintValuePattern().globalMatch(content); - while (matches.hasNext()) { - const QString value = matches.next().captured(1).trimmed(); - if (isAllowedPaintValue(value)) { - continue; - } - const QString normalized = value.toLower(); - if (normalized.startsWith(QLatin1Char('#')) || normalized.contains(QStringLiteral("rgb(")) || - normalized.contains(QStringLiteral("hsl(")) || QColor(value).isValid()) { - return true; - } - } - return false; -} - -bool hasCurrentColorToken(const QString &absolutePath) -{ - QFile file(absolutePath); - if (!file.open(QIODevice::ReadOnly)) { - return false; - } - - const QString content = QString::fromUtf8(file.readAll()); - auto matches = paintValuePattern().globalMatch(content); - while (matches.hasNext()) { - if (matches.next().captured(1).trimmed().compare(QStringLiteral("currentColor"), Qt::CaseInsensitive) == 0) { - return true; - } - } - return false; -} - -bool isSchemeVariant(const QString &fileName) -{ - return fileName.contains(QStringLiteral("-dark."), Qt::CaseInsensitive) || - fileName.contains(QStringLiteral("-light."), Qt::CaseInsensitive); -} - -bool hasColorInFilename(const QString &fileName) -{ - static const QRegularExpression colorSuffix( - QStringLiteral(R"(_(green|blue|red|yellow|black|white|gray|grey)\.svg$)"), - QRegularExpression::CaseInsensitiveOption); - return colorSuffix.match(fileName).hasMatch(); -} - -/** @brief Collects every current violation as "rule relative/path.svg". */ -QSet collectViolations() -{ - QSet violations; - - QDirIterator it(iconsDir(), QDir::Files, QDirIterator::Subdirectories); - while (it.hasNext()) { - it.next(); - const QFileInfo info = it.fileInfo(); - const QString relativePath = QDir(iconsDir()).relativeFilePath(info.absoluteFilePath()); - if (isContentArt(relativePath)) { - continue; - } - if (info.suffix().compare(QStringLiteral("svg"), Qt::CaseInsensitive) != 0) { - violations.insert(violation(QStringLiteral("raster"), relativePath)); - continue; - } - - bool validXml = false; - bool hasViewBox = false; - bool hasEditorMetadata = false; - bool hasPhysicalSize = false; - inspectSvg(info.absoluteFilePath(), validXml, hasViewBox, hasEditorMetadata, hasPhysicalSize); - - if (!validXml) { - violations.insert(violation(QStringLiteral("xml"), relativePath)); - } - if (validXml && !hasViewBox) { - violations.insert(violation(QStringLiteral("viewbox"), relativePath)); - } - if (hasPhysicalSize) { - violations.insert(violation(QStringLiteral("physical-size"), relativePath)); - } - if (hasEditorMetadata) { - violations.insert(violation(QStringLiteral("editor-metadata"), relativePath)); - } - if (hasHardcodedColor(info.absoluteFilePath()) && !isSchemeVariant(info.fileName())) { - violations.insert(violation(QStringLiteral("hardcoded-color"), relativePath)); - } - if (!hasCurrentColorToken(info.absoluteFilePath()) && !isSchemeVariant(info.fileName())) { - violations.insert(violation(QStringLiteral("no-token"), relativePath)); - } - if (hasColorInFilename(info.fileName())) { - violations.insert(violation(QStringLiteral("color-filename"), relativePath)); - } - } - - return violations; -} - -QString formatSet(const QSet &entries) -{ - QStringList lines(entries.begin(), entries.end()); - lines.sort(); - return lines.join(QLatin1Char('\n')); -} - -} // namespace - -/** - * @brief Every UI glyph follows the palette-token rules. - * - * The legacy set was paid down icon by icon, so no baseline grandfathers - * violations: a new violation fails right here. Scheme variants - * (`*-dark.svg`/`*-light.svg`) and mana art are exempt inside collectViolations(). - */ -TEST(IconAssets, AssetsFollowTheRules) -{ - ASSERT_TRUE(QDir::isAbsolutePath(iconsDir())); - ASSERT_TRUE(QDir(iconsDir()).exists()) << "Missing icon directory: " << iconsDir().toStdString(); - - const QSet violations = collectViolations(); - EXPECT_TRUE(violations.isEmpty()) << "Icon rule violations. Fix the icon; do not add exceptions:\n" - << formatSet(violations).toStdString(); -} diff --git a/tests/local_client_lifetime_test.cpp b/tests/local_client_lifetime_test.cpp deleted file mode 100644 index 95a2b1380..000000000 --- a/tests/local_client_lifetime_test.cpp +++ /dev/null @@ -1,149 +0,0 @@ -/** - * @file local_client_lifetime_test.cpp - * @brief Tests that a LocalClient survives the death of the LocalServer it talks to. - * @ingroup Tests - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -// The server library refers to this global; the real applications define it in main.cpp. -RNG_Abstract *rng = nullptr; - -namespace -{ - -// GTest's main() creates no QCoreApplication, which QObject::deleteLater() needs. -const QCoreApplication &application() -{ - static int argc = 1; - static char executable[] = "local_client_lifetime_test"; - static char *argv[] = {executable, nullptr}; - static const QCoreApplication app(argc, argv); - return app; -} - -/// Collects the warnings one logging category emits while this object is alive. -/// -/// The handler is process-global and Qt does not nest handlers, so only one capture can be -/// installed at a time; GTest running one case at a time is what makes that safe. -class CategoryWarningCapture -{ -public: - explicit CategoryWarningCapture(const char *_category) : category(_category) - { - previousHandler = qInstallMessageHandler(captureMessage); - s_active = this; - } - - ~CategoryWarningCapture() - { - qInstallMessageHandler(previousHandler); - s_active = nullptr; - } - - CategoryWarningCapture(const CategoryWarningCapture &) = delete; - CategoryWarningCapture &operator=(const CategoryWarningCapture &) = delete; - - const QStringList &warnings() const - { - return capturedWarnings; - } - -private: - static void captureMessage(QtMsgType type, const QMessageLogContext &context, const QString &message) - { - if (s_active != nullptr && type == QtWarningMsg && context.category != nullptr && - std::strcmp(s_active->category, context.category) == 0) { - s_active->capturedWarnings.append(message); - } - - // Forward everything else, so a failure elsewhere in the test is still visible. - if (previousHandler != nullptr) { - previousHandler(type, context, message); - return; - } - std::fprintf(stderr, "%s\n", qPrintable(qFormatLogMessage(type, context, message))); - } - - const char *category; - QStringList capturedWarnings; - - static CategoryWarningCapture *s_active; - static QtMessageHandler previousHandler; -}; - -CategoryWarningCapture *CategoryWarningCapture::s_active = nullptr; -QtMessageHandler CategoryWarningCapture::previousHandler = nullptr; - -class LocalClientLifetimeTest : public ::testing::Test -{ -protected: - void SetUp() override - { - (void)application(); - - server = std::make_unique(); - LocalServerInterface *lsi = server->newConnection(); - ASSERT_NE(lsi, nullptr); - // Building the client logs in and joins room 0 through that interface, exactly as - // MainWindow::startLocalGame() does. - client = std::make_unique(lsi, QStringLiteral("lifetime-test-player"), - QStringLiteral("lifetime-test-client-id")); - } - - void TearDown() override - { - // Either case may already have deleted one of these. - client.reset(); - server.reset(); - } - - std::unique_ptr server; - std::unique_ptr client; -}; - -TEST_F(LocalClientLifetimeTest, SendAfterServerDeletedIsDropped) -{ - server.reset(); // also destroys the LocalServerInterface the client was built on - - CategoryWarningCapture capture("local_client"); - // A default container stands in for a command still queued when the local game ended. - client->sendCommandContainer(CommandContainer()); - - ASSERT_EQ(capture.warnings().size(), 1); - EXPECT_TRUE(capture.warnings().first().contains(QStringLiteral("dropping command"))) - << capture.warnings().first().toStdString(); - - // The surviving client is intact: reading its state must not touch the deleted interface. - EXPECT_EQ(client->getUserName(), QStringLiteral("lifetime-test-player")); -} - -TEST_F(LocalClientLifetimeTest, DestroyingClientAfterServerIsSafe) -{ - server.reset(); - - CategoryWarningCapture capture("local_client"); - client.reset(); // must neither crash nor touch the destroyed interface - - // The destructor itself must have been silent. - EXPECT_TRUE(capture.warnings().isEmpty()); - - // A working capture proves the emptiness above is real rather than a broken handler. - qCWarning(LocalClientLog) << "local_client_lifetime_test capture self-check"; - EXPECT_EQ(capture.warnings().size(), 1); -} - -} // namespace diff --git a/tests/model_contract/CMakeLists.txt b/tests/model_contract/CMakeLists.txt deleted file mode 100644 index 3251c1443..000000000 --- a/tests/model_contract/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -cockatrice_add_test( - NAME - model_contract_test - SOURCES - ${VERSION_STRING_CPP} - model_contract_test.cpp - LIBS - libcockatrice_models - libcockatrice_card - libcockatrice_deck_list - libcockatrice_settings - INCLUDE_DIRS - ${CMAKE_CURRENT_SOURCE_DIR}/../support - ${CMAKE_CURRENT_SOURCE_DIR}/../carddatabase - DEFINITIONS - CARDDB_DATADIR="${CMAKE_SOURCE_DIR}/tests/carddatabase/data/" -) diff --git a/tests/model_contract/model_contract_test.cpp b/tests/model_contract/model_contract_test.cpp deleted file mode 100644 index aefa26f3d..000000000 --- a/tests/model_contract/model_contract_test.cpp +++ /dev/null @@ -1,137 +0,0 @@ -#include "libcockatrice/deck_list/deck_list.h" -#include "libcockatrice/deck_list/tree/inner_deck_list_node.h" -#include "libcockatrice/models/database/card_database_display_model.h" -#include "libcockatrice/models/database/card_database_model.h" -#include "libcockatrice/models/database/card_set/card_sets_model.h" -#include "libcockatrice/models/deck_list/deck_list_model.h" -#include "model_contract_checker.h" -#include "test_card_database_path_provider.h" - -#include "gtest/gtest.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace -{ -QSharedPointer makeDeck() -{ - return QSharedPointer(new DeckList()); -} - -void loadCardDatabase(CardDatabase &database) -{ - database.loadCardDatabases(); - ASSERT_EQ(database.getLoadStatus(), Ok); -} - -TEST(ModelContract, DeckListModelKeepsContractWhileZonesAndCardsChange) -{ - const QSharedPointer deck = makeDeck(); - DeckListModel model(nullptr, deck); - - test_support::ModelContractChecker checker(&model); - - ASSERT_NE(deck->getTree()->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr); - model.rebuildTree(); - - CardInfoPtr bolt = CardInfo::newInstance("Lightning Bolt"); - const QModelIndex added = model.addCard(ExactCard(bolt), DECK_ZONE_MAIN); - ASSERT_TRUE(added.isValid()); - - CardInfoPtr bears = CardInfo::newInstance("Grizzly Bears"); - bears->setProperty(Mtg::MainCardType, "Creature"); - const QModelIndex grouped = model.addCard(ExactCard(bears), "Removal"); - ASSERT_TRUE(grouped.isValid()); - - ASSERT_TRUE(model.removeRows(grouped.row(), 1, grouped.parent())); -} - -TEST(ModelContract, DeckListModelEmitsCardAddedSignal) -{ - const QSharedPointer deck = makeDeck(); - DeckListModel model(nullptr, deck); - QSignalSpy spy(&model, &DeckListModel::cardAddedAt); - - const QModelIndex added = model.addCard(ExactCard(CardInfo::newInstance("Lightning Bolt")), DECK_ZONE_MAIN); - - ASSERT_TRUE(added.isValid()); - EXPECT_EQ(spy.count(), 1); -} - -TEST(ModelContract, CardDatabaseModelAndDisplayProxyKeepContract) -{ - CardDatabase database(nullptr, new NoopCardPreferenceProvider(), new TestCardDatabasePathProvider(), - new NoopCardSetPriorityController()); - ASSERT_NO_FATAL_FAILURE(loadCardDatabase(database)); - - CardDatabaseModel source(&database, false); - test_support::ModelContractChecker sourceChecker(&source); - - CardDatabaseDisplayModel display; - display.setSourceModel(&source); - test_support::ModelContractChecker displayChecker(&display); - - ASSERT_GT(source.rowCount(), 0); - EXPECT_EQ(display.rowCount(), source.rowCount()); - - // A card row is a leaf, so its index must not claim child columns. The - // tester does not check this, hence the explicit assertion. - const QModelIndex sourceCard = source.index(0, 0); - ASSERT_TRUE(sourceCard.isValid()); - EXPECT_EQ(source.columnCount(sourceCard), 0); - const QModelIndex displayCard = display.index(0, 0); - ASSERT_TRUE(displayCard.isValid()); - EXPECT_EQ(display.columnCount(displayCard), 0); - - QSignalSpy dirtySpy(&display, &CardDatabaseDisplayModel::modelDirty); - display.setCardName("Do"); - ASSERT_TRUE(dirtySpy.wait()); - EXPECT_GT(display.rowCount(), 0); - EXPECT_LT(display.rowCount(), source.rowCount()); -} - -TEST(ModelContract, SetsModelKeepsContract) -{ - CardDatabase database(nullptr, new NoopCardPreferenceProvider(), new TestCardDatabasePathProvider(), - new NoopCardSetPriorityController()); - ASSERT_NO_FATAL_FAILURE(loadCardDatabase(database)); - - SetsModel model(&database); - test_support::ModelContractChecker checker(&model); - - ASSERT_GT(model.rowCount(), 0); - ASSERT_GT(model.columnCount(), 0); -} - -TEST(ModelContract, SettingsSignalIsObservableWithQSignalSpy) -{ - QTemporaryDir tempDir; - ASSERT_TRUE(tempDir.isValid()); - DownloadSettings settings(tempDir.path() + "/", nullptr); - QSignalSpy spy(&settings, &DownloadSettings::downloadSpoilerStatusChanged); - - settings.setDownloadSpoilerStatus(true); - - ASSERT_EQ(spy.count(), 1); -} -} // namespace - -int main(int argc, char **argv) -{ - QCoreApplication app(argc, argv); - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/tests/movecard_tests/CMakeLists.txt b/tests/movecard_tests/CMakeLists.txt index 35d7b44ed..68d8fc84c 100755 --- a/tests/movecard_tests/CMakeLists.txt +++ b/tests/movecard_tests/CMakeLists.txt @@ -9,15 +9,3 @@ cockatrice_add_test( LABELS server ) - -cockatrice_add_test( - NAME - player_order_test - SOURCES - player_order_test.cpp - LIBS - libcockatrice_network_server_remote - libcockatrice_rng - LABELS - server -) diff --git a/tests/movecard_tests/player_order_test.cpp b/tests/movecard_tests/player_order_test.cpp deleted file mode 100644 index 6e398af24..000000000 --- a/tests/movecard_tests/player_order_test.cpp +++ /dev/null @@ -1,268 +0,0 @@ -#include "game/game_config.h" -#include "game/role_info.h" -#include "game/server_abstract_participant.h" -#include "game/server_game.h" -#include "server_abstractuserinterface.h" -#include "server_response_containers.h" -#include "server_room.h" -#include "server_test_helpers.h" - -#include -#include -#include -#include -#include -#include -#include - -RNG_Abstract *rng = nullptr; // this needs to be defined due to other functions in server - -class ScriptedRng : public RNG_Abstract -{ -public: - QList values; - - unsigned int rand(int min, int max) override - { - const unsigned int value = values.takeFirst(); - EXPECT_GE(value, static_cast(min)); - EXPECT_LE(value, static_cast(max)); - return value; - } -}; - -class FakeUserInterface : public Server_AbstractUserInterface -{ -public: - FakeUserInterface(Server *_server, const ServerInfo_User &_userInfo) : Server_AbstractUserInterface(_server) - { - setUserInfo(_userInfo); - } - - int getLastCommandTime() const override - { - return 0; - } - - bool addSaidMessageSize(int) override - { - return true; - } - - void sendProtocolItem(const Response &) override - { - } - - void sendProtocolItem(const SessionEvent &) override - { - } - - void sendProtocolItem(const GameEventContainer &) override - { - } - - void sendProtocolItem(const RoomEvent &) override - { - } -}; - -namespace -{ -QStringList participantNamesInOrder(const Server_Game &game) -{ - QStringList names; - for (int id : game.getSeatOrder()) { - const auto *participant = game.getParticipants().value(id, nullptr); - if (participant) { - names.append(QString::fromStdString(participant->getUserInfo()->name())); - } - } - return names; -} - -QList participantIdsInOrder(const Server_Game &game) -{ - return game.getSeatOrder(); -} -} // namespace - -class PlayerOrderTest : public ::testing::Test -{ -protected: - ServerInfo_User creator; - ServerInfo_User userB; - ServerInfo_User userC; - - PlayerOrderTest() - { - creator.set_name("A"); - creator.set_user_level(ServerInfo_User::IsRegistered); - userB.set_name("B"); - userB.set_user_level(ServerInfo_User::IsRegistered); - userC.set_name("C"); - userC.set_user_level(ServerInfo_User::IsRegistered); - } -}; - -TEST_F(PlayerOrderTest, JoinOrderIsSeatOrder) -{ - FakeServer server; - Server_Room room(0, 0, "", "", "", "", false, "", {}, &server); - FakeUserInterface uiA(&server, creator); - FakeUserInterface uiB(&server, userB); - FakeUserInterface uiC(&server, userC); - GameConfig config{.creatorInfo = creator, - .gameId = 1, - .description = QString(), - .password = QString(), - .maxPlayers = 3, - .gameTypes = QList(), - .onlyBuddies = false, - .onlyRegistered = false, - .spectatorsAllowed = false, - .spectatorsNeedPassword = false, - .spectatorsCanTalk = false, - .spectatorsSeeEverything = false, - .startingLifeTotal = 20, - .shareDecklistsOnLoad = false, - .shufflePlayers = false}; - Server_Game game(config, &room); - ResponseContainer rc(0); - - game.addPlayer(&uiA, rc, RoleInfo{}, false); - game.addPlayer(&uiB, rc, RoleInfo{}, false); - game.addPlayer(&uiC, rc, RoleInfo{}, false); - - EXPECT_EQ(participantNamesInOrder(game), QStringList({"A", "B", "C"})); - EXPECT_EQ(participantIdsInOrder(game), QList({0, 1, 2})); - EXPECT_EQ(game.getHostId(), 0); - EXPECT_EQ(game.getPlayerCount(), 3); -} - -TEST_F(PlayerOrderTest, ReorderPlayerSeats) -{ - FakeServer server; - Server_Room room(0, 0, "", "", "", "", false, "", {}, &server); - FakeUserInterface uiA(&server, creator); - FakeUserInterface uiB(&server, userB); - FakeUserInterface uiC(&server, userC); - GameConfig config{.creatorInfo = creator, - .gameId = 1, - .description = QString(), - .password = QString(), - .maxPlayers = 3, - .gameTypes = QList(), - .onlyBuddies = false, - .onlyRegistered = false, - .spectatorsAllowed = false, - .spectatorsNeedPassword = false, - .spectatorsCanTalk = false, - .spectatorsSeeEverything = false, - .startingLifeTotal = 20, - .shareDecklistsOnLoad = false, - .shufflePlayers = false}; - Server_Game game(config, &room); - ResponseContainer rc(0); - - game.addPlayer(&uiA, rc, RoleInfo{}, false); - game.addPlayer(&uiB, rc, RoleInfo{}, false); - game.addPlayer(&uiC, rc, RoleInfo{}, false); - - game.reorderPlayerSeats({"C", "A", "B"}); - - // player ids are stable; only the seat order changes - EXPECT_EQ(participantNamesInOrder(game), QStringList({"C", "A", "B"})); - EXPECT_EQ(participantIdsInOrder(game), QList({2, 0, 1})); - EXPECT_EQ(game.getParticipants().size(), 3); - - // the host keeps its seat: creator A is still in the game, so host stays 0 - EXPECT_EQ(game.getHostId(), 0); - - // no re-keying means every mapping keyed by player id stays valid - const int gameId = game.getGameId(); - EXPECT_EQ(uiA.getGames().value(gameId).second, 0); - EXPECT_EQ(uiB.getGames().value(gameId).second, 1); - EXPECT_EQ(uiC.getGames().value(gameId).second, 2); -} - -TEST_F(PlayerOrderTest, ReorderPlayerSeatsKeepsPlayerCount) -{ - FakeServer server; - Server_Room room(0, 0, "", "", "", "", false, "", {}, &server); - FakeUserInterface uiA(&server, creator); - FakeUserInterface uiB(&server, userB); - FakeUserInterface uiC(&server, userC); - GameConfig config{.creatorInfo = creator, - .gameId = 1, - .description = QString(), - .password = QString(), - .maxPlayers = 3, - .gameTypes = QList(), - .onlyBuddies = false, - .onlyRegistered = false, - .spectatorsAllowed = false, - .spectatorsNeedPassword = false, - .spectatorsCanTalk = false, - .spectatorsSeeEverything = false, - .startingLifeTotal = 20, - .shareDecklistsOnLoad = false, - .shufflePlayers = false}; - Server_Game game(config, &room); - ResponseContainer rc(0); - - game.addPlayer(&uiA, rc, RoleInfo{}, false); - game.addPlayer(&uiB, rc, RoleInfo{}, false); - game.addPlayer(&uiC, rc, RoleInfo{}, false); - - // listing only a subset appends the remaining players in their current order - game.reorderPlayerSeats({"C"}); - - EXPECT_EQ(participantNamesInOrder(game), QStringList({"C", "A", "B"})); - EXPECT_EQ(participantIdsInOrder(game), QList({2, 0, 1})); - EXPECT_EQ(game.getPlayerCount(), 3); - EXPECT_EQ(game.getHostId(), 0); -} - -TEST_F(PlayerOrderTest, ShufflePlayerSeatsIsAPermutation) -{ - FakeServer server; - Server_Room room(0, 0, "", "", "", "", false, "", {}, &server); - FakeUserInterface uiA(&server, creator); - FakeUserInterface uiB(&server, userB); - FakeUserInterface uiC(&server, userC); - GameConfig config{.creatorInfo = creator, - .gameId = 1, - .description = QString(), - .password = QString(), - .maxPlayers = 3, - .gameTypes = QList(), - .onlyBuddies = false, - .onlyRegistered = false, - .spectatorsAllowed = false, - .spectatorsNeedPassword = false, - .spectatorsCanTalk = false, - .spectatorsSeeEverything = false, - .startingLifeTotal = 20, - .shareDecklistsOnLoad = false, - .shufflePlayers = false}; - Server_Game game(config, &room); - ResponseContainer rc(0); - - game.addPlayer(&uiA, rc, RoleInfo{}, false); - game.addPlayer(&uiB, rc, RoleInfo{}, false); - game.addPlayer(&uiC, rc, RoleInfo{}, false); - - // fisher-yates on [A, B, C]: rand(0, 2) -> 1 (take B), rand(0, 1) -> 0 (take A), rand(0, 0) -> 0 (take C) - auto *scriptedRng = new ScriptedRng; - scriptedRng->values = {1, 0, 0}; - rng = scriptedRng; - - game.shufflePlayerSeats(); - - EXPECT_EQ(participantNamesInOrder(game), QStringList({"B", "A", "C"})); - EXPECT_EQ(participantIdsInOrder(game), QList({1, 0, 2})); - QSet idSet(participantIdsInOrder(game).cbegin(), participantIdsInOrder(game).cend()); - EXPECT_EQ(idSet.size(), 3); // ids are unique - // ids are stable, so the host (creator A, id 0) is unchanged - EXPECT_EQ(game.getHostId(), 0); -} diff --git a/tests/moxfield_signature_spells_test.cpp b/tests/moxfield_signature_spells_test.cpp deleted file mode 100644 index 54346a934..000000000 --- a/tests/moxfield_signature_spells_test.cpp +++ /dev/null @@ -1,84 +0,0 @@ -#include "client/network/parsers/interface_json_deck_parser.h" - -#include -#include -#include -#include - -TEST(MoxfieldImport, SignatureSpellIsAddedToMainWithoutReplacingCommanderBanner) -{ - // Moxfield v2 board objects map IDs to entries with quantity and card. - const auto input = QJsonDocument::fromJson(R"json({ - "name": "Oathbreaker example", "description": "Notes retained", - "mainboard": {"land": {"quantity": 1, "card": {"name": "Island", "set": "abc", "cn": "1"}}}, - "sideboard": {"side": {"quantity": 1, "card": {"name": "Mountain", "set": "abc", "cn": "2"}}}, - "commanders": {"walker": {"quantity": 1, "card": {"name": "Jace", "set": "abc", "cn": "3", "scryfall_id": "walker-id"}}}, - "signatureSpells": {"spell": {"quantity": 1, "card": {"name": "Lightning Bolt", "set": "xyz", "cn": "4", "scryfall_id": "spell-id"}}} - })json") - .object(); - MoxfieldJsonParser parser; - DeckList deck = parser.parse(input); - int mainSpellCount = 0; - int sideSpellCount = 0; - int mainLands = 0; - int sideLands = 0; - deck.forEachCard([&](InnerDecklistNode *zone, DecklistCardNode *card) { - if (card->getName() == "Island" && zone->getName() == DECK_ZONE_MAIN) { - mainLands += card->getNumber(); - } - if (card->getName() == "Mountain" && zone->getName() == DECK_ZONE_SIDE) { - sideLands += card->getNumber(); - } - if (card->getName() != "Lightning Bolt") { - return; - } - if (zone->getName() == DECK_ZONE_MAIN) { - mainSpellCount += card->getNumber(); - EXPECT_EQ(card->getCardSetShortName(), "XYZ"); - EXPECT_EQ(card->getCardCollectorNumber(), "4"); - EXPECT_EQ(card->getCardProviderId(), "spell-id"); - } else if (zone->getName() == DECK_ZONE_SIDE) { - sideSpellCount += card->getNumber(); - } - }); - EXPECT_EQ(mainSpellCount, 1); - EXPECT_EQ(sideSpellCount, 0); - EXPECT_EQ(mainLands, 1); - EXPECT_EQ(sideLands, 1); - EXPECT_EQ(deck.getName(), "Oathbreaker example"); - EXPECT_EQ(deck.getComments(), "Notes retained"); - EXPECT_EQ(deck.getBannerCard().name, "Jace"); - EXPECT_EQ(deck.getBannerCard().providerId, "walker-id"); -} - -TEST(MoxfieldImport, QuantityAwareDeckInsertionRetainsCountAndPrinting) -{ - DeckList deck; - auto *card = deck.addCards("Island", 2, DECK_ZONE_MAIN, -1, "ABC", "4", "id"); - ASSERT_NE(card, nullptr); - EXPECT_EQ(card->getNumber(), 2); - EXPECT_EQ(card->getCardProviderId(), "id"); - EXPECT_EQ(deck.addCards("Island", 0, DECK_ZONE_MAIN), nullptr); -} - -TEST(OnlineImport, ArchidektPreservesNameDescriptionAndCards) -{ - const auto input = QJsonDocument::fromJson(R"json({ - "name": "Online deck", "description": "Deck notes", - "cards": [{"quantity": 2, "card": { - "oracleCard": {"name": "Island"}, "edition": {"editioncode": "abc"}, "collectorNumber": "1" - }}] - })json") - .object(); - ArchidektJsonParser parser; - const DeckList deck = parser.parse(input); - int count = 0; - deck.forEachCard([&](InnerDecklistNode *zone, DecklistCardNode *card) { - if (zone->getName() == DECK_ZONE_MAIN && card->getName() == "Island") { - count += card->getNumber(); - } - }); - EXPECT_EQ(count, 2); - EXPECT_EQ(deck.getName(), "Online deck"); - EXPECT_EQ(deck.getComments(), "Deck notes"); -} diff --git a/tests/oracle/CMakeLists.txt b/tests/oracle/CMakeLists.txt index 1cc1ad952..6958673f7 100644 --- a/tests/oracle/CMakeLists.txt +++ b/tests/oracle/CMakeLists.txt @@ -9,7 +9,6 @@ cockatrice_add_test( ../../oracle/src/oracleimporter.cpp ../../oracle/src/parsehelpers.cpp ../../oracle/src/raw_json_scanner.cpp - ../../oracle/src/database_writer.cpp oracle_importer_test.cpp LIBS libcockatrice_card diff --git a/tests/oracle/oracle_importer_test.cpp b/tests/oracle/oracle_importer_test.cpp index 1b4e2d915..83d77d465 100644 --- a/tests/oracle/oracle_importer_test.cpp +++ b/tests/oracle/oracle_importer_test.cpp @@ -1,14 +1,11 @@ -#include "../../oracle/src/database_writer.h" #include "../../oracle/src/oracleimporter.h" #include "../../oracle/src/raw_json_scanner.h" -#include "../support/scoped_file_size_limit.h" #include "libcockatrice/card/card_info.h" #include "gtest/gtest.h" #include #include #include -#include #include #include #include @@ -23,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -1144,208 +1140,6 @@ TEST_F(OracleImporterTest, StartImportAppliesLocalizedData) ASSERT_EQ(result->getLocalizedText("pt"), "Raio causa 3 de dano a qualquer alvo."); } -namespace -{ -QByteArray refreshSource(const QString &name = "New Card") -{ - QJsonObject card{{"name", name}, {"text", "Rules text."}, {"layout", "normal"}, - {"type", "Artifact"}, {"number", "1"}, {"rarity", "common"}}; - QJsonObject set{{"code", "TST"}, {"name", "Test Set"}, {"type", "expansion"}, {"cards", QJsonArray{card}}}; - return QJsonDocument(QJsonObject{{"data", QJsonObject{{"TST", set}}}}).toJson(QJsonDocument::Compact); -} -} // namespace - -TEST_F(OracleImporterTest, FailedLazyParseKeepsInstalledDatabase) -{ - QTemporaryDir dir; - ASSERT_TRUE(dir.isValid()); - const QString path = dir.filePath("cards.xml"); - QFile original(path); - ASSERT_TRUE(original.open(QIODevice::WriteOnly)); - ASSERT_EQ(original.write("existing database"), 17); - original.close(); - - // The metadata scanner skips numeric values without converting them. Qt's - // per-set parser rejects an overflowing number after selection succeeds. - auto badSet = QJsonDocument::fromJson(refreshSource()).object().value("data").toObject().value("TST").toObject(); - auto goodSet = badSet; - goodSet["code"] = "AAA"; - goodSet["name"] = "A successful first set"; - auto badCard = badSet.value("cards").toArray().first().toObject(); - badCard["number"] = "overflow"; - badSet["cards"] = QJsonArray{badCard}; - QByteArray data = QJsonDocument(QJsonObject{{"data", QJsonObject{{"AAA", goodSet}, {"TST", badSet}}}}) - .toJson(QJsonDocument::Compact); - data.replace("\"number\":\"overflow\"", "\"number\":1e9999"); - ASSERT_TRUE(importer->readSetsFromByteArray(data)); - EXPECT_EQ(importer->startImport(), 0); - EXPECT_FALSE(importer->hasSuccessfulImport()); - EXPECT_TRUE(importer->getImportError().contains("TST")); - EXPECT_TRUE(importer->getCardList().isEmpty()); - EXPECT_FALSE(importer->saveToFile(path, {}, {})); - ASSERT_TRUE(original.open(QIODevice::ReadOnly)); - EXPECT_EQ(original.readAll(), "existing database"); -} - -TEST_F(OracleImporterTest, EmptyImportCannotReplaceInstalledCards) -{ - const QByteArray source = R"({"data":{"TST":{"code":"TST","name":"Test","type":"expansion","cards":[]}}})"; - ASSERT_TRUE(importer->readSetsFromByteArray(source)); - EXPECT_EQ(importer->startImport(), 0); - EXPECT_FALSE(importer->hasSuccessfulImport()); - EXPECT_FALSE(importer->getImportError().isEmpty()); -} - -TEST_F(OracleImporterTest, MissingSourceBytesCannotProduceSuccessfulImport) -{ - ASSERT_TRUE(importer->readSetsFromByteArray(refreshSource())); - const auto selected = importer->getSets(); - importer->releaseSetData(); - importer->getSets() = selected; - EXPECT_EQ(importer->startImport(), 0); - EXPECT_FALSE(importer->hasSuccessfulImport()); - EXPECT_TRUE(importer->getImportError().contains("TST")); -} - -TEST_F(OracleImporterTest, CancellationDuringFinalSetCannotSavePartialDatabase) -{ - ASSERT_TRUE(importer->readSetsFromByteArray(refreshSource())); - QObject::connect( - importer, &OracleImporter::setIndexChanged, importer, - [this](int, int, const QString &name) { - if (!name.isEmpty()) { - importer->cancelImport(); - } - }, - Qt::DirectConnection); - EXPECT_EQ(importer->startImport(), 0); - EXPECT_FALSE(importer->hasSuccessfulImport()); - EXPECT_TRUE(importer->getCardList().isEmpty()); -} - -TEST_F(OracleImporterTest, CancellationBeforeWorkerStartsIsNotLost) -{ - ASSERT_TRUE(importer->readSetsFromByteArray(refreshSource())); - importer->prepareImport(); - importer->cancelImport(); - EXPECT_EQ(importer->startImport(), 0); - EXPECT_FALSE(importer->hasSuccessfulImport()); - importer->prepareImport(); - EXPECT_EQ(importer->startImport(), 1); - EXPECT_TRUE(importer->hasSuccessfulImport()); -} - -TEST_F(OracleImporterTest, NewImportReplacesPreviousInMemoryCards) -{ - ASSERT_TRUE(importer->readSetsFromByteArray(refreshSource("Old Card"))); - ASSERT_EQ(importer->startImport(), 1); - ASSERT_TRUE(importer->readSetsFromByteArray(refreshSource("New Card"))); - EXPECT_FALSE(importer->hasSuccessfulImport()); - ASSERT_EQ(importer->startImport(), 1); - EXPECT_EQ(importer->getCardList().size(), 1); - EXPECT_FALSE(importer->getCardList().contains("Old Card")); - EXPECT_TRUE(importer->getCardList().contains("New Card")); -} - -TEST_F(OracleImporterTest, FailedSourceLoadCannotReusePreviousSuccessfulImport) -{ - ASSERT_TRUE(importer->readSetsFromByteArray(refreshSource())); - ASSERT_EQ(importer->startImport(), 1); - ASSERT_FALSE(importer->readSetsFromByteArray("invalid JSON")); - EXPECT_FALSE(importer->hasSuccessfulImport()); - EXPECT_EQ(importer->startImport(), 0); -} - -TEST_F(OracleImporterTest, SuccessfulRefreshCommitsCompleteXml) -{ - QTemporaryDir dir; - ASSERT_TRUE(dir.isValid()); - const QString path = dir.filePath("cards.xml"); - ASSERT_TRUE(importer->readSetsFromByteArray(refreshSource())); - ASSERT_EQ(importer->startImport(), 1); - importer->releaseSetData(); - ASSERT_TRUE(importer->saveToFile(path, "test-source", "v1")); - QFile file(path); - ASSERT_TRUE(file.open(QIODevice::ReadOnly)); - const QByteArray xml = file.readAll(); - EXPECT_TRUE(xml.contains("New Card")); - EXPECT_TRUE(xml.contains("test-source")); - EXPECT_TRUE(xml.contains("")); -} - -TEST(OracleDatabaseWriter, AcceptsCompleteSupportedVersions) -{ - EXPECT_TRUE(OracleDatabase::validateXml( - "") - .isEmpty()); - EXPECT_TRUE(OracleDatabase::validateXml("") - .isEmpty()); - EXPECT_FALSE( - OracleDatabase::validateXml("") - .isEmpty()); -} - -TEST(OracleDatabaseWriter, InvalidDownloadPreservesInstalledBytes) -{ - QTemporaryDir dir; - ASSERT_TRUE(dir.isValid()); - const QString path = dir.filePath("tokens.xml"); - QFile original(path); - ASSERT_TRUE(original.open(QIODevice::WriteOnly)); - ASSERT_EQ(original.write("installed tokens"), 16); - original.close(); - for (const QByteArray &payload : {QByteArray("server error"), - QByteArray(""), QByteArray()}) { - QString error; - EXPECT_FALSE(OracleDatabase::saveXml(path, payload, &error)); - EXPECT_FALSE(error.isEmpty()); - ASSERT_TRUE(original.open(QIODevice::ReadOnly)); - EXPECT_EQ(original.readAll(), "installed tokens"); - original.close(); - } -} - -TEST(OracleDatabaseWriter, CompleteDownloadReplacesInstalledBytes) -{ - QTemporaryDir dir; - ASSERT_TRUE(dir.isValid()); - const QString path = dir.filePath("cards.xml"); - const QByteArray data(""); - QString error = "previous failure"; - ASSERT_TRUE(OracleDatabase::saveXml(path, data, &error)); - EXPECT_TRUE(error.isEmpty()); - QFile file(path); - ASSERT_TRUE(file.open(QIODevice::ReadOnly)); - EXPECT_EQ(file.readAll(), data); -} - -#ifdef Q_OS_UNIX -TEST(OracleDatabaseWriter, ShortWriteKeepsPreviouslyInstalledDatabase) -{ - QTemporaryDir dir; - ASSERT_TRUE(dir.isValid()); - const QString path = dir.filePath("cards.xml"); - QFile original(path); - ASSERT_TRUE(original.open(QIODevice::WriteOnly)); - ASSERT_EQ(original.write("installed database"), 18); - original.close(); - const QByteArray data = ""; - // A real filesystem write failure: the soft file-size cap makes the writer's own - // flush fail without filling a disk. The cap is scoped rather than forked, because a - // death-test child under RLIMIT_FSIZE is killed by SIGSEGV on macOS. - test_support::ScopedFileSizeLimit fileSizeCap(128); - ASSERT_TRUE(fileSizeCap.isValid()); - - QString error; - EXPECT_FALSE(OracleDatabase::saveXml(path, data, &error)); - EXPECT_FALSE(error.isEmpty()); - - ASSERT_TRUE(original.open(QIODevice::ReadOnly)); - EXPECT_EQ(original.readAll(), "installed database"); -} -#endif - int main(int argc, char **argv) { ::testing::InitGoogleTest(&argc, argv); diff --git a/tests/password_hash_test.cpp b/tests/password_hash_test.cpp index 8e7eded72..99f2e1400 100644 --- a/tests/password_hash_test.cpp +++ b/tests/password_hash_test.cpp @@ -52,17 +52,6 @@ TEST(PasswordHashTest, DeriveKeyMatchesKnownVector) ASSERT_EQ(derived.toHex(), expected.toHex()); } -TEST(PasswordHashTest, DeriveKeyCoversTheWholeAcceptedRangeOfR) -{ - // costParamsAreSane accepts r up to 32. The memory budget handed to OpenSSL has to cover - // scrypt's XY array (256 * r bytes) on top of V and B, or derivation fails for r >= 17. - for (const int r : {17, 32}) { - const QByteArray derived = PasswordHasher::deriveKey("password", QByteArray("NaCl"), 1024, r, 1); - ASSERT_FALSE(derived.isEmpty()) << "deriveKey failed for accepted r=" << r; - ASSERT_EQ(derived.size(), SCRYPT_VERIFIER_LENGTH); - } -} - TEST(PasswordHashTest, PasswordVerifierRoundTrip) { const QString stored = PasswordHasher::generatePasswordVerifier("hunter2"); diff --git a/tests/server_card_counter_test.cpp b/tests/server_card_counter_test.cpp index 6b884864d..6308d80b9 100644 --- a/tests/server_card_counter_test.cpp +++ b/tests/server_card_counter_test.cpp @@ -8,14 +8,10 @@ #include #include #include -#include #include #include #include -// Referenced by other translation units in the server_remote library. -RNG_Abstract *rng = nullptr; - TEST(ServerCardCounter, IncrementNewCounter) { Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0); diff --git a/tests/server_forced_password_change_test.cpp b/tests/server_forced_password_change_test.cpp deleted file mode 100644 index 9717b610b..000000000 --- a/tests/server_forced_password_change_test.cpp +++ /dev/null @@ -1,234 +0,0 @@ -/** @file server_forced_password_change_test.cpp - * @brief Tests for the restricted session a forced password change leaves behind at login. - * @ingroup Tests - */ - -#include "libcockatrice/protocol/pb/response.pb.h" -#include "libcockatrice/protocol/pb/server_message.pb.h" -#include "server.h" -#include "server_database_interface.h" -#include "server_protocolhandler.h" - -#include -#include -#include -#include -#include -#include -#include - -RNG_Abstract *rng = nullptr; // referenced by the server_remote library - -namespace -{ - -class MockDatabaseInterface : public Server_DatabaseInterface -{ -public: - AuthenticationResult checkUserPassword(Server_ProtocolHandler *, - const QString &, - const QString &, - const QString &, - QString &, - int &, - bool) override - { - return PasswordChangeRequired; - } - ServerInfo_User getUserData(const QString &name, bool withId) override - { - ServerInfo_User user; - user.set_name(name.toStdString()); - user.set_user_level(ServerInfo_User::IsUser | ServerInfo_User::IsRegistered | ServerInfo_User::IsModerator); - if (withId) { - user.set_id(1); - } - return user; - } - int getNextReplayId() override - { - return 1; - } - int getNextGameId() override - { - return 1; - } - int getActiveUserCount(QString) override - { - return 0; - } -}; - -class FakeServer : public Server -{ -public: - FakeServer() - { - setDatabaseInterface(new MockDatabaseInterface()); - } -}; - -class TestHandler : public Server_ProtocolHandler -{ -public: - TestHandler(Server *_server, Server_DatabaseInterface *_db) : Server_ProtocolHandler(_server, _db) - { - } - - QString getAddress() const override - { - return {}; - } - QString getConnectionType() const override - { - return {}; - } - - Response::ResponseCode lastResponseCode = Response::RespNothing; - int lastExtendedSessionCommand = -1; - -protected: - Response::ResponseCode - processExtendedSessionCommand(int cmdType, const SessionCommand & /*cmd*/, ResponseContainer & /*rc*/) override - { - lastExtendedSessionCommand = cmdType; - return Response::RespOk; - } - - void transmitProtocolItem(const ServerMessage &item) override - { - if (item.message_type() == ServerMessage::RESPONSE) { - lastResponseCode = item.response().response_code(); - } - } -}; - -class ForcedPasswordChangeTest : public ::testing::Test -{ -protected: - FakeServer server; - TestHandler handler{&server, server.getDatabaseInterface()}; - - void login() - { - CommandContainer cont; - cont.set_cmd_id(1); - Command_Login cmd; - cmd.set_user_name("mod"); - cont.add_session_command()->MutableExtension(Command_Login::ext)->CopyFrom(cmd); - handler.processCommandContainer(cont); - } - - Response::ResponseCode sendPing() - { - CommandContainer cont; - cont.set_cmd_id(2); - cont.add_session_command()->MutableExtension(Command_Ping::ext); - handler.processCommandContainer(cont); - return handler.lastResponseCode; - } - - Response::ResponseCode sendSessionCommand() - { - CommandContainer cont; - cont.set_cmd_id(3); - cont.add_session_command()->MutableExtension(Command_ListRooms::ext); - handler.processCommandContainer(cont); - return handler.lastResponseCode; - } - - Response::ResponseCode sendRoomCommand() - { - CommandContainer cont; - cont.set_cmd_id(4); - cont.add_room_command()->MutableExtension(Command_RoomSay::ext)->set_message("hello"); - handler.processCommandContainer(cont); - return handler.lastResponseCode; - } - - Response::ResponseCode sendMixedSessionAndRoomCommand() - { - CommandContainer cont; - cont.set_cmd_id(5); - cont.add_session_command()->MutableExtension(Command_Ping::ext); - cont.add_room_command()->MutableExtension(Command_RoomSay::ext)->set_message("hello"); - handler.processCommandContainer(cont); - return handler.lastResponseCode; - } - - Response::ResponseCode sendAccountPassword() - { - CommandContainer cont; - cont.set_cmd_id(6); - Command_AccountPassword cmd; - cmd.set_old_password("temporary-password"); - cmd.set_new_password("replacement-password"); - cont.add_session_command()->MutableExtension(Command_AccountPassword::ext)->CopyFrom(cmd); - handler.processCommandContainer(cont); - return handler.lastResponseCode; - } -}; - -TEST_F(ForcedPasswordChangeTest, LoginReportsTheRequiredChange) -{ - login(); - - EXPECT_EQ(Response::RespPasswordChangeRequired, handler.lastResponseCode); - ASSERT_NE(nullptr, handler.getUserInfo()); - EXPECT_EQ("mod", QString::fromStdString(handler.getUserInfo()->name())); -} - -TEST_F(ForcedPasswordChangeTest, PendingSessionIsNotRegisteredAsAUser) -{ - login(); - // The session may change its password, but it must not take a user slot or appear in - // the session table before the client reconnects with the new password. - EXPECT_FALSE(handler.getUserInfo()->has_session_id()); - EXPECT_EQ(0, server.getUsersCount()); -} - -TEST_F(ForcedPasswordChangeTest, PendingModeratorIsNotReportedOnline) -{ - login(); - server.addClient(&handler); - - EXPECT_TRUE(server.getOnlineModeratorList().isEmpty()); -} - -TEST_F(ForcedPasswordChangeTest, OnlyPingAndPasswordChangeAreServed) -{ - login(); - - EXPECT_EQ(Response::RespOk, sendPing()); - EXPECT_EQ(Response::RespFunctionNotAllowed, sendSessionCommand()); - EXPECT_EQ(Response::RespFunctionNotAllowed, sendRoomCommand()); - // Dispatch prefers game/room over session, so a container carrying both must not slip past - // the restriction by carrying a session command. - EXPECT_EQ(Response::RespFunctionNotAllowed, sendMixedSessionAndRoomCommand()); -} - -TEST_F(ForcedPasswordChangeTest, AccountPasswordReachesTheCommand) -{ - login(); - // The forced change is useless if the gate refuses the command it needs. ACCOUNT_PASSWORD is - // served by the extended-command hook, so it must arrive there instead of being filtered. - EXPECT_EQ(Response::RespOk, sendAccountPassword()); - EXPECT_EQ(SessionCommand::ACCOUNT_PASSWORD, handler.lastExtendedSessionCommand); -} - -TEST_F(ForcedPasswordChangeTest, CompletedLoginIsStillReportedOnline) -{ - TestHandler loggedIn{&server, server.getDatabaseInterface()}; - ServerInfo_User user; - user.set_name("online-mod"); - user.set_user_level(ServerInfo_User::IsUser | ServerInfo_User::IsRegistered | ServerInfo_User::IsModerator); - user.set_session_id(7); - loggedIn.setUserInfo(user); - server.addClient(&loggedIn); - - const QList moderators = server.getOnlineModeratorList(); - ASSERT_EQ(1, moderators.size()); - EXPECT_EQ("online-mod", moderators.first()); -} - -} // namespace diff --git a/tests/server_game_join_test.cpp b/tests/server_game_join_test.cpp index 93895ab5c..8a2ae8c45 100644 --- a/tests/server_game_join_test.cpp +++ b/tests/server_game_join_test.cpp @@ -4,7 +4,6 @@ */ #include "game/game_config.h" -#include "game/role_info.h" #include "game/server_game.h" #include "libcockatrice/protocol/pb/response.pb.h" #include "server.h" @@ -120,13 +119,13 @@ TEST_F(GameJoinOverrideTest, StaffBypassPasswordRestriction) game = makeGame(true, false, false, true); // A plain user cannot override the password even with the override flag set. - EXPECT_EQ(game->checkJoin(&plainUser, "wrong", {}, true), Response::RespWrongPassword); + EXPECT_EQ(game->checkJoin(&plainUser, "wrong", false, true, false), Response::RespWrongPassword); // Moderators and judges may enter any game regardless of the password. - EXPECT_EQ(game->checkJoin(&moderator, "wrong", {}, true), Response::RespOk); - EXPECT_EQ(game->checkJoin(&judge, "wrong", {}, true), Response::RespOk); + EXPECT_EQ(game->checkJoin(&moderator, "wrong", false, true, false), Response::RespOk); + EXPECT_EQ(game->checkJoin(&judge, "wrong", false, true, false), Response::RespOk); // Without the override flag judges are still subject to the password. - EXPECT_EQ(game->checkJoin(&judge, "wrong", {.isJudge = true}, false), Response::RespWrongPassword); - EXPECT_EQ(game->checkJoin(&judge, "secret", {.isJudge = true}, false), Response::RespOk); + EXPECT_EQ(game->checkJoin(&judge, "wrong", false, false, true), Response::RespWrongPassword); + EXPECT_EQ(game->checkJoin(&judge, "secret", false, false, true), Response::RespOk); } TEST_F(GameJoinOverrideTest, StaffBypassRegisteredOnlyRestriction) @@ -134,9 +133,9 @@ TEST_F(GameJoinOverrideTest, StaffBypassRegisteredOnlyRestriction) game = makeGame(false, true, false, true); // Without the override flag the only-registered restriction still applies. - EXPECT_EQ(game->checkJoin(&unregisteredJudge, QString(), {}, false), Response::RespUserLevelTooLow); + EXPECT_EQ(game->checkJoin(&unregisteredJudge, QString(), false, false, false), Response::RespUserLevelTooLow); // An unregistered judge may enter when overriding restrictions. - EXPECT_EQ(game->checkJoin(&unregisteredJudge, QString(), {}, true), Response::RespOk); + EXPECT_EQ(game->checkJoin(&unregisteredJudge, QString(), false, true, false), Response::RespOk); } TEST_F(GameJoinOverrideTest, StaffBypassBuddiesOnlyRestriction) @@ -144,10 +143,10 @@ TEST_F(GameJoinOverrideTest, StaffBypassBuddiesOnlyRestriction) game = makeGame(false, false, true, true); // A plain user who is not on the creator's buddy list gets rejected. - EXPECT_EQ(game->checkJoin(&plainUser, QString(), {}, true), Response::RespOnlyBuddies); + EXPECT_EQ(game->checkJoin(&plainUser, QString(), false, true, false), Response::RespOnlyBuddies); // Moderators and judges bypass the buddies-only restriction. - EXPECT_EQ(game->checkJoin(&moderator, QString(), {}, true), Response::RespOk); - EXPECT_EQ(game->checkJoin(&judge, QString(), {}, true), Response::RespOk); + EXPECT_EQ(game->checkJoin(&moderator, QString(), false, true, false), Response::RespOk); + EXPECT_EQ(game->checkJoin(&judge, QString(), false, true, false), Response::RespOk); } TEST_F(GameJoinOverrideTest, StaffBypassSpectatorsNotAllowedRestriction) @@ -155,11 +154,11 @@ TEST_F(GameJoinOverrideTest, StaffBypassSpectatorsNotAllowedRestriction) game = makeGame(false, false, false, false); // A plain user cannot spectate when the game disallows spectators. - EXPECT_EQ(game->checkJoin(&plainUser, QString(), {.isSpectator = true}, false), Response::RespSpectatorsNotAllowed); + EXPECT_EQ(game->checkJoin(&plainUser, QString(), true, false, false), Response::RespSpectatorsNotAllowed); // Moderators and judges may spectate any game regardless of the password // and the spectator restriction. - EXPECT_EQ(game->checkJoin(&moderator, "wrong", {.isSpectator = true}, true), Response::RespOk); - EXPECT_EQ(game->checkJoin(&judge, "wrong", {.isSpectator = true}, true), Response::RespOk); + EXPECT_EQ(game->checkJoin(&moderator, "wrong", true, true, false), Response::RespOk); + EXPECT_EQ(game->checkJoin(&judge, "wrong", true, true, false), Response::RespOk); } TEST_F(GameJoinOverrideTest, JudgeOverrideDoesNotGrantJudgeJoinToPlainUser) @@ -167,8 +166,8 @@ TEST_F(GameJoinOverrideTest, JudgeOverrideDoesNotGrantJudgeJoinToPlainUser) game = makeGame(false, false, false, true); // joining with join_as_judge still requires the judge flag even when overriding. - EXPECT_EQ(game->checkJoin(&plainUser, QString(), {.isJudge = true}, true), Response::RespUserLevelTooLow); - EXPECT_EQ(game->checkJoin(&judge, QString(), {.isJudge = true}, true), Response::RespOk); + EXPECT_EQ(game->checkJoin(&plainUser, QString(), false, true, true), Response::RespUserLevelTooLow); + EXPECT_EQ(game->checkJoin(&judge, QString(), false, true, true), Response::RespOk); } } // namespace diff --git a/tests/server_logger_test.cpp b/tests/server_logger_test.cpp deleted file mode 100644 index 3c2d047cc..000000000 --- a/tests/server_logger_test.cpp +++ /dev/null @@ -1,201 +0,0 @@ -#include "server_logger.h" - -#include "gtest/gtest.h" -#include -#include -#include -#include -#include -#include - -namespace -{ - -/** - * @brief Redirects std::cout for the lifetime of the object so the logger's console - * sink can be asserted on. - */ -class CoutCapture -{ -public: - CoutCapture() : previousBuffer(std::cout.rdbuf(captured.rdbuf())) - { - } - ~CoutCapture() - { - std::cout.rdbuf(previousBuffer); - } - - QString text() const - { - return QString::fromStdString(captured.str()); - } - -private: - std::ostringstream captured; - std::streambuf *previousBuffer; -}; - -// The console sink is written by the logger thread; drive it directly here, as the event -// loop would in the server. -void flushLogger(ServerLogger &logger) -{ - QMetaObject::invokeMethod(&logger, "flushBuffer", Qt::DirectConnection); -} - -// Regression: --log-to-console used to be gated behind a successfully opened logfile, so an -// empty server/logfile silenced every diagnostic, including critical startup errors. -TEST(ServerLoggerTest, ConsoleSinkDoesNotDependOnLogFile) -{ - ServerLogger logger(true, true, QString()); - logger.startLog(QString()); - - CoutCapture capture; - logger.logMessage("could not open the database"); - flushLogger(logger); - - EXPECT_TRUE(capture.text().contains("could not open the database")) << capture.text().toStdString(); -} - -// writelog only describes the logfile; disabling it must not silence the console. -TEST(ServerLoggerTest, ConsoleSinkSurvivesDisabledFileLog) -{ - QTemporaryDir dir; - ASSERT_TRUE(dir.isValid()); - - ServerLogger logger(true, false, QString()); - logger.startLog(dir.filePath("server.log")); - - CoutCapture capture; - logger.logMessage("startup failed"); - flushLogger(logger); - - EXPECT_TRUE(capture.text().contains("startup failed")) << capture.text().toStdString(); -} - -// logfilters selects what goes into the logfile; the console is not filtered. -TEST(ServerLoggerTest, ConsoleSinkIgnoresLogFilters) -{ - ServerLogger logger(true, true, "database"); - logger.startLog(QString()); - - CoutCapture capture; - logger.logMessage("unrelated message"); - flushLogger(logger); - - EXPECT_TRUE(capture.text().contains("unrelated message")) << capture.text().toStdString(); -} - -TEST(ServerLoggerTest, StaysQuietWhenConsoleIsDisabled) -{ - ServerLogger logger(false, false, QString()); - logger.startLog(QString()); - - CoutCapture capture; - logger.logMessage("not for the console"); - flushLogger(logger); - - EXPECT_TRUE(capture.text().isEmpty()) << capture.text().toStdString(); -} - -TEST(ServerLoggerTest, IsLoggingEnabledMirrorsTheSinks) -{ - QTemporaryDir dir; - ASSERT_TRUE(dir.isValid()); - - // The console is a sink of its own: messages must not be discarded for want of a logfile. - { - ServerLogger logger(true, false, QString()); - EXPECT_TRUE(logger.isLoggingEnabled()); - } - - // The logfile sink needs an open file and writelog; reloadConfig() carries the SIGHUP change. - { - ServerLogger logger(false, true, QString()); - EXPECT_FALSE(logger.isLoggingEnabled()) << "no logfile is open yet"; - logger.startLog(dir.filePath("enabled.log")); - EXPECT_TRUE(logger.isLoggingEnabled()); - logger.reloadConfig(false, QString()); - EXPECT_FALSE(logger.isLoggingEnabled()) << "writelog=false leaves no sink enabled"; - } -} - -TEST(ServerLoggerTest, WritesMatchingFilteredMessagesToTheLogFile) -{ - QTemporaryDir dir; - ASSERT_TRUE(dir.isValid()); - const QString logPath = dir.filePath("server.log"); - - { - ServerLogger logger(false, true, "database"); - logger.startLog(logPath); - logger.logMessage("database is unavailable"); - logger.logMessage("unrelated message"); - } - - QFile logFile(logPath); - ASSERT_TRUE(logFile.open(QIODevice::ReadOnly)); - const QString contents = QString::fromUtf8(logFile.readAll()); - EXPECT_TRUE(contents.contains("database is unavailable")) << contents.toStdString(); - EXPECT_FALSE(contents.contains("unrelated message")) << contents.toStdString(); -} - -// SIGHUP reloads the configuration; the logger must pick up the new filter. -TEST(ServerLoggerTest, ReloadConfigAppliesANewFilter) -{ - QTemporaryDir dir; - ASSERT_TRUE(dir.isValid()); - const QString logPath = dir.filePath("server.log"); - - { - ServerLogger logger(false, true, "database"); - logger.startLog(logPath); - logger.logMessage("filtered out"); - logger.reloadConfig(true, QString()); - logger.logMessage("kept after reload"); - } - - QFile logFile(logPath); - ASSERT_TRUE(logFile.open(QIODevice::ReadOnly)); - const QString contents = QString::fromUtf8(logFile.readAll()); - EXPECT_FALSE(contents.contains("filtered out")) << contents.toStdString(); - EXPECT_TRUE(contents.contains("kept after reload")) << contents.toStdString(); -} - -TEST(ServerLoggerTest, DisabledFileLogLeavesTheLogFileEmpty) -{ - QTemporaryDir dir; - ASSERT_TRUE(dir.isValid()); - const QString logPath = dir.filePath("server.log"); - - { - ServerLogger logger(false, false, QString()); - logger.startLog(logPath); - logger.logMessage("not for the logfile"); - } - - QFile logFile(logPath); - ASSERT_TRUE(logFile.open(QIODevice::ReadOnly)); - EXPECT_TRUE(logFile.readAll().isEmpty()); -} - -// A filter list consisting only of separators activates filtering with no entries; the old -// trimmed-empty check suppressed the logfile in that case and this preserves it. -TEST(ServerLoggerTest, DegenerateFilterSuppressesTheLogFile) -{ - QTemporaryDir dir; - ASSERT_TRUE(dir.isValid()); - const QString logPath = dir.filePath("server.log"); - - { - ServerLogger logger(false, true, ","); - logger.startLog(logPath); - logger.logMessage("anything"); - } - - QFile logFile(logPath); - ASSERT_TRUE(logFile.open(QIODevice::ReadOnly)); - EXPECT_TRUE(logFile.readAll().isEmpty()); -} - -} // namespace diff --git a/tests/settings/CMakeLists.txt b/tests/settings/CMakeLists.txt index 9dbda9d6b..98bed1f4b 100644 --- a/tests/settings/CMakeLists.txt +++ b/tests/settings/CMakeLists.txt @@ -1,7 +1,5 @@ cockatrice_add_test(NAME settings_manager_test SOURCES settings_manager_test.cpp LIBS libcockatrice_settings) -cockatrice_add_test(NAME servers_settings_test SOURCES servers_settings_test.cpp LIBS libcockatrice_settings) - cockatrice_add_test( NAME settings_defaults_test diff --git a/tests/settings/servers_settings_test.cpp b/tests/settings/servers_settings_test.cpp deleted file mode 100644 index 5d5953999..000000000 --- a/tests/settings/servers_settings_test.cpp +++ /dev/null @@ -1,228 +0,0 @@ -#include "gtest/gtest.h" -#include -#include -#include -#include - -namespace -{ -class ServersSettingsTest : public ::testing::Test -{ -protected: - QTemporaryDir tempDir; - QString settingsPath; - - void SetUp() override - { - settingsPath = tempDir.path() + "/"; - } - - QString settingsFile() const - { - return settingsPath + "servers.ini"; - } - - void writeLegacyServer(int index, - const QString &saveName, - const QString &host, - const QString &port, - const QString &username, - const QString &password, - bool savePassword, - const QString &site) - { - QSettings settings(settingsFile(), QSettings::IniFormat); - const QString prefix = QStringLiteral("server/server_details/"); - settings.setValue(prefix + QStringLiteral("saveName%1").arg(index), saveName); - settings.setValue(prefix + QStringLiteral("server%1").arg(index), host); - settings.setValue(prefix + QStringLiteral("port%1").arg(index), port); - settings.setValue(prefix + QStringLiteral("username%1").arg(index), username); - settings.setValue(prefix + QStringLiteral("password%1").arg(index), password); - settings.setValue(prefix + QStringLiteral("savePassword%1").arg(index), savePassword); - settings.setValue(prefix + QStringLiteral("site%1").arg(index), site); - } -}; - -TEST_F(ServersSettingsTest, AddServerStoresAllFields) -{ - ServersSettings settings(settingsPath, nullptr); - settings.addNewServer("Alpha", "alpha.example", "4748", "alice", "secret", true, "https://alpha.example"); - - const auto servers = settings.getServers(); - ASSERT_EQ(servers.size(), 1); - EXPECT_EQ(servers.first().saveName, QString("Alpha")); - EXPECT_EQ(servers.first().host, QString("alpha.example")); - EXPECT_EQ(servers.first().port, QString("4748")); - EXPECT_EQ(servers.first().username, QString("alice")); - EXPECT_EQ(servers.first().password, QString("secret")); - EXPECT_TRUE(servers.first().savePassword); - EXPECT_EQ(servers.first().site, QString("https://alpha.example")); -} - -TEST_F(ServersSettingsTest, AddExistingHostAndPortUpdatesInsteadOfDuplicating) -{ - ServersSettings settings(settingsPath, nullptr); - settings.addNewServer("Alpha", "alpha.example", "4748", "alice", "secret", true, "site-a"); - settings.addNewServer("Renamed", "alpha.example", "4748", "bob", "new-secret", true, "site-b"); - - const auto servers = settings.getServers(); - ASSERT_EQ(servers.size(), 1); - EXPECT_EQ(servers.first().saveName, QString("Renamed")); - EXPECT_EQ(servers.first().username, QString("bob")); - EXPECT_EQ(servers.first().password, QString("new-secret")); - EXPECT_EQ(servers.first().site, QString("site-b")); -} - -TEST_F(ServersSettingsTest, RemoveServerRemovesOnlyMatchingHostAndKeepsOrder) -{ - ServersSettings settings(settingsPath, nullptr); - settings.addNewServer("Alpha", "alpha.example", "4748", "alice", "a", true, ""); - settings.addNewServer("Beta", "beta.example", "4748", "bob", "b", true, ""); - settings.addNewServer("Gamma", "gamma.example", "4748", "carol", "c", true, ""); - - settings.removeServer("beta.example"); - - const auto servers = settings.getServers(); - ASSERT_EQ(servers.size(), 2); - EXPECT_EQ(servers.at(0).saveName, QString("Alpha")); - EXPECT_EQ(servers.at(1).saveName, QString("Gamma")); -} - -TEST_F(ServersSettingsTest, RemovingLastServerDropsItsStaleArraySlot) -{ - ServersSettings settings(settingsPath, nullptr); - settings.addNewServer("Alpha", "alpha.example", "4748", "alice", "a", true, ""); - settings.addNewServer("Beta", "beta.example", "4748", "bob", "b", true, ""); - settings.addNewServer("Gamma", "gamma.example", "4748", "carol", "gamma-secret", true, ""); - - settings.removeServer("gamma.example"); - - QSettings raw(settingsFile(), QSettings::IniFormat); - EXPECT_FALSE(raw.contains("server/server_details/servers/3/password")); - EXPECT_FALSE(raw.contains("server/server_details/servers/3/saveName")); - ASSERT_EQ(settings.getServers().size(), 2); -} - -TEST_F(ServersSettingsTest, UpdateWithoutLossKeepsCredentials) -{ - ServersSettings settings(settingsPath, nullptr); - settings.addNewServer("Alpha", "alpha.example", "4748", "alice", "secret", true, ""); - - EXPECT_TRUE(settings.updateExistingServerWithoutLoss("Renamed", "alpha.example", "1234", "site")); - - const auto server = settings.getServer(settings.findServerIndex("alpha.example", "1234")); - ASSERT_TRUE(server.has_value()); - EXPECT_EQ(server->saveName, QString("Renamed")); - EXPECT_EQ(server->username, QString("alice")); - EXPECT_EQ(server->password, QString("secret")); - EXPECT_TRUE(server->savePassword); - EXPECT_EQ(server->site, QString("site")); -} - -TEST_F(ServersSettingsTest, SetServerPasswordUpdatesOnlyTheNamedProfile) -{ - ServersSettings settings(settingsPath, nullptr); - settings.addNewServer("Alpha", "alpha.example", "4748", "alice", "old", true, ""); - settings.addNewServer("Beta", "beta.example", "4748", "bob", "keep", true, ""); - - settings.setServerPassword("Beta", "new"); - - EXPECT_EQ(settings.getServer(0)->password, QString("old")); - EXPECT_EQ(settings.getServer(1)->password, QString("new")); -} - -TEST_F(ServersSettingsTest, LegacyProfilesAreMigrated) -{ - { - QSettings settings(settingsFile(), QSettings::IniFormat); - settings.setValue("server/server_details/totalServers", 2); - } - writeLegacyServer(1, "Alpha", "alpha.example", "4748", "alice", "secret", true, "site-a"); - writeLegacyServer(2, "Beta", "beta.example", "4748", "bob", "other", false, "site-b"); - - ServersSettings settings(settingsPath, nullptr); - - const auto servers = settings.getServers(); - ASSERT_EQ(servers.size(), 2); - EXPECT_EQ(servers.at(0).saveName, QString("Alpha")); - EXPECT_EQ(servers.at(0).host, QString("alpha.example")); - EXPECT_TRUE(servers.at(0).savePassword); - EXPECT_EQ(servers.at(1).saveName, QString("Beta")); - EXPECT_FALSE(servers.at(1).savePassword); - - QSettings raw(settingsFile(), QSettings::IniFormat); - EXPECT_FALSE(raw.contains("server/server_details/totalServers")); - EXPECT_FALSE(raw.contains("server/server_details/saveName1")); - EXPECT_FALSE(raw.contains("server/server_details/server1")); -} - -TEST_F(ServersSettingsTest, MigrationRunsOnce) -{ - writeLegacyServer(1, "Alpha", "alpha.example", "4748", "alice", "secret", true, ""); - { - QSettings settings(settingsFile(), QSettings::IniFormat); - settings.setValue("server/server_details/totalServers", 1); - } - - { - ServersSettings first(settingsPath, nullptr); - ASSERT_EQ(first.getServers().size(), 1); - } - - ServersSettings second(settingsPath, nullptr); - ASSERT_EQ(second.getServers().size(), 1); -} - -TEST_F(ServersSettingsTest, LegacyProfileAddedAfterMigrationIsMerged) -{ - { - ServersSettings first(settingsPath, nullptr); - first.addNewServer("Alpha", "alpha.example", "4748", "alice", "secret", true, ""); - } - - // An older build writes its own profile back in the legacy format after the - // array migration already happened. - writeLegacyServer(1, "Beta", "beta.example", "4748", "bob", "other", true, "site-b"); - // A duplicate of a profile the array already holds must not be added twice. - writeLegacyServer(2, "Alpha duplicate", "alpha.example", "4748", "eve", "dupe", true, ""); - { - QSettings settings(settingsFile(), QSettings::IniFormat); - settings.setValue("server/server_details/totalServers", 2); - } - - ServersSettings settings(settingsPath, nullptr); - - const auto servers = settings.getServers(); - ASSERT_EQ(servers.size(), 2); - EXPECT_EQ(servers.at(0).saveName, QString("Alpha")); - EXPECT_EQ(servers.at(0).password, QString("secret")); - EXPECT_EQ(servers.at(1).saveName, QString("Beta")); - EXPECT_EQ(servers.at(1).host, QString("beta.example")); - EXPECT_EQ(servers.at(1).username, QString("bob")); - EXPECT_EQ(servers.at(1).password, QString("other")); - EXPECT_TRUE(servers.at(1).savePassword); - EXPECT_EQ(servers.at(1).site, QString("site-b")); - - QSettings raw(settingsFile(), QSettings::IniFormat); - EXPECT_FALSE(raw.contains("server/server_details/totalServers")); - EXPECT_FALSE(raw.contains("server/server_details/saveName1")); - EXPECT_FALSE(raw.contains("server/server_details/server2")); - - // The merge is persisted, so a further start adds nothing. - ServersSettings again(settingsPath, nullptr); - ASSERT_EQ(again.getServers().size(), 2); -} - -TEST_F(ServersSettingsTest, OutOfRangeIndexReturnsNullopt) -{ - ServersSettings settings(settingsPath, nullptr); - EXPECT_FALSE(settings.getServer(-1).has_value()); - EXPECT_FALSE(settings.getServer(0).has_value()); -} -} // namespace - -int main(int argc, char **argv) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/tests/spoiler_file_test.cpp b/tests/spoiler_file_test.cpp deleted file mode 100644 index ecdc3285f..000000000 --- a/tests/spoiler_file_test.cpp +++ /dev/null @@ -1,135 +0,0 @@ -#include "client/network/update/card_spoiler/spoiler_file.h" -#include "support/scoped_file_size_limit.h" - -#include -#include -#include -#include -#include - -namespace -{ -class SpoilerFileTest : public ::testing::Test -{ -protected: - QTemporaryDir directory; - QString path; - QString error; - const QByteArray original = ""; - - void SetUp() override - { - ASSERT_TRUE(directory.isValid()); - path = directory.filePath("spoiler.xml"); - QFile file(path); - ASSERT_TRUE(file.open(QIODevice::WriteOnly)); - ASSERT_EQ(file.write(original), original.size()); - } - - QByteArray read() - { - QFile file(path); - EXPECT_TRUE(file.open(QIODevice::ReadOnly)); - return file.readAll(); - } - - SpoilerFile::SaveResult save(const QByteArray &data) - { - return SpoilerFile::save(path, data, [] { return true; }, error); - } -}; - -TEST_F(SpoilerFileTest, InvalidDocumentsPreserveExistingFile) -{ - for (const QByteArray &invalid : - {QByteArray(), QByteArray(""), - QByteArray(""), - QByteArray(""), - QByteArray(""), - QByteArray(""), - QByteArray("")}) { - EXPECT_EQ(save(invalid), SpoilerFile::SaveResult::Failed); - EXPECT_FALSE(error.isEmpty()); - EXPECT_EQ(read(), original); - } -} - -TEST_F(SpoilerFileTest, SupportedVersionsAreAccepted) -{ - EXPECT_TRUE(SpoilerFile::validate(original).isEmpty()); - EXPECT_TRUE( - SpoilerFile::validate("").isEmpty()); -} - -TEST_F(SpoilerFileTest, IdenticalFileIsUnchanged) -{ - EXPECT_EQ(save(original), SpoilerFile::SaveResult::Unchanged); - EXPECT_TRUE(error.isEmpty()); - EXPECT_EQ(read(), original); -} - -TEST_F(SpoilerFileTest, CompleteFileHashDetectsChangesAfterLargeCommonPrefix) -{ - QByteArray changed = ""; - ASSERT_EQ(save(changed), SpoilerFile::SaveResult::Written); - changed.replace("", ""); - EXPECT_EQ(save(changed), SpoilerFile::SaveResult::Written); - EXPECT_EQ(read(), changed); - EXPECT_TRUE(error.isEmpty()); -} - -TEST_F(SpoilerFileTest, CancellationBeforeWritePreservesExistingFile) -{ - EXPECT_EQ(SpoilerFile::save(path, original, [] { return false; }, error), SpoilerFile::SaveResult::Failed); - EXPECT_FALSE(error.isEmpty()); - EXPECT_EQ(read(), original); -} - -TEST_F(SpoilerFileTest, CancellationBeforeCommitPreservesExistingFile) -{ - int checks = 0; - EXPECT_EQ(SpoilerFile::save( - path, original + "\n", [&checks] { return ++checks == 1; }, error), - SpoilerFile::SaveResult::Failed); - EXPECT_EQ(checks, 2); - EXPECT_FALSE(error.isEmpty()); - EXPECT_EQ(read(), original); - EXPECT_EQ(QDir(directory.path()).entryList(QDir::Files), QStringList{"spoiler.xml"}); -} - -TEST_F(SpoilerFileTest, MissingParentIsCreated) -{ - path = directory.filePath("nested/spoiler.xml"); - EXPECT_EQ(save(original), SpoilerFile::SaveResult::Written); - EXPECT_EQ(read(), original); -} - -TEST_F(SpoilerFileTest, FileInParentPathReportsFailureWithoutModifyingIt) -{ - EXPECT_EQ(SpoilerFile::save( - QDir(path).filePath("spoiler.xml"), original, [] { return true; }, error), - SpoilerFile::SaveResult::Failed); - EXPECT_FALSE(error.isEmpty()); - EXPECT_EQ(read(), original); -} - -#ifdef Q_OS_UNIX -TEST_F(SpoilerFileTest, ShortWriteLeavesExistingFileIntact) -{ - const QByteArray changed = ""; - // A real short write exercises QSaveFile's buffered flush failure without depending - // on disk capacity. The cap is scoped rather than forked, because a death-test child - // under RLIMIT_FSIZE is killed by SIGSEGV on macOS. - test_support::ScopedFileSizeLimit fileSizeCap(128); - ASSERT_TRUE(fileSizeCap.isValid()); - - EXPECT_EQ(save(changed), SpoilerFile::SaveResult::Failed); - EXPECT_FALSE(error.isEmpty()); - EXPECT_EQ(read(), original); - EXPECT_EQ(QDir(directory.path()).entryList(QDir::Files), QStringList{"spoiler.xml"}); -} -#endif -} // namespace diff --git a/tests/support/model_contract_checker.h b/tests/support/model_contract_checker.h deleted file mode 100644 index 9b493ff6e..000000000 --- a/tests/support/model_contract_checker.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef COCKATRICE_TEST_MODEL_CONTRACT_CHECKER_H -#define COCKATRICE_TEST_MODEL_CONTRACT_CHECKER_H - -#include -#include -#include - -namespace test_support -{ -/** - * @brief Keeps a QAbstractItemModelTester alive for the lifetime of a scope. - * - * The tester only observes the model while it exists, so construct this before - * the mutations a test wants to validate and keep it in scope until the end. - * Fatal reporting mode aborts on the first contract violation; a warning would - * let the test pass while printing a line nobody reads in CI. - */ -class ModelContractChecker -{ -public: - explicit ModelContractChecker(QAbstractItemModel *model) - : tester( - std::make_unique(model, QAbstractItemModelTester::FailureReportingMode::Fatal)) - { - } - - ModelContractChecker(const ModelContractChecker &) = delete; - ModelContractChecker &operator=(const ModelContractChecker &) = delete; - -private: - std::unique_ptr tester; -}; -} // namespace test_support - -#endif // COCKATRICE_TEST_MODEL_CONTRACT_CHECKER_H diff --git a/tests/support/scoped_file_size_limit.h b/tests/support/scoped_file_size_limit.h deleted file mode 100644 index 1c1f3d939..000000000 --- a/tests/support/scoped_file_size_limit.h +++ /dev/null @@ -1,83 +0,0 @@ -#ifndef COCKATRICE_TEST_SCOPED_FILE_SIZE_LIMIT_H -#define COCKATRICE_TEST_SCOPED_FILE_SIZE_LIMIT_H - -#include - -#ifdef Q_OS_UNIX - -#include -#include -#include - -namespace test_support -{ -/** - * @brief Caps how large a single file may grow, so a writer's short-write path is reachable. - * - * Lowering RLIMIT_FSIZE makes the next write past the cap fail with EFBIG instead of - * filling a filesystem, which is the only way to fail an install step mid-write without - * depending on free disk space or file ownership. Only the soft limit is lowered, so the - * destructor can hand the process back exactly as it found it: ctest runs one case per - * process, but a whole test binary must not carry the cap into its neighbours. - * - * Do not use this inside a gtest death test. A forked child under RLIMIT_FSIZE is killed - * by SIGSEGV on the macOS runners, while the same case passes on Linux, so the fork is - * what breaks - not the writer. The guard alone isolates the failure just as well. - */ -class ScopedFileSizeLimit -{ -public: - explicit ScopedFileSizeLimit(rlim_t maxBytes) - { - if (getrlimit(RLIMIT_FSIZE, &previousLimit) != 0) { - return; - } - - struct sigaction ignore = {}; - ignore.sa_handler = SIG_IGN; - sigemptyset(&ignore.sa_mask); - if (sigaction(SIGXFSZ, &ignore, &previousAction) != 0) { - return; - } - actionSaved = true; - - struct rlimit capped = previousLimit; - capped.rlim_cur = std::min(maxBytes, previousLimit.rlim_max); - if (setrlimit(RLIMIT_FSIZE, &capped) != 0) { - return; - } - active = true; - } - - ~ScopedFileSizeLimit() - { - if (active) { - setrlimit(RLIMIT_FSIZE, &previousLimit); - } - if (actionSaved) { - sigaction(SIGXFSZ, &previousAction, nullptr); - } - } - - ScopedFileSizeLimit(const ScopedFileSizeLimit &) = delete; - ScopedFileSizeLimit &operator=(const ScopedFileSizeLimit &) = delete; - - /** - * @brief Whether the cap is in force; a test that needs the failure must assert this. - */ - [[nodiscard]] bool isValid() const - { - return active; - } - -private: - bool active = false; - bool actionSaved = false; - struct rlimit previousLimit = {}; - struct sigaction previousAction = {}; -}; -} // namespace test_support - -#endif // Q_OS_UNIX - -#endif // COCKATRICE_TEST_SCOPED_FILE_SIZE_LIMIT_H diff --git a/tests/svg_recolor_test.cpp b/tests/svg_recolor_test.cpp deleted file mode 100644 index abe1e8d1a..000000000 --- a/tests/svg_recolor_test.cpp +++ /dev/null @@ -1,66 +0,0 @@ -#include "libcockatrice/utility/svg_recolor.h" - -#include -#include - -namespace -{ - -TEST(SvgRecolor, ReplacesEverySentinel) -{ - const QByteArray svg = R"()"; - const QByteArray result = resolveSvgColorSentinel(svg, "#ff8800"); - - EXPECT_EQ(result.count("#ff8800"), 2); - EXPECT_FALSE(result.contains("currentColor")); -} - -TEST(SvgRecolor, ReplacesSentinelRegardlessOfCase) -{ - const QByteArray svg = R"()"; - - EXPECT_EQ(resolveSvgColorSentinel(svg, "#ff8800").count("#ff8800"), 2); -} - -TEST(SvgRecolor, LeavesTheRestOfTheDocumentIntact) -{ - const QByteArray svg = - R"()"; - const QByteArray result = resolveSvgColorSentinel(svg, "#123456"); - - EXPECT_TRUE(result.contains(R"(viewBox="0 0 24 24")")); - EXPECT_TRUE(result.contains(R"(d="M0 0h24v24")")); - EXPECT_TRUE(result.contains("an ordinary comment")); -} - -TEST(SvgRecolor, DoesNotModifyTheInput) -{ - const QByteArray svg = R"()"; - const QByteArray original = svg; - - resolveSvgColorSentinel(svg, "#000000"); - - EXPECT_EQ(svg, original); -} - -TEST(SvgRecolor, PreservesBytesThatAreNotValidUtf8) -{ - QByteArray svg = ""; - svg.append("\xff\xfe"); - svg.append(R"()"); - - const QByteArray result = resolveSvgColorSentinel(svg, "#ff8800"); - - EXPECT_TRUE(result.contains("\xff\xfe")); - EXPECT_FALSE(result.contains("currentColor")); - EXPECT_EQ(result.count("#ff8800"), 1); -} - -TEST(SvgRecolor, NoSentinelIsANoOp) -{ - const QByteArray svg = R"()"; - - EXPECT_EQ(resolveSvgColorSentinel(svg, "#ffffff"), svg); -} - -} // namespace diff --git a/tests/theme_migration/CMakeLists.txt b/tests/theme_migration/CMakeLists.txt index 818c1bb16..93493ee5f 100644 --- a/tests/theme_migration/CMakeLists.txt +++ b/tests/theme_migration/CMakeLists.txt @@ -5,14 +5,12 @@ cockatrice_add_test( ${CMAKE_SOURCE_DIR}/cockatrice/src/interface/theme_manager.cpp ${CMAKE_SOURCE_DIR}/cockatrice/src/interface/theme_config.cpp ${CMAKE_SOURCE_DIR}/cockatrice/src/interface/pixel_map_generator.cpp - ${CMAKE_SOURCE_DIR}/cockatrice/src/interface/theme_icon.cpp ${CMAKE_SOURCE_DIR}/cockatrice/src/client/settings/cache_settings.cpp ${CMAKE_SOURCE_DIR}/cockatrice/src/client/settings/card_counter_settings.cpp ${CMAKE_SOURCE_DIR}/cockatrice/src/client/settings/shortcuts_settings.cpp ${CMAKE_SOURCE_DIR}/cockatrice/src/client/network/update/client/release_channel.cpp ${VERSION_STRING_CPP} theme_migration_test.cpp - theme_icon_render_test.cpp LIBS libcockatrice_settings libcockatrice_network @@ -20,6 +18,4 @@ cockatrice_add_test( libcockatrice_protocol INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/cockatrice/src - DEFINITIONS - COCKATRICE_SOURCE_DIR="${CMAKE_SOURCE_DIR}" ) diff --git a/tests/theme_migration/theme_icon_render_test.cpp b/tests/theme_migration/theme_icon_render_test.cpp deleted file mode 100644 index f12db5b16..000000000 --- a/tests/theme_migration/theme_icon_render_test.cpp +++ /dev/null @@ -1,189 +0,0 @@ -#include "interface/theme_icon.h" -#include "interface/theme_manager.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace -{ -/** - * @brief Creates the GUI application QPixmap needs, using the offscreen plugin. - * - * The theme-migration binary is headless; creating this lazily keeps its other - * tests free of a display dependency. - */ -void ensureGuiApplication() -{ - static int argc = 1; - static char name[] = "theme_icon_test"; - static char *argv[] = {name, nullptr}; - // Leaked on purpose: a function-local static QApplication is destroyed before Qt's - // own library statics at exit, and the network module's destructors then run - // against a torn-down QObject layer (SEGV under AddressSanitizer). - static QApplication *app = new QApplication(argc, argv); - Q_UNUSED(app); -} - -QString resourcesDir() -{ - return QDir(QStringLiteral(COCKATRICE_SOURCE_DIR)).absoluteFilePath(QStringLiteral("cockatrice/resources")); -} - -int countOpaquePixels(const QPixmap &pixmap, const QColor &expected) -{ - const QImage image = pixmap.toImage(); - int count = 0; - for (int y = 0; y < image.height(); ++y) { - for (int x = 0; x < image.width(); ++x) { - const QColor pixel = image.pixelColor(x, y); - if (pixel.alpha() > 200 && pixel.red() == expected.red() && pixel.green() == expected.green() && - pixel.blue() == expected.blue()) { - ++count; - } - } - } - return count; -} - -QByteArray svgWith(const QByteArray &colorToken) -{ - return QByteArrayLiteral(R"()"); -} - -/** - * @brief Restores the global theme search paths and palette after each test. - * - * The icon engine reads both process-wide values, so a failing assertion must - * not leak a temporary theme directory or palette into the next test. - */ -class ThemeIconRenderTest : public ::testing::Test -{ -protected: - void SetUp() override - { - qputenv("QT_QPA_PLATFORM", "offscreen"); - ensureGuiApplication(); - savedSearchPaths = QDir::searchPaths(QStringLiteral("theme")); - savedPalette = qApp->palette(); - themeManager = new ThemeManager; - QDir::setSearchPaths(QStringLiteral("theme"), {resourcesDir()}); - } - - void TearDown() override - { - delete themeManager; - themeManager = nullptr; - QDir::setSearchPaths(QStringLiteral("theme"), savedSearchPaths); - qApp->setPalette(savedPalette); - } - - QStringList savedSearchPaths; ///< Search paths captured before the test. - QPalette savedPalette; ///< Application palette captured before the test. -}; - -/** @brief A non-square request must letterbox, not squash, a 24×24 glyph. */ -TEST_F(ThemeIconRenderTest, NonSquareRequestPreservesAspectRatio) -{ - const QIcon icon = loadThemedIcon(QStringLiteral("icons/player")); - ASSERT_FALSE(icon.isNull()); - - EXPECT_EQ(icon.actualSize(QSize(20, 15)), QSize(15, 15)); - - const QPixmap pixmap = icon.pixmap(QSize(20, 15)); - ASSERT_FALSE(pixmap.isNull()); - EXPECT_EQ(pixmap.deviceIndependentSize(), QSizeF(15, 15)); -} - -/** @brief The engine must follow palette flips, icon modes, and DPR. */ -TEST_F(ThemeIconRenderTest, ThemedIconFollowsPaletteModeAndDpr) -{ - QPalette palette = qApp->palette(); - palette.setColor(QPalette::WindowText, QColor(QStringLiteral("#123456"))); - qApp->setPalette(palette); - - const QIcon icon = loadThemedIcon(QStringLiteral("icons/search")); - ASSERT_FALSE(icon.isNull()); - - const QPixmap normal = icon.pixmap(QSize(24, 24), 1.0); - ASSERT_FALSE(normal.isNull()); - EXPECT_EQ(normal.size(), QSize(24, 24)); - EXPECT_DOUBLE_EQ(normal.devicePixelRatio(), 1.0); - EXPECT_GT(countOpaquePixels(normal, QColor(QStringLiteral("#123456"))), 0); - - const QPixmap hidpi = icon.pixmap(QSize(24, 24), 2.0); - ASSERT_FALSE(hidpi.isNull()); - EXPECT_DOUBLE_EQ(hidpi.devicePixelRatio(), 2.0); - EXPECT_EQ(hidpi.deviceIndependentSize(), QSizeF(24, 24)); - - palette.setColor(QPalette::WindowText, QColor(QStringLiteral("#abcdef"))); - qApp->setPalette(palette); - const QPixmap flipped = icon.pixmap(QSize(24, 24), 1.0); - EXPECT_GT(countOpaquePixels(flipped, QColor(QStringLiteral("#abcdef"))), 0); - - QPalette selectedPalette = qApp->palette(); - selectedPalette.setColor(QPalette::HighlightedText, QColor(QStringLiteral("#00ff00"))); - qApp->setPalette(selectedPalette); - const QPixmap selected = icon.pixmap(QSize(24, 24), 1.0, QIcon::Selected, QIcon::Off); - EXPECT_GT(countOpaquePixels(selected, QColor(QStringLiteral("#00ff00"))), 0); -} -} // namespace - -TEST_F(ThemeIconRenderTest, SentinelUsesPaletteColor) -{ - QPalette palette; - palette.setColor(QPalette::WindowText, QColor(Qt::white)); - qApp->setPalette(palette); - - const QPixmap pixmap = loadSentinelSvgPixmap(QStringLiteral("icons/search.svg")); - - ASSERT_FALSE(pixmap.isNull()); - EXPECT_EQ(pixmap.size(), QSize(24, 24)); - EXPECT_GT(countOpaquePixels(pixmap, Qt::white), 0); -} - -TEST_F(ThemeIconRenderTest, NonSentinelSvgReturnsNull) -{ - QTemporaryDir themeDir; - ASSERT_TRUE(themeDir.isValid()); - QFile file(QDir(themeDir.path()).absoluteFilePath(QStringLiteral("plain.svg"))); - ASSERT_TRUE(file.open(QIODevice::WriteOnly)); - file.write(svgWith("#000000")); - file.close(); - QDir::addSearchPath(QStringLiteral("theme"), themeDir.path()); - - EXPECT_TRUE(loadSentinelSvgPixmap(QStringLiteral("plain.svg")).isNull()); - EXPECT_TRUE(loadSentinelSvgPixmap(QStringLiteral("icons/search.png")).isNull()); -} - -TEST_F(ThemeIconRenderTest, LowercaseSentinelIsResolved) -{ - QTemporaryDir themeDir; - ASSERT_TRUE(themeDir.isValid()); - QFile file(QDir(themeDir.path()).absoluteFilePath(QStringLiteral("lower.svg"))); - ASSERT_TRUE(file.open(QIODevice::WriteOnly)); - file.write(svgWith("currentcolor")); - file.close(); - - QDir::addSearchPath(QStringLiteral("theme"), themeDir.path()); - - QPalette palette; - palette.setColor(QPalette::WindowText, QColor(QStringLiteral("#123456"))); - qApp->setPalette(palette); - - const QPixmap pixmap = loadSentinelSvgPixmap(QStringLiteral("lower.svg")); - - ASSERT_FALSE(pixmap.isNull()); - EXPECT_GT(countOpaquePixels(pixmap, QColor(QStringLiteral("#123456"))), 0); -} diff --git a/tests/user_games_model_test.cpp b/tests/user_games_model_test.cpp deleted file mode 100644 index 33c29d6d4..000000000 --- a/tests/user_games_model_test.cpp +++ /dev/null @@ -1,248 +0,0 @@ -#include "interface/widgets/server/user/user_games_model.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -RNG_Abstract *rng = nullptr; // required by the transitive server library; this suite sends no game commands - -namespace -{ -class GamesClient : public AbstractClient -{ -public: - QList sent; - - GamesClient() - { - setStatus(StatusLoggedIn); - } - - ~GamesClient() override - { - qDeleteAll(pendingCommands); - pendingCommands.clear(); - } - - void changeStatus(ClientStatus status) - { - setStatus(status); - } - - void answer(int request, Response response) - { - response.set_cmd_id(sent.at(request).cmd_id()); - ServerMessage message; - message.set_message_type(ServerMessage::RESPONSE); - *message.mutable_response() = response; - processProtocolItem(message); - } - -protected: - void sendCommandContainer(const CommandContainer &command) override - { - sent.append(command); - } -}; - -Response gamesResponse(std::initializer_list ids) -{ - Response response; - response.set_response_code(Response::RespOk); - auto *games = response.MutableExtension(Response_GetGamesOfUser::ext); - for (int id : ids) { - auto *game = games->add_game_list(); - game->set_game_id(id); - game->set_room_id(7); - } - return response; -} - -using State = UserGamesModel::State; - -TEST(UserGamesModel, OfflineUserDoesNotSendARequest) -{ - GamesClient client; - UserGamesModel model(&client); - model.setUser("Alice", false); - model.refresh(); - EXPECT_TRUE(client.sent.isEmpty()); - EXPECT_EQ(State::Offline, model.getState()); - EXPECT_FALSE(model.canRefresh()); - EXPECT_EQ(0, model.rowCount()); -} - -TEST(UserGamesModel, PresenceLossInvalidatesTheOutstandingResponse) -{ - GamesClient client; - UserGamesModel model(&client); - model.setUser("Alice", true); - EXPECT_EQ(State::Loading, model.getState()); - EXPECT_FALSE(model.canRefresh()); - model.setUser("Alice", false); - client.answer(0, gamesResponse({1})); - EXPECT_EQ(State::Offline, model.getState()); - EXPECT_EQ(0, model.rowCount()); - - model.setUser("Alice", true); - client.answer(1, gamesResponse({2})); - EXPECT_EQ(State::Ready, model.getState()); - EXPECT_TRUE(model.canRefresh()); - EXPECT_EQ(2, model.data(model.index(0), UserGamesModel::GameRole).value().game_id()); -} - -TEST(UserGamesModel, SwitchingBackToTheSameUserDoesNotAcceptTheirOldRequest) -{ - GamesClient client; - UserGamesModel model(&client); - model.setUser("Alice", true); - model.setUser("Bob", true); - model.setUser("Alice", true); - client.answer(2, gamesResponse({3})); - client.answer(0, gamesResponse({1})); - client.answer(1, gamesResponse({2})); - EXPECT_EQ(1, model.rowCount()); - EXPECT_EQ(3, model.data(model.index(0), UserGamesModel::GameRole).value().game_id()); -} - -TEST(UserGamesModel, RefreshSupersedesThePreviousRequest) -{ - GamesClient client; - UserGamesModel model(&client); - model.setUser("Alice", true); - model.refresh(); - client.answer(0, gamesResponse({1})); - EXPECT_EQ(State::Loading, model.getState()); - EXPECT_EQ(0, model.rowCount()); - client.answer(1, gamesResponse({2})); - EXPECT_EQ(State::Ready, model.getState()); - EXPECT_EQ(2, model.data(model.index(0), UserGamesModel::GameRole).value().game_id()); -} - -TEST(UserGamesModel, EmptySuccessAndMissingPayloadAreDifferentStates) -{ - GamesClient client; - UserGamesModel model(&client); - model.setUser("Alice", true); - client.answer(0, gamesResponse({})); - EXPECT_EQ(State::Empty, model.getState()); - EXPECT_TRUE(model.canRefresh()); - - model.refresh(); - Response missingPayload; - missingPayload.set_response_code(Response::RespOk); - client.answer(1, missingPayload); - EXPECT_EQ(State::Error, model.getState()); - EXPECT_TRUE(model.canRefresh()); -} - -TEST(UserGamesModel, FailedRequestsCanBeRetried) -{ - GamesClient client; - UserGamesModel model(&client); - model.setUser("Alice", true); - Response error; - error.set_response_code(Response::RespNameNotFound); - client.answer(0, error); - EXPECT_EQ(State::Error, model.getState()); - model.refresh(); - client.answer(1, gamesResponse({4})); - EXPECT_EQ(State::Ready, model.getState()); -} - -TEST(UserGamesModel, DisconnectRejectsLateRepliesAndReconnectFetchesAgain) -{ - GamesClient client; - UserGamesModel model(&client); - model.setUser("Alice", true); - client.changeStatus(StatusDisconnecting); - client.answer(0, gamesResponse({1})); - EXPECT_EQ(State::Disconnected, model.getState()); - EXPECT_FALSE(model.canRefresh()); - model.refresh(); - EXPECT_EQ(1, client.sent.size()); - client.changeStatus(StatusLoggedIn); - client.answer(1, gamesResponse({2})); - EXPECT_EQ(State::Ready, model.getState()); -} - -TEST(UserGamesModel, ClientDestructionClearsGamesAndDisablesRefresh) -{ - auto client = std::make_unique(); - UserGamesModel model(client.get()); - model.setUser("Alice", true); - client->answer(0, gamesResponse({1})); - client.reset(); - EXPECT_EQ(State::Disconnected, model.getState()); - EXPECT_EQ(0, model.rowCount()); - EXPECT_FALSE(model.canRefresh()); - model.refresh(); - EXPECT_EQ(State::Disconnected, model.getState()); -} - -TEST(UserGamesModel, ResetInvalidatesAnOpenGameActionAndPreservesTheModelContract) -{ - GamesClient client; - UserGamesModel model(&client); - QAbstractItemModelTester tester(&model, QAbstractItemModelTester::FailureReportingMode::Fatal); - model.setUser("Alice", true); - client.answer(0, gamesResponse({1, 2, 3})); - QPersistentModelIndex selected(model.index(1)); - EXPECT_TRUE(selected.isValid()); - model.refresh(); - EXPECT_FALSE(selected.isValid()); - EXPECT_EQ(0, model.rowCount()); - client.answer(1, gamesResponse({4})); - EXPECT_EQ(1, model.rowCount()); -} - -TEST(UserGamesModel, StateListenerCanSelectAnotherUserBeforeTheRequestIsSent) -{ - GamesClient client; - UserGamesModel model(&client); - bool switched = false; - QObject::connect(&model, &UserGamesModel::stateChanged, &model, [&] { - if (!switched && model.getState() == State::Loading) { - switched = true; - model.setUser("Bob", false); - } - }); - model.setUser("Alice", true); - EXPECT_TRUE(client.sent.isEmpty()); - EXPECT_EQ(State::Offline, model.getState()); -} - -TEST(UserGamesModel, TimedOutResponseCannotReplaceARetry) -{ - GamesClient client; - UserGamesModel model(&client, 50); - model.setUser("Alice", true); - QSignalSpy changes(&model, &UserGamesModel::stateChanged); - ASSERT_TRUE(changes.wait(1000)); - ASSERT_EQ(State::Error, model.getState()); - EXPECT_TRUE(model.canRefresh()); - model.refresh(); - client.answer(0, gamesResponse({1})); - EXPECT_EQ(State::Loading, model.getState()); - client.answer(1, gamesResponse({2})); - EXPECT_EQ(State::Ready, model.getState()); - EXPECT_EQ(2, model.data(model.index(0), UserGamesModel::GameRole).value().game_id()); -} -} // namespace - -int main(int argc, char **argv) -{ - QCoreApplication app(argc, argv); - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/vcpkg b/vcpkg index 9eec002df..9e593bb18 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit 9eec002df1cd109f8f104cd966a763daf9751489 +Subproject commit 9e593bb18ea69cc5095e012465dcd675a822ed0d diff --git a/vcpkg.json b/vcpkg.json index 8c9c64161..f12227024 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", - "builtin-baseline": "9eec002df1cd109f8f104cd966a763daf9751489", + "builtin-baseline": "9e593bb18ea69cc5095e012465dcd675a822ed0d", "dependencies": [ "gtest", "liblzma",